callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Refresh patches.

Browse Source 
* Drop debian/patches/git_bitmask-dont-hardcode-64bit-size.patch, merged
  upstream.
This commit is contained in:
Michael Biebl
2015-10-07 22:41:03 +00:00
parent c4cd5e3220
commit bb42b81016
8 changed files with 25 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -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@debian.org> Thu, 08 Oct 2015 00:18:33 +0200

8
debian/patches/015_default-fallback-icon-theme.patch vendored
View File

@ -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"),

8
debian/patches/016_no_offscreen_widgets_grabbing.patch vendored
View File

@ -3,11 +3,11 @@ Author: Cody Russell <bratsche@gnome.org>
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;

8
debian/patches/017_no_offscreen_device_grabbing.patch vendored
View File

@ -3,11 +3,11 @@ Author: Robert Carr <racarr@canonical.com>
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;

8
debian/patches/060_ignore-random-icons.patch vendored
View File

@ -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

8
debian/patches/071_fix-installation-of-HTML-images.patch vendored
View File

@ -11,9 +11,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
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; \

26
debian/patches/git_bitmask-dont-hardcode-64bit-size.patch vendored
View File

@ -1,26 +0,0 @@
From 97293865b5c3e10fa65009e5f787312a17f47b06 Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@ubuntu.com>
Date: Sun, 27 Sep 2015 15:10:15 +0200
Subject: bitmask: Don't hardcode 64bit size
This looks like an oversight from "quickly testing a potential fix" and
then forgetting to make a production-ready when it works.
https://bugzilla.gnome.org/show_bug.cgi?id=755691
diff --git a/gtk/gtkallocatedbitmask.c b/gtk/gtkallocatedbitmask.c
index f95e312..f655e9d 100644
--- a/gtk/gtkallocatedbitmask.c
+++ b/gtk/gtkallocatedbitmask.c
@@ -312,7 +312,7 @@ _gtk_allocated_bitmask_invert_range (GtkBitmask *mask,
for (i = start_word; i <= end_word; i++)
mask->data[i] ^= ALL_BITS;
mask->data[start_word] ^= (((VALUE_TYPE) 1) << start_bit) - 1;
- if (end_bit != 63)
+ if (end_bit != VALUE_SIZE_BITS - 1)
mask->data[end_word] ^= ALL_BITS << (end_bit + 1);
return gtk_allocated_bitmask_shrink (mask);
--
cgit v0.10.2

1
debian/patches/series vendored
View File

@ -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