From fbe6918ddfe9852f1f59a6692bf0ed9841831382 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sun, 2 Oct 2016 01:10:20 -0500 Subject: [PATCH 1/3] plymouth: update to 0.9.2 --- common/shlibs | 8 ++++---- srcpkgs/plymouth/template | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index ae6ad78d099..2293ce77fdb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2548,10 +2548,10 @@ libTKXmlXCAF.so.10 oce-0.17.1_1 libTKernel.so.10 oce-0.17.1_1 libKF5CoreAddons.so.5 kcoreaddons-5.26.0_1 librpmatch.so.0 musl-rpmatch-1.0_1 -libply.so.2 plymouth-0.8.8_1 -libply-splash-core.so.2 plymouth-0.8.8_1 -libply-splash-graphics.so.2 plymouth-0.8.8_1 -libply-boot-client.so.2 plymouth-0.8.8_1 +libply.so.4 plymouth-0.9.2_1 +libply-splash-core.so.4 plymouth-0.9.2_1 +libply-splash-graphics.so.4 plymouth-0.9.2_1 +libply-boot-client.so.4 plymouth-0.9.2_1 libmilter.so.1.0.2 libmilter-1.0.2_1 libopendkim.so.10 opendkim-2.10.3_1 libtevent.so.0 tevent-0.9.28_1 diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 0b3d93c0b9c..849daf3c889 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -1,7 +1,13 @@ # Template file for 'plymouth' pkgname=plymouth -version=0.8.8 +version=0.9.2 revision=1 +build_style=gnu-configure +configure_args="--with-system-root-install=no \ + --without-rhgb-compat-link --enable-systemd-integration=no \ + --enable-gtk=no --enable-gdm-transition --enable-pango \ + --enable-documentation=no" +conf_files="/etc/plymouth/plymouthd.conf" hostmakedepends="pkg-config" makedepends="pango-devel libdrm-devel" depends="plymouth-data>=0" @@ -10,11 +16,7 @@ maintainer="William OD " homepage="https://www.freedesktop.org/wiki/Software/Plymouth/" license="GPL-2" distfiles="${FREEDESKTOP_SITE}/plymouth/releases/$pkgname-$version.tar.bz2" -checksum=1bada4e1d3a31a5a99adc2db83f5452d9818839cda51a6e430f044f6281d759b -build_style=gnu-configure -configure_args="--with-system-root-install=no --without-rhgb-compat-link - --enable-systemd-integration=no --enable-gtk=no --enable-gdm-transition --enable-pango" -conf_files="/etc/plymouth/plymouthd.conf" +checksum=2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" musl-rpmatch-devel" @@ -32,9 +34,9 @@ plymouth-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/*.so - vmove usr/lib/*.a + vmove usr/lib/*.la vmove usr/lib/pkgconfig - vmove usr/lib/plymouth/*.a + vmove usr/lib/plymouth/*.la } } From 55e234546c32e099803f19397c7d66b2a05e0bd6 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sun, 2 Oct 2016 01:30:59 -0500 Subject: [PATCH 2/3] plymouth: Enable x11 plugin --- srcpkgs/plymouth/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 849daf3c889..1c27ff5e27d 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -5,11 +5,11 @@ revision=1 build_style=gnu-configure configure_args="--with-system-root-install=no \ --without-rhgb-compat-link --enable-systemd-integration=no \ - --enable-gtk=no --enable-gdm-transition --enable-pango \ + --enable-gtk --enable-gdm-transition --enable-pango \ --enable-documentation=no" conf_files="/etc/plymouth/plymouthd.conf" hostmakedepends="pkg-config" -makedepends="pango-devel libdrm-devel" +makedepends="pango-devel libdrm-devel gtk+3-devel" depends="plymouth-data>=0" short_desc="Graphical boot animation and logger" maintainer="William OD " From 55790e4f397e7369e69427b8e2d77d3c159f6d08 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Tue, 4 Oct 2016 21:22:59 -0500 Subject: [PATCH 3/3] plymouth: template cleanup --- srcpkgs/plymouth/files/void-logo.png | Bin 8249 -> 0 bytes srcpkgs/plymouth/template | 9 +++------ 2 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 srcpkgs/plymouth/files/void-logo.png diff --git a/srcpkgs/plymouth/files/void-logo.png b/srcpkgs/plymouth/files/void-logo.png deleted file mode 100644 index 512c9c1c207d87ad76e3e8bfc4c8f05c224f1279..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8249 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 diff --git a/srcpkgs/plymouth/template b/srcpkgs/plymouth/template index 1c27ff5e27d..e84b95a6799 100644 --- a/srcpkgs/plymouth/template +++ b/srcpkgs/plymouth/template @@ -6,10 +6,11 @@ build_style=gnu-configure configure_args="--with-system-root-install=no \ --without-rhgb-compat-link --enable-systemd-integration=no \ --enable-gtk --enable-gdm-transition --enable-pango \ - --enable-documentation=no" + --with-logo /usr/share/void-artwork/void-logo.png --localstatedir=/ \ + --disable-documentation" conf_files="/etc/plymouth/plymouthd.conf" hostmakedepends="pkg-config" -makedepends="pango-devel libdrm-devel gtk+3-devel" +makedepends="pango-devel libdrm-devel gtk+3-devel void-artwork" depends="plymouth-data>=0" short_desc="Graphical boot animation and logger" maintainer="William OD " @@ -24,10 +25,6 @@ case "$XBPS_TARGET_MACHINE" in ;; esac -pre_install() { - vinstall $FILESDIR/void-logo.png 644 usr/share/plymouth/ bizcom.png -} - plymouth-devel_package() { short_desc+=" - development files" depends="${makedepends} ${sourcepkg}>=${version}_${revision}"