[plymouth/f16] [ProvenPackager] Applying tested fix for bz704658, more than a year after patch posted

[Tom Callaway]

commit 13869a48ded37810076c0fcffcff1ce4a1111cda
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Mon Jul 23 10:23:57 2012 -0400

    [ProvenPackager] Applying tested fix for bz704658, more than a year after patch posted

 plymouth-0.8.6.1-fix-fail-to-start.patch |   35 ++++++++++++++++++++++++++++++
 plymouth.spec                            |   10 +++++++-
 2 files changed, 44 insertions(+), 1 deletions(-)
---
diff --git a/plymouth-0.8.6.1-fix-fail-to-start.patch b/plymouth-0.8.6.1-fix-fail-to-start.patch
new file mode 100644
index 0000000..447bc2f
--- /dev/null
+++ b/plymouth-0.8.6.1-fix-fail-to-start.patch
@@ -0,0 +1,35 @@
+diff -up plymouth-0.8.6.1/src/plugins/splash/throbgress/plugin.c.fix-fail-to-start plymouth-0.8.6.1/src/plugins/splash/throbgress/plugin.c
+--- plymouth-0.8.6.1/src/plugins/splash/throbgress/plugin.c.fix-fail-to-start	2012-07-23 10:11:27.659035587 -0400
++++ plymouth-0.8.6.1/src/plugins/splash/throbgress/plugin.c	2012-07-23 10:12:39.746036670 -0400
+@@ -103,6 +103,7 @@ struct _ply_boot_splash_plugin
+   uint32_t root_is_mounted : 1;
+   uint32_t is_visible : 1;
+   uint32_t is_animating : 1;
++  uint32_t is_idle : 1;
+ };
+ 
+ ply_boot_splash_plugin_interface_t * ply_boot_splash_plugin_get_interface (void);
+@@ -292,6 +293,8 @@ view_start_animation (view_t *view)
+ 
+   plugin = view->plugin;
+ 
++  plugin->is_idle = false;
++
+   assert (plugin != NULL);
+   assert (plugin->loop != NULL);
+ 
+@@ -804,7 +807,14 @@ static void
+ become_idle (ply_boot_splash_plugin_t *plugin,
+              ply_trigger_t            *idle_trigger)
+ {
++  if (plugin->is_idle)
++    {
++      ply_trigger_pull (idle_trigger, NULL);
++      return;
++    }
++
+   stop_animation (plugin, idle_trigger);
++  plugin->is_idle = true;
+ }
+ 
+ static void
diff --git a/plymouth.spec b/plymouth.spec
index 879b4e9..8b81f8b 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -6,7 +6,7 @@
 Summary: Graphical Boot Animation and Logger
 Name: plymouth
 Version: 0.8.4
-Release: 0.20110822.4%{?dist}
+Release: 0.20110822.5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Source1: boot-duration
 Source2: charge.plymouth
 Source3: plymouth-set-default-plugin
 Source4: plymouth-update-initrd
+Patch0: plymouth-0.8.6.1-fix-fail-to-start.patch
 
 URL: http://freedesktop.org/software/plymouth/releases
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -237,6 +238,9 @@ Plymouth. It features a small spinner on a dark background.
 
 %prep
 %setup -q
+# Resolves bz 704658
+# GDM doesn't start properly when spinfinity theme is used.
+%patch0 -p1 -b .fix-fail-to-start
 
 # Change the default theme
 sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
@@ -501,6 +505,10 @@ fi
 %defattr(-, root, root)
 
 %changelog
+* Mon Jul 23 2012 Tom Callaway <spot at fedoraproject.org> - 0.8.4-0.20110822.5
+- fix bz704658 (thanks to Ian Pilcher for the patch), resolves issue where spinfinity theme
+  never goes idle and thus, never exits to gdm
+
 * Sat May 12 2012 Dan Horák <dan[at]danny.cz> 0.8.4-0.20110822.4
 - Don't require libdrm_intel on non intel arches, libdrm 2.4.33 doesn't provide it there