r30002 - in /desktop/unstable/gtk+2.0/debian: changelog patches/001_static-linking-dont-query-immodules.patch patches/005_support_disabling_x11_extensions.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct  5 09:32:58 2011
New Revision: 30002

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=30002
Log:
Refresh patches.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
    desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=30002&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/changelog [utf-8] Wed Oct  5 09:32:58 2011
@@ -6,6 +6,7 @@
     - Add Breaks: libgnome2-0 (<< 2.32.1-2) to libgail-common to ensure
       we have a recent enough version of libgnome2-0 which can read the
       accessibility module from the new multiarch location. Closes: #636536
+  * Refresh patches.
 
  -- Michael Biebl <biebl at debian.org>  Wed, 05 Oct 2011 11:11:48 +0200
 

Modified: desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=30002&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] Wed Oct  5 09:32:58 2011
@@ -2,11 +2,11 @@
              when --disable-shared was given
 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
 
-Index: gtk+2.0-2.22.0/configure.in
+Index: gtk+-2.24.6/configure.in
 ===================================================================
---- gtk+2.0-2.22.0.orig/configure.in	2010-09-23 05:00:45.000000000 +0200
-+++ gtk+2.0-2.22.0/configure.in	2010-09-23 20:29:21.069589516 +0200
-@@ -150,6 +150,7 @@
+--- gtk+-2.24.6.orig/configure.in	2011-08-30 22:21:47.000000000 +0200
++++ gtk+-2.24.6/configure.in	2011-10-05 11:31:45.486226953 +0200
+@@ -151,6 +151,7 @@
  dnl Initialize libtool
  AC_PROG_CC
  AM_DISABLE_STATIC
@@ -14,10 +14,10 @@
  
  dnl 
  dnl Check for a working C++ compiler, but do not bail out, if none is found.
-Index: gtk+2.0-2.22.0/modules/input/Makefile.am
+Index: gtk+-2.24.6/modules/input/Makefile.am
 ===================================================================
---- gtk+2.0-2.22.0.orig/modules/input/Makefile.am	2010-09-23 05:00:38.000000000 +0200
-+++ gtk+2.0-2.22.0/modules/input/Makefile.am	2010-09-23 20:29:21.069589516 +0200
+--- gtk+-2.24.6.orig/modules/input/Makefile.am	2011-08-16 04:30:52.000000000 +0200
++++ gtk+-2.24.6/modules/input/Makefile.am	2011-10-05 11:31:45.486226953 +0200
 @@ -176,8 +176,12 @@
  if CROSS_COMPILING
  RUN_QUERY_IMMODULES_TEST=false

Modified: desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/patches/005_support_disabling_x11_extensions.patch?rev=30002&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] (original)
+++ desktop/unstable/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] Wed Oct  5 09:32:58 2011
@@ -3,11 +3,11 @@
 
 Support disabling X11 extensions
 
-Index: gtk+2.0-2.22.0/configure.in
+Index: gtk+-2.24.6/configure.in
 ===================================================================
---- gtk+2.0-2.22.0.orig/configure.in	2010-09-23 20:29:25.890579526 +0200
-+++ gtk+2.0-2.22.0/configure.in	2010-09-23 20:29:29.405590870 +0200
-@@ -241,6 +241,18 @@
+--- gtk+-2.24.6.orig/configure.in	2011-10-05 11:31:53.738123214 +0200
++++ gtk+-2.24.6/configure.in	2011-10-05 11:31:56.410089622 +0200
+@@ -242,6 +242,18 @@
                [AC_HELP_STRING([--enable-xinerama],
  	                      [support xinerama extension if available [default=yes]])],,
                [enable_xinerama="yes"])
@@ -26,7 +26,7 @@
  AC_ARG_ENABLE(rebuilds,
                [AC_HELP_STRING([--disable-rebuilds],
                                [disable all source autogeneration rules])],,
-@@ -1187,7 +1199,8 @@
+@@ -1188,7 +1200,8 @@
    AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
  
    # Check for the RANDR extension
@@ -36,7 +36,7 @@
       AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
  
       X_PACKAGES="$X_PACKAGES xrandr"
-@@ -1203,7 +1216,8 @@
+@@ -1204,7 +1217,8 @@
  
    # Checks for XFixes extension
    
@@ -46,7 +46,7 @@
      AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
      
      X_PACKAGES="$X_PACKAGES xfixes"
-@@ -1212,7 +1226,8 @@
+@@ -1213,7 +1227,8 @@
  
    # Checks for Xcomposite extension
  
@@ -56,7 +56,7 @@
      AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
  
      X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -1221,7 +1236,7 @@
+@@ -1222,7 +1237,7 @@
  
    # Checks for Xdamage extension