r33442 - in /desktop/experimental/gtk+3.0/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Mar 21 01:43:38 UTC 2012


Author: biebl
Date: Wed Mar 21 01:43:37 2012
New Revision: 33442

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33442
Log:
* Refresh patches.
* Disable 043_notebook_scroll.patch, it needs to be updated.

Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
    desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
    desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
    desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
    desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
    desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch
    desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch
    desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
    desktop/experimental/gtk+3.0/debian/patches/series

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Wed Mar 21 01:43:37 2012
@@ -11,8 +11,10 @@
       package.
     - Update dependencies of libgtk-3-dev. Strip the minimum version from
       libx*-dev, since those versions were older then lenny anyway.
-
- -- Michael Biebl <biebl at debian.org>  Wed, 21 Mar 2012 02:36:21 +0100
+  * Refresh patches.
+  * Disable 043_notebook_scroll.patch, it needs to be updated.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 21 Mar 2012 02:41:41 +0100
 
 gtk+3.0 (3.3.16-1) experimental; urgency=low
 

Modified: desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/015_default-fallback-icon-theme.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -1,8 +1,8 @@
-Index: gtk+-3.3.16/gtk/gtksettings.c
+Index: gtk+-3.3.20/gtk/gtksettings.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtksettings.c	2012-03-05 00:06:46.552212764 +0100
-+++ gtk+-3.3.16/gtk/gtksettings.c	2012-03-05 01:25:06.032166838 +0100
-@@ -430,7 +430,7 @@
+--- gtk+-3.3.20.orig/gtk/gtksettings.c	2012-03-21 00:38:01.090485562 +0100
++++ gtk+-3.3.20/gtk/gtksettings.c	2012-03-21 00:38:04.810485429 +0100
+@@ -443,7 +443,7 @@
                                               g_param_spec_string ("gtk-fallback-icon-theme",
                                                                    P_("Fallback Icon Theme Name"),
                                                                    P_("Name of a icon theme to fall back to"),

Modified: desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -3,11 +3,11 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427
 
-Index: gtk+-3.3.16/gtk/gtkmain.c
+Index: gtk+-3.3.20/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkmain.c	2012-03-05 00:06:46.500212763 +0100
-+++ gtk+-3.3.16/gtk/gtkmain.c	2012-03-05 01:25:09.020166807 +0100
-@@ -2003,9 +2003,14 @@
+--- gtk+-3.3.20.orig/gtk/gtkmain.c	2012-03-21 00:38:00.982485565 +0100
++++ gtk+-3.3.20/gtk/gtkmain.c	2012-03-21 00:38:11.186485204 +0100
+@@ -2036,9 +2036,14 @@
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;

Modified: desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/017_no_offscreen_device_grabbing.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -3,11 +3,11 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
 Bug-Ubuntu: https://launchpad.net/bugs/804009
 
-Index: gtk+-3.2.3/gtk/gtkmain.c
+Index: gtk+-3.3.20/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.2.3.orig/gtk/gtkmain.c	2011-12-20 18:37:42.094995730 +0100
-+++ gtk+-3.2.3/gtk/gtkmain.c	2011-12-20 18:37:43.046995696 +0100
-@@ -2298,9 +2298,14 @@
+--- gtk+-3.3.20.orig/gtk/gtkmain.c	2012-03-21 00:38:11.186485204 +0100
++++ gtk+-3.3.20/gtk/gtkmain.c	2012-03-21 00:38:14.194485098 +0100
+@@ -2129,9 +2129,14 @@
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;

Modified: desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/018_gdkenumtypes.c_location.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -18,11 +18,11 @@
  gdk/Makefile.am |   17 +++++++----------
  1 files changed, 7 insertions(+), 10 deletions(-)
 
-Index: gtk+-3.3.16/gdk/Makefile.am
+Index: gtk+-3.3.20/gdk/Makefile.am
 ===================================================================
---- gtk+-3.3.16.orig/gdk/Makefile.am	2012-03-05 00:06:46.324212766 +0100
-+++ gtk+-3.3.16/gdk/Makefile.am	2012-03-05 01:25:14.252166756 +0100
-@@ -187,8 +187,8 @@
+--- gtk+-3.3.20.orig/gdk/Makefile.am	2012-03-21 00:38:00.762485573 +0100
++++ gtk+-3.3.20/gdk/Makefile.am	2012-03-21 00:38:17.102484995 +0100
+@@ -189,8 +189,8 @@
  introspection_files = 		\
  	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
  	$(gdk_c_sources)	\

Modified: desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -1,8 +1,8 @@
-Index: gtk+2.0-2.21.5/modules/input/imviqr.c
+Index: gtk+-3.3.20/modules/input/imviqr.c
 ===================================================================
---- gtk+2.0-2.21.5.orig/modules/input/imviqr.c	2010-06-16 17:27:05.000000000 +0200
-+++ gtk+2.0-2.21.5/modules/input/imviqr.c	2010-07-22 17:56:01.021052474 +0200
-@@ -244,7 +244,7 @@
+--- gtk+-3.3.20.orig/modules/input/imviqr.c	2012-03-21 00:38:00.662485577 +0100
++++ gtk+-3.3.20/modules/input/imviqr.c	2012-03-21 00:38:21.298484846 +0100
+@@ -242,7 +242,7 @@
    N_("Vietnamese (VIQR)"), /* Human readable name */
    GETTEXT_PACKAGE,	   /* Translation domain */
     GTK_LOCALEDIR,	   /* Dir for bindtextdomain (not strictly needed for "gtk+") */

Modified: desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/044_tracker_fts.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -3,11 +3,11 @@
  GTK3's file selector dialog.
  This way files can be found by their content and not only their file name.
 
-diff --git a/gtk/gtksearchenginetracker.c b/gtk/gtksearchenginetracker.c
-index a2b4b93..ad878f6 100644
---- a/gtk/gtksearchenginetracker.c
-+++ b/gtk/gtksearchenginetracker.c
-@@ -51,7 +51,7 @@
+Index: gtk+-3.3.20/gtk/gtksearchenginetracker.c
+===================================================================
+--- gtk+-3.3.20.orig/gtk/gtksearchenginetracker.c	2012-03-21 00:38:00.554485580 +0100
++++ gtk+-3.3.20/gtk/gtksearchenginetracker.c	2012-03-21 00:38:24.098484747 +0100
+@@ -50,7 +50,7 @@
   * use filename matching instead. This doesn't use the content of the
   * file however.
   */

Modified: desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/060_ignore-random-icons.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/060_ignore-random-icons.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -1,8 +1,8 @@
-Index: gtk+3.0-2.90.5/gtk/updateiconcache.c
+Index: gtk+-3.3.20/gtk/updateiconcache.c
 ===================================================================
---- gtk+3.0-2.90.5.orig/gtk/updateiconcache.c	2010-05-08 06:39:07.000000000 +0200
-+++ gtk+3.0-2.90.5/gtk/updateiconcache.c	2010-07-30 19:12:50.495114783 +0200
-@@ -660,7 +660,7 @@
+--- gtk+-3.3.20.orig/gtk/updateiconcache.c	2012-03-21 00:38:00.442485584 +0100
++++ gtk+-3.3.20/gtk/updateiconcache.c	2012-03-21 00:38:26.866484650 +0100
+@@ -658,7 +658,7 @@
  		      directories = g_list_append (directories, g_strdup (subdir));
  		    }
  		  else

