[SCM] sineshaper/master: Prevent FTBFS with --as-needed, thanks to Ilya Barygin for the patch (Closes: #638599)

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Aug 21 08:28:14 UTC 2011


The following commit has been merged in the master branch:
commit a7b52724cb2a3af68137742e7df20af33ac344dd
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Aug 21 10:26:22 2011 +0200

    Prevent FTBFS with --as-needed, thanks to Ilya Barygin for the patch (Closes: #638599)

diff --git a/debian/patches/0002-ld_as_needed.patch b/debian/patches/0002-ld_as_needed.patch
new file mode 100644
index 0000000..67cb314
--- /dev/null
+++ b/debian/patches/0002-ld_as_needed.patch
@@ -0,0 +1,31 @@
+Description: Fix linking order to avoid FTBFS with --as-needed enabled.
+Author: Ilya Barygin <barygin at gmail.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638599
+Forwarded: no
+---
+ src/sineshaper/Makefile.am |    2 +-
+ src/sineshaper/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- sineshaper.orig/src/sineshaper/Makefile.am
++++ sineshaper/src/sineshaper/Makefile.am
+@@ -14,7 +14,7 @@ sineshaper_gtk_SOURCES = \
+ 	skindial_gtkmm.cpp skindial_gtkmm.hpp \
+ 	sineshapergui.hpp sineshapergui.cpp \
+ 	sineshaperports.hpp
+-sineshaper_gtk_LDADD = @DSSI_LIBS@ @LIBGLADEMM_LIBS@ @LIBLO_LIBS@ ../common/libdssi_ui.la ../common/libdssi_common.la
++sineshaper_gtk_LDADD = ../common/libdssi_ui.la ../common/libdssi_common.la @DSSI_LIBS@ @LIBGLADEMM_LIBS@ @LIBLO_LIBS@
+ sineshaper_gtk_CXXFLAGS = @LIBLO_CFLAGS@ @DSSI_CFLAGS@ -D_XOPEN_SOURCE @LIBGLADEMM_CFLAGS@ -DINSTALL_DIR=\"$(dssidir)\" -I../common/ -I../gui-components
+ 
+ dist_bin_SCRIPTS = sineshaper.sh
+--- sineshaper.orig/src/sineshaper/Makefile.in
++++ sineshaper/src/sineshaper/Makefile.in
+@@ -220,7 +220,7 @@ sineshaper_gtk_SOURCES = \
+ 	sineshapergui.hpp sineshapergui.cpp \
+ 	sineshaperports.hpp
+ 
+-sineshaper_gtk_LDADD = @DSSI_LIBS@ @LIBGLADEMM_LIBS@ @LIBLO_LIBS@ ../common/libdssi_ui.la ../common/libdssi_common.la
++sineshaper_gtk_LDADD = ../common/libdssi_ui.la ../common/libdssi_common.la @DSSI_LIBS@ @LIBGLADEMM_LIBS@ @LIBLO_LIBS@
+ sineshaper_gtk_CXXFLAGS = @LIBLO_CFLAGS@ @DSSI_CFLAGS@ -D_XOPEN_SOURCE @LIBGLADEMM_CFLAGS@ -DINSTALL_DIR=\"$(dssidir)\" -I../common/ -I../gui-components
+ dist_bin_SCRIPTS = sineshaper.sh
+ gui_DATA = sineshaper.glade dial.png pixmaps/dummydial.png pixmaps/sineshaper.png presets
diff --git a/debian/patches/series b/debian/patches/series
index d181f7e..245e933 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-ftbfs.patch
+0002-ld_as_needed.patch

-- 
sineshaper packaging



More information about the pkg-multimedia-commits mailing list