r24784 - in /desktop/unstable/gedit/debian: changelog patches/04_link_against_libICE.patch patches/90_autoreconf.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sat Jul 17 00:38:50 UTC 2010


Author: biebl
Date: Sat Jul 17 00:38:50 2010
New Revision: 24784

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24784
Log:
* debian/patches/04_link_against_libICE.patch
  - Link against libICE so we don't fail with stricter linkers like
    binutils-gold. Closes: #554483
* debian/patches/90_autoreconf.patch
  - Refresh as 04_link_against_libICE.patch changes configure.ac.

Added:
    desktop/unstable/gedit/debian/patches/04_link_against_libICE.patch
Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/patches/90_autoreconf.patch
    desktop/unstable/gedit/debian/patches/series

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=24784&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog [utf-8] (original)
+++ desktop/unstable/gedit/debian/changelog [utf-8] Sat Jul 17 00:38:50 2010
@@ -1,6 +1,11 @@
 gedit (2.30.3-1) UNRELEASED; urgency=low
 
   * New upstream bugfix release.
+  * debian/patches/04_link_against_libICE.patch
+    - Link against libICE so we don't fail with stricter linkers like
+      binutils-gold. Closes: #554483
+  * debian/patches/90_autoreconf.patch
+    - Refresh as 04_link_against_libICE.patch changes configure.ac.
 
  -- Michael Biebl <biebl at debian.org>  Sun, 04 Jul 2010 20:44:16 +0200
 

Added: desktop/unstable/gedit/debian/patches/04_link_against_libICE.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/04_link_against_libICE.patch?rev=24784&op=file
==============================================================================
--- desktop/unstable/gedit/debian/patches/04_link_against_libICE.patch (added)
+++ desktop/unstable/gedit/debian/patches/04_link_against_libICE.patch [utf-8] Sat Jul 17 00:38:50 2010
@@ -1,0 +1,17 @@
+Description: Link against libICE
+ eggsmclient-xsmp uses libICE so we explicitly need to link against it to not
+ fail with stricter linkers like binutils-gold.
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/554483
+Index: gedit-2.30.3/configure.ac
+===================================================================
+--- gedit-2.30.3.orig/configure.ac	2010-07-17 02:20:45.481463497 +0200
++++ gedit-2.30.3/configure.ac	2010-07-17 02:20:59.029469305 +0200
+@@ -320,6 +320,7 @@
+    test "$os_win32" = "no"; then
+ 	PKG_CHECK_MODULES(EGG_SMCLIENT, [
+ 		sm >= 1.0.0
++		ice
+ 	])
+ else
+ 	EGG_SMCLIENT_CFLAGS=

Modified: desktop/unstable/gedit/debian/patches/90_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/90_autoreconf.patch?rev=24784&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/90_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/90_autoreconf.patch [utf-8] Sat Jul 17 00:38:50 2010
@@ -1,6 +1,8 @@
 diff '-x*config.guess' '-x*config.sub' -Naur gedit-2.30.2.old/aclocal.m4 gedit-2.30.2/aclocal.m4
---- gedit-2.30.2.old/aclocal.m4	2010-04-18 21:31:32.000000000 +0200
-+++ gedit-2.30.2/aclocal.m4	2010-04-19 10:37:14.173738727 +0200
+Index: gedit-2.30.3/aclocal.m4
+===================================================================
+--- gedit-2.30.3.orig/aclocal.m4	2010-07-17 02:21:43.897464538 +0200
++++ gedit-2.30.3/aclocal.m4	2010-07-17 02:21:48.945463092 +0200
 @@ -1121,14 +1121,16 @@
  # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
  # ---------------------------------------------
@@ -38,9 +40,10 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff '-x*config.guess' '-x*config.sub' -Naur gedit-2.30.2.old/configure gedit-2.30.2/configure
---- gedit-2.30.2.old/configure	2010-04-18 21:31:37.000000000 +0200
-+++ gedit-2.30.2/configure	2010-04-19 10:37:15.437737911 +0200
+Index: gedit-2.30.3/configure
+===================================================================
+--- gedit-2.30.3.orig/configure	2010-07-17 02:21:43.917464295 +0200
++++ gedit-2.30.3/configure	2010-07-17 02:22:55.637458005 +0200
 @@ -6009,11 +6009,11 @@
    ;;
  
@@ -516,7 +519,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$X11_PKG_ERRORS" >&5
-@@ -14024,10 +14058,11 @@
+@@ -14024,49 +14058,59 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGG_SMCLIENT" >&5
  $as_echo_n "checking for EGG_SMCLIENT... " >&6; }
  
