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

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Sat Apr 16 18:25:27 UTC 2016 

Author: biebl
Date: Sat Apr 16 18:25:27 2016
New Revision: 48018

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=48018
Log:
Drop debian/patches/git_window-Remove-suspicious-branch.patch, merged
upstream and refresh the remaining patches.

Removed:
    desktop/unstable/gtk+3.0/debian/patches/git_window-Remove-suspicious-branch.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/018_gdkenumtypes.c_location.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=48018&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog	[utf-8] Sat Apr 16 18:25:27 2016
@@ -1,6 +1,8 @@
 gtk+3.0 (3.20.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop debian/patches/git_window-Remove-suspicious-branch.patch, merged
+    upstream and refresh the remaining patches.
 
  -- Michael Biebl <biebl at debian.org>  Sat, 16 Apr 2016 20:09:59 +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=48018&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] Sat Apr 16 18:25:27 2016
@@ -1,8 +1,8 @@
-Index: gtk+-3.18.3/gtk/gtksettings.c
+Index: gtk+-3.20.3/gtk/gtksettings.c
 ===================================================================
---- gtk+-3.18.3.orig/gtk/gtksettings.c	2015-11-11 01:32:31.859659829 +0100
-+++ gtk+-3.18.3/gtk/gtksettings.c	2015-11-11 01:32:31.859659829 +0100
-@@ -467,7 +467,7 @@
+--- gtk+-3.20.3.orig/gtk/gtksettings.c	2016-04-16 20:12:13.342293338 +0200
++++ gtk+-3.20.3/gtk/gtksettings.c	2016-04-16 20:12:13.338293278 +0200
+@@ -464,7 +464,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=48018&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] Sat Apr 16 18:25:27 2016
@@ -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.18.2/gtk/gtkmain.c
+Index: gtk+-3.20.3/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.18.2.orig/gtk/gtkmain.c	2015-10-13 21:40:57.143828925 +0200
-+++ gtk+-3.18.2/gtk/gtkmain.c	2015-10-13 21:40:57.139828869 +0200
-@@ -2163,9 +2163,14 @@
+--- gtk+-3.20.3.orig/gtk/gtkmain.c	2016-04-16 20:12:17.858361634 +0200
++++ gtk+-3.20.3/gtk/gtkmain.c	2016-04-16 20:12:17.854361573 +0200
+@@ -2188,9 +2188,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=48018&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] Sat Apr 16 18:25:27 2016
@@ -3,11 +3,11 @@
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
 Bug-Ubuntu: https://launchpad.net/bugs/804009
 
-Index: gtk+-3.18.2/gtk/gtkmain.c
+Index: gtk+-3.20.3/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.18.2.orig/gtk/gtkmain.c	2015-10-13 21:41:02.115896913 +0200
-+++ gtk+-3.18.2/gtk/gtkmain.c	2015-10-13 21:41:02.111896858 +0200
-@@ -2256,9 +2256,14 @@
+--- gtk+-3.20.3.orig/gtk/gtkmain.c	2016-04-16 20:12:20.282398274 +0200
++++ gtk+-3.20.3/gtk/gtkmain.c	2016-04-16 20:12:20.278398214 +0200
+@@ -2281,9 +2281,14 @@
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;

Modified: desktop/unstable/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/018_gdkenumtypes.c_location.patch?rev=48018&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch	[utf-8] Sat Apr 16 18:25:27 2016
@@ -18,9 +18,11 @@
  gdk/Makefile.am |   17 +++++++----------
  1 files changed, 7 insertions(+), 10 deletions(-)
 
---- a/gdk/Makefile.am
-+++ b/gdk/Makefile.am
-@@ -217,8 +217,8 @@
+Index: gtk+-3.20.3/gdk/Makefile.am
+===================================================================
+--- gtk+-3.20.3.orig/gdk/Makefile.am	2016-04-16 20:12:22.574432906 +0200
++++ gtk+-3.20.3/gdk/Makefile.am	2016-04-16 20:12:22.570432846 +0200
+@@ -222,8 +222,8 @@
  introspection_files = 		\
  	$(filter-out gdkkeysyms-compat.h, $(gdk_h_sources))	\
  	$(gdk_c_sources)	\
@@ -31,7 +33,7 @@
  
  Gdk-3.0.gir: libgdk-3.la Makefile
  Gdk_3_0_gir_SCANNERFLAGS = 	\
-@@ -385,7 +385,7 @@
+@@ -388,7 +388,7 @@
  
  lib_LTLIBRARIES = libgdk-3.la
  
@@ -40,7 +42,7 @@
  EXTRA_DIST += \
  	$(gdk_built_sources)	\
  	fallback-c89.c
-@@ -399,18 +399,15 @@
+@@ -402,18 +402,15 @@
  	$(gdk_built_sources)			\
  	gdkconfig.h
  

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=48018&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/series	[utf-8] Sat Apr 16 18:25:27 2016
@@ -8,4 +8,3 @@
 071_fix-installation-of-HTML-images.patch
 no-accessibility-dump.patch
 disable-flaky-textview-margins-reftest.patch
-git_window-Remove-suspicious-branch.patch

More information about the pkg-gnome-commits mailing list