From 1e8ea1d7ed43fc66a7452dfa0557f42aa3916aea Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Wed, 9 Jan 2019 03:21:06 +0000
Subject: Wed Jan  9 03:21:06 UTC 2019

ap/alsa-utils-1.1.8-x86_64-1.txz:  Upgraded.
ap/gutenprint-5.3.1-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
l/alsa-lib-1.1.8-x86_64-1.txz:  Upgraded.
l/alsa-oss-1.1.8-x86_64-1.txz:  Upgraded.
l/alsa-plugins-1.1.8-x86_64-1.txz:  Upgraded.
extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txz:  Upgraded.
extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txz:  Upgraded.
---
 source/l/gtk+3/gtk+3.SlackBuild                    |  5 ++-
 ....e3a1593a0984cc0156ec1892a46af8f256a64878.patch | 42 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch

(limited to 'source/l/gtk+3')

diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild
index 9b546092..7d880bde 100755
--- a/source/l/gtk+3/gtk+3.SlackBuild
+++ b/source/l/gtk+3/gtk+3.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=gtk+3
 VERSION=${VERSION:-$(echo gtk+-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -79,6 +79,9 @@ find . \
 
 zcat $CWD/gtk.typo.fix.diff.gz | patch -p1 --verbose || exit 1
 
+# Fix segfault:
+zcat $CWD/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch.gz | patch -p1 --verbose || exit 1
+
 # Regenerate ./configure:
 libtoolize --copy --force
 autoreconf -vif
diff --git a/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch b/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch
new file mode 100644
index 00000000..99806d19
--- /dev/null
+++ b/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch
@@ -0,0 +1,42 @@
+From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001
+From: Daniel Boles <dboles.src@gmail.com>
+Date: Thu, 13 Dec 2018 17:20:13 +0100
+Subject: [PATCH] x11: Fix deprecation macro use
+
+G_GNUC_END_IGNORE_DEPRECATIONS terminates the if statement and does not
+consider the following block to be part of the if. So that block was
+always taken irregardless of the pattern.
+
+Fixes #1280
+---
+ gdk/x11/gdkwindow-x11.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
+index 97ada6d739..764e39495f 100644
+--- a/gdk/x11/gdkwindow-x11.c
++++ b/gdk/x11/gdkwindow-x11.c
+@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow      *window,
+   double r, g, b, a;
+   cairo_surface_t *surface;
+   cairo_matrix_t matrix;
++  cairo_pattern_t *parent_relative_pattern;
+ 
+   if (GDK_WINDOW_DESTROYED (window))
+     return;
+@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow      *window,
+     }
+ 
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+-  if (pattern == gdk_x11_get_parent_relative_pattern ())
++  parent_relative_pattern = gdk_x11_get_parent_relative_pattern ();
+ G_GNUC_END_IGNORE_DEPRECATIONS
++
++  if (pattern == parent_relative_pattern)
+     {
+       GdkWindow *parent;
+ 
+-- 
+2.18.1
+
+
-- 
cgit v1.2.3