From a1b0a38c4dc724c5ba47056349b15cea404f6946 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Mon, 2 Jun 2014 08:36:25 +0700 Subject: [PATCH] desktop/notion: Updated for version 3_2014052800. Signed-off-by: Willy Sudiarto Raharjo --- desktop/notion/README | 3 --- desktop/notion/doinst.sh | 3 +++ desktop/notion/notion.SlackBuild | 14 +++++++++++--- desktop/notion/notion.info | 6 +++--- desktop/notion/xinitrc.notion | 30 ++++++++++++++++++++++++++++++ 5 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 desktop/notion/doinst.sh create mode 100644 desktop/notion/xinitrc.notion diff --git a/desktop/notion/README b/desktop/notion/README index 3d7423564f..331a917b03 100644 --- a/desktop/notion/README +++ b/desktop/notion/README @@ -15,6 +15,3 @@ Features include: * RandR: mod_xrandr expands on mod_xinerama and picks up changes in the randr configuration without the need for restarting Notion * Extensibility: Notion can be extended with lua scripts. - -NOTE: to launch it at X start just put 'exec notion' in a ~/.xinitrc -file. diff --git a/desktop/notion/doinst.sh b/desktop/notion/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/desktop/notion/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/desktop/notion/notion.SlackBuild b/desktop/notion/notion.SlackBuild index 3a94cdc361..eac27eca4c 100644 --- a/desktop/notion/notion.SlackBuild +++ b/desktop/notion/notion.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=notion -VERSION=${VERSION:-3_2014010900} +VERSION=${VERSION:-3_2014052800} +SRCVER=$(echo $VERSION | tr _ - ) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,8 +55,6 @@ else LIBDIRSUFFIX="" fi -SRCVER=$(echo $VERSION | tr _ - ) - set -e rm -rf $PKG @@ -97,11 +96,20 @@ make install \ 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 +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +# Install an xinitrc script +mkdir -p $PKG/etc/X11/xinit +install -m 0755 $CWD/xinitrc.$PRGNAM $PKG/etc/X11/xinit/xinitrc.$PRGNAM + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README LICENSE CHANGELOG $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/notion/notion.info b/desktop/notion/notion.info index 714f365693..4bb9c565c6 100644 --- a/desktop/notion/notion.info +++ b/desktop/notion/notion.info @@ -1,8 +1,8 @@ PRGNAM="notion" -VERSION="3_2014010900" +VERSION="3_2014052800" HOMEPAGE="http://notion.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/notion/notion-3-2014010900-src.tar.gz" -MD5SUM="8192c61ce92e5926a7664eeb3274f65f" +DOWNLOAD="http://downloads.sourceforge.net/notion/notion-3-2014052800-src.tar.gz" +MD5SUM="f6256fe12a3d321dbb7f7d2ecfcdcbeb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lua" diff --git a/desktop/notion/xinitrc.notion b/desktop/notion/xinitrc.notion new file mode 100644 index 0000000000..f1d86ac1fb --- /dev/null +++ b/desktop/notion/xinitrc.notion @@ -0,0 +1,30 @@ +#!/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +# Merge in defaults and keymaps +if [ -f $sysresources ]; then + xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + xmodmap $usermodmap +fi + +# Start notion +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + exec ck-launch-session notion +else + exec notion +fi