diff --git a/0002-Install-label-ft-plugin-into-initrd-if-available.patch b/0002-Install-label-ft-plugin-into-initrd-if-available.patch index 6cc5d7a..4b4b3d3 100644 --- a/0002-Install-label-ft-plugin-into-initrd-if-available.patch +++ b/0002-Install-label-ft-plugin-into-initrd-if-available.patch @@ -1,30 +1,17 @@ -From 2c4145e4b7e146541ba8e33aee5e0125423d97bc Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Wed, 20 Jan 2016 14:03:18 +0100 -Subject: [PATCH 2/2] Install label-ft plugin into initrd, if available - -It is small and useful enough to include it by default. - -Signed-off-by: Fabian Vogt ---- - scripts/plymouth-populate-initrd.in | 9 +++++++++ - 1 file changed, 9 insertions(+) - -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}" +diff -Nura plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in +--- plymouth-0.9.4+git20190304.ed9f201/scripts/plymouth-populate-initrd.in 2019-03-12 20:11:18.845236943 +0800 ++++ plymouth-0.9.4+git20190304.ed9f201_new/scripts/plymouth-populate-initrd.in 2019-03-12 20:25:34.933746928 +0800 +@@ -433,6 +433,15 @@ + inst_recur "${PLYMOUTH_IMAGE_DIR}" fi +if [ -f "${PLYMOUTH_PLUGIN_PATH}/label-ft.so" ]; then -+ inst ${PLYMOUTH_PLUGIN_PATH}/label-ft.so $INITRDDIR -+ font=$(fc-match -f %{file}) -+ inst "$font" $INITRDDIR -+ # The label-ft plugin expects it at this location -+ mkdir -p $INITRDDIR/usr/share/fonts -+ ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf ++ inst ${PLYMOUTH_PLUGIN_PATH}/label-ft.so $INITRDDIR ++ font=$(fc-match -f %{file}) ++ inst "$font" $INITRDDIR ++ # The label-ft plugin expects it at this location ++ mkdir -p $INITRDDIR/usr/share/fonts ++ ln -s "$font" $INITRDDIR/usr/share/fonts/Plymouth.ttf +fi + if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then diff --git a/plymouth-0.9.4+git20181219.c8f1256.tar.xz b/plymouth-0.9.4+git20181219.c8f1256.tar.xz deleted file mode 100644 index 85431a5..0000000 --- a/plymouth-0.9.4+git20181219.c8f1256.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ecedd0e7be257b16594bfaa6b36347fb6cb2a7f17b289ba3c3a5d999a48d95b -size 5943796 diff --git a/plymouth-0.9.4+git20190304.ed9f201.tar.xz b/plymouth-0.9.4+git20190304.ed9f201.tar.xz new file mode 100644 index 0000000..335a4b1 --- /dev/null +++ b/plymouth-0.9.4+git20190304.ed9f201.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9da2f4333a98584cbf43cbf8deeee60e3220da56b7e9019d18bd4c6b466baa3e +size 6217360 diff --git a/plymouth.changes b/plymouth.changes index 0cda7e1..a793653 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Tue Mar 12 12:33:54 UTC 2019 - qzhao@suse.com + +- Update to version 0.9.4+git20181219.c8f1256: + * ply-pixel-buffer: Fix right and bottom edge rendering of + scaled buffers. + * Add support for translating the user visible strings in some + themes + * Prefix Title and Subtitle theme config keywords with an + underscore + * Add new reboot and system-upgrade modes + * main: Remove private ply_mode_t + * two-step: Make ProgressBarShowPercentComplete a per mode + setting + * plymouthd.defaults: Change default ShowDelay to 0 + * ply-boot-splash: Do not add ply_boot_splash_update_progress + timeout multiple times + * logging: Minor log-message fixes. + Improve logging format. + * themes: Update spinner and bgrt theme offline updates mode + * two-step: Add a per mode setting to suppress messages. + Add progress-bar support. + Add MessageBelowAnimation option. + Add per mode settings. + Drop background_is_bgrt view_t member + * ply-progress-bar: Allow caller to specify the widgets width and + height. + Allow choosing fore- and back-ground color. + Redraw on percentage update. + * boot-server: fix type confusion when allocating connection object + * ply-device-manager: Handle change events for monitor hotplugging. + Consume all events in one go. + * drm: Stop limiting preferred-mode picking to UEFI systems. + Reset mode on display-port connected outputs with a bad + link-status. + Implement handle_change_event. + Ensure heads are mapped before flushing them. + Allow calling create_heads_for_active_connectors multiple + times. + Allow calling ply_renderer_head_add_connector with existing + connector_id. + Limit backend->resources lifetime to within query_device. + Store and keep all the outputs in the backend. + Add get_output_info helper function + Stop storing a pointer to drmModeConnector in ply_output_t + Stop keeing a drmModeConnector instance around. + Refactor ply_renderer_head_add_connector and + ply_renderer_head_new + + +- Rebase 0002-Install-label-ft-plugin-into-initrd-if-available.patch + ------------------------------------------------------------------- Wed Jan 2 08:09:46 UTC 2019 - qzhao@suse.com diff --git a/plymouth.spec b/plymouth.spec index e54e9e5..396bc92 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -22,7 +22,8 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.4+git20181219.c8f1256 +#Version: 0.9.4+git20181219.c8f1256 +Version: 0.9.4+git20190304.ed9f201 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later @@ -57,6 +58,7 @@ BuildRequires: module-init-tools BuildRequires: pkgconfig BuildRequires: suse-module-tools # needed for systemd-tty-ask-password-agent +BuildRequires: intltool BuildRequires: systemd BuildRequires: update-desktop-files BuildRequires: xz @@ -68,6 +70,8 @@ BuildRequires: pkgconfig(libsystemd) >= 186 BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(pango) >= 1.21.0 BuildRequires: pkgconfig(systemd) >= 186 +#BuildRequires: translation-update-upstream +Recommends: %{name}-lang Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts @@ -349,6 +353,7 @@ Plymouth. %prep %autosetup -p1 +#translation-update-upstream # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %%y %{_sourcedir}/%{name}.changes)\"/" src/main.c @@ -527,6 +532,7 @@ fi %{_unitdir}/* %ghost %{_localstatedir}/log/boot.log %ghost %{_localstatedir}/spool/plymouth/boot.log +/usr/share/locale/ %files dracut %defattr(-, root, root)