r36782 - in /desktop/experimental/gtk+2.0/debian: changelog patches/001_static-linking-dont-query-immodules.patch patches/003_gdk.pc_privates.patch patches/005_support_disabling_x11_extensions.patch patches/065_gir_set_packages.patch

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Sun Feb 24 11:48:53 UTC 2013 

Author: pochu
Date: Sun Feb 24 11:48:52 2013
New Revision: 36782

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

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
    desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
    desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
    desktop/experimental/gtk+2.0/debian/patches/065_gir_set_packages.patch

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=36782&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Sun Feb 24 11:48:52 2013
@@ -1,6 +1,8 @@
 gtk+2.0 (2.24.16-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    + debian/patches:
+      - Refreshed.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 24 Feb 2013 00:21:02 +0100
 

Modified: desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=36782&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] Sun Feb 24 11:48:52 2013
@@ -2,11 +2,9 @@
              when --disable-shared was given
 Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
 
-Index: gtk+-2.24.6/configure.in
-===================================================================
---- 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 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -150,6 +150,7 @@
  dnl Initialize libtool
  AC_PROG_CC
  AM_DISABLE_STATIC
@@ -14,10 +12,8 @@
  
  dnl 
  dnl Check for a working C++ compiler, but do not bail out, if none is found.
-Index: gtk+-2.24.6/modules/input/Makefile.am
-===================================================================
---- 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
+--- a/modules/input/Makefile.am
++++ b/modules/input/Makefile.am
 @@ -176,8 +176,12 @@
  if CROSS_COMPILING
  RUN_QUERY_IMMODULES_TEST=false

Modified: desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/003_gdk.pc_privates.patch?rev=36782&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] Sun Feb 24 11:48:52 2013
@@ -1,8 +1,6 @@
-Index: gtk+-2.24.9/configure.in
-===================================================================
---- gtk+-2.24.9.orig/configure.in	2012-01-25 12:26:35.144442401 +0100
-+++ gtk+-2.24.9/configure.in	2012-01-25 12:26:57.180441622 +0100
-@@ -1322,23 +1322,27 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1320,23 +1320,27 @@
  
  # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
  if test "x$gdktarget" = "xx11"; then
@@ -35,10 +33,8 @@
  AC_SUBST(GDK_EXTRA_LIBS)
  AC_SUBST(GDK_EXTRA_CFLAGS)
  AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+-2.24.9/gdk-2.0.pc.in
-===================================================================
---- gtk+-2.24.9.orig/gdk-2.0.pc.in	2012-01-24 20:38:37.000000000 +0100
-+++ gtk+-2.24.9/gdk-2.0.pc.in	2012-01-25 12:26:57.180441622 +0100
+--- a/gdk-2.0.pc.in
++++ b/gdk-2.0.pc.in
 @@ -8,5 +8,6 @@
  Description: GTK+ Drawing Kit (${target} target)
  Version: @VERSION@

Modified: desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/005_support_disabling_x11_extensions.patch?rev=36782&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] Sun Feb 24 11:48:52 2013
@@ -3,11 +3,9 @@
 
 Support disabling X11 extensions
 
-Index: gtk+-2.24.9/configure.in
-===================================================================
---- gtk+-2.24.9.orig/configure.in	2012-01-25 12:26:57.180441622 +0100
-+++ gtk+-2.24.9/configure.in	2012-01-25 12:27:10.980441134 +0100
-@@ -242,6 +242,18 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,6 +241,18 @@
                [AC_HELP_STRING([--enable-xinerama],
  	                      [support xinerama extension if available [default=yes]])],,
                [enable_xinerama="yes"])
@@ -26,7 +24,7 @@
  AC_ARG_ENABLE(rebuilds,
                [AC_HELP_STRING([--disable-rebuilds],
                                [disable all source autogeneration rules])],,
-@@ -1190,7 +1202,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 +34,7 @@
       AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
  
       X_PACKAGES="$X_PACKAGES xrandr"
-@@ -1206,7 +1219,8 @@
+@@ -1204,7 +1217,8 @@
  
    # Checks for XFixes extension
    
@@ -46,7 +44,7 @@
      AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
      
      X_PACKAGES="$X_PACKAGES xfixes"
-@@ -1215,7 +1229,8 @@
+@@ -1213,7 +1227,8 @@
  
    # Checks for Xcomposite extension
  
@@ -56,7 +54,7 @@
      AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
  
      X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -1224,7 +1239,7 @@
+@@ -1222,7 +1237,7 @@
  
    # Checks for Xdamage extension
  

Modified: desktop/experimental/gtk+2.0/debian/patches/065_gir_set_packages.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/065_gir_set_packages.patch?rev=36782&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/065_gir_set_packages.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/065_gir_set_packages.patch [utf-8] Sun Feb 24 11:48:52 2013
@@ -1,8 +1,6 @@
 === modified file 'gdk/Makefile.am'
-Index: gtk+-2.24.9/gdk/Makefile.am
-===================================================================
---- gtk+-2.24.9.orig/gdk/Makefile.am	2012-01-24 20:38:37.000000000 +0100
-+++ gtk+-2.24.9/gdk/Makefile.am	2012-01-25 12:29:30.928436184 +0100
+--- a/gdk/Makefile.am
++++ b/gdk/Makefile.am
 @@ -3,6 +3,7 @@
  -include $(INTROSPECTION_MAKEFILE)
  INTROSPECTION_GIRS =
@@ -39,10 +37,8 @@
  GdkX11_2_0_gir_CFLAGS = $(INCLUDES) -L$(top_builddir)/gdk
  INTROSPECTION_GIRS += GdkX11-2.0.gir
  
-Index: gtk+-2.24.9/gtk/Makefile.am
-===================================================================
---- gtk+-2.24.9.orig/gtk/Makefile.am	2012-01-24 20:38:37.000000000 +0100
-+++ gtk+-2.24.9/gtk/Makefile.am	2012-01-25 12:29:30.928436184 +0100
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
 @@ -3,6 +3,7 @@
  -include $(INTROSPECTION_MAKEFILE)
  INTROSPECTION_GIRS =
@@ -51,7 +47,7 @@
  	--add-include-path=../gdk
  INTROSPECTION_COMPILER_ARGS = \
  	--includedir=$(srcdir) \
-@@ -1010,11 +1011,11 @@
+@@ -1012,11 +1013,11 @@
      gtktypebuiltins.c
  
  Gtk-2.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-2.0.gir Makefile
@@ -65,7 +61,7 @@
  Gtk_2_0_gir_CFLAGS = \
  		$(INCLUDES) \
  		-UGDK_DISABLE_DEPRECATED \
-@@ -1022,6 +1023,7 @@
+@@ -1024,6 +1025,7 @@
  		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
  Gtk_2_0_gir_LIBS = $(gtktargetlib)
  Gtk_2_0_gir_FILES = $(introspection_files)

More information about the pkg-gnome-commits mailing list