pool/gtk3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 662625 from home:gary_lin:branches:GNOME:Factory

Browse Source 
Add gtk3-x11-fix-deprecation-macro-use.patch to fix the potential crash (boo#1120456)

OBS-URL: https://build.opensuse.org/request/show/662625
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=336
This commit is contained in:
Bjørn Lie 2019-01-03 10:52:37 +00:00 committed by Git OBS Bridge
parent 5d8254b6b2
commit b1cdc8c8dd
3 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk3-x11-fix-deprecation-macro-use.patch Normal file
View File

@ -0,0 +1,41 @@
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.20.1

6
gtk3.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 3 09:00:53 UTC 2019 - Gary Ching-Pang Lin <glin@suse.com>
- Add gtk3-x11-fix-deprecation-macro-use.patch to fix the potential
crash (boo#1120456)
-------------------------------------------------------------------
Thu Dec 13 05:31:08 UTC 2018 - bjorn.lie@gmail.com

5
gtk3.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package gtk3
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands
#
# All modifications and additions to the file contributed by third parties
@ -41,6 +41,8 @@ Patch1: gtk3-revert-forced-xftdpi.patch
Patch2: gtk3-atk-table-cell.patch
# PATCH-FIX-UPSTREAM gtk3-revert-Fix-deprecation-warnings.patch -- Revert "Fix deprecation warnings", fixes build.
Patch3: gtk3-revert-Fix-deprecation-warnings.patch
# PATCH-FIX-UPSTREAM gtk3-x11-fix-deprecation-macro-use.patch -- x11: Fix deprecation macro use
Patch4: gtk3-x11-fix-deprecation-macro-use.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: docbook-xsl-stylesheets
@ -374,6 +376,7 @@ cp -a %{SOURCE1} .
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%configure \