[Pkg-amule-commits] [SCM] Git repository for pkg-amule branch, master, updated. debian/2.3.1-8-5-g1082057

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 1bc37b9e40e9d4ccdd974c8cf6930edc7d92d572
Author: Sandro Tosi <morph at debian.org>
Date:   Wed Aug 29 15:47:51 2012 +0200

    Fix build with ld --as-needed; thanks to Ilya Barygin for the report and patch; Closes: #677209

diff --git a/debian/patches/fix_FTBFS_ld_as-needed.patch b/debian/patches/fix_FTBFS_ld_as-needed.patch
new file mode 100644
index 0000000..917c630
--- /dev/null
+++ b/debian/patches/fix_FTBFS_ld_as-needed.patch
@@ -0,0 +1,25 @@
+Description: fix build with --as-needed linker option
+Author: Ilya Barygin <randomaction at ubuntu.com>
+
+--- amule-2.3.1.orig/src/utils/plasmamule/Makefile.am
++++ amule-2.3.1/src/utils/plasmamule/Makefile.am
+@@ -31,7 +31,7 @@ plasma_engine_plasmamule_so_CXXFLAGS = -
+ plasma_applet_plasmamule_so_CXXFLAGS = -shared -D__IMG_PATH__=\"${KDE_ICON_PATH}\" -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
+ plasmamule_engine_feeder_CXXFLAGS = -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} ${DEBUGFLAG}
+ 
+-plasmamule_engine_feeder_LDFLAGS = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
++plasmamule_engine_feeder_LDADD = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
+ 
+ noinst_HEADERS = plasma-engine-plasmamule.h plasma-applet-plasmamule.h plasmamule-dbus.h qt-emc.h
+ 
+--- amule-2.3.1.orig/src/utils/plasmamule/Makefile.in
++++ amule-2.3.1/src/utils/plasmamule/Makefile.in
+@@ -402,7 +402,7 @@ nodist_plasma_applet_plasmamule_so_SOURC
+ plasma_engine_plasmamule_so_CXXFLAGS = -shared -I${KDE_HEADER_DIR} ${QT_CORE_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
+ plasma_applet_plasmamule_so_CXXFLAGS = -shared -D__IMG_PATH__=\"${KDE_ICON_PATH}\" -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
+ plasmamule_engine_feeder_CXXFLAGS = -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} ${DEBUGFLAG}
+-plasmamule_engine_feeder_LDFLAGS = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
++plasmamule_engine_feeder_LDADD = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
+ noinst_HEADERS = plasma-engine-plasmamule.h plasma-applet-plasmamule.h plasmamule-dbus.h qt-emc.h
+ CLEANFILES = *.moc
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/debian/patches/series b/debian/patches/series
index ad39f0c..638e7b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ version_check.diff
 libupnp-fix-publisherurl.patch
 gcc_4.7.diff
 handle_empty_statistics_file.patch
+fix_FTBFS_ld_as-needed.patch

-- 
Git repository for pkg-amule