From 44558a0e32973ac81df8516f2e62538f686e1baf Mon Sep 17 00:00:00 2001
From: Erik Falor <ewfalor@gmail.com>
Date: Thu, 3 Sep 2020 13:03:57 +0700
Subject: desktop/enlightenment: Updated for version 0.24.2.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/enlightenment/enlightenment.SlackBuild | 35 ++++++++++++++------------
 desktop/enlightenment/enlightenment.info       |  6 ++---
 2 files changed, 22 insertions(+), 19 deletions(-)

(limited to 'desktop/enlightenment')

diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild
index 5a1b7bb3a2..2c440a7157 100644
--- a/desktop/enlightenment/enlightenment.SlackBuild
+++ b/desktop/enlightenment/enlightenment.SlackBuild
@@ -1,8 +1,9 @@
 #!/bin/sh
+
 # Slackware build script for Enlightenment
-# Copyright 2018 Erik Falor <ewfalor@gmail.com>, Logan, Utah, USA
-# All rights reserved.
-# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Erik Falor | Logan, UT, USA | ewfalor@gmail.com | August 2020
+
+# Previously by Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 # Originally by Aleksandar Samardzic <asamardzic@gmail.com>
 
 # This program is free software: you can redistribute it and/or modify
@@ -24,7 +25,7 @@
 # <http://www.gnu.org/licenses/>.
 
 PRGNAM=enlightenment
-VERSION=${VERSION:-0.22.4}
+VERSION=${VERSION:-0.24.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,6 +58,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="AUTHORS COPYING INSTALL NEWS README TODO"
+
 set -e
 
 rm -rf $PKG
@@ -72,19 +75,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+meson . build \
+	--prefix=/usr/ \
+	--libdir=/usr/lib${LIBDIRSUFFIX} \
+	-Dsystemd=false \
+	-Dpam=false \
+	-Dbuild-id=$ARCH-slackware-linux
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+ninja -C build -v
+
+DESTDIR=$PKG ninja -C build install
 
 # Don't clobber config files on upgrade
 mv $PKG/etc/enlightenment/sysactions.conf $PKG/etc/enlightenment/sysactions.conf.new
@@ -93,12 +95,13 @@ mv $PKG/etc/xdg/menus/e-applications.menu $PKG/etc/xdg/menus/e-applications.menu
 # Handle the xinitrc file
 mkdir -p $PKG/etc/X11/xinit
 cat $CWD/xinitrc.enlightenment > $PKG/etc/X11/xinit/xinitrc.enlightenment.new
+chmod +x $PKG/etc/X11/xinit/xinitrc.enlightenment.new
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/enlightenment/enlightenment.info b/desktop/enlightenment/enlightenment.info
index 0bbd48d1aa..cea8213f10 100644
--- a/desktop/enlightenment/enlightenment.info
+++ b/desktop/enlightenment/enlightenment.info
@@ -1,8 +1,8 @@
 PRGNAM="enlightenment"
-VERSION="0.22.4"
+VERSION="0.24.2"
 HOMEPAGE="https://www.enlightenment.org/"
-DOWNLOAD="https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.22.4.tar.xz"
-MD5SUM="2444a699b4c995eb83c813aa555ca418"
+DOWNLOAD="https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.24.2.tar.xz"
+MD5SUM="dffeea99a238c7f68b9e73a51fdf8be0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="efl"
-- 
cgit v1.2.3