Accepting request 100938 from home:vuntz:branches:GNOME:Factory

Unbreak eog & ephy

OBS-URL: https://build.opensuse.org/request/show/100938
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=74

gtk3-unbreak-apps.patch

@@ -0,0 +1,24 @@
+From 85fcd50b3f33cb811f4ba79a53b3a6b29054c721 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt@desrt.ca>
+Date: Tue, 17 Jan 2012 15:55:50 +0000
+Subject: Revert "set the G_PARAM_CONSTRUCT flag on the GtkWindow:application property"
+
+This reverts commit d4fe912879ce1b19490ba5729f67a27b1cf397c9.
+
+This patch caused some unanticipated compatibility issues.
+---
+diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
+index 62b9ac0..93eb4a7 100644
+--- a/gtk/gtkwindow.c
++++ b/gtk/gtkwindow.c
+@@ -1044,7 +1044,7 @@ gtk_window_class_init (GtkWindowClass *klass)
+                                                         P_("GtkApplication"),
+                                                         P_("The GtkApplication for the window"),
+                                                         GTK_TYPE_APPLICATION,
+-                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
++                                                        GTK_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+ 
+   window_signals[SET_FOCUS] =
+     g_signal_new (I_("set-focus"),
+--
+cgit v0.9.0.2

gtk3.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 20 14:08:02 UTC 2012 - vuntz@opensuse.org
+
+- Add gtk3-unbreak-apps.patch: revert a change in 3.3.8 that breaks
+  eog and epiphany.
+
 -------------------------------------------------------------------
 Tue Jan 17 07:13:15 UTC 2012 - vuntz@opensuse.org
 

gtk3.spec

@@ -16,6 +16,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define build_broadway_backend 1
 
 # When updating the binary version, do not forget to also update baselibs.conf
@@ -40,6 +41,8 @@ Patch0:         gtk3-GTK_PATH64.patch
 Patch1:         gtk3-path-local.patch
 # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
 Patch3:         gtk3-bnc130159-bgo319483-async-font-selection.patch
+# PATCH-FIX-UPSTREAM gtk3-unbreak-apps.patch bgo#667628 vuntz@opensuse.org -- Revert change breaking eog & epiphany
+Patch4:         gtk3-unbreak-apps.patch
 BuildRequires:  cups-devel
 BuildRequires:  fdupes
 # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
@@ -287,6 +290,7 @@ cp -a %{S:1} .
 %endif
 %patch1 -p0
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure \