From b88f7757bbb9d553dd5d65b330e7888cf5505d59 Mon Sep 17 00:00:00 2001 From: Erik Falor Date: Sat, 29 Jul 2017 23:13:04 +0700 Subject: desktop/enlightenment: Updated for version 0.21.8 + new maintainer. Signed-off-by: Willy Sudiarto Raharjo --- desktop/enlightenment/README | 11 +---------- desktop/enlightenment/doinst.sh | 4 ++-- desktop/enlightenment/enlightenment.SlackBuild | 14 +++++++------- desktop/enlightenment/enlightenment.info | 12 ++++++------ desktop/enlightenment/slack-desc | 2 +- desktop/enlightenment/xinitrc.enlightenment | 21 +++++++++++++++++++++ desktop/enlightenment/xinitrc.enlightenment17 | 21 --------------------- 7 files changed, 38 insertions(+), 47 deletions(-) create mode 100644 desktop/enlightenment/xinitrc.enlightenment delete mode 100644 desktop/enlightenment/xinitrc.enlightenment17 (limited to 'desktop') diff --git a/desktop/enlightenment/README b/desktop/enlightenment/README index 522962fc36..aa63cf83de 100644 --- a/desktop/enlightenment/README +++ b/desktop/enlightenment/README @@ -1,13 +1,4 @@ -Enlightenment DR17 is the next generation of UNIX graphical +Enlightenment is the next generation of UNIX graphical environments. It is not just a window manager, but it is also a desktop shell. A desktop shell means a window manager plus a file manager plus configuration utilities all in one. - -The complete build order is: lua, eina, eet, evas, ecore, eio, embryo, -edje, efreet, e_dbus, enlightenment. - -For sbopkg users: - -"lua eina eet evas ecore eio embryo edje efreet e_dbus enlightenment" - - diff --git a/desktop/enlightenment/doinst.sh b/desktop/enlightenment/doinst.sh index babb02233e..1284de8456 100644 --- a/desktop/enlightenment/doinst.sh +++ b/desktop/enlightenment/doinst.sh @@ -9,5 +9,5 @@ config() { } config etc/enlightenment/sysactions.conf.new -config etc/xdg/menus/enlightenment.menu.new -config etc/X11/xinit/xinitrc.enlightenment17.new +config etc/xdg/menus/e-applications.menu.new +config etc/X11/xinit/xinitrc.enlightenment.new diff --git a/desktop/enlightenment/enlightenment.SlackBuild b/desktop/enlightenment/enlightenment.SlackBuild index a6605a710d..8e801d8629 100644 --- a/desktop/enlightenment/enlightenment.SlackBuild +++ b/desktop/enlightenment/enlightenment.SlackBuild @@ -22,7 +22,7 @@ # . PRGNAM=enlightenment -VERSION=${VERSION:-0.17.6} +VERSION=${VERSION:-0.21.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -30,7 +30,7 @@ SRC_VERSION=$(echo $VERSION | tr _ -) if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -61,7 +61,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$SRC_VERSION -tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz cd $PRGNAM-$SRC_VERSION chown -R root:root . find -L . \ @@ -86,11 +86,11 @@ make install DESTDIR=$PKG # Don't clobber config files on upgrade mv $PKG/etc/enlightenment/sysactions.conf $PKG/etc/enlightenment/sysactions.conf.new -mv $PKG/etc/xdg/menus/enlightenment.menu $PKG/etc/xdg/menus/enlightenment.menu.new +mv $PKG/etc/xdg/menus/e-applications.menu $PKG/etc/xdg/menus/e-applications.menu.new # Handle the xinitrc file mkdir -p $PKG/etc/X11/xinit -cat $CWD/xinitrc.enlightenment17 > $PKG/etc/X11/xinit/xinitrc.enlightenment17.new +cat $CWD/xinitrc.enlightenment > $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 diff --git a/desktop/enlightenment/enlightenment.info b/desktop/enlightenment/enlightenment.info index 77841cab48..bb6f830b69 100644 --- a/desktop/enlightenment/enlightenment.info +++ b/desktop/enlightenment/enlightenment.info @@ -1,10 +1,10 @@ PRGNAM="enlightenment" -VERSION="0.17.6" +VERSION="0.21.8" HOMEPAGE="https://www.enlightenment.org/" -DOWNLOAD="https://download.enlightenment.org/releases/enlightenment-0.17.6.tar.bz2" -MD5SUM="2bbbff352b03e9eb86d173f0d4dea37a" +DOWNLOAD="https://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.21.8.tar.gz" +MD5SUM="bf2a87f293e26467b5e5b3c1002c0021" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="e_dbus edje efreet eio" -MAINTAINER="Ryan P.C. McQuen" -EMAIL="ryanpcmcquen@member.fsf.org" +REQUIRES="efl" +MAINTAINER="Erik Falor" +EMAIL="ewfalor@gmail.com" diff --git a/desktop/enlightenment/slack-desc b/desktop/enlightenment/slack-desc index f8a47b5599..ceb75c3c9e 100644 --- a/desktop/enlightenment/slack-desc +++ b/desktop/enlightenment/slack-desc @@ -14,6 +14,6 @@ enlightenment: manager, but it is also a desktop shell. A desktop enlightenment: shell means, a window manager plus a file manager, plus enlightenment: configuration utilities all in one. enlightenment: -enlightenment: Enlightenment home page is: http://www.enlightenment.org/ +enlightenment: Enlightenment home page is: https://www.enlightenment.org/ enlightenment: enlightenment: diff --git a/desktop/enlightenment/xinitrc.enlightenment b/desktop/enlightenment/xinitrc.enlightenment new file mode 100644 index 0000000000..b930c84d92 --- /dev/null +++ b/desktop/enlightenment/xinitrc.enlightenment @@ -0,0 +1,21 @@ +#!/bin/sh +# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# merge in defaults and keymaps +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f $userresources ] && xrdb -merge $userresources +[ -f $usermodmap ] && xmodmap $usermodmap + +# Start the window manager: +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session enlightenment_start +else + exec enlightenment_start +fi + diff --git a/desktop/enlightenment/xinitrc.enlightenment17 b/desktop/enlightenment/xinitrc.enlightenment17 deleted file mode 100644 index b930c84d92..0000000000 --- a/desktop/enlightenment/xinitrc.enlightenment17 +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps -[ -f $sysresources ] && xrdb -merge $sysresources -[ -f $sysmodmap ] && xmodmap $sysmodmap -[ -f $userresources ] && xrdb -merge $userresources -[ -f $usermodmap ] && xmodmap $usermodmap - -# Start the window manager: -if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session enlightenment_start -else - exec enlightenment_start -fi - -- cgit v1.2.3