[packages/gtk+3] upstream fix for "Can't set ParentRelative background for window"; rel 2

[atler]

commit 8420525903ae28810baf598592a9ada9103137f8
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jan 9 23:30:06 2019 +0100

    upstream fix for "Can't set ParentRelative background for window"; rel 2
    
    see https://gitlab.gnome.org/GNOME/gtk/issues/1280

 gtk+3.spec           |  4 +++-
 parentrelative.patch | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 1 deletion(-)
---
diff --git a/gtk+3.spec b/gtk+3.spec
index 1298390..717f5bb 100644
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -21,7 +21,7 @@ Summary(pl.UTF-8):	GIMP Toolkit
 Summary(tr.UTF-8):	GIMP ToolKit arayüz kitaplığı
 Name:		gtk+3
 Version:	3.24.2
-Release:	1
+Release:	2
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/3.24/gtk+-%{version}.tar.xz
@@ -30,6 +30,7 @@ Patch0:		%{name}-papi.patch
 Patch1:		typeahead.patch
 Patch2:		%{name}-cloudproviders.patch
 Patch3:		shooter.patch
+Patch4:		parentrelative.patch
 URL:		http://www.gtk.org/
 BuildRequires:	at-spi2-atk-devel >= 2.6.0
 BuildRequires:	atk-devel >= 1:2.16.0
@@ -292,6 +293,7 @@ Moduł GTK+ do drukowania przez PAPI.
 %endif
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # for packaging clean examples
 # TODO: add am patch to do it like demos/gtk-demo via some configurable dir
diff --git a/parentrelative.patch b/parentrelative.patch
new file mode 100644
index 0000000..0549473
--- /dev/null
+++ b/parentrelative.patch
@@ -0,0 +1,41 @@
+From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001
+From: Daniel Boles <dboles.src at 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
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk+3.git/commitdiff/8420525903ae28810baf598592a9ada9103137f8