Balló György pushed to branch main at Arch Linux / Packaging / Packages / 
plymouth


Commits:
b568620c by Balló György at 2024-12-19T01:43:49+01:00
upgpkg: 24.004.60-10: Update to the latest git snapshot

- - - - -


3 changed files:

- .SRCINFO
- PKGBUILD
- plymouth.initcpio_install


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = plymouth
        pkgdesc = Graphical boot splash screen
        pkgver = 24.004.60
-       pkgrel = 9
+       pkgrel = 10
        url = https://www.freedesktop.org/wiki/Software/Plymouth/
        install = plymouth.install
        arch = x86_64
@@ -35,7 +35,7 @@ pkgbase = plymouth
        source = mkinitcpio-generate-shutdown-ramfs-plymouth.conf
        b2sums = 
a3d55f4f7be81bdf2ddd5c2b74a3fdb4e368c31fc41e12ab100ce2a7986cb418151b3df0d0316011710dd0e1ae99631166eecf80bc1dd5cc9054a4685266afed
        b2sums = 
afb2449b542aa3e971eab6b953c907347fdf4e499b4140a5e6736a7c99557c0d8d2fed28dbee56d84c8c619335c59bd382457d85e51145884ad0616e9095f232
-       b2sums = 
91f9e2864a73fa3884cd0074cbb7c9535ab83308466fe8994691cc8aab9b6001b0339c9eb9766c6084758112d87723c11f22f1e55f420f34ce2ddcc68ae35b38
+       b2sums = 
e9efbfd924a07005e883c4cd21d25c520288daf8bf611ee20a245b8b8f925bc90188dfcbb9e13da883479c5214562795717bb4404dd7ef1444eb04ab69dad4a9
        b2sums = 
063448411de837ed38ece935719f07fd17b18830680c9fa95b7bd39a097778186c40373590504c9b44144125986304311f528c73592c29d19043b8395e6f99c2
        b2sums = 
7bb910b7402ad4372f1918be763421308534044c46d42e77af0aadcb7cbe13a99633805b36fa841f8ea1006ddb204ecea3031b96b05ec4e8d16150b2c7864629
 


=====================================
PKGBUILD
=====================================
@@ -6,7 +6,7 @@
 
 pkgname=plymouth
 pkgver=24.004.60
-pkgrel=9
+pkgrel=10
 pkgdesc='Graphical boot splash screen'
 arch=(x86_64)
 url='https://www.freedesktop.org/wiki/Software/Plymouth/'
@@ -48,7 +48,7 @@ source=(
 b2sums=(
   
a3d55f4f7be81bdf2ddd5c2b74a3fdb4e368c31fc41e12ab100ce2a7986cb418151b3df0d0316011710dd0e1ae99631166eecf80bc1dd5cc9054a4685266afed
   
afb2449b542aa3e971eab6b953c907347fdf4e499b4140a5e6736a7c99557c0d8d2fed28dbee56d84c8c619335c59bd382457d85e51145884ad0616e9095f232
-  
91f9e2864a73fa3884cd0074cbb7c9535ab83308466fe8994691cc8aab9b6001b0339c9eb9766c6084758112d87723c11f22f1e55f420f34ce2ddcc68ae35b38
+  
e9efbfd924a07005e883c4cd21d25c520288daf8bf611ee20a245b8b8f925bc90188dfcbb9e13da883479c5214562795717bb4404dd7ef1444eb04ab69dad4a9
   
063448411de837ed38ece935719f07fd17b18830680c9fa95b7bd39a097778186c40373590504c9b44144125986304311f528c73592c29d19043b8395e6f99c2
   
7bb910b7402ad4372f1918be763421308534044c46d42e77af0aadcb7cbe13a99633805b36fa841f8ea1006ddb204ecea3031b96b05ec4e8d16150b2c7864629
 )
@@ -57,7 +57,7 @@ prepare() {
   cd $pkgname
 
   # Various fixes from upstream
-  git cherry-pick -n -m 1 24.004.60..c08a22599f595915e39a1a900c5eb86c967a15e5
+  git cherry-pick -n -m 1 24.004.60..a0e8b6cf50114482e8b5d17ac2e99ff0f274d4c5
 
   # Use mkinitcpio to update initrd
   sed -i 's/^dracut -f$/mkinitcpio -P/' scripts/plymouth-update-initrd


=====================================
plymouth.initcpio_install
=====================================
@@ -11,9 +11,12 @@ build() {
   local PLYMOUTH_MONOSPACE_FONT_NAME=$(sed -n "s/^ *MonospaceFont *= *//p" 
"$PLYMOUTH_THEME_DIR/$PLYMOUTH_THEME_NAME.plymouth" | sed -e 's/ [0-9]\+ *$//' 
-e 's/ \(Regular\|Bold\|Italic\|Bold Italic\|Oblique\|Bold 
Oblique\|Thin\|Light\|Extra Bold\) *$/:style=\1/')
 
   if [ -n "$PLYMOUTH_MONOSPACE_FONT_NAME" ]; then
-    local PLYMOUTH_MONOSPACE_FONT_PATH=$(fc-match -f %{file} 
"$PLYMOUTH_MONOSPACE_FONT_NAME")
+    local PLYMOUTH_MONOSPACE_BASE_FONT_NAME=$(fc-match -f %{family} 
"$PLYMOUTH_MONOSPACE_FONT_NAME" | sed 's/,.*//')
+    local PLYMOUTH_MONOSPACE_FONT_PATH=$(fc-match -f %{file} 
"$PLYMOUTH_MONOSPACE_BASE_FONT_NAME")
+    local PLYMOUTH_MONOSPACE_BOLD_FONT_PATH=$(fc-match -f %{file} 
"$PLYMOUTH_MONOSPACE_BASE_FONT_NAME:weight=bold")
   else
     local PLYMOUTH_MONOSPACE_FONT_PATH=$(fc-match -f %{file} monospace)
+    local PLYMOUTH_MONOSPACE_BOLD_FONT_PATH=$(fc-match -f %{file} 
monospace:weight=bold)
   fi
 
   # exit if no module exists on the system for the theme
@@ -47,6 +50,7 @@ build() {
   fi
   if [ -n "$PLYMOUTH_MONOSPACE_FONT_PATH" ]; then
     add_file "$PLYMOUTH_MONOSPACE_FONT_PATH" 
'/usr/share/fonts/Plymouth-monospace.ttf'
+    add_file "$PLYMOUTH_MONOSPACE_BOLD_FONT_PATH" 
'/usr/share/fonts/Plymouth-monospace-bold.ttf'
   fi
 
   # copy xkb info and x11 locale



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/plymouth/-/commit/b568620c8b08bf8b9fc15a07eaabac3f5a485251

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/plymouth/-/commit/b568620c8b08bf8b9fc15a07eaabac3f5a485251
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to