From 5db2423befaf4834bb8bd9ae297817debdaa3b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 5 Jun 2016 22:44:56 +0200 Subject: New cherry-picked patches --- debian/changelog | 5 +++- debian/patches/0001-buildflags.patch | 2 +- debian/patches/0005-hardening.patch | 2 +- debian/patches/0510-Delay_size_request.patch | 26 ++++++++++++++++++ .../0515-Fix_background_color_drawing.patch | 32 ++++++++++++++++++++++ debian/patches/series | 2 ++ 6 files changed, 66 insertions(+), 3 deletions(-) create mode 100644 debian/patches/0510-Delay_size_request.patch create mode 100644 debian/patches/0515-Fix_background_color_drawing.patch diff --git a/debian/changelog b/debian/changelog index 28b9d17..564755a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,11 @@ shotwell (0.23.1-1) unstable; urgency=medium + Fix files mode in temp-source tarball. Thanks to Alexis Bienvenüe . * New debian/shotwell-common.postrm to rebuild icon cache after purge / remove. + * New cherry-picked patches from upstream (Closes: #823835): + - 0510-Delay_size_request.patch + - 0515-Fix_background_color_drawing.patch - -- Jörg Frings-Fürst Sun, 05 Jun 2016 15:05:46 +0200 + -- Jörg Frings-Fürst Sun, 05 Jun 2016 22:36:26 +0200 shotwell (0.22.1-1) unstable; urgency=medium diff --git a/debian/patches/0001-buildflags.patch b/debian/patches/0001-buildflags.patch index 9b293f4..dbce802 100644 --- a/debian/patches/0001-buildflags.patch +++ b/debian/patches/0001-buildflags.patch @@ -7,7 +7,7 @@ Index: trunk/Makefile =================================================================== --- trunk.orig/Makefile +++ trunk/Makefile -@@ -403,8 +403,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe +@@ -402,8 +402,8 @@ PLUGIN_CFLAGS = -O2 -g -pipe endif endif diff --git a/debian/patches/0005-hardening.patch b/debian/patches/0005-hardening.patch index 0ace20c..a579867 100644 --- a/debian/patches/0005-hardening.patch +++ b/debian/patches/0005-hardening.patch @@ -14,7 +14,7 @@ Index: trunk/Makefile ifdef UNITY_SUPPORT VALAFLAGS := $(VALAFLAGS) --define UNITY_SUPPORT endif -@@ -677,7 +677,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) +@@ -676,7 +676,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP) @ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile diff --git a/debian/patches/0510-Delay_size_request.patch b/debian/patches/0510-Delay_size_request.patch new file mode 100644 index 0000000..7c03791 --- /dev/null +++ b/debian/patches/0510-Delay_size_request.patch @@ -0,0 +1,26 @@ +Description: Delay size_request +Author: Jens Georg +Origin: https://git.gnome.org/browse/shotwell/commit/?id=4a70d87 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=766864 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823835 +Forwarded: not-needed +Last-Update: 2015-06-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/CheckerboardLayout.vala +=================================================================== +--- trunk.orig/src/CheckerboardLayout.vala ++++ trunk/src/CheckerboardLayout.vala +@@ -911,7 +911,11 @@ public class CheckerboardLayout : Gtk.Dr + debug("on_viewport_resized: due_to_reflow=%s set_size_request %dx%d", + size_allocate_due_to_reflow.to_string(), parent_allocation.width, req.height); + #endif +- set_size_request(parent_allocation.width - SCROLLBAR_PLACEHOLDER_WIDTH, req.height); ++ // But if the current height is 0, don't request a size yet. Delay ++ // it to do_reflow (bgo#766864) ++ if (req.height != 0) { ++ set_size_request(parent_allocation.width - SCROLLBAR_PLACEHOLDER_WIDTH, req.height); ++ } + } else { + // set the layout's width and height to always match the parent's + set_size_request(parent_allocation.width, parent_allocation.height); diff --git a/debian/patches/0515-Fix_background_color_drawing.patch b/debian/patches/0515-Fix_background_color_drawing.patch new file mode 100644 index 0000000..04a1adb --- /dev/null +++ b/debian/patches/0515-Fix_background_color_drawing.patch @@ -0,0 +1,32 @@ +Description: Fix background color drawing +Author: Jens Georg +Origin: https://git.gnome.org/browse/shotwell/commit/?id=7361b3f +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=766864 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823835 +Forwarded: not-needed +Last-Update: 2015-06-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/CheckerboardLayout.vala +=================================================================== +--- trunk.orig/src/CheckerboardLayout.vala ++++ trunk/src/CheckerboardLayout.vala +@@ -1812,6 +1812,10 @@ public class CheckerboardLayout : Gtk.Dr + // we want switched_to() to be the final call in the process (indicating that the page is + // now in place and should do its thing to update itself), have to be be prepared for + // GTK/GDK calls between the widgets being actually present on the screen and "switched to" ++ ++ Gtk.Allocation allocation; ++ get_allocation(out allocation); ++ get_style_context().render_background (ctx, 0, 0, allocation.width, allocation.height); + + // watch for message mode + if (message == null) { +@@ -1833,7 +1837,6 @@ public class CheckerboardLayout : Gtk.Dr + int text_width, text_height; + pango_layout.get_pixel_size(out text_width, out text_height); + +- Gtk.Allocation allocation; + get_allocation(out allocation); + + int x = allocation.width - text_width; diff --git a/debian/patches/series b/debian/patches/series index 44fcb41..2b6f8ff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ #0502-Have-all-soup-sessions-validate-TLS-certificates.patch #0503-facebook-Dont-disable-XSS-auditor.patch 0100-ios8.patch +0510-Delay_size_request.patch +0515-Fix_background_color_drawing.patch -- cgit v1.2.3