← Back to branch summary

~ubuntu-branches/ubuntu/hardy/gnome-applets/hardy-updates

« back to all changes in this revision

Viewing changes to debian/patches/99_ltmain_as-needed.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-03-10 10:20:15 UTC
  • mfrom: (1.1.27 upstream)
  • Revision ID: james.westby@ubuntu.com-20080310102015-d46428z4vws97he8
Tags: 2.22.0-0ubuntu1
* New upstream version
* debian/control.in:
  - updated gnome-settings-daemon build depends
* debian/patches/16_correct_keyboard_accessibility.patch:
  - dropped, fixed in the new version
* debian/patches/98_autoreconf.patch:
  - new version update
* debian/patches/99_ltmain_as-needed.patch:
  - new version update

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/99_ltmain_as-needed.patch
1
 
Index: nautilus-2.18.1/ltmain.sh
2
 
===================================================================
3
 
--- nautilus-2.18.1.orig/ltmain.sh      2006-07-13 09:12:13.000000000 +0200
4
 
+++ nautilus-2.18.1/ltmain.sh   2007-06-06 23:36:38.899175453 +0200
5
 
@@ -1794,6 +1794,11 @@
 
1
diff -Nur -x '*.orig' -x '*~' gnome-applets-2.22.0/ltmain.sh gnome-applets-2.22.0.new/ltmain.sh
 
2
--- gnome-applets-2.22.0/ltmain.sh      2007-06-02 07:47:43.000000000 +0200
 
3
+++ gnome-applets-2.22.0.new/ltmain.sh  2008-03-10 10:30:02.000000000 +0100
 
4
@@ -1754,6 +1754,11 @@
6
5
        arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
7
6
        ;;
8
7
 
9
8
+      -Wl,--as-needed)
10
9
+       deplibs="$deplibs $arg"
11
10
+       continue
12
 
+       ;;      
 
11
+       ;;    
13
12
+
14
13
       -Wl,*)
15
14
        args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
16
15
        arg=
17
 
@@ -2134,6 +2139,15 @@
 
16
@@ -2094,6 +2099,15 @@
18
17
        lib=
19
18
        found=no
20
19
        case $deplib in
27
26
+         fi
28
27
+         continue
29
28
+         ;;
30
 
        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 
29
        -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
31
30
          if test "$linkmode,$pass" = "prog,link"; then
32
31
            compile_deplibs="$deplib $compile_deplibs"