From: Uwe Hermann <redacted>
Date: Wed, 1 Jan 2014 19:15:38 +0000 (+0100)
Subject: Rename pulseview.patch to pulseview_linkfix.patch.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=22838903fe2a494ef00e67f2428bce0c1ac63cc4;p=sigrok-util.git

Rename pulseview.patch to pulseview_linkfix.patch.
---

diff --git a/cross-compile/mingw/pulseview.patch b/cross-compile/mingw/pulseview.patch
deleted file mode 100644
index e80207e..0000000
--- a/cross-compile/mingw/pulseview.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/pulseview_linkfix.patch b/cross-compile/mingw/pulseview_linkfix.patch
new file mode 100644
index 0000000..e80207e
--- /dev/null
+++ b/cross-compile/mingw/pulseview_linkfix.patch
@@ -0,0 +1,12 @@
+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 e401ab3..b38a111 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -113,7 +113,7 @@ cd ..
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview.patch
+patch -p1 < ../../pulseview_linkfix.patch
 PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..