diff --git a/srcpkgs/enlightenment/patches/0001-remove-dependency-on-libexecinfo_h.patch b/srcpkgs/enlightenment/patches/0001-remove-dependency-on-libexecinfo_h.patch deleted file mode 100644 index 10457143e56..00000000000 --- a/srcpkgs/enlightenment/patches/0001-remove-dependency-on-libexecinfo_h.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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/patches/musl-signal_h.patch b/srcpkgs/enlightenment/patches/musl-signal_h.patch new file mode 100644 index 00000000000..290c473d63b --- /dev/null +++ b/srcpkgs/enlightenment/patches/musl-signal_h.patch @@ -0,0 +1,24 @@ +From cb7e05c703331dd38613dad8304ed49581853abe Mon Sep 17 00:00:00 2001 +From: q66 +Date: Wed, 10 Jun 2020 21:12:43 +0200 +Subject: [PATCH] e_util_suid: need signal.h + +--- + src/bin/e_util_suid.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git src/bin/e_util_suid.h src/bin/e_util_suid.h +index e09091146..be961a520 100644 +--- src/bin/e_util_suid.h ++++ src/bin/e_util_suid.h +@@ -28,6 +28,7 @@ + #endif + #include + #include ++#include + #ifdef HAVE_PRCTL + # include + #elif defined(HAVE_PROCCTL) +-- +2.27.0 + diff --git a/srcpkgs/enlightenment/template b/srcpkgs/enlightenment/template index 9cbc50b8019..906bde66082 100644 --- a/srcpkgs/enlightenment/template +++ b/srcpkgs/enlightenment/template @@ -1,23 +1,32 @@ # Template file for 'enlightenment' pkgname=enlightenment -version=0.23.1 +version=0.24.1 revision=1 build_style=meson configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false - $(vopt_bool wayland wayland)" -hostmakedepends="efl pkg-config" + $(vopt_bool wayland wl)" +hostmakedepends="efl pkg-config $(vopt_if wayland xorg-server-xwayland)" makedepends="efl-devel pam-devel xkeyboard-config $(vopt_if wayland 'libxkbcommon-devel MesaLib-devel wayland-devel')" -depends="desktop-file-utils hicolor-icon-theme xkeyboard-config" +depends="desktop-file-utils hicolor-icon-theme xkeyboard-config + $(vopt_if wayland xorg-server-xwayland)" conf_files="/etc/enlightenment/sysactions.conf" short_desc="Enlightenment desktop shell" maintainer="q66 " license="BSD-2-Clause" homepage="http://enlightenment.org" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" -checksum=e530590c09b560679621f4531d55c242cfafe8523309e0ae88fb267e00f52c34 +checksum=aee2b6178c918d71ebe661129f4008d773e70e5784651dadbcf56eec0a6d4a09 lib32disabled=yes build_options="wayland" +build_options_default="wayland" + +post_extract() { + # disable backtrace support on musl for now + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + vsed -i '/HAVE_EXECINFO_H/d' meson.build + fi +} post_install() { # Use our native tools to shutdown/suspend.