update to 0.9.5, bring in line with -git version of package

author: Taijian 2020-08-06 11:50:58 +0200
committer: Taijian 2020-08-06 11:50:58 +0200
commit: d37b4bf300866faeaeeb7dfa29ddf99b7a27200f (patch)
tree: aa7425312b69050d5b22517807ba00bf21ab1d40
parent: 2ec2c8d65718b5c1bf73bb24b139bbbfa103774b (diff)
download: aur-d37b4bf300866faeaeeb7dfa29ddf99b7a27200f.tar.gz
9 files changed, 90 insertions, 73 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d806e830cf4e..60996112f6be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = plymouth
 	pkgdesc = A graphical boot splash screen with kernel mode-setting support
-	pkgver = 0.9.4
-	pkgrel = 7
-	url = http://www.freedesktop.org/wiki/Software/Plymouth/
+	pkgver = 0.9.5
+	pkgrel = 1
+	url = https://www.freedesktop.org/wiki/Software/Plymouth/
+	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = docbook-xsl
@@ -11,14 +12,13 @@ pkgbase = plymouth
 	depends = systemd
 	optdepends = ttf-dejavu: For true type font support
 	optdepends = xf86-video-fbdev: Support special graphic cards on early startup
-	provides = plymouth
-	conflicts = plymouth-git
+	optdepends = cantarell-fonts: True Type support for BGRT theme
 	conflicts = plymouth-legacy
 	conflicts = plymouth-nosystemd
 	options = !libtool
 	options = !emptydirs
 	backup = etc/plymouth/plymouthd.conf
-	source = http://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.4.tar.xz
+	source = https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/0.9.5/plymouth-0.9.5.tar.gz
 	source = arch-logo.png
 	source = plymouth.encrypt_hook
 	source = plymouth.encrypt_install
@@ -28,32 +28,30 @@ pkgbase = plymouth
 	source = slim-plymouth.service
 	source = sddm-plymouth.service
 	source = plymouth-deactivate.service
-	source = plymouth-read-write.service
-	source = plymouth-start.service
+	source = plymouth-start.service.in.patch
 	source = plymouth-start.path
 	source = plymouth.initcpio_hook
 	source = plymouth.initcpio_install
 	source = sd-plymouth.initcpio_install
 	source = plymouth-quit.service.in.patch
 	source = plymouth-update-initrd.patch
-	md5sums = 4efa5551d230165981b105e7c6a50aa7
-	md5sums = 1aedc14a276232311b6615f1e05d4714
-	md5sums = d67132b297ccfb1a877a2efd78076963
-	md5sums = 247b77b9b2a8e22b1e94a07462e8b23e
-	md5sums = ae6e97bb1104bb12cbca6738e3fb872d
-	md5sums = 1430ae2ec501d600f8f6771454dc9bbe
-	md5sums = 870ea3e63c6989e2badf79d1fbafa914
-	md5sums = a3cfc30df846b2d7057a29e7fbe8733a
-	md5sums = b95f6979dc2f373045b2ab88a36d6771
-	md5sums = 006847d16b852c7a50ee2f241fd9647e
-	md5sums = cd81fba110ad5a81ad97397fe82fda52
-	md5sums = 24ad6b024f8e8bb9abe13df317eb9bcb
-	md5sums = 672ad913e2383483bcb4599a0a6bee48
-	md5sums = 32f04fdbd1eb94ade30d1e63fdcdd9b5
-	md5sums = c17e915b19a469198a37dd7376a846c7
-	md5sums = af3c3eadc80e240416d11b2d5983dfb5
-	md5sums = 165a39dbedcc6e123c8ca05d5b4b2e25
-	md5sums = 0357775c16b5f90f1af485e6a4c80a9e
+	sha256sums = 55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba
+	sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7
+	sha256sums = 7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120
+	sha256sums = b6193aefa4af4449a700bca25565ba13932ceaaf6ecd72ce1ff107f6c3466ad9
+	sha256sums = 0fabb974c1a301da000d5c4b9eea224ba508e577d3a6a798b67b94d4d54af255
+	sha256sums = 06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d
+	sha256sums = 86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71
+	sha256sums = 9b5534921c5bf92a9285ba53b323209e812145c204ac5fed6899b7aad78300ef
+	sha256sums = 46b1c4d6c41a888e55d05d21996c4381019e91b490ed13e216b229e264a56648
+	sha256sums = 3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb
+	sha256sums = 3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb
+	sha256sums = ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff
+	sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769
+	sha256sums = c7cb6fc10bc04afc8a661de4de85ebd3974bd8df695ad6043e4c9af5441bab49
+	sha256sums = 0bb07ff5efa4d7b9afcedeffc35496edb7664c2a0a8030bbdc7b368c5030638d
+	sha256sums = a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa
+	sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
 
 pkgname = plymouth
 
