Accepting request 632215 from Base:System

OBS-URL: https://build.opensuse.org/request/show/632215 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=61
2018-09-04 20:47:18 +00:00 · 2018-09-04 20:47:18 +00:00 · 25596bd680
commit 25596bd680
parent 5a16e6580f 54388355dc
14 changed files with 119 additions and 102 deletions
--- a/0001-Add-label-ft-plugin.patch
+++ b/0001-Add-label-ft-plugin.patch
@ -20,11 +20,11 @@ Signed-off-by: Fabian Vogt <fvogt@suse.com>
 create mode 100644 src/plugins/controls/label-ft/Makefile.am
 create mode 100644 src/plugins/controls/label-ft/plugin.c

-diff --git a/configure.ac b/configure.ac
-index 445034d..13b8c3e 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -60,6 +60,15 @@ if test x$enable_pango = xyes; then
+Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
+===================================================================
+--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac	2018-08-17 19:58:07.106444425 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac	2018-08-17 19:58:59.703026810 +0200
+@@ -69,6 +69,15 @@ if test x$enable_pango = xyes; then
   AC_SUBST(PANGO_LIBS)
 fi
 
@ -40,7 +40,7 @@ index 445034d..13b8c3e 100644
 AC_ARG_ENABLE(gtk, AS_HELP_STRING([--enable-gtk],[enable building with gtk, disabled there is no x11 renderer]),enable_gtk=$enableval,enable_gtk=yes)
 AM_CONDITIONAL(ENABLE_GTK,  [test "$enable_gtk" = yes])
 