Modified: desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/061_multiarch_module_fallback.patch?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch [utf-8] Wed Mar 21 01:43:37 2012
@@ -5,11 +5,11 @@
 Author: Steve Langasek <steve.langasek at linaro.org>
 Forwarded: not-needed
 
-Index: gtk+-3.3.16/gtk/gtkmodules.c
+Index: gtk+-3.3.20/gtk/gtkmodules.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkmodules.c	2012-03-05 00:06:46.000000000 +0100
-+++ gtk+-3.3.16/gtk/gtkmodules.c	2012-03-05 01:28:44.432164702 +0100
-@@ -59,6 +59,7 @@
+--- gtk+-3.3.20.orig/gtk/gtkmodules.c	2012-03-21 00:38:00.334485587 +0100
++++ gtk+-3.3.20/gtk/gtkmodules.c	2012-03-21 00:38:29.590484553 +0100
+@@ -57,6 +57,7 @@
    gchar *home_gtk_dir = NULL;
    gchar *module_path;
    gchar *default_dir;
@@ -17,7 +17,7 @@
    static gchar **result = NULL;
  
    if (result)
-@@ -73,21 +74,23 @@
+@@ -71,21 +72,23 @@
  
    if (exe_prefix)
      default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL);

Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=33442&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Wed Mar 21 01:43:37 2012
@@ -4,7 +4,7 @@
 018_gdkenumtypes.c_location.patch
 022_disable-viqr-im-for-vi-locale.patch
 #042_treeview_single-focus.patch
-043_notebook_scroll.patch
+#043_notebook_scroll.patch
 044_tracker_fts.patch
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch




More information about the pkg-gnome-commits mailing list