@@ -531,8 +534,19 @@
 +        if test -n "$PKG_CONFIG" && \
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		sm >= 1.0.0
++		ice
  	\""; } >&5
-@@ -14043,13 +14078,15 @@
+   ($PKG_CONFIG --exists --print-errors "
+ 		sm >= 1.0.0
++		ice
+ 	") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EGG_SMCLIENT_CFLAGS=`$PKG_CONFIG --cflags "
+ 		sm >= 1.0.0
++		ice
+ 	" 2>/dev/null`
  else
    pkg_failed=yes
  fi
@@ -553,20 +567,31 @@
 +        if test -n "$PKG_CONFIG" && \
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		sm >= 1.0.0
++		ice
  	\""; } >&5
-@@ -14065,8 +14102,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -14079,13 +14117,13 @@
+   ($PKG_CONFIG --exists --print-errors "
+ 		sm >= 1.0.0
++		ice
+ 	") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+   pkg_cv_EGG_SMCLIENT_LIBS=`$PKG_CONFIG --libs "
+ 		sm >= 1.0.0
++		ice
+ 	" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -14079,19 +14123,22 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -574,17 +599,26 @@
 +	        EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "
  		sm >= 1.0.0
 -	" 2>&1`
++		ice
 +	"`
          else
 -	        EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --print-errors "
 +	        EGG_SMCLIENT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
  		sm >= 1.0.0
 -	" 2>&1`
++		ice
 +	"`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$EGG_SMCLIENT_PKG_ERRORS" >&5
-@@ -14503,10 +14541,11 @@
+ 
+ 	as_fn_error "Package requirements (
+ 		sm >= 1.0.0
++		ice
+ 	) were not met:
+ 
+ $EGG_SMCLIENT_PKG_ERRORS
+@@ -14503,10 +14550,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
  $as_echo_n "checking for PYGTK... " >&6; }
  
@@ -600,7 +634,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		pygobject-2.0 >= \$PYGOBJECT_REQUIRED
  		pygtk-2.0 >= \$PYGTK_REQUIRED
-@@ -14525,13 +14564,15 @@
+@@ -14525,13 +14573,15 @@
  else
    pkg_failed=yes
  fi
@@ -622,19 +656,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		pygobject-2.0 >= \$PYGOBJECT_REQUIRED
  		pygtk-2.0 >= \$PYGTK_REQUIRED
-@@ -14550,8 +14591,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -14564,15 +14606,15 @@
+@@ -14550,8 +14600,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -14564,15 +14615,15 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -654,9 +688,10 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$PYGTK_PKG_ERRORS" >&5
-diff '-x*config.guess' '-x*config.sub' -Naur gedit-2.30.2.old/ltmain.sh gedit-2.30.2/ltmain.sh
---- gedit-2.30.2.old/ltmain.sh	2010-04-18 16:55:34.000000000 +0200
-+++ gedit-2.30.2/ltmain.sh	2010-04-19 10:37:03.905737266 +0200
+Index: gedit-2.30.3/ltmain.sh
+===================================================================
+--- gedit-2.30.3.orig/ltmain.sh	2010-07-17 02:21:43.909465230 +0200
++++ gedit-2.30.3/ltmain.sh	2010-07-17 02:21:49.009465383 +0200
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
@@ -735,9 +770,10 @@
  	  esac
  	  ;;
  	no)
-diff '-x*config.guess' '-x*config.sub' -Naur gedit-2.30.2.old/m4/libtool.m4 gedit-2.30.2/m4/libtool.m4
---- gedit-2.30.2.old/m4/libtool.m4	2010-04-18 16:55:34.000000000 +0200
-+++ gedit-2.30.2/m4/libtool.m4	2010-04-19 10:37:04.065753351 +0200
+Index: gedit-2.30.3/m4/libtool.m4
+===================================================================
+--- gedit-2.30.3.orig/m4/libtool.m4	2010-07-17 02:21:43.881465012 +0200
++++ gedit-2.30.3/m4/libtool.m4	2010-07-17 02:21:49.021464678 +0200
 @@ -2445,7 +2445,7 @@
    ;;
  

Modified: desktop/unstable/gedit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/series?rev=24784&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gedit/debian/patches/series [utf-8] Sat Jul 17 00:38:50 2010
@@ -1,4 +1,5 @@
 01_gedit-bugreport-location.patch
 03_python_path.patch
+04_link_against_libICE.patch
 90_autoreconf.patch
 99_ltmain_as-needed.patch




More information about the pkg-gnome-commits mailing list