r26915 - in /desktop/unstable/gnome-vfs/debian: changelog patches/31_link_tests_and_programs_against_required_libs.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Mar 16 14:14:25 2011
New Revision: 26915

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26915
Log:
* debian/patches/31_link_tests_and_programs_against_required_libs.patch
  - Link binaries in test/ and programs/ against all required libs to not
    fail with binutils-gold and GCC 4.5.

Added:
    desktop/unstable/gnome-vfs/debian/patches/31_link_tests_and_programs_against_required_libs.patch
Modified:
    desktop/unstable/gnome-vfs/debian/changelog
    desktop/unstable/gnome-vfs/debian/patches/series

Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=26915&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/changelog [utf-8] Wed Mar 16 14:14:25 2011
@@ -18,6 +18,9 @@
     - Update GnuTLS configure check to also check for libgcrypt using
       AM_PATH_LIBGCRYPT.
     - Add Build-Depends on libgcrypt11-dev.
+  * debian/patches/31_link_tests_and_programs_against_required_libs.patch
+    - Link binaries in test/ and programs/ against all required libs to not
+      fail with binutils-gold and GCC 4.5.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 16 Mar 2011 13:08:05 +0100
 

Added: desktop/unstable/gnome-vfs/debian/patches/31_link_tests_and_programs_against_required_libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/31_link_tests_and_programs_against_required_libs.patch?rev=26915&op=file
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/31_link_tests_and_programs_against_required_libs.patch (added)
+++ desktop/unstable/gnome-vfs/debian/patches/31_link_tests_and_programs_against_required_libs.patch [utf-8] Wed Mar 16 14:14:25 2011
@@ -1,0 +1,54 @@
+From 04cdfe8095fd76ec48586030c83bcef9db1dfb1a Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Wed, 16 Mar 2011 12:16:51 +0100
+Subject: [PATCH] Link test/ and programs/ against all required libs
+
+Required by GCC 4.5.
+---
+ configure.in         |    6 +++++-
+ programs/Makefile.am |    4 ++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index c997af8..9e1cc4b 100644
+--- a/configure.in
++++ b/configure.in
+@@ -111,10 +111,14 @@ PKG_CHECK_MODULES(MODULES_XML_GCONF, glib-2.0 >= $GLIB_REQUIRED gmodule-no-expor
+ AC_SUBST(MODULES_XML_GCONF_CFLAGS)
+ AC_SUBST(MODULES_XML_GCONF_LIBS)
+ 
+-PKG_CHECK_MODULES(TEST, gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED)
++PKG_CHECK_MODULES(TEST, gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED)
+ AC_SUBST(TEST_LIBS)
+ AC_SUBST(TEST_CFLAGS)
+ 
++PKG_CHECK_MODULES(PROGRAMS, gobject-2.0 >= $GLIB_REQUIRED)
++AC_SUBST(PROGRAMS_LIBS)
++AC_SUBST(PROGRAMS_CFLAGS)
++
+ cflags_set=yes
+ GNOME_COMPILE_WARNINGS
+ VFS_CFLAGS="$warnCFLAGS $complCFLAGS"
+diff --git a/programs/Makefile.am b/programs/Makefile.am
+index ee4d2f8..27ee15b 100644
+--- a/programs/Makefile.am
++++ b/programs/Makefile.am
+@@ -3,13 +3,13 @@ NULL =
+ INCLUDES =					\
+ 	-I$(top_srcdir)				\
+ 	-I$(top_builddir)			\
+-	$(TEST_CFLAGS)				\
++	$(PROGRAMS_CFLAGS)			\
+ 	$(VFS_CFLAGS)				\
+ 	-DG_DISABLE_DEPRECATED
+ 
+ libraries =						\
+ 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
+-	$(TEST_LIBS)					\
++	$(PROGRAMS_LIBS)				\
+ 	$(LIBEFS_LIBS)
+ 
+ bin_PROGRAMS =						\
+-- 
+1.7.4.1
+

Modified: desktop/unstable/gnome-vfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/series?rev=26915&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/series [utf-8] Wed Mar 16 14:14:25 2011
@@ -20,3 +20,4 @@
 23_improve_volume_labels.patch
 24_home_dir_fakeroot.patch
 30_nfs4.patch
+31_link_tests_and_programs_against_required_libs.patch