r15151 - in /desktop/experimental/eel2/debian: changelog patches/99_ltmain_as-needed.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Fri Mar 14 19:56:34 2008
New Revision: 15151

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15151
Log:
  + debian/patches/99_ltmain_as-needed.patch:
    - Updated to apply cleanly again.

Modified:
    desktop/experimental/eel2/debian/changelog
    desktop/experimental/eel2/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/experimental/eel2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eel2/debian/changelog?rev=15151&op=diff
==============================================================================
--- desktop/experimental/eel2/debian/changelog (original)
+++ desktop/experimental/eel2/debian/changelog Fri Mar 14 19:56:34 2008
@@ -7,6 +7,8 @@
     + debian/patches/10_open-with_install.patch:
       - Disabled for now, the code is not in eel anymore and needs to be
         patched somewhere else.
+    + debian/patches/99_ltmain_as-needed.patch:
+      - Updated to apply cleanly again.
 
  -- Sebastian Dröge <slomo at debian.org>  Fri, 14 Mar 2008 20:44:25 +0100
 

Modified: desktop/experimental/eel2/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/eel2/debian/patches/99_ltmain_as-needed.patch?rev=15151&op=diff
==============================================================================
--- desktop/experimental/eel2/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/eel2/debian/patches/99_ltmain_as-needed.patch Fri Mar 14 19:56:34 2008
@@ -1,32 +1,30 @@
-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 @@
+--- ltmain.sh	2007-08-14 18:43:36.000000000 +0100
++++ ltmain.sh.new	2007-12-20 12:07:00.000000000 +0000
+@@ -1793,6 +1793,11 @@
+ 	IFS="$save_ifs"
  	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
  	;;
++        
++       -Wl,--as-needed)
++        deplibs="$deplibs $arg"
++        continue
++        ;;
  
-+      -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 @@
+@@ -2137,6 +2142,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)
++        -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|-threads)
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"