--- Begin Message ---
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: plymouth@packages.debian.org
Control: affects -1 + src:plymouth
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package plymouth
[ Reason ]
This version switch to the new theme for trixie and fixes the
installation/usage of the fonts
[ Impact ]
The new default theme will not be used and some fonts might be missing
[ Tests ]
Tested manually
[ Risks ]
The changes involve the creation of the initramfs and installation of
the fonts in it, so the risk is that the initramfs fails to be created
(that will be discovered quickly) or the user might have other fonts
that the ones they expects
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
unblock plymouth/24.004.60-4
diff -Nru plymouth-24.004.60/debian/changelog plymouth-24.004.60/debian/changelog
--- plymouth-24.004.60/debian/changelog 2024-07-17 18:39:45.000000000 +0200
+++ plymouth-24.004.60/debian/changelog 2025-05-14 11:04:21.000000000 +0200
@@ -1,3 +1,20 @@
+plymouth (24.004.60-4) unstable; urgency=medium
+
+ * d/l/plymouth.hook: Do not explicitly install DejaVu fonts.
+ Rely on fontconfig to tell us which fonts to install in the initramfs.
+ This will also avoid installing duplicate fonts (Closes: #1105224)
+
+ -- Laurent Bigonville <bigon@debian.org> Wed, 14 May 2025 11:04:21 +0200
+
+plymouth (24.004.60-3) unstable; urgency=medium
+
+ * d/p/0003-default-theme.patch: Use ceratopsian theme
+ * d/l/plymouth.hook: Install Cantarell variable font file if available
+ * Fix fallback not working when fc-match isn't available (Closes: #1093517)
+ * d/local/plymouth.hook: Install the default/fallback fonts
+
+ -- Laurent Bigonville <bigon@debian.org> Tue, 13 May 2025 10:30:17 +0200
+
plymouth (24.004.60-2) unstable; urgency=medium
* Team upload
diff -Nru plymouth-24.004.60/debian/local/plymouth.hook plymouth-24.004.60/debian/local/plymouth.hook
--- plymouth-24.004.60/debian/local/plymouth.hook 2024-07-17 18:39:45.000000000 +0200
+++ plymouth-24.004.60/debian/local/plymouth.hook 2025-05-14 11:04:21.000000000 +0200
@@ -82,6 +82,7 @@
if [ -f /etc/os-release ]
then
+ mkdir -p "${DESTDIR}/etc"
cp /etc/os-release "${DESTDIR}/etc"
fi
@@ -101,13 +102,15 @@
# This is only needed because fc-cache bellow fails if the directory doesn't exist
mkdir -p "${DESTDIR}/usr/local/share/fonts"
- # fonts-dejavu
- if [ -e /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf ]
- then
- mkdir -p "${DESTDIR}/usr/share/fonts/truetype/dejavu"
- cp -dRp /usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf "${DESTDIR}/usr/share/fonts/truetype/dejavu"
- cp -dRp /usr/share/fonts/truetype/dejavu/DejaVuSans.ttf "${DESTDIR}/usr/share/fonts/truetype/dejavu"
- fi
+ # Fallback fonts
+ mkdir -p ${DESTDIR}/usr/share/fonts
+ DEFAULT_FONT=$(fc-match -f %{file} 2> /dev/null)
+ [ ! -z "$DEFAULT_FONT" ] && copy_file font "$DEFAULT_FONT"
+ DEFAULT_MONOSPACE_FONT=$(fc-match -f %{file} monospace 2> /dev/null)
+ [ ! -z "$DEFAULT_MONOSPACE_FONT" ] && copy_file font "$DEFAULT_MONOSPACE_FONT"
+
+ [ ! -z "$DEFAULT_FONT" ] && ln -s "$DEFAULT_FONT" ${DESTDIR}/usr/share/fonts/Plymouth.ttf
+ [ ! -z "$DEFAULT_MONOSPACE_FONT" ] && ln -s "$DEFAULT_MONOSPACE_FONT" ${DESTDIR}/usr/share/fonts/Plymouth-monospace.ttf
case "${THEME_NAME}" in
spinner|bgrt)
# ATM, this is needed by the spinner and bgrt themes
@@ -117,6 +120,11 @@
cp -dRp /usr/share/fonts/opentype/cantarell/Cantarell-Regular.otf "${DESTDIR}/usr/share/fonts/opentype/cantarell"
cp -dRp /usr/share/fonts/opentype/cantarell/Cantarell-Light.otf "${DESTDIR}/usr/share/fonts/opentype/cantarell"
fi
+ if [ -e /usr/share/fonts/opentype/cantarell/Cantarell-VF.otf ]
+ then
+ mkdir -p "${DESTDIR}/usr/share/fonts/opentype/cantarell"
+ cp -dRp /usr/share/fonts/opentype/cantarell/Cantarell-VF.otf "${DESTDIR}/usr/share/fonts/opentype/cantarell"
+ fi
# We continue to the default case here
;;
esac
diff -Nru plymouth-24.004.60/debian/patches/0003-default-theme.patch plymouth-24.004.60/debian/patches/0003-default-theme.patch
--- plymouth-24.004.60/debian/patches/0003-default-theme.patch 2024-07-17 18:39:45.000000000 +0200
+++ plymouth-24.004.60/debian/patches/0003-default-theme.patch 2025-05-14 11:04:21.000000000 +0200
@@ -7,7 +7,7 @@
# Administrator customizations go in this file
#[Daemon]
-#Theme=fade-in
-+#Theme=emerald
++#Theme=ceratopsian
--- a/src/plymouthd.defaults
+++ b/src/plymouthd.defaults
@@ -1,6 +1,6 @@
@@ -15,6 +15,6 @@
# upgrades.
[Daemon]
-Theme=spinner
-+Theme=emerald
++Theme=ceratopsian
ShowDelay=0
DeviceTimeout=8
diff -Nru plymouth-24.004.60/debian/patches/0007-label-freetype-fix-fallback-not-working-when-fc-matc.patch plymouth-24.004.60/debian/patches/0007-label-freetype-fix-fallback-not-working-when-fc-matc.patch
--- plymouth-24.004.60/debian/patches/0007-label-freetype-fix-fallback-not-working-when-fc-matc.patch 1970-01-01 01:00:00.000000000 +0100
+++ plymouth-24.004.60/debian/patches/0007-label-freetype-fix-fallback-not-working-when-fc-matc.patch 2025-05-14 11:04:21.000000000 +0200
@@ -0,0 +1,47 @@
+From: Ferdinand Bachmann <ferdinand.bachmann@yrlf.at>
+Date: Tue, 16 Jan 2024 01:52:11 +0100
+Subject: label-freetype: fix fallback not working when fc-match isn't
+ available
+
+The new font loading functions introduced in
+544e62ac41a490f04d8e6b4e85f8b9fa1171b0cc assume that popen() returns
+NULL when fc-match is unavailable or fails. This is incorrect, since
+popen() will always start a shell to run the passed command and return a
+stream to that shell's stdin and stdout.
+
+This results in an non-null but empty font name being passed to
+FT_New_Face(), which fails.
+
+This commit fixes this by also using the fallback font when the font
+path read from the popen() stream is empty.
+
+Fixes #239
+Fixes regression caused by 544e62ac41a490f04d8e6b4e85f8b9fa1171b0cc
+---
+ src/plugins/controls/label-freetype/plugin.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/plugins/controls/label-freetype/plugin.c b/src/plugins/controls/label-freetype/plugin.c
+index 917b04c..be20620 100644
+--- a/src/plugins/controls/label-freetype/plugin.c
++++ b/src/plugins/controls/label-freetype/plugin.c
+@@ -135,6 +135,9 @@ find_default_font_path (void)
+
+ pclose (fp);
+
++ if (strcmp (fc_match_out, "") == 0)
++ return FONT_FALLBACK;
++
+ return fc_match_out;
+ }
+
+@@ -152,6 +155,9 @@ find_default_monospace_font_path (void)
+
+ pclose (fp);
+
++ if (strcmp (fc_match_out, "") == 0)
++ return MONOSPACE_FONT_FALLBACK;
++
+ return fc_match_out;
+ }
+
diff -Nru plymouth-24.004.60/debian/patches/0008-show-delay.patch plymouth-24.004.60/debian/patches/0008-show-delay.patch
--- plymouth-24.004.60/debian/patches/0008-show-delay.patch 2024-07-17 18:39:45.000000000 +0200
+++ plymouth-24.004.60/debian/patches/0008-show-delay.patch 2025-05-14 11:04:21.000000000 +0200
@@ -6,5 +6,5 @@
@@ -1,3 +1,4 @@
# Administrator customizations go in this file
#[Daemon]
- #Theme=emerald
+ #Theme=ceratopsian
+#ShowDelay=0
diff -Nru plymouth-24.004.60/debian/patches/series plymouth-24.004.60/debian/patches/series
--- plymouth-24.004.60/debian/patches/series 2024-07-17 18:39:45.000000000 +0200
+++ plymouth-24.004.60/debian/patches/series 2025-05-14 11:04:21.000000000 +0200
@@ -4,3 +4,4 @@
drop-systemd-vconsole-setup-service.patch
fallback-etc-default-keyboard.patch
ply-boot-splash-Set-unbuffered-input-when-creating-a.patch
+0007-label-freetype-fix-fallback-not-working-when-fc-matc.patch
--- End Message ---