From 6d15b2662898d2a2f709f43e39bed7cf0f2f665c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 5 Nov 2017 10:57:45 +0100 Subject: [PATCH] enlightenment: set --sysconfdir and build with PIE enabled. This makes enlightenment work again. --- srcpkgs/enlightenment/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 07b05bd8fb1..e43111f55ad 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,17 +1,16 @@ # Template file for 'enlightenment' pkgname=enlightenment version=0.22.0 -revision=1 -nopie=yes +revision=2 lib32disabled=yes build_options="wayland" build_style=meson -configure_args="-Dpam=true -Dbluez4=false -Dsystemd=false +configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false $(vopt_if wayland '-Dwayland=true' '-Dwayland=false')" hostmakedepends="pkg-config efl" -makedepends="pam-devel pixman-devel efl-devel +makedepends="pam-devel pixman-devel efl-devel xkeyboard-config $(vopt_if wayland 'libxkbcommon-devel MesaLib-devel wayland-devel')" -depends="hicolor-icon-theme desktop-file-utils" +depends="hicolor-icon-theme desktop-file-utils xkeyboard-config" conf_files="/etc/enlightenment/sysactions.conf" homepage="http://enlightenment.org" short_desc="Enlightenment desktop" @@ -21,7 +20,6 @@ distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${ve checksum=1b3eb9db7dd9c41b90e9ab67be875ea300e13774503fecdd692d96917ddeb976 post_install() { - mv "${DESTDIR}"/usr/etc "${DESTDIR}" # Use our native tools to shutdown/suspend. sed -i 's/^action:.*halt.*/action: halt shutdown -h now/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf sed -i 's/^action:.*reboot.*/action: reboot shutdown -r now/g' ${DESTDIR}/etc/${pkgname}/sysactions.conf