diff --git a/PKGBUILD b/PKGBUILD
index 4d1b943ed20b..f0806c80343d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,28 @@
-#
-# Maintainer: Sebastian Lau <lauseb644@gmail.com>
+# Maintainer: Taijian <taijian@posteo.de>
+# Contributor: Sebastian Lau <lauseb644@gmail.com>
 # Contributor Damian01w <damian01w@gmail.com>
 # Contributor: Padfoot <padfoot@exemail.com.au>
 #
 
 pkgname=plymouth
-pkgver=0.9.4
-pkgrel=7
+pkgver=0.9.5
+pkgrel=1
 pkgdesc="A graphical boot splash screen with kernel mode-setting support"
-url="http://www.freedesktop.org/wiki/Software/Plymouth/"
-arch=('x86_64')
+url="https://www.freedesktop.org/wiki/Software/Plymouth/"
+arch=('i686' 'x86_64')
 license=('GPL')
+
 depends=('libdrm' 'pango' 'systemd')
 makedepends=('docbook-xsl')
 optdepends=('ttf-dejavu: For true type font support'
-	    'xf86-video-fbdev: Support special graphic cards on early startup')
-provides=('plymouth')
-conflicts=('plymouth-git' 'plymouth-legacy' 'plymouth-nosystemd')
+        'xf86-video-fbdev: Support special graphic cards on early startup'
+        'cantarell-fonts: True Type support for BGRT theme')
+conflicts=('plymouth-legacy' 'plymouth-nosystemd')
 backup=('etc/plymouth/plymouthd.conf')
 
 options=('!libtool' '!emptydirs')
 
-source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.xz"
+source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'arch-logo.png'
 	'plymouth.encrypt_hook'
 	'plymouth.encrypt_install'
@@ -31,44 +32,44 @@ source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pk
 	'slim-plymouth.service'
 	'sddm-plymouth.service'
 	'plymouth-deactivate.service'
-	'plymouth-read-write.service'
-	'plymouth-start.service'
+	'plymouth-start.service.in.patch'
 	'plymouth-start.path'
 	'plymouth.initcpio_hook'
 	'plymouth.initcpio_install'
 	'sd-plymouth.initcpio_install'
 	'plymouth-quit.service.in.patch'
-	'plymouth-update-initrd.patch')
+	'plymouth-update-initrd.patch'
+)
 
