enlightenment: update to 0.24.1, enable wayland by default

This commit is contained in:
q66 2020-06-10 21:11:35 +02:00
parent 3ed5e0dbc5
commit 35333ee450
3 changed files with 38 additions and 19 deletions

View file

@ -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')

View file

@ -0,0 +1,24 @@
From cb7e05c703331dd38613dad8304ed49581853abe Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
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 <sys/types.h>
#include <pwd.h>
+#include <signal.h>
#ifdef HAVE_PRCTL
# include <sys/prctl.h>
#elif defined(HAVE_PROCCTL)
--
2.27.0

View file

@ -1,23 +1,32 @@
# Template file for 'enlightenment' # Template file for 'enlightenment'
pkgname=enlightenment pkgname=enlightenment
version=0.23.1 version=0.24.1
revision=1 revision=1
build_style=meson build_style=meson
configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false configure_args="--sysconfdir=/etc -Dpam=true -Dbluez4=false -Dsystemd=false
$(vopt_bool wayland wayland)" $(vopt_bool wayland wl)"
hostmakedepends="efl pkg-config" hostmakedepends="efl pkg-config $(vopt_if wayland xorg-server-xwayland)"
makedepends="efl-devel pam-devel xkeyboard-config makedepends="efl-devel pam-devel xkeyboard-config
$(vopt_if wayland 'libxkbcommon-devel MesaLib-devel wayland-devel')" $(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" conf_files="/etc/enlightenment/sysactions.conf"
short_desc="Enlightenment desktop shell" short_desc="Enlightenment desktop shell"
maintainer="q66 <daniel@octaforge.org>" maintainer="q66 <daniel@octaforge.org>"
license="BSD-2-Clause" license="BSD-2-Clause"
homepage="http://enlightenment.org" homepage="http://enlightenment.org"
distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz" distfiles="http://download.enlightenment.org/rel/apps/${pkgname}/${pkgname}-${version}.tar.xz"
checksum=e530590c09b560679621f4531d55c242cfafe8523309e0ae88fb267e00f52c34 checksum=aee2b6178c918d71ebe661129f4008d773e70e5784651dadbcf56eec0a6d4a09
lib32disabled=yes lib32disabled=yes
build_options="wayland" 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() { post_install() {
# Use our native tools to shutdown/suspend. # Use our native tools to shutdown/suspend.