drop upstreamed patch
Update snapshot
This commit is contained in:
parent
c144108a5a
commit
ec506a2a6d
@ -1,35 +0,0 @@
|
||||
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
|
@ -14,7 +14,6 @@ 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)
|
||||
@ -235,9 +234,6 @@ 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
|
||||
|
Loading…
Reference in New Issue
Block a user