-md5sums=('4efa5551d230165981b105e7c6a50aa7'
-         '1aedc14a276232311b6615f1e05d4714'
-         'd67132b297ccfb1a877a2efd78076963'
-         '247b77b9b2a8e22b1e94a07462e8b23e'
-         'ae6e97bb1104bb12cbca6738e3fb872d'
-         '1430ae2ec501d600f8f6771454dc9bbe'
-         '870ea3e63c6989e2badf79d1fbafa914'
-         'a3cfc30df846b2d7057a29e7fbe8733a'
-         'b95f6979dc2f373045b2ab88a36d6771'
-         '006847d16b852c7a50ee2f241fd9647e'
-         'cd81fba110ad5a81ad97397fe82fda52'
-         '24ad6b024f8e8bb9abe13df317eb9bcb'
-         '672ad913e2383483bcb4599a0a6bee48'
-         '32f04fdbd1eb94ade30d1e63fdcdd9b5'
-         'c17e915b19a469198a37dd7376a846c7'
-         'af3c3eadc80e240416d11b2d5983dfb5'
-         '165a39dbedcc6e123c8ca05d5b4b2e25'
-         '0357775c16b5f90f1af485e6a4c80a9e')
+sha256sums=('55a461003ece0a4daeffb8b7ac2178977c5ce024a7e688d24f6d2230465b50ba'
+            'de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7'
+            '7afa97d21444cbac7a6213edda09d9fa73ecbef1a6cea1e745f56669760c6120'
+            'b6193aefa4af4449a700bca25565ba13932ceaaf6ecd72ce1ff107f6c3466ad9'
+            '0fabb974c1a301da000d5c4b9eea224ba508e577d3a6a798b67b94d4d54af255'
+            '06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d'
+            '86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71'
+            '9b5534921c5bf92a9285ba53b323209e812145c204ac5fed6899b7aad78300ef'
+            '46b1c4d6c41a888e55d05d21996c4381019e91b490ed13e216b229e264a56648'
+            '3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb'
+            '3a46f7faced877a913506d59757f0af60ad3d5f0bc365c56ed7ecc7aef75c5eb'
+            'ce3d62f4c5a1b5c0ccadd15406c7430251d1a42b232721bfbfc747da1b13e3ff'
+            '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769'
+            'c7cb6fc10bc04afc8a661de4de85ebd3974bd8df695ad6043e4c9af5441bab49'
+            '0bb07ff5efa4d7b9afcedeffc35496edb7664c2a0a8030bbdc7b368c5030638d'
+            'a1766e3fae000e5158a23b5c01d2c615894e6c3f9923877ccc5ca1bcb36351fa'
+            '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a')
 
 prepare() {
 	cd "$srcdir"/${pkgname}-${pkgver}
 	patch -p1 -i $srcdir/plymouth-update-initrd.patch
 	patch -p1 -i $srcdir/plymouth-quit.service.in.patch
+	patch -p1 -i $srcdir/plymouth-start.service.in.patch
 }
 
 build() {
 	cd "$srcdir"/${pkgname}-${pkgver}
 
-	LDFLAGS="$LDFLAGS -ludev" ./configure \
+	LDFLAGS="$LDFLAGS -ludev" ./autogen.sh \
 		--prefix=/usr \
 		--exec-prefix=/usr \
 		--sysconfdir=/etc \
@@ -81,15 +82,14 @@ build() {
 		--enable-tracing \
 		--enable-pango \
 		--enable-gtk=no \
-		--enable-tracing \
-		--disable-tests \
-		--with-logo=/usr/share/plymouth/arch-logo.png \
 		--with-release-file=/etc/os-release \
+		--with-logo=/usr/share/plymouth/arch-logo.png \
 		--with-background-color=0x000000 \
 		--with-background-start-color-stop=0x000000 \
 		--with-background-end-color-stop=0x4D4D4D \
 		--without-rhgb-compat-link \
-		--without-system-root-install
+		--without-system-root-install \
+        --with-runtimedir=/run
 
 	make
 }
@@ -112,8 +112,6 @@ package() {
   done
 
   install -Dm644 "$srcdir/plymouth-deactivate.service" 	"$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service"
-  install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service"
-  install -Dm644 "$srcdir/plymouth-read-write.service" "$pkgdir/usr/lib/systemd/system/plymouth-read-write.service"
   install -Dm644 "$srcdir/plymouth-start.path" 	"$pkgdir/usr/lib/systemd/system/plymouth-start.path"
   install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
 }
diff --git a/plymouth-deactivate.service b/plymouth-deactivate.service
index 2c6f34954093..6f1d87eb4333 100644
--- a/plymouth-deactivate.service
+++ b/plymouth-deactivate.service
@@ -7,3 +7,4 @@ Before=getty@tty1.service
 ExecStart=/usr/bin/plymouth deactivate
 Type=oneshot
 TimeoutSec=20
+RemainAfterExit=yes
diff --git a/plymouth-quit.service.in.patch b/plymouth-quit.service.in.patch
index ec3435cea42b..133834986b6a 100644
--- a/plymouth-quit.service.in.patch
+++ b/plymouth-quit.service.in.patch
@@ -1,6 +1,6 @@
-diff -aur plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in
---- plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in	2012-09-27 02:50:53.000000000 +1000
-+++ plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in	2014-02-11 16:36:58.813194805 +1100
+diff -aur plymouth.src/systemd-units/plymouth-quit.service.in plymouth.patch/systemd-units/plymouth-quit.service.in
+--- plymouth.src/systemd-units/plymouth-quit.service.in        2014-02-20 19:38:13.329427597 +1100
++++ plymouth.patch/systemd-units/plymouth-quit.service.in      2014-02-20 19:40:52.619343839 +1100
 @@ -1,8 +1,9 @@
  [Unit]
  Description=Terminate Plymouth Boot Screen
diff --git a/plymouth-start.service.in.patch b/plymouth-start.service.in.patch
new file mode 100644
index 000000000000..b630b61571b1
--- /dev/null
+++ b/plymouth-start.service.in.patch
@@ -0,0 +1,9 @@
+--- plymouth.src/systemd-units/Downloads/plymouth-start.service.in
++++ plymouth.patch/systemd-units/plymouth-start.service.in
+@@ -12,3 +12,6 @@
+ RemainAfterExit=yes 
+ KillMode=none 
+ SendSIGKILL=no
++
++[Install]
++WantedBy=sysinit.target
diff --git a/plymouth-update-initrd.patch b/plymouth-update-initrd.patch
index 47d88a60d6db..0d0235cf750d 100644
--- a/plymouth-update-initrd.patch
+++ b/plymouth-update-initrd.patch
@@ -1,6 +1,6 @@
-diff -aur plymouth-0.9.0.src/scripts/plymouth-update-initrd plymouth-0.9.0.patch/scripts/plymouth-update-initrd
---- plymouth-0.9.0.src/scripts/plymouth-update-initrd	2014-01-16 08:14:47.000000000 +1100
-+++ plymouth-0.9.0.patch/scripts/plymouth-update-initrd	2014-05-21 19:04:16.802594001 +1000
+diff -aur plymouth.src/scripts/plymouth-update-initrd plymouth.patch/scripts/plymouth-update-initrd
+--- plymouth.src/scripts/plymouth-update-initrd        2014-02-20 19:38:13.319427393 +1100
++++ plymouth.patch/scripts/plymouth-update-initrd      2014-02-20 19:54:13.035553244 +1100
 @@ -1,2 +1,4 @@
  #!/bin/bash
 -dracut -f
diff --git a/plymouth.encrypt_install b/plymouth.encrypt_install
index 4553c0e4c994..0946161c97bf 100644
--- a/plymouth.encrypt_install
+++ b/plymouth.encrypt_install
@@ -14,7 +14,6 @@ build() {
 
     add_binary "cryptsetup"
     add_binary "dmsetup"
-    add_binary "plymouth"
     add_file "/usr/lib/udev/rules.d/10-dm.rules"
     add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
     add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
@@ -22,6 +21,8 @@ build() {
     add_binary "/usr/lib/plymouth/label.so"
     add_binary "/usr/lib/plymouth/text.so"
     add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
+    add_file "/usr/share/fonts/cantarell/Cantarell-Thin.otf"
+    add_file "/usr/share/fonts/cantarell/Cantarell-Regular.otf"
     add_file "/etc/fonts/fonts.conf"
     add_file "/etc/fonts/conf.d/60-latin.conf"
 
diff --git a/plymouth.initcpio_install b/plymouth.initcpio_install
index f437971439ea..ca18b1c154f4 100644
--- a/plymouth.initcpio_install
+++ b/plymouth.initcpio_install
@@ -33,7 +33,12 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
 	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-            add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+        add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+
+		# BGRT theme depends on Spinner theme
+		if [ "${PLYMOUTH_THEME_NAME}" == "bgrt" ] && [ -d ${DATADIR}/plymouth/themes/spinner ]; then
+			add_full_dir ${DATADIR}/plymouth/themes/spinner
+		fi
 	fi
 	
 	add_file /usr/lib/udev/rules.d/70-uaccess.rules
diff --git a/sd-plymouth.initcpio_install b/sd-plymouth.initcpio_install
index 2add5632b3cb..5f2cad90ba2c 100644
--- a/sd-plymouth.initcpio_install
+++ b/sd-plymouth.initcpio_install
@@ -36,7 +36,12 @@ build() {
 	add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
 
 	if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
-                add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+        add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+
+		# BGRT theme depends on Spinner theme
+		if [ "${PLYMOUTH_THEME_NAME}" == "bgrt" ] && [ -d ${DATADIR}/plymouth/themes/spinner ]; then
+			add_full_dir ${DATADIR}/plymouth/themes/spinner
+		fi
 	fi
 	
 	add_udev_rule 70-uaccess.rules
author	Taijian	2020-08-06 11:50:58 +0200
committer	Taijian	2020-08-06 11:50:58 +0200
commit	d37b4bf300866faeaeeb7dfa29ddf99b7a27200f (patch)
tree	aa7425312b69050d5b22517807ba00bf21ab1d40
parent	2ec2c8d65718b5c1bf73bb24b139bbbfa103774b (diff)
download	aur-d37b4bf300866faeaeeb7dfa29ddf99b7a27200f.tar.gz