-@@ -295,6 +304,7 @@ AC_CONFIG_FILES([Makefile
+@@ -308,6 +317,7 @@ AC_CONFIG_FILES([Makefile
            src/plugins/splash/script/Makefile
            src/plugins/controls/Makefile
            src/plugins/controls/label/Makefile
@ -48,11 +48,11 @@ index 445034d..13b8c3e 100644
            src/Makefile
            src/client/ply-boot-client.pc
            src/client/Makefile
-diff --git a/src/libply-splash-graphics/ply-label.c b/src/libply-splash-graphics/ply-label.c
-index ba1f7b1..7c65708 100644
--- a/src/libply-splash-graphics/ply-label.c
-+++ b/src/libply-splash-graphics/ply-label.c
-@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *label)
+Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
+===================================================================
+--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c	2018-08-17 19:58:59.703026810 +0200
+@@ -96,8 +96,13 @@ ply_label_load_plugin (ply_label_t *labe
 
         get_plugin_interface_function_t get_label_plugin_interface;
 
@ -66,10 +66,10 @@ index ba1f7b1..7c65708 100644
         if (label->module_handle == NULL)
                 return false;
 
-diff --git a/src/plugins/controls/Makefile.am b/src/plugins/controls/Makefile.am
-index f1621f9..284b206 100644
--- a/src/plugins/controls/Makefile.am
-+++ b/src/plugins/controls/Makefile.am
+Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am
+===================================================================
+--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/controls/Makefile.am	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/Makefile.am	2018-08-17 19:58:59.703026810 +0200
@@ -1,4 +1,8 @@
 +SUBDIRS =
 if ENABLE_PANGO
@ -80,11 +80,10 @@ index f1621f9..284b206 100644
 +SUBDIRS += label-ft
 endif
 MAINTAINERCLEANFILES = Makefile.in
-diff --git a/src/plugins/controls/label-ft/Makefile.am b/src/plugins/controls/label-ft/Makefile.am
-new file mode 100644
-index 0000000..2ff864d
--- /dev/null
-+++ b/src/plugins/controls/label-ft/Makefile.am
+Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/Makefile.am	2018-08-17 19:58:59.703026810 +0200
@@ -0,0 +1,22 @@
 +AM_CPPFLAGS = -I$(top_srcdir)                                                 \
 +           -I$(srcdir)/../../../libply                                        \
@ -108,11 +107,10 @@ index 0000000..2ff864d
 +label_ft_la_SOURCES = $(srcdir)/plugin.c
 +
 +MAINTAINERCLEANFILES = Makefile.in
-diff --git a/src/plugins/controls/label-ft/plugin.c b/src/plugins/controls/label-ft/plugin.c
-new file mode 100644
-index 0000000..06fe73e
--- /dev/null
-+++ b/src/plugins/controls/label-ft/plugin.c
+Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/controls/label-ft/plugin.c	2018-08-17 19:58:59.703026810 +0200
@@ -0,0 +1,507 @@
 +/* ply-label.c - label control
 + *
@ -621,6 +619,3 @@ index 0000000..06fe73e
 +}
 +
 +/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */
-- 
-2.7.0
-
--- a/0002-Install-label-ft-plugin-into-initrd-if-available.patch
+++ b/0002-Install-label-ft-plugin-into-initrd-if-available.patch
@ -10,11 +10,11 @@ Signed-off-by: Fabian Vogt <fvogt@suse.com>
 scripts/plymouth-populate-initrd.in | 9 +++++++++
 1 file changed, 9 insertions(+)

-diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
-index 43c7f22..a109c59 100755
--- a/scripts/plymouth-populate-initrd.in
-+++ b/scripts/plymouth-populate-initrd.in
-@@ -427,6 +427,15 @@
+Index: plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in
+===================================================================
+--- plymouth-0.9.3+git20180807.7663b0c.orig/scripts/plymouth-populate-initrd.in	2018-08-17 19:57:27.334004329 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in	2018-08-17 19:59:15.535202195 +0200
+@@ -427,6 +427,15 @@ if [ -d ${PLYMOUTH_DATADIR}/plymouth/the
      inst_recur "${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}"
 fi
 
@ -30,6 +30,3 @@ index 43c7f22..a109c59 100755
 if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
     cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
 fi
-- 
-2.7.0
-
--- a/0003-fix_null_deref.patch
+++ b/0003-fix_null_deref.patch
@ -12,10 +12,10 @@ Signed-off-by: Fabian Vogt <fvogt@suse.com>
 src/libply-splash-graphics/ply-label.c | 8 ++++++++
 1 file changed, 8 insertions(+)

-Index: plymouth-0.9.2/src/libply-splash-graphics/ply-label.c
+Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c
 ===================================================================
--- plymouth-0.9.2.orig/src/libply-splash-graphics/ply-label.c
-+++ plymouth-0.9.2/src/libply-splash-graphics/ply-label.c
+--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-graphics/ply-label.c	2018-08-17 19:58:59.703026810 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-graphics/ply-label.c	2018-08-17 19:59:33.203397962 +0200
@@ -130,6 +130,15 @@ ply_label_load_plugin (ply_label_t *labe
 
         label->control = label->plugin_interface->create_control ();
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 <services>
  <service mode="disabled" name="tar_scm">
-    <param name="url">git://anongit.freedesktop.org/plymouth</param>
+    <param name="url">https://gitlab.freedesktop.org/plymouth/plymouth.git</param>
    <param name="scm">git</param>
    <param name="changesgenerate">enable</param>
    <param name="filename">plymouth</param>
--- a/4
+++ b/4
@ -1,4 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                <param name="url">git://anongit.freedesktop.org/plymouth</param>
-              <param name="changesrevision">6e9e95dc0fe89a3c52f50e44ff0096a6e65e46a6</param></service></servicedata>
+              <param name="changesrevision">6e9e95dc0fe89a3c52f50e44ff0096a6e65e46a6</param></service><service name="tar_scm">
+                <param name="url">https://gitlab.freedesktop.org/plymouth/plymouth.git</param>
+              <param name="changesrevision">9ed2a0c55be8ee9919953efbacedc079a7428358</param></service></servicedata>
--- a/plymouth-0.9.3+git20171220.6e9e95d.tar.xz
+++ b/plymouth-0.9.3+git20171220.6e9e95d.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b656593d1fbb35208a588fcb1c60a25f3b938ab688cee9a434259ec5f213168
-size 871648
--- a/plymouth-0.9.3+git20180827.0a66272.tar.xz
+++ b/plymouth-0.9.3+git20180827.0a66272.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89f426e5eb12aeea105a9748a62dc9d87282c50f560882ef08b4dee69aacc044
+size 874016
--- a/plymouth-correct-runtime-dir.patch
+++ b/plymouth-correct-runtime-dir.patch
@ -1,6 +1,8 @@
--- a/configure.ac	2012-11-02 22:26:41.000000000 +0100
-+++ b/configure.ac	2013-02-22 17:15:58.300689336 +0100
-@@ -268,7 +268,7 @@
+Index: plymouth-0.9.3+git20180807.7663b0c/configure.ac
+===================================================================
+--- plymouth-0.9.3+git20180807.7663b0c.orig/configure.ac	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/configure.ac	2018-08-17 19:58:07.106444425 +0200
+@@ -150,7 +150,7 @@ if test x$with_system_root_install = xye
 else
   plymouthclientdir=$bindir
   plymouthdaemondir=$sbindir
--- a/plymouth-dracut-path.patch
+++ b/plymouth-dracut-path.patch
@ -1,6 +1,8 @@
--- scripts/plymouth-populate-initrd.in	2012-08-21 01:25:52.000000000 +0200
-+++ scripts/plymouth-populate-initrd.in	2012-11-01 18:27:22.760029873 +0100
-@@ -372,8 +372,8 @@
+Index: plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in
+===================================================================
+--- plymouth-0.9.3+git20180807.7663b0c.orig/scripts/plymouth-populate-initrd.in	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/scripts/plymouth-populate-initrd.in	2018-08-17 19:57:27.334004329 +0200
+@@ -386,8 +386,8 @@ done
 [ -z "$INITRDDIR" ] && usage error
 
 mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
--- a/plymouth-manpages.patch
+++ b/plymouth-manpages.patch
@ -1,7 +1,7 @@
-Index: plymouth-0.8.8_git20140207/docs/Makefile.am
+Index: plymouth-0.9.3+git20180807.7663b0c/docs/Makefile.am
 ===================================================================
--- plymouth-0.8.8_git20140207.orig/docs/Makefile.am
-+++ plymouth-0.8.8_git20140207/docs/Makefile.am
+--- plymouth-0.9.3+git20180807.7663b0c.orig/docs/Makefile.am	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/docs/Makefile.am	2018-08-17 19:58:25.330646165 +0200
@@ -16,12 +16,14 @@ plymouth.1: plymouth1.xml
 %.1: %.xml
 	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
--- a/plymouth-only_use_fb_for_cirrus_bochs.patch
+++ b/plymouth-only_use_fb_for_cirrus_bochs.patch
@ -6,11 +6,11 @@ DRM does not work well with cirrus and bochs (no display) but the framebuffer dr
 prevents DRM drivers from loading.
 As we need to support cirrus for libvirt and bochs for QEMU, we cannot just remove support for frame-buffer.

-Index: plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-device-manager.c
+Index: plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c
 ===================================================================
--- plymouth-0.9.2+git20161215.18dd755.orig/src/libply-splash-core/ply-device-manager.c
-+++ plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-device-manager.c
-@@ -227,13 +227,33 @@ create_devices_for_udev_device (ply_devi
+--- plymouth-0.9.3+git20180807.7663b0c.orig/src/libply-splash-core/ply-device-manager.c	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/src/libply-splash-core/ply-device-manager.c	2018-08-17 19:58:41.178821647 +0200
+@@ -228,13 +228,33 @@ create_devices_for_udev_device (ply_devi
                 subsystem = udev_device_get_subsystem (device);
                 ply_trace ("device subsystem is %s", subsystem);
 
--- a/plymouth-some-greenish-openSUSE-colors.patch
+++ b/plymouth-some-greenish-openSUSE-colors.patch
@ -7,10 +7,10 @@ Subject: [PATCH] Some greenish openSUSE colors
 src/plugins/splash/text/plugin.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

-Index: plymouth-0.9.2/src/plugins/splash/text/plugin.c
+Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/text/plugin.c
 ===================================================================
--- plymouth-0.9.2.orig/src/plugins/splash/text/plugin.c
-+++ plymouth-0.9.2/src/plugins/splash/text/plugin.c
+--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/splash/text/plugin.c	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/text/plugin.c	2018-08-17 19:57:50.786263802 +0200
@@ -174,10 +174,10 @@ view_start_animation (view_t *view)
                                           0x2e3436);
         ply_terminal_set_color_hex_value (terminal,
@ -24,10 +24,10 @@ Index: plymouth-0.9.2/src/plugins/splash/text/plugin.c
 
         ply_text_display_set_background_color (view->display,
                                                PLY_TERMINAL_COLOR_BLACK);
-Index: plymouth-0.9.2/src/plugins/splash/tribar/plugin.c
+Index: plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/tribar/plugin.c
 ===================================================================
--- plymouth-0.9.2.orig/src/plugins/splash/tribar/plugin.c
-+++ plymouth-0.9.2/src/plugins/splash/tribar/plugin.c
+--- plymouth-0.9.3+git20180807.7663b0c.orig/src/plugins/splash/tribar/plugin.c	2018-08-07 17:41:15.000000000 +0200
+++ plymouth-0.9.3+git20180807.7663b0c/src/plugins/splash/tribar/plugin.c	2018-08-17 19:57:50.786263802 +0200
@@ -177,13 +177,13 @@ view_start_animation (view_t *view)
                                           0x000000);
         ply_terminal_set_color_hex_value (terminal,
--- a/plymouth.changes
+++ b/plymouth.changes
@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Tue Aug 28 07:32:03 UTC 2018 - qzhao@suse.com
+
+- Update to version 0.9.3+git20180827.0a66272:
+  ensure tty is closed on deactivate
+  If plymouth doesn't get explicitly "activated" then when
+  GDM tries to deactivate it, the deactivation request is
+  a noop.
+  One aspect of being active, though is having ownership and
+  control of the terminal.  This happens immediately, even
+  before a splash is shown.
+  The `deactivate` request needs to relinguish such control,
+  unconditionally, since some display server is about to use
+  the tty.
+- Update patch name base on quilt standerd
+  Remove only_use_fb_for_cirrus_bochs.patch
+  Add plymouth-only_use_fb_for_cirrus_bochs.patch
+  Remove 0001-Some-greenish-openSUSE-colors.patch
+  Add plymouth-some-greenish-openSUSE-colors.patch
+
+-------------------------------------------------------------------
+Fri Aug 17 17:36:09 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 0.9.3+git20180807.7663b0c:
+  * systemd-units: Add "ConditionVirtualization=!container"
+  * README: add link to Code of Conduct
+  * two-step: add unhandled splash mode case to switch
+  * main: fix build
+  * Fix miscellaneous compiler warnings
+  * configure: Pass -Wno-cast-function-type if available
+  * main: Fix getting detailed logs from systemd
+  * main: Show details when ESC is pressed during splash_delay
+  * drm: Remove unnecessary reset_scan_out_buffer_if_needed() call
+    from ply_renderer_head_map()
+  * main: Only activate renderers if the splash uses pixel-displays
+- Switch to new gitlab home in _service.
+- Refresh patches with quilt.
+- Use autosetup macro.
+
 -------------------------------------------------------------------
 Sat Aug  4 06:15:14 UTC 2018 - qzhao@suse.com

--- a/plymouth.spec
+++ b/plymouth.spec
@ -22,43 +22,31 @@
 %define plymouth_initrd_file /boot/initrd-plymouth.img

 Name:           plymouth
-Version:        0.9.3+git20171220.6e9e95d
+Version:        0.9.3+git20180827.0a66272
 Release:        0
 Summary:        Graphical Boot Animation and Logger
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/Base
 Url:            http://www.freedesktop.org/wiki/Software/Plymouth

 Source0:        %{name}-%{version}.tar.xz
 Source1:        boot-duration
-# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com
-# -- prefix is /usr/sbin and /usr/bin
-Patch9:         plymouth-dracut-path.patch
-# PATCH-FIX-OPENSUSE 0001-Some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com
-# -- to use suse colors in tribar.
-Patch10:        0001-Some-greenish-openSUSE-colors.patch
-# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com 
-# -- make sure the runtime directory is /run and not /var/run
-Patch16:        plymouth-correct-runtime-dir.patch
-# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de 
-# -- Fix man page installation
-Patch17:        plymouth-manpages.patch
-# PATCH-FIX-UPSTREAM plymouth-ignore-cirrusdrm.patch bnc#888590 fcrozat@suse.com 
-# -- ignore cirrusdrm, use fb instead
-# Patch26:        plymouth-ignore-cirrusdrm.patch
-# PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com 
-# -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer 
-# -- driver and plymouth-ignore-cirrusdrm.patch with single patch.
-Patch26:        only_use_fb_for_cirrus_bochs.patch
-# PATCH-FIX-UPSTREAM 
-# 0001-Add-label-ft-plugin.patch 
-# 0002-Install-label-ft-plugin-into-initrd-if-available.patch 
-# 0003-fix_null_deref.patch 
-# boo#959986 fvogt@suse.com
-# -- add ability to output text in initrd needed for encryption.
-Patch30:        0001-Add-label-ft-plugin.patch
-Patch31:        0002-Install-label-ft-plugin-into-initrd-if-available.patch
-Patch32:        0003-fix_null_deref.patch
+# PATCH-FIX-OPENSUSE plymouth-dracut-path.patch tittiatcoke@gmail.com -- Prefix is /usr/sbin and /usr/bin
+Patch0:         plymouth-dracut-path.patch
+# PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 fcrozat@suse.com -- To use suse colors in tribar.
+Patch1:         plymouth-some-greenish-openSUSE-colors.patch
+# PATCH-FIX-OPENSUSE plymouth-correct-runtime-dir.patch tittiatcoke@gmail.com -- Make sure the runtime directory is /run and not /var/run
+Patch2:         plymouth-correct-runtime-dir.patch
+# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 idoenmez@suse.de  -- Fix man page installation
+Patch3:         plymouth-manpages.patch
+# PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 fvogt@suse.com -- force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch.
+Patch4:         plymouth-only_use_fb_for_cirrus_bochs.patch
+# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
+Patch5:         0001-Add-label-ft-plugin.patch
+# PATCH-FIX-UPSTREAM 0002-Install-label-ft-plugin-into-initrd-if-available.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
+Patch6:         0002-Install-label-ft-plugin-into-initrd-if-available.patch
+# PATCH-FIX-UPSTREAM 0003-fix_null_deref.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.
+Patch7:         0003-fix_null_deref.patch

 BuildRequires:  automake
 BuildRequires:  docbook-xsl-stylesheets
@ -349,15 +337,7 @@ Plymouth. It it is a simple example theme the uses the "script"
 plugin.

 %prep
-%setup -q
-%patch9
-%patch10 -p1
-%patch16 -p1
-%patch17 -p1
-%patch26 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
+%autosetup -p1

 # replace builddate with patch0date
 sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c