[ProvenPackager] Applying tested fix for bz704658, more than a year after patch posted
This commit is contained in:
parent
c39f0345e5
commit
d9cf52a0c2
35
plymouth-0.8.6.1-fix-fail-to-start.patch
Normal file
35
plymouth-0.8.6.1-fix-fail-to-start.patch
Normal file
@ -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
|
@ -6,7 +6,7 @@
|
|||||||
Summary: Graphical Boot Animation and Logger
|
Summary: Graphical Boot Animation and Logger
|
||||||
Name: plymouth
|
Name: plymouth
|
||||||
Version: 0.8.6.1
|
Version: 0.8.6.1
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
|
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
|
||||||
@ -14,6 +14,7 @@ Source1: boot-duration
|
|||||||
Source2: charge.plymouth
|
Source2: charge.plymouth
|
||||||
Source3: plymouth-set-default-plugin
|
Source3: plymouth-set-default-plugin
|
||||||
Source4: plymouth-update-initrd
|
Source4: plymouth-update-initrd
|
||||||
|
Patch0: plymouth-0.8.6.1-fix-fail-to-start.patch
|
||||||
|
|
||||||
URL: http://freedesktop.org/software/plymouth/releases
|
URL: http://freedesktop.org/software/plymouth/releases
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
@ -234,6 +235,9 @@ Plymouth. It features a small spinner on a dark background.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%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
|
# Change the default theme
|
||||||
sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
|
sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults
|
||||||
@ -498,6 +502,10 @@ fi
|
|||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 23 2012 Tom Callaway <spot@fedoraproject.org> - 0.8.6.1-3
|
||||||
|
- fix bz704658 (thanks to Ian Pilcher for the patch), resolves issue where spinfinity theme
|
||||||
|
never goes idle and thus, never exits to gdm
|
||||||
|
|
||||||
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.6.1-2
|
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.6.1-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user