r46362 - in /desktop/unstable/gtk+3.0/debian: ./ patches/

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Oct 7 22:41:03 UTC 2015 

Author: biebl
Date: Wed Oct  7 22:41:03 2015
New Revision: 46362

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46362
Log:
* Refresh patches.
* Drop debian/patches/git_bitmask-dont-hardcode-64bit-size.patch, merged
  upstream.

Removed:
    desktop/unstable/gtk+3.0/debian/patches/git_bitmask-dont-hardcode-64bit-size.patch
Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
    desktop/unstable/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
    desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
    desktop/unstable/gtk+3.0/debian/patches/060_ignore-random-icons.patch
    desktop/unstable/gtk+3.0/debian/patches/071_fix-installation-of-HTML-images.patch
    desktop/unstable/gtk+3.0/debian/patches/series

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=46362&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Wed Oct  7 22:41:03 2015
@@ -1,6 +1,9 @@
 gtk+3.0 (3.18.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
+  * Drop debian/patches/git_bitmask-dont-hardcode-64bit-size.patch, merged
+    upstream.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 08 Oct 2015 00:18:33 +0200
 

Modified: desktop/unstable/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/015_default-fallback-icon-theme.patch?rev=46362&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/015_default-fallback-icon-theme.patch	[utf-8] Wed Oct  7 22:41:03 2015
@@ -1,8 +1,8 @@
-Index: gtk+-3.16.6/gtk/gtksettings.c
+Index: gtk+-3.18.1/gtk/gtksettings.c
 ===================================================================
---- gtk+-3.16.6.orig/gtk/gtksettings.c	2015-07-22 21:04:31.312918612 +0200
-+++ gtk+-3.16.6/gtk/gtksettings.c	2015-07-22 21:04:31.308918550 +0200
-@@ -461,7 +461,7 @@
+--- gtk+-3.18.1.orig/gtk/gtksettings.c	2015-10-08 00:19:24.297948066 +0200
++++ gtk+-3.18.1/gtk/gtksettings.c	2015-10-08 00:19:24.293948010 +0200
+@@ -468,7 +468,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/unstable/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch?rev=46362&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch	[utf-8] Wed Oct  7 22:41:03 2015
@@ -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.16.6/gtk/gtkmain.c
+Index: gtk+-3.18.1/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.16.6.orig/gtk/gtkmain.c	2015-07-22 21:04:35.528984593 +0200
-+++ gtk+-3.16.6/gtk/gtkmain.c	2015-07-22 21:04:35.524984530 +0200
-@@ -2064,9 +2064,14 @@
+--- gtk+-3.18.1.orig/gtk/gtkmain.c	2015-10-08 00:19:28.186001985 +0200
++++ gtk+-3.18.1/gtk/gtkmain.c	2015-10-08 00:19:28.182001929 +0200
+@@ -2157,9 +2157,14 @@
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;

Modified: desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/017_no_offscreen_device_grabbing.patch?rev=46362&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch	[utf-8] Wed Oct  7 22:41:03 2015
@@ -3,11 +3,11 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
 Bug-Ubuntu: https://launchpad.net/bugs/804009
 
-Index: gtk+-3.16.6/gtk/gtkmain.c
+Index: gtk+-3.18.1/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.16.6.orig/gtk/gtkmain.c	2015-07-22 21:04:37.829020576 +0200
-+++ gtk+-3.16.6/gtk/gtkmain.c	2015-07-22 21:04:37.825020513 +0200
-@@ -2157,9 +2157,14 @@
+--- gtk+-3.18.1.orig/gtk/gtkmain.c	2015-10-08 00:19:30.634035933 +0200
++++ gtk+-3.18.1/gtk/gtkmain.c	2015-10-08 00:19:30.630035878 +0200
+@@ -2250,9 +2250,14 @@
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;

Modified: desktop/unstable/gtk+3.0/debian/patches/060_ignore-random-icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/060_ignore-random-icons.patch?rev=46362&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/060_ignore-random-icons.patch	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/060_ignore-random-icons.patch	[utf-8] Wed Oct  7 22:41:03 2015
@@ -1,6 +1,8 @@
---- a/gtk/updateiconcache.c
-+++ b/gtk/updateiconcache.c
-@@ -676,7 +676,7 @@
+Index: gtk+-3.18.1/gtk/updateiconcache.c
+===================================================================
+--- gtk+-3.18.1.orig/gtk/updateiconcache.c	2015-10-08 00:19:36.650119362 +0200
++++ gtk+-3.18.1/gtk/updateiconcache.c	2015-10-08 00:19:36.646119308 +0200
+@@ -678,7 +678,7 @@
  		      directories = g_list_append (directories, g_strdup (subdir));
  		    }
  		  else

Modified: desktop/unstable/gtk+3.0/debian/patches/071_fix-installation-of-HTML-images.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/071_fix-installation-of-HTML-images.patch?rev=46362&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/071_fix-installation-of-HTML-images.patch	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/071_fix-installation-of-HTML-images.patch	[utf-8] Wed Oct  7 22:41:03 2015
@@ -11,9 +11,11 @@
  gtk-doc.make |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- a/gtk-doc.make
-+++ b/gtk-doc.make
-@@ -182,8 +182,8 @@
+Index: gtk+-3.18.1/gtk-doc.make
+===================================================================
+--- gtk+-3.18.1.orig/gtk-doc.make	2015-10-08 00:19:40.398171340 +0200
++++ gtk+-3.18.1/gtk-doc.make	2015-10-08 00:19:40.394171284 +0200
+@@ -193,8 +193,8 @@
  	  if test -f $(abs_srcdir)/$$file ; then \
  	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
  	  fi; \

Modified: desktop/unstable/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/series?rev=46362&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Wed Oct  7 22:41:03 2015
@@ -7,4 +7,3 @@
 060_ignore-random-icons.patch
 071_fix-installation-of-HTML-images.patch
 reftest-known-fail.patch
-git_bitmask-dont-hardcode-64bit-size.patch

More information about the pkg-gnome-commits mailing list