From 63f49c193bbfab510bcc2e4a85187e591da0fe3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Wed, 21 Apr 2021 18:36:24 -0300 Subject: [PATCH] pulseaudio: remove INSTALL and move INSTALL.msg. INSTALL script installed a /usr/lib32 symlink to /usr/lib on x86 machines (added in 5bb3a0cf7bd39c5de60cf272bb1fe069a001af7f), which has been unnecessary for a long time, given that base-files contains the symlink already. It was also the wrong solution: libdir being special cased to /usr/lib32 on i686 (to provide the multilib repo) should have led to the symlink being part of some base package, not a workaround in a specific package. Furthermore, ever since 488edb2a9ce9bb81a137c5932b9ddbe3d4fd6d44, the package follows Void's policy of always using /usr/lib$wordsize as libdir, instead of /usr/lib, and most things dealing with library paths shouldn't be package specific. --- Since we are here: INSTALL.msg doesn't need to be printed every time the package is updated, so move to README.voidlinux. Don't use -f in rm commands. --- srcpkgs/pulseaudio/INSTALL | 7 ------- srcpkgs/pulseaudio/{INSTALL.msg => files/README.voidlinux} | 0 srcpkgs/pulseaudio/template | 5 +++-- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 srcpkgs/pulseaudio/INSTALL rename srcpkgs/pulseaudio/{INSTALL.msg => files/README.voidlinux} (100%) diff --git a/srcpkgs/pulseaudio/INSTALL b/srcpkgs/pulseaudio/INSTALL deleted file mode 100644 index b4647d5e671..00000000000 --- a/srcpkgs/pulseaudio/INSTALL +++ /dev/null @@ -1,7 +0,0 @@ -case "${ACTION}" in -post) - if [ "$ARCH" = "i686" ]; then - ln -sf lib usr/lib32 - fi - ;; -esac diff --git a/srcpkgs/pulseaudio/INSTALL.msg b/srcpkgs/pulseaudio/files/README.voidlinux similarity index 100% rename from srcpkgs/pulseaudio/INSTALL.msg rename to srcpkgs/pulseaudio/files/README.voidlinux diff --git a/srcpkgs/pulseaudio/template b/srcpkgs/pulseaudio/template index 01ddc8ed732..554e241e73a 100644 --- a/srcpkgs/pulseaudio/template +++ b/srcpkgs/pulseaudio/template @@ -1,7 +1,7 @@ # Template file for 'pulseaudio' pkgname=pulseaudio version=14.2 -revision=2 +revision=3 build_style=meson # XXX: new version should be able to enable systemd functionality using elogind configure_args="-Djack=enabled -Dlirc=disabled -Dhal-compat=false -Dorc=enabled @@ -47,8 +47,9 @@ pre_configure() { } post_install() { - rm -f ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf + rm ${DESTDIR}/etc/dbus-1/system.d/pulseaudio-system.conf vsv pulseaudio + vdoc $FILESDIR/README.voidlinux } libpulseaudio_package() {