[SCM] libdrumstick/master: New fix for FTBFS with binutils-gold.
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Tue Mar 1 15:24:01 UTC 2011
The following commit has been merged in the master branch:
commit 08a4577b83269785de0fd2dcd7587a890fdfd6fd
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Tue Mar 1 16:03:11 2011 +0100
New fix for FTBFS with binutils-gold.
The cmake maintainer suggested a different fix, so here's the new
approach. For details, see #615742.
diff --git a/debian/patches/linker-gold.patch b/debian/patches/linker-gold.patch
new file mode 100644
index 0000000..778a6d8
--- /dev/null
+++ b/debian/patches/linker-gold.patch
@@ -0,0 +1,20 @@
+--- a/utils/vpiano/CMakeLists.txt
++++ b/utils/vpiano/CMakeLists.txt
+@@ -7,6 +7,8 @@
+
+ QT4_WRAP_UI(vpiano_ui_SRCS ${vpiano_forms_SRCS})
+
++FIND_PACKAGE(X11)
++
+ SET(vpiano_SRCS
+ pianokey.cpp
+ pianokey.h
+@@ -52,7 +54,7 @@
+ TARGET_LINK_LIBRARIES(drumstick-vpiano
+ ${QT_LIBRARIES}
+ ${ALSA_LIBS}
+- ${QT_X11_X11_LIBRARY}
++ ${X11_X11_LIB}
+ drumstick-common
+ drumstick-alsa
+ )
--
libdrumstick packaging
More information about the pkg-multimedia-commits
mailing list