plymouth:moved into main for pisi 2.0

2016-01-26 13:44:44 +02:00
parent 6676f0d10e
commit e41838ce0e
16 changed files with 995 additions and 0 deletions
@@ -0,0 +1,49 @@
+From 152304f3fd2ebd04ca6d49c62dce4ddd2269326a Mon Sep 17 00:00:00 2001
+From: Frederic Crozat <fcrozat@suse.com>
+Date: Fri, 20 Jul 2012 11:07:29 +0200
+Subject: [PATCH] Revert "libply: remove the unused SPLASH_MODE_SUSPEND and
+ SPLASH_MODE_RESUME"
+
+This reverts commit 02c596757753589f7e49d26eab2759d552f24671.
+
+Conflicts:
+	src/libply-splash-core/ply-boot-splash-plugin.h
+	src/plugins/splash/script/script-lib-plymouth.c
+---
+ src/libply-splash-core/ply-boot-splash-plugin.h |    2 ++
+ src/plugins/splash/script/script-lib-plymouth.c |    6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h
+index 2d73d66..1a67526 100644
+--- a/src/libply-splash-core/ply-boot-splash-plugin.h
+++ b/src/libply-splash-core/ply-boot-splash-plugin.h
+@@ -38,6 +38,8 @@ typedef enum
+ {
+   PLY_BOOT_SPLASH_MODE_BOOT_UP,
+   PLY_BOOT_SPLASH_MODE_SHUTDOWN,
+  PLY_BOOT_SPLASH_MODE_SUSPEND,
+  PLY_BOOT_SPLASH_MODE_RESUME,
+   PLY_BOOT_SPLASH_MODE_UPDATES,
+   PLY_BOOT_SPLASH_MODE_INVALID
+ } ply_boot_splash_mode_t;
+diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
+index 5c648a6..eb7791e 100644
+--- a/src/plugins/splash/script/script-lib-plymouth.c
+++ b/src/plugins/splash/script/script-lib-plymouth.c
+@@ -61,6 +61,12 @@ static script_return_t plymouth_get_mode (script_state_t *state,
+       case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
+         obj = script_obj_new_string ("shutdown");
+         break;
+      case PLY_BOOT_SPLASH_MODE_SUSPEND:
+        obj = script_obj_new_string ("suspend");
+        break;
+      case PLY_BOOT_SPLASH_MODE_RESUME:
+        obj = script_obj_new_string ("resume");
+	break;
+       case PLY_BOOT_SPLASH_MODE_UPDATES:
+         obj = script_obj_new_string ("updates");
+         break;
+-- 
+1.7.10.4
+