Accepting request 616616 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/616616
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=131

gtk3-filechooserbutton-Fix-reserved-pointers.patch

@@ -0,0 +1,32 @@
+From e44bbeb558ddef5ffd3749aca3fec2dafaa0d634 Mon Sep 17 00:00:00 2001
+From: Benjamin Otte <otte@redhat.com>
+Date: Tue, 10 Apr 2018 14:22:16 +0200
+Subject: [PATCH] filechooserbutton: Fix reserved pointers
+
+So gcc stops complaining about unnecessary parenthesis.
+---
+ gtk/gtkfilechooserbutton.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gtk/gtkfilechooserbutton.h b/gtk/gtkfilechooserbutton.h
+index 0e5276fe71..fcad9f4f88 100644
+--- a/gtk/gtkfilechooserbutton.h
++++ b/gtk/gtkfilechooserbutton.h
+@@ -63,10 +63,10 @@ struct _GtkFileChooserButtonClass
+   /*< private >*/
+ 
+   /* Padding for future expansion */
+-  void (*__gtk_reserved1);
+-  void (*__gtk_reserved2);
+-  void (*__gtk_reserved3);
+-  void (*__gtk_reserved4);
++  void (*__gtk_reserved1) (void);
++  void (*__gtk_reserved2) (void);
++  void (*__gtk_reserved3) (void);
++  void (*__gtk_reserved4) (void);
+ };
+ 
+ 
+-- 
+2.13.7
+

gtk3.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 12 05:35:47 UTC 2018 - fezhang@suse.com
+
+- Add gtk3-filechooserbutton-Fix-reserved-pointers.patch: Stop gcc
+  from complaining about unnecessary parenthesis, fix gnucash build
+  failures.
+
 -------------------------------------------------------------------
 Tue Apr 24 07:57:46 UTC 2018 - dimstar@opensuse.org
 

gtk3.spec

@@ -35,8 +35,10 @@ Source3:        macros.gtk3
 Source99:       baselibs.conf
 # PATCH-FIX-OPENSUSE gtk3-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH
 Patch0:         gtk3-GTK_PATH64.patch
-# PATCH-FIX-OPENSUSE revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96
+# PATCH-FIX-OPENSUSE gtk3-revert-forced-xftdpi.patch fvogt@opensuse.org -- Revert very controversal commit on GTK3, forcing DPI to 96
 Patch1:         gtk3-revert-forced-xftdpi.patch
+# PATCH-FIX-UPSTREAM gtk3-filechooserbutton-Fix-reserved-pointers.patch fezhang@suse.com -- Stop gcc from complaining about unnecessary parenthesis resulting build failures in gnucash.
+Patch2:         gtk3-filechooserbutton-Fix-reserved-pointers.patch
 BuildRequires:  cups-devel >= 1.2
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  fdupes
@@ -350,6 +352,7 @@ cp -a %{SOURCE1} .
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \