From 99514929470605aabf23294a894e09afb7899af1 Mon Sep 17 00:00:00 2001 From: maxice8 <30738253+maxice8@users.noreply.github.com> Date: Sun, 5 Nov 2017 05:00:20 -0200 Subject: [PATCH] enlightenment: update to 0.22.0. (#8837) --- .../0001-remove-dependency-on-libexecinfo_h.patch | 14 ++++++++++++++ srcpkgs/enlightenment/template | 11 ++++++----- 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/enlightenment/patches/0001-remove-dependency-on-libexecinfo_h.patch diff --git a/srcpkgs/enlightenment/patches/0001-remove-dependency-on-libexecinfo_h.patch b/srcpkgs/enlightenment/patches/0001-remove-dependency-on-libexecinfo_h.patch new file mode 100644 index 00000000000..10457143e56 --- /dev/null +++ b/srcpkgs/enlightenment/patches/0001-remove-dependency-on-libexecinfo_h.patch @@ -0,0 +1,14 @@ +--- meson.build ++++ meson.build +@@ -163,11 +163,6 @@ endif + if cc.has_header('netinet/in.h') == true + config_h.set('HAVE_NETINET_IN_H' , '1') + endif +-if cc.has_header('execinfo.h') == true +- config_h.set('HAVE_EXECINFO_H' , '1') +-elif cc.has_function('backtrace_symbols_fd', dependencies: 'execinfo') == false +- execinfo_dep = dependency('execinfo', required: false) +-endif + + if cc.has_header('fnmatch.h') == false + error('fnmatch.h not found') diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 4f8b60ae3d4..07b05bd8fb1 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,13 +1,13 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.21.10 +version=0.22.0 revision=1 nopie=yes lib32disabled=yes build_options="wayland" -build_style=gnu-configure -configure_args="--enable-pam --disable-bluez4 --disable-systemd - $(vopt_if wayland '--enable-wayland-egl --enable-wayland-clients' '--disable-wayland-egl')" +build_style=meson +configure_args="-Dpam=true -Dbluez4=false -Dsystemd=false + $(vopt_if wayland '-Dwayland=true' '-Dwayland=false')" hostmakedepends="pkg-config efl" makedepends="pam-devel pixman-devel efl-devel $(vopt_if wayland 'libxkbcommon-devel MesaLib-devel wayland-devel')" @@ -18,9 +18,10 @@ short_desc="Enlightenment desktop" maintainer="Juan RP " license="2-clause-BSD" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=9bb915caa5b390b2e212ff5f6f75b57a3d082f80d2f7b5b278bd902e2fad7f14 +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