From: Uwe Hermann <redacted>
Date: Tue, 28 Jan 2014 17:08:33 +0000 (+0100)
Subject: sigrok-cross-mingw: Drop obsolete linking fix.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=41425bb4fb37b83244e7f3bc7b8924229be8c922;p=sigrok-util.git

sigrok-cross-mingw: Drop obsolete linking fix.

This is now included in mainline PulseView.
---

diff --git a/cross-compile/mingw/pulseview_linkfix.patch b/cross-compile/mingw/pulseview_linkfix.patch
deleted file mode 100644
index e80207e..0000000
--- a/cross-compile/mingw/pulseview_linkfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 443dea6..7b91e0b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -250,6 +250,7 @@ set(PULSEVIEW_LINK_LIBS
- if(STATIC_PKGDEPS_LIBS)
- 	link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
- 	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
-+	list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack
- else()
- 	link_directories(${PKGDEPS_LIBRARY_DIRS})
- 	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 33da4cb..a287e1a 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -163,7 +163,6 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview_linkfix.patch
 patch -p1 < ../../pulseview_decodersdir.patch
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_DECODE=y -DENABLE_COTIRE=y .
 make $PARALLEL VERBOSE=1