UPD to v0.9.4

3 files changed, 9 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e096719a121..2a23cc85e967 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = plymouth
 	pkgdesc = A graphical boot splash screen with kernel mode-setting support
-	pkgver = 0.9.3
-	pkgrel = 5
+	pkgver = 0.9.4
+	pkgrel = 1
 	url = http://www.freedesktop.org/wiki/Software/Plymouth/
 	arch = x86_64
 	license = GPL
@@ -17,7 +17,7 @@ pkgbase = plymouth
 	options = !libtool
 	options = !emptydirs
 	backup = etc/plymouth/plymouthd.conf
-	source = http://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.3.tar.xz
+	source = http://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.4.tar.xz
 	source = arch-logo.png
 	source = plymouth.encrypt_hook
 	source = plymouth.encrypt_install
@@ -33,10 +33,8 @@ pkgbase = plymouth
 	source = plymouth.initcpio_install
 	source = sd-plymouth.initcpio_install
 	source = plymouth-quit.service.in.patch
-	source = plymouth-set-default-theme.in.patch
 	source = plymouth-update-initrd.patch
-	source = sysmacros.patch
-	md5sums = b261c720888a5431cdfce8494805eab3
+	md5sums = 4efa5551d230165981b105e7c6a50aa7
 	md5sums = 65fa2763d5c9bb9f80973ea5e6e3db3e
 	md5sums = d67132b297ccfb1a877a2efd78076963
 	md5sums = 02861a13840dee3a5f2224b598274220
@@ -52,9 +50,7 @@ pkgbase = plymouth
 	md5sums = c17e915b19a469198a37dd7376a846c7
 	md5sums = af3c3eadc80e240416d11b2d5983dfb5
 	md5sums = 165a39dbedcc6e123c8ca05d5b4b2e25
-	md5sums = f79edbbb30c71b0dbcd102c7dd31660b
 	md5sums = 0357775c16b5f90f1af485e6a4c80a9e
-	md5sums = d2805e2ac2b4dcaf44f63e9a5f898e94
 
 pkgname = plymouth
 
diff --git a/PKGBUILD b/PKGBUILD
index 1f547792f901..b1753df34b85 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 #
 
 pkgname=plymouth
-pkgver=0.9.3
-pkgrel=5
+pkgver=0.9.4
+pkgrel=1
 pkgdesc="A graphical boot splash screen with kernel mode-setting support"
 url="http://www.freedesktop.org/wiki/Software/Plymouth/"
 arch=('x86_64')
@@ -37,11 +37,9 @@ source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pk
 	'plymouth.initcpio_install'
 	'sd-plymouth.initcpio_install'
 	'plymouth-quit.service.in.patch'
-	'plymouth-set-default-theme.in.patch'
-	'plymouth-update-initrd.patch'
-	'sysmacros.patch')
+	'plymouth-update-initrd.patch')
 
-md5sums=('b261c720888a5431cdfce8494805eab3'
+md5sums=('4efa5551d230165981b105e7c6a50aa7'
          '65fa2763d5c9bb9f80973ea5e6e3db3e'
          'd67132b297ccfb1a877a2efd78076963'
          '02861a13840dee3a5f2224b598274220'
@@ -57,16 +55,12 @@ md5sums=('b261c720888a5431cdfce8494805eab3'
          'c17e915b19a469198a37dd7376a846c7'
          'af3c3eadc80e240416d11b2d5983dfb5'
          '165a39dbedcc6e123c8ca05d5b4b2e25'
-         'f79edbbb30c71b0dbcd102c7dd31660b'
-         '0357775c16b5f90f1af485e6a4c80a9e'
-         'd2805e2ac2b4dcaf44f63e9a5f898e94')
+         '0357775c16b5f90f1af485e6a4c80a9e')
 
 prepare() {
 	cd "$srcdir"/${pkgname}-${pkgver}
-	patch -p1 -i $srcdir/plymouth-set-default-theme.in.patch
 	patch -p1 -i $srcdir/plymouth-update-initrd.patch
 	patch -p1 -i $srcdir/plymouth-quit.service.in.patch
-	patch -p1 -i $srcdir/sysmacros.patch
 }
 
 build() {
diff --git a/plymouth-set-default-theme.in.patch b/plymouth-set-default-theme.in.patch
deleted file mode 100644
index 808a64474d74..000000000000
--- a/plymouth-set-default-theme.in.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -aur plymouth-0.8.8.src/scripts/plymouth-set-default-theme.in plymouth-0.8.8.patch/scripts/plymouth-set-default-theme.in
---- plymouth-0.8.8.src/scripts/plymouth-set-default-theme.in	2012-10-27 02:01:45.000000000 +1100
-+++ plymouth-0.8.8.patch/scripts/plymouth-set-default-theme.in	2014-01-26 09:55:34.337189615 +1100
-@@ -173,7 +173,10 @@
-         exit $?
- fi
- 
--if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
-+if [ -z ${THEME_NAME} ]; then
-+        echo "Please specify a theme name"
-+        exit 1
-+elif [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then
-         echo "${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth does not exist" > /dev/stderr
-         exit 1
- fi