r11332 - in /desktop/unstable/control-center/debian: changelog patches/99_ltmain_as-needed.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jun  6 21:46:38 2007
New Revision: 11332

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11332
Log:
* capplets-data.gconf-defaults: set the default keybindings, formerly
* 99_ltmain_as-needed.patch: get --as-needed back to work.

Added:
    desktop/unstable/control-center/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/unstable/control-center/debian/changelog

Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=11332&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog (original)
+++ desktop/unstable/control-center/debian/changelog Wed Jun  6 21:46:38 2007
@@ -1,10 +1,11 @@
 control-center (1:2.18.1-2) UNRELEASED; urgency=low
 
-  * capplets-data.gconf-defaults: set the default keybindings, formerly 
+  * capplets-data.gconf-defaults: set the default keybindings, formerly
     in patches/07_default_keys.patch.
   * patches/07_default_keys.patch: removed.
-
- -- Josselin Mouette <joss at debian.org>  Wed, 25 Apr 2007 23:48:43 +0200
+  * 99_ltmain_as-needed.patch: get --as-needed back to work.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 06 Jun 2007 23:46:20 +0200
 
 control-center (1:2.18.1-1) unstable; urgency=low
 

Added: desktop/unstable/control-center/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/99_ltmain_as-needed.patch?rev=11332&op=file
==============================================================================
--- desktop/unstable/control-center/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/control-center/debian/patches/99_ltmain_as-needed.patch Wed Jun  6 21:46:38 2007
@@ -1,0 +1,32 @@
+Index: nautilus-2.18.1/ltmain.sh
+===================================================================
+--- nautilus-2.18.1.orig/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
++++ nautilus-2.18.1/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
+@@ -1784,6 +1784,11 @@
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++      
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2124,6 +2129,15 @@
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-Wl,--as-needed)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"