[SCM] libdrumstick/master: Drop linker-gold.patch, not needed anymore

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Sat Jul 23 13:22:41 UTC 2016


The following commit has been merged in the master branch:
commit 337201bb688d5b37932d924abb6f19bc84299e0a
Author: James Cowgill <jcowgill at debian.org>
Date:   Sat Jul 23 13:59:54 2016 +0100

    Drop linker-gold.patch, not needed anymore

diff --git a/debian/patches/linker-gold.patch b/debian/patches/linker-gold.patch
deleted file mode 100644
index ff39c10..0000000
--- a/debian/patches/linker-gold.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix FTBFS with GNU's gold ld.
-From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615742
----
- utils/vpiano/CMakeLists.txt |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- libdrumstick.orig/utils/vpiano/CMakeLists.txt
-+++ libdrumstick/utils/vpiano/CMakeLists.txt
-@@ -7,6 +7,8 @@ SET(vpiano_forms_SRCS
- 
- QT4_WRAP_UI(vpiano_ui_SRCS ${vpiano_forms_SRCS})
- 
-+FIND_PACKAGE(X11)
-+
- SET(vpiano_SRCS
-     pianokey.cpp
-     pianokey.h
-@@ -52,7 +54,7 @@ ADD_EXECUTABLE(drumstick-vpiano
- TARGET_LINK_LIBRARIES(drumstick-vpiano
-     ${QT_LIBRARIES} 
-     ${ALSA_LIBS} 
--    ${QT_X11_X11_LIBRARY}
-+    ${X11_X11_LIB}
-     drumstick-common
-     drumstick-alsa
- )
diff --git a/debian/patches/series b/debian/patches/series
index ff1b1fe..834fbe0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-linker-gold.patch
 gcc6.patch

-- 
libdrumstick packaging



More information about the pkg-multimedia-commits mailing list