- Update to version 0.4.5

- Make text plugin blue and less 80s

.cvsignore

@@ -1 +1 @@
-plymouth-0.4.0.tar.bz2
+plymouth-0.4.5.tar.bz2

drop-text-mode.patch

@@ -1,99 +0,0 @@
-commit 48a6bfa3bbed72d052324daa44e50bfb41b68efb
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Mon Jun 16 16:37:23 2008 -0400
-
-    Factor out background drawing code in throbber helper.
-
-diff --git a/src/libplybootsplash/ply-throbber.c b/src/libplybootsplash/ply-throbber.c
-index 2349864..0dd6dc5 100644
---- a/src/libplybootsplash/ply-throbber.c
-+++ b/src/libplybootsplash/ply-throbber.c
-@@ -122,6 +122,14 @@ ply_throbber_free (ply_throbber_t *throbber)
- }
- 
- static void
-+draw_background (ply_throbber_t *throbber)
-+{
-+  ply_frame_buffer_fill_with_gradient (throbber->frame_buffer, &throbber->frame_area,
-+                                       PLYMOUTH_BACKGROUND_START_COLOR,
-+                                       PLYMOUTH_BACKGROUND_END_COLOR);
-+}
-+
-+static void
- animate_at_time (ply_throbber_t *throbber,
-                  double      time)
- {
-@@ -141,9 +149,7 @@ animate_at_time (ply_throbber_t *throbber,
- 
-   ply_frame_buffer_pause_updates (throbber->frame_buffer);
-   if (throbber->frame_area.width > 0)
--    ply_frame_buffer_fill_with_gradient (throbber->frame_buffer, &throbber->frame_area,
--                                         PLYMOUTH_BACKGROUND_START_COLOR,
--                                         PLYMOUTH_BACKGROUND_END_COLOR);
-+    draw_background (throbber);
- 
-   frames = (ply_image_t * const *) ply_array_get_elements (throbber->frames);
- 
-@@ -305,8 +311,8 @@ void
- ply_throbber_stop (ply_throbber_t *throbber)
- {
-   if (throbber->frame_area.width > 0)
--    ply_frame_buffer_fill_with_hex_color (throbber->frame_buffer, &throbber->frame_area,
--                                          PLYMOUTH_BACKGROUND_COLOR);
-+    draw_background (throbber);
-+
-   throbber->frame_buffer = NULL;
-   throbber->window = NULL;
- 
-
-commit 34862aa8d3711c207f62b125fd37ceb5597451d9
-Author: Kristian Høgsberg <krh@redhat.com>
-Date:   Mon Jun 16 17:14:58 2008 -0400
-
-    Don't go to text mode on exit.
-
-diff --git a/src/libplybootsplash/ply-window.c b/src/libplybootsplash/ply-window.c
-index e0d90c0..62dd73c 100644
---- a/src/libplybootsplash/ply-window.c
-+++ b/src/libplybootsplash/ply-window.c
-@@ -338,8 +338,6 @@ ply_window_open (ply_window_t *window)
- void
- ply_window_close (ply_window_t *window)
- {
--  ply_window_set_mode (window, PLY_WINDOW_MODE_TEXT);
--
-   if (ply_frame_buffer_device_is_open (window->frame_buffer))
-     ply_frame_buffer_close (window->frame_buffer);
- 
-@@ -408,7 +406,6 @@ ply_window_free (ply_window_t *window)
-                                            ply_window_detach_from_event_loop,
-                                            window);
- 
--  ply_window_set_mode (window, PLY_WINDOW_MODE_TEXT);
-   ply_window_close (window);
- 
-   ply_buffer_free (window->keyboard_input_buffer);
-diff --git a/src/splash-plugins/spinfinity/plugin.c b/src/splash-plugins/spinfinity/plugin.c
-index fe8f644..454071b 100644
---- a/src/splash-plugins/spinfinity/plugin.c
-+++ b/src/splash-plugins/spinfinity/plugin.c
-@@ -243,8 +243,6 @@ static void
- detach_from_event_loop (ply_boot_splash_plugin_t *plugin)
- {
-   plugin->loop = NULL;
--
--  ply_window_set_mode (plugin->window, PLY_WINDOW_MODE_TEXT);
- }
- 
- void
-@@ -384,9 +382,9 @@ hide_splash_screen (ply_boot_splash_plugin_t *plugin,
- 
-   plugin->frame_buffer = NULL;
- 
--  ply_window_set_mode (plugin->window, PLY_WINDOW_MODE_TEXT);
-   plugin->window = NULL;
- }
-+
- static void
- draw_password_entry (ply_boot_splash_plugin_t *plugin)
- {

fix-harmless-spew.patch

@@ -1,25 +0,0 @@
-commit cc0fc4e577e4f397e7115eabfa74ce2f2629f29c
-Author: Ray Strode <rstrode@redhat.com>
-Date:   Sun Jun 22 01:19:18 2008 -0400
-
-    /Really/ exit cleanly if rhgb isn't present on kernel cmdline
-    
-    Unlike b7f4399294fad3d70029526cd7334c50d8673214 which was
-    broken
-
-diff --git a/src/main.c b/src/main.c
-index f554ce0..e855f68 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -454,7 +454,10 @@ main (int    argc,
-   if (!initialize_environment (&state))
-     {
-       if (errno == 0)
--        return 0;
-+        {
-+          ply_detach_daemon (daemon_handle, 0);
-+          return 0;
-+        }
- 
-       ply_error ("could not setup basic operating environment: %m");
-       ply_detach_daemon (daemon_handle, EX_OSERR);

make-ask-for-password-work.patch

@@ -1,61 +0,0 @@
-commit a33a76fc145c35e2407a90ab7f4efbf5f99ddd01
-Author: Ray Strode <rstrode@redhat.com>
-Date:   Wed Jun 25 15:54:07 2008 -0400
-
-    Properly stop animation when asking for password in text plugin
-
-diff --git a/src/splash-plugins/text/plugin.c b/src/splash-plugins/text/plugin.c
-index 82b17a0..ae8de18 100644
---- a/src/splash-plugins/text/plugin.c
-+++ b/src/splash-plugins/text/plugin.c
-@@ -105,6 +105,7 @@ start_animation (ply_boot_splash_plugin_t *plugin)
-   assert (plugin->loop != NULL);
- 
-   ply_window_clear_screen (plugin->window);
-+  ply_window_hide_text_cursor (plugin->window);
- 
-   window_width = ply_window_get_number_of_text_columns (plugin->window);
-   window_height = ply_window_get_number_of_text_rows (plugin->window);
-@@ -160,7 +161,8 @@ on_enter (ply_boot_splash_plugin_t *plugin,
-       ply_answer_with_string (plugin->pending_password_answer, line);
-       plugin->keyboard_input_is_hidden = false;
-       plugin->pending_password_answer = NULL;
--      write (STDOUT_FILENO, CLEAR_LINE_SEQUENCE, strlen (CLEAR_LINE_SEQUENCE));
-+
-+      start_animation (plugin);
-     }
- }
- 
-@@ -189,9 +191,6 @@ show_splash_screen (ply_boot_splash_plugin_t *plugin,
- 
-   plugin->window = window;
- 
--  ply_window_clear_screen (plugin->window);
--  ply_window_hide_text_cursor (plugin->window);
--
-   start_animation (plugin);
- 
-   return true;
-@@ -240,9 +239,21 @@ void
- ask_for_password (ply_boot_splash_plugin_t *plugin,
-                   ply_answer_t             *answer)
- {
-+  int window_width, window_height;
-+
-   plugin->pending_password_answer = answer;
- 
--  write (STDOUT_FILENO, "\nPassword: ", strlen ("\nPassword: "));
-+  stop_animation (plugin);
-+  ply_window_clear_screen (plugin->window);
-+
-+  window_width = ply_window_get_number_of_text_columns (plugin->window);
-+  window_height = ply_window_get_number_of_text_rows (plugin->window);
-+
-+  ply_window_set_text_cursor_position (plugin->window,
-+                                       window_width / 2 - strlen ("Password:        "),
-+                                       window_height / 2);
-+  write (STDOUT_FILENO, "Password: ", strlen ("Password: "));
-+  ply_window_show_text_cursor (plugin->window);
-   plugin->keyboard_input_is_hidden = true;
- }
- 

make-reset-work.patch

@@ -1,12 +0,0 @@
-diff -up plymouth-0.4.0/scripts/plymouth-set-default-plugin.make-reset-work plymouth-0.4.0/scripts/plymouth-set-default-plugin
---- plymouth-0.4.0/scripts/plymouth-set-default-plugin.make-reset-work	2008-06-23 19:27:35.000000000 -0400
-+++ plymouth-0.4.0/scripts/plymouth-set-default-plugin	2008-06-23 19:27:44.000000000 -0400
-@@ -25,7 +25,7 @@ fi
- 
- PLUGIN_NAME=$1
- if [ $1 = '--reset' ]; then
--        PLUGIN_NAME=$(basename $(ls -1 -t ${LIBDIR}/plymouth/*.so 2> /dev/null | grep -v default.so | head -n 1) .so)
-+        PLUGIN_NAME=$(basename $(ls -1 -t ${LIBDIR}/plymouth/*.so 2> /dev/null | grep -v default.so | tail -n 1) .so)
-         if [ $PLUGIN_NAME = .so ]; then
-                 rm -f ${LIBDIR}/plymouth/default.so
-                 exit 0

plymouth.spec

@@ -1,7 +1,7 @@
 Summary: Plymouth Graphical Boot Animation and Logger
 Name: plymouth
-Version: 0.4.0
+Version: 0.4.5
-Release: 4%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -14,10 +14,6 @@ Provides: rhgb = 1:10.0.0
 Requires: system-logos >= 9.0.1
 Requires: elfutils
 
-Patch0: fix-harmless-spew.patch
-Patch1: make-reset-work.patch
-Patch2: make-ask-for-password-work.patch
-
 %description
 Plymouth provides an attractive graphical boot animation in
 place of the text messages that normally get shown.  Text
@@ -67,9 +63,6 @@ spins in the shape of an infinity sign.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-harmless-spew
-%patch1 -p1 -b .make-reset-work
-%patch2 -p1 -b .make-ask-for-password-work
 
 %build
 %configure --enable-tracing --disable-tests --without-boot-entry \
@@ -77,7 +70,7 @@ spins in the shape of an infinity sign.
            --with-logo=%{_datadir}/pixmaps/system-logo-white.png \
            --with-background-start-color-stop=0x0073B3           \
            --with-background-end-color-stop=0x00457E             \
-           --with-background-color=0x00457E
+           --with-background-color=0x3391cd
 
 make
 
@@ -170,6 +163,10 @@ fi
 %{_libdir}/plymouth/spinfinity.so
 
 %changelog
+* Thu Jun 26 2008 Ray Strode <rstrode@redhat.com> - 0.4.5-1
+- Update to version 0.4.5
+- Make text plugin blue and less 80s
+
 * Wed Jun 25 2008 Ray Strode <rstrode@redhat.com> - 0.4.0-4
 - Make "Password: " show up correctly in text plugin
 

sources

@@ -1 +1 @@
-e60b35f5458aa2ecd37ccbf7b0e5b044  plymouth-0.4.0.tar.bz2
+5add7ba1aacc451d86855e9529ca11c9  plymouth-0.4.5.tar.bz2