From e72acb0614920a260e82029e069fbeb6dcea979e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 20 Mar 2013 21:54:38 -0400 Subject: [PATCH] gd fix --- gd-fix.patch | 23 +++++++++++++++++++++++ gnome-initial-setup.spec | 7 ++++++- test-day-fixes.patch | 36 +----------------------------------- 3 files changed, 30 insertions(+), 36 deletions(-) create mode 100644 gd-fix.patch diff --git a/gd-fix.patch b/gd-fix.patch new file mode 100644 index 0000000..892d423 --- /dev/null +++ b/gd-fix.patch @@ -0,0 +1,23 @@ +From 3abc95da3c5b44484aeae3c69e3701da160bf057 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi +Date: Tue, 19 Mar 2013 15:35:30 +0000 +Subject: gd-stack: set parent window when adding stack children + +Or children added after realization won't be properly displayed by +the stack. +--- +diff --git a/libgd/gd-stack.c b/libgd/gd-stack.c +index 14e6628..9d0e82b 100644 +--- a/libgd/libgd/gd-stack.c ++++ b/libgd/libgd/gd-stack.c +@@ -857,6 +857,7 @@ gd_stack_add (GtkContainer *container, + + priv->children = g_list_append (priv->children, child_info); + ++ gtk_widget_set_parent_window (child, priv->bin_window); + gtk_widget_set_parent (child, GTK_WIDGET (stack)); + + g_signal_connect (child, "notify::visible", +-- +cgit v0.9.1 + diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec index 0a13d9f..ef9bad0 100644 --- a/gnome-initial-setup.spec +++ b/gnome-initial-setup.spec @@ -1,6 +1,6 @@ Name: gnome-initial-setup Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bootstrapping your OS License: GPLv2+ @@ -11,6 +11,7 @@ Source0: http://download.gnome.org/sources/%{name}/0.8/%{name}-%{version} # https://bugzilla.gnome.org/show_bug.cgi?id=687957 Patch0: yelp-fixes.patch Patch1: test-day-fixes.patch +Patch2: gd-fix.patch %global nm_version 0.9 %global glib_required_version 2.29.4 @@ -63,6 +64,7 @@ you through configuring it. It is integrated with gdm. %setup -q %patch0 -p1 -b .yelp-fixes %patch1 -p1 -b .test-day-fixes +%patch2 -p1 -b .gd-fix autoreconf -i -f @@ -118,6 +120,9 @@ userdel %{name} &>/dev/null || : /usr/lib/systemd/system/gnome-initial-setup.service %changelog +* Wed Mar 20 2013 Ray Strode 0.8-3 +- Add cosimoc fix for gd page transitions + * Wed Mar 20 2013 Ray Strode 0.8-2 - Disable gd page transitions for now since they don't completely work right (ask adamw). diff --git a/test-day-fixes.patch b/test-day-fixes.patch index 0fee0bf..d5e03c2 100644 --- a/test-day-fixes.patch +++ b/test-day-fixes.patch @@ -1,7 +1,7 @@ From 4d54e7a12aaf048146f8c536c2125f4a16865b97 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 20 Mar 2013 20:24:45 -0400 -Subject: [PATCH 1/2] account-page: stop watching realmd when disposed +Subject: [PATCH 1/1] account-page: stop watching realmd when disposed We don't want any handlers called when the page is freed. --- @@ -27,37 +27,3 @@ index c488098..594be4c 100644 -- 1.8.1.4 - -From 43616d3cf13d671c3759da9a16c6eb4a4f6f7af0 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Wed, 20 Mar 2013 21:34:14 -0400 -Subject: [PATCH 2/2] disable GD transitions - -They're screwing up at the moment. ---- - gnome-initial-setup/gis-driver.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c -index 2802399..83bed0a 100644 ---- a/gnome-initial-setup/gis-driver.c -+++ b/gnome-initial-setup/gis-driver.c -@@ -173,6 +173,7 @@ gis_driver_get_mode (GisDriver *driver) - static GType - get_assistant_type (void) - { -+#if 0 - gboolean enable_animations; - g_object_get (gtk_settings_get_default (), - "gtk-enable-animations", &enable_animations, -@@ -181,6 +182,7 @@ get_assistant_type (void) - if (enable_animations && g_getenv ("GIS_DISABLE_GD") == NULL) - return GIS_TYPE_ASSISTANT_GD; - else -+#endif - return GIS_TYPE_ASSISTANT_GTK; - } - --- -1.8.1.4 -