sys-boot/plymouth : version bump (v0.9.4) -> this one works

6 files changed, 56 insertions, 61 deletions

diff --git a/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
new file mode 100644
index 00000000..8969161b
--- /dev/null
+++ b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
@@ -0,0 +1,45 @@
+From f8d7813b32dfe129d1e5718719ee3eff131f4fac Mon Sep 17 00:00:00 2001
+From: Kjell Claesson <kjell.claesson@epost.tidanet.se>
+Date: Fri, 18 Aug 2017 00:25:56 +0200
+Subject: [PATCH] Fix build with newer glibc
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac                          | 1 +
+ src/libply-splash-core/ply-terminal.c | 8 ++++++++
+ 2 files changed, 9 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c32697f..8376789 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@ AC_CONFIG_AUX_DIR(build-tools)
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
++AC_HEADER_MAJOR
+ AC_PROG_AWK
+ AC_PROG_CC_STDC
+ AM_PROG_CC_C_O
+diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
+index a0954f2..ef62bf8 100644
+--- a/src/libply-splash-core/ply-terminal.c
++++ b/src/libply-splash-core/ply-terminal.c
+@@ -36,6 +36,14 @@
+ #include <unistd.h>
+ #include <wchar.h>
+ 
++/* major()/minor() */
++#ifdef MAJOR_IN_MKDEV
++#    include <sys/mkdev.h>
++#endif
++#ifdef MAJOR_IN_SYSMACROS
++#    include <sys/sysmacros.h>
++#endif
++
+ #include <linux/kd.h>
+ #include <linux/major.h>
+ #include <linux/vt.h>
+-- 
+2.14.1
+
diff --git a/sys-boot/plymouth/files/plymouth-default-theme.patch b/sys-boot/plymouth/files/plymouth-default-theme.patch
new file mode 100644
index 00000000..55df932b
--- /dev/null
+++ b/sys-boot/plymouth/files/plymouth-default-theme.patch
@@ -0,0 +1,11 @@
+diff -Nur a/src/plymouthd.defaults b/src/plymouthd.defaults
+--- a/src/plymouthd.defaults	2018-09-20 18:53:38.000000000 +0100
++++ b/src/plymouthd.defaults	2020-04-25 02:14:12.014468210 +0100
+@@ -1,6 +1,4 @@
+ # Distribution defaults. Changes to this file will get overwritten during
+ # upgrades.
+ [Daemon]
+-Theme=spinner
+-ShowDelay=5
+-DeviceTimeout=5
++Theme=redcore
diff --git a/sys-boot/plymouth/files/plymouth-fix-window-size-with-multiple-heads.patch b/sys-boot/plymouth/files/plymouth-fix-window-size-with-multiple-heads.patch
deleted file mode 100644
index 53172d1a..00000000
--- a/sys-boot/plymouth/files/plymouth-fix-window-size-with-multiple-heads.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur a/src/plugins/splash/script/script-lib-sprite.c b/src/plugins/splash/script/script-lib-sprite.c
---- a/src/plugins/splash/script/script-lib-sprite.c	2012-09-26 17:50:53.000000000 +0100
-+++ b/src/plugins/splash/script/script-lib-sprite.c	2018-04-12 01:20:25.782074829 +0100
-@@ -233,7 +233,7 @@
-       if (width == 0)
-         width = ply_pixel_display_get_width (display->pixel_display);
-       else
--        width = MIN (width, ply_pixel_display_get_width (display->pixel_display));
-+        width = MAX (width, ply_pixel_display_get_width (display->pixel_display));
-     }
-   return script_return_obj (script_obj_new_number (width));
- }
-@@ -273,7 +273,7 @@
-       if (height == 0)
-         height = ply_pixel_display_get_height (display->pixel_display);
-       else
--        height = MIN (height, ply_pixel_display_get_height (display->pixel_display));
-+        height = MAX (height, ply_pixel_display_get_height (display->pixel_display));
-     }
-   return script_return_obj (script_obj_new_number (height));
- }
diff --git a/sys-boot/plymouth/files/plymouth-include-sysmacros.patch b/sys-boot/plymouth/files/plymouth-include-sysmacros.patch
deleted file mode 100644
index 7f39fa1a..00000000
--- a/sys-boot/plymouth/files/plymouth-include-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
---- a/src/libply-splash-core/ply-terminal.c	2012-09-26 17:50:53.000000000 +0100
-+++ b/src/libply-splash-core/ply-terminal.c	2018-02-21 11:04:49.318694569 +0000
-@@ -32,6 +32,7 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <termios.h>
- #include <unistd.h>
- #include <wchar.h>
diff --git a/sys-boot/plymouth/files/plymouth-redcore-defaults.patch b/sys-boot/plymouth/files/plymouth-redcore-defaults.patch
deleted file mode 100644
index 3da72cb3..00000000
--- a/sys-boot/plymouth/files/plymouth-redcore-defaults.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nurp plymouth-0.8.8.orig/src/plymouthd.defaults plymouth-0.8.8/src/plymouthd.defaults
---- plymouth-0.8.8.orig/src/plymouthd.defaults	2012-09-26 18:50:53.000000000 +0200
-+++ plymouth-0.8.8/src/plymouthd.defaults	2013-11-15 14:10:58.638895827 +0100
-@@ -1,4 +1,4 @@
- # Distribution defaults. Changes to this file will get overwritten during
- # upgrades.
- [Daemon]
--Theme=spinner
-+Theme=text
diff --git a/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch b/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch
deleted file mode 100644
index fe0f8f6a..00000000
--- a/sys-boot/plymouth/files/plymouth-text-redcore-colors.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nurp plymouth-0.8.8.orig/src/plugins/splash/text/plugin.c plymouth-0.8.8/src/plugins/splash/text/plugin.c
---- plymouth-0.8.8.orig/src/plugins/splash/text/plugin.c	2019-01-26 16:06:17.245381656 +0200
-+++ plymouth-0.8.8/src/plugins/splash/text/plugin.c	2019-01-26 15:34:11.185772000 +0200
-@@ -177,13 +177,13 @@ view_start_animation (view_t *view)
-                                     0x000000);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_WHITE,
--                                    0xffffff);
-+                                    0xDDDDDD);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BLUE,
--                                    0x0073B3);
-+                                    0x8f0A0A);
-   ply_terminal_set_color_hex_value (terminal,
-                                     PLY_TERMINAL_COLOR_BROWN,
--                                    0x00457E);
-+                                    0x520A0A);
- 
-   ply_text_display_set_background_color (view->display,
-                                          PLY_TERMINAL_COLOR_BLACK);