<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9117e49f94c88d6137ca7898e0d6be221aeda586">https://github.com/macports/macports-ports/commit/9117e49f94c88d6137ca7898e0d6be221aeda586</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 9117e49f9 gthumb: update to version 3.4.5
</span>9117e49f9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9117e49f94c88d6137ca7898e0d6be221aeda586
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Nov 7 16:23:25 2017 -0800
<span style='display:block; white-space:pre;color:#404040;'> gthumb: update to version 3.4.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Apply upstream post-release patches.
</span>---
gnome/gthumb/Portfile | 16 +++--
.../files/patch-fix-selections-action-name.diff | 25 +++++++
...tch-fix-seqfault-when-svg-cannot-be-loaded.diff | 78 ++++++++++++++++++++++
.../patch-grid-view-activate-smooth-scrolling.diff | 24 +++++++
...tch-grid-view-white-background-for-emblems.diff | 38 +++++++++++
.../patch-no-bitmaps-with-invalid-colors.diff | 42 ++++++++++++
gnome/gthumb/files/patch-use-autoaudiosink.diff | 26 ++++++++
.../patch-use-display-name-if-no-edit-name.diff | 38 +++++++++++
8 files changed, 282 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/Portfile b/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f98172c..1e9adb4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
name gthumb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.5
</span> license GPL-2+
set branch [join [lrange [split ${version} .] 0 1] .]
description Image viewer and browser for the GNOME desktop.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,8 +15,8 @@ homepage https://wiki.gnome.org/Apps/gthumb
</span> master_sites gnome:sources/gthumb/${branch}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 c10fd12f3bfea31c390c74e8e08f86f16e2159fbd6c806daa025423e0ded825d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ca10fc54f9e18e56cfb6679747bc0ee78762e4bd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 816fc63ba9cfc397ea8c9a4d21870051813aa4d97383f3d3ae74cb3ea8235746 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 61095b84eb07a858be351c729257dd4c3d87dad4
</span>
depends_build port:intltool \
port:pkgconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +42,14 @@ depends_lib port:desktop-file-utils \
</span> depends_run port:yelp
patchfiles patch-configure.ac.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-gthumb-gth-toolbox.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gthumb-gth-toolbox.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-bitmaps-with-invalid-colors.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-selections-action-name.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-display-name-if-no-edit-name.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-grid-view-activate-smooth-scrolling.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-grid-view-white-background-for-emblems.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-seqfault-when-svg-cannot-be-loaded.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-autoaudiosink.diff
</span>
# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-fix-selections-action-name.diff b/gnome/gthumb/files/patch-fix-selections-action-name.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..edb04a4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-fix-selections-action-name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 151e61723cf9d79cec3a8efabb650e4aa554cd57 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Paolo Bacchilega <paobac@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 1 Jul 2017 19:26:46 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: selections: fixed action name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extensions/selections/callbacks.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/extensions/selections/callbacks.c b/extensions/selections/callbacks.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d729f18..3c9e1a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extensions/selections/callbacks.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extensions/selections/callbacks.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@ static const GActionEntry actions[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "go-to-selection-1", gth_browser_activate_go_to_selection_1 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "go-to-selection-2", gth_browser_activate_go_to_selection_2 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "go-to-selection-3", gth_browser_activate_go_to_selection_3 },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { "go-to-file-container", gth_browser_activate_go_to_file_container },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { "go-to-container-from-selection", gth_browser_activate_go_to_file_container },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { "remove-from-selection", gth_browser_activate_remove_from_current_selection }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-fix-seqfault-when-svg-cannot-be-loaded.diff b/gnome/gthumb/files/patch-fix-seqfault-when-svg-cannot-be-loaded.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..89b14b0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-fix-seqfault-when-svg-cannot-be-loaded.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f961196d1bbe01c706368eef581f01eeae273ed7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Paolo Bacchilega <paobac@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 14 Jul 2017 08:47:13 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: SEGFAULT when a svg image could not be loaded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[bug 784886]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extensions/cairo_io/cairo-image-surface-svg.c | 18 +++++++++++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gthumb/gth-image-viewer.c | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 17 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/extensions/cairo_io/cairo-image-surface-svg.c b/extensions/cairo_io/cairo-image-surface-svg.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ee07770..75e6f48 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extensions/cairo_io/cairo-image-surface-svg.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extensions/cairo_io/cairo-image-surface-svg.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,22 +140,26 @@ gth_image_svg_new (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static gboolean
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gth_image_svg_set_handle (GthImageSvg *self,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RsvgHandle *rsvg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RsvgDimensionData dimension_data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (self->rsvg == rsvg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- self->rsvg = g_object_ref (rsvg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rsvg_handle_get_dimensions (rsvg, &dimension_data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((dimension_data.width == 0) || (dimension_data.height == 0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rsvg_handle_get_dimensions (self->rsvg, &dimension_data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ self->rsvg = g_object_ref (rsvg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self->original_width = dimension_data.width;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self->original_height = dimension_data.height;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gth_image_svg_set_zoom (GTH_IMAGE (self), 1.0, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return TRUE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,7 +187,11 @@ _cairo_image_surface_create_from_svg (GInputStream *istream,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cancellable,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rsvg != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gth_image_svg_set_handle (GTH_IMAGE_SVG (image), rsvg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (! gth_image_svg_set_handle (GTH_IMAGE_SVG (image), rsvg)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_set_error (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Error");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_object_unref (image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ image = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_object_unref (rsvg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gthumb/gth-image-viewer.c b/gthumb/gth-image-viewer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 587c5f3..0bc45ad 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gthumb/gth-image-viewer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gthumb/gth-image-viewer.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -815,7 +815,10 @@ image_has_alpha (GthImageViewer *viewer)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (image == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- first_pixel = cairo_image_surface_get_data (image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ first_pixel = _cairo_image_surface_flush_and_get_data (image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (first_pixel == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return FALSE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return first_pixel[CAIRO_ALPHA] < 255;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-grid-view-activate-smooth-scrolling.diff b/gnome/gthumb/files/patch-grid-view-activate-smooth-scrolling.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3b92543
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-grid-view-activate-smooth-scrolling.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8b1c65e2a07c4c8eb14a55777bfcffb30cf7f6ab Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Paolo Bacchilega <paobac@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 1 Jul 2017 19:28:32 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: grid view: activate smooth scrolling to get the overshoot effect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gthumb/gth-grid-view.c | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gthumb/gth-grid-view.c b/gthumb/gth-grid-view.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f110918..ba5846a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gthumb/gth-grid-view.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gthumb/gth-grid-view.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1042,6 +1042,7 @@ gth_grid_view_realize (GtkWidget *widget)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ attributes.height = MAX (self->priv->height, allocation.height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ attributes.event_mask = (GDK_EXPOSURE_MASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | GDK_SCROLL_MASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ | GDK_SMOOTH_SCROLL_MASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | GDK_POINTER_MOTION_MASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | GDK_ENTER_NOTIFY_MASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ | GDK_LEAVE_NOTIFY_MASK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-grid-view-white-background-for-emblems.diff b/gnome/gthumb/files/patch-grid-view-white-background-for-emblems.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8dcc66a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-grid-view-white-background-for-emblems.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d4f55d42fda50bd7934e037adfa35fcde1a5732d Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Paolo Bacchilega <paobac@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 1 Jul 2017 19:30:41 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: grid view: make the emblems more visible using a white background
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gthumb/gth-grid-view.c | 6 ++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gthumb/gth-grid-view.c b/gthumb/gth-grid-view.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ba5846a..7941109 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gthumb/gth-grid-view.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gthumb/gth-grid-view.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1557,17 +1557,19 @@ _gth_grid_view_item_draw_emblems (GthGridViewItem *item,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ icon = g_themed_icon_new (emblem);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ image = gth_icon_cache_get_surface (grid_view->priv->icon_cache, icon);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (image != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cairo_set_source_surface (cr, image, item->thumbnail_area.x + emblem_offset + 1, item->thumbnail_area.y + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_rectangle (cr,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item->thumbnail_area.x + emblem_offset + 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ item->thumbnail_area.y + 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_image_surface_get_width (image),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_image_surface_get_height (image));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cairo_fill_preserve (cr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cairo_set_source_surface (cr, image, item->thumbnail_area.x + emblem_offset + 1, item->thumbnail_area.y + 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_fill (cr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cairo_surface_destroy (image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- emblem_offset += EMBLEM_SIZE + (EMBLEM_SIZE / 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ emblem_offset += EMBLEM_SIZE;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_object_unref (icon);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-no-bitmaps-with-invalid-colors.diff b/gnome/gthumb/files/patch-no-bitmaps-with-invalid-colors.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d0ece20
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-no-bitmaps-with-invalid-colors.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e44976dca72d15092bf38bceecf7cbaf81e91891 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Jan de Groot <jgc@archlinux.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 13 Feb 2017 13:28:27 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: Do not process bitmap thumbnails with invalid color settings.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Libraw sets these to 0 in an excption handler, we should not assert fatal when processing such an image.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[bug #778556]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extensions/raw_files/main.c | 16 ++++++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 10 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/extensions/raw_files/main.c b/extensions/raw_files/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 00a4c77..de54c1b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extensions/raw_files/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extensions/raw_files/main.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -292,12 +292,16 @@ _cairo_image_surface_create_from_raw (GInputStream *istream,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case LIBRAW_THUMBNAIL_BITMAP:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- image = _libraw_read_bitmap_data (raw_data->thumbnail.twidth,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raw_data->thumbnail.theight,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raw_data->thumbnail.tcolors,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (guchar *) raw_data->thumbnail.thumb,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- raw_data->thumbnail.tlength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((raw_data->thumbnail.tcolors > 0) && (raw_data->thumbnail.tcolors <= 4)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ image = _libraw_read_bitmap_data (raw_data->thumbnail.twidth,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raw_data->thumbnail.theight,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raw_data->thumbnail.tcolors,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 8,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (guchar *) raw_data->thumbnail.thumb,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ raw_data->thumbnail.tlength);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Unsupported data format");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_INVALID_DATA, "Unsupported data format");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-use-autoaudiosink.diff b/gnome/gthumb/files/patch-use-autoaudiosink.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..220c150
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-use-autoaudiosink.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a5f0ad8c2ab916846b83caa9904942f5c15e53d7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Paolo Bacchilega <paobac@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Mon, 31 Jul 2017 08:02:00 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: use autoaudiosink instead of gsettingsaudiosink
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+[bug #785612]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extensions/slideshow/gth-slideshow.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/extensions/slideshow/gth-slideshow.c b/extensions/slideshow/gth-slideshow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8a2724e..f1dc0de 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- extensions/slideshow/gth-slideshow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ extensions/slideshow/gth-slideshow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,7 +434,7 @@ gth_slideshow_show_cb (GtkWidget *widget,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ self->priv->playbin = gst_element_factory_make ("playbin", "playbin");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_object_set (self->priv->playbin,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "audio-sink", gst_element_factory_make ("gsettingsaudiosink", "audiosink"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "audio-sink", gst_element_factory_make ("autoaudiosink", "audiosink"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "flags", _GST_PLAY_FLAG_AUDIO,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "volume", 1.0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/files/patch-use-display-name-if-no-edit-name.diff b/gnome/gthumb/files/patch-use-display-name-if-no-edit-name.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b5e41dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/files/patch-use-display-name-if-no-edit-name.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a59045b982e26e534455f33437b1421ab86270a6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Paolo Bacchilega <paobac@src.gnome.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 1 Jul 2017 19:27:32 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: rename folder: use the display name if the edit name is not available
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gthumb/gth-folder-tree.c | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gthumb/gth-folder-tree.c b/gthumb/gth-folder-tree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bcec3f2..606db85 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gthumb/gth-folder-tree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gthumb/gth-folder-tree.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1887,6 +1887,7 @@ gth_folder_tree_start_editing (GthFolderTree *folder_tree,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ RenameData *data;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GtkWidget *toplevel;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GtkWidget *dialog;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const char *edit_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! gth_folder_tree_get_iter (folder_tree, file, &iter, NULL))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1914,8 +1915,11 @@ gth_folder_tree_start_editing (GthFolderTree *folder_tree,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ &iter,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COLUMN_FILE_DATA, &file_data,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gtk_entry_set_text (GTK_ENTRY (gth_request_dialog_get_entry (GTH_REQUEST_DIALOG (dialog))),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- g_file_info_get_edit_name (file_data->info));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ edit_name = g_file_info_get_edit_name (file_data->info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (edit_name == NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ edit_name = g_file_info_get_display_name (file_data->info);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (edit_name != NULL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gtk_entry_set_text (GTK_ENTRY (gth_request_dialog_get_entry (GTH_REQUEST_DIALOG (dialog))), edit_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gtk_widget_show (dialog);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cgit v0.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>