From a6c63eebc9ecaa96b297deb0d2863e5766324209 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Sun, 10 Jul 2016 10:38:38 +0200 Subject: [PATCH] desktop/lxlauncher: Updated for version 0.2.5. Signed-off-by: Matteo Bernardini --- desktop/lxlauncher/lxlauncher.SlackBuild | 17 ++++++------- desktop/lxlauncher/lxlauncher.info | 6 ++--- ...se-libmenu-cache-returned-empty-menu.patch | 25 ------------------- ...ibtoolize-from-autogen.sh-it-never-u.patch | 25 ------------------- 4 files changed, 11 insertions(+), 62 deletions(-) delete mode 100644 desktop/lxlauncher/patches/0001-Fix-crash-in-case-libmenu-cache-returned-empty-menu.patch delete mode 100644 desktop/lxlauncher/patches/0002-Remove-call-to-libtoolize-from-autogen.sh-it-never-u.patch diff --git a/desktop/lxlauncher/lxlauncher.SlackBuild b/desktop/lxlauncher/lxlauncher.SlackBuild index c1ebe6e2d4..5afdeb1d24 100644 --- a/desktop/lxlauncher/lxlauncher.SlackBuild +++ b/desktop/lxlauncher/lxlauncher.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # $Id: lxlauncher.SlackBuild,v 1.3 2009/09/11 20:45:23 root Exp root $ # Copyright (c) 2008-2009 Eric Hameleers, Eindhoven, NL -# Copyright (c) 2010-2014 Matteo Bernardini, Pisa, IT +# Copyright 2010-2016 Matteo Bernardini # * update. +# 0.2.5-1: 10/jul/2016 by Matteo Bernardini +# * update. # # Run 'sh lxlauncher.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -50,7 +52,7 @@ # ----------------------------------------------------------------------------- PRGNAM=lxlauncher -VERSION=${VERSION:-0.2.3} +VERSION=${VERSION:-0.2.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -93,13 +95,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# apply patches from upstream -for i in $CWD/patches/* ; do patch -p1 < $i ; done + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; sh autogen.sh || true diff --git a/desktop/lxlauncher/lxlauncher.info b/desktop/lxlauncher/lxlauncher.info index 55347b2587..59eddfca6c 100644 --- a/desktop/lxlauncher/lxlauncher.info +++ b/desktop/lxlauncher/lxlauncher.info @@ -1,8 +1,8 @@ PRGNAM="lxlauncher" -VERSION="0.2.3" +VERSION="0.2.5" HOMEPAGE="http://www.lxde.org/" -DOWNLOAD="http://downloads.sourceforge.net/lxde/lxlauncher-0.2.3.tar.xz" -MD5SUM="7f53137fb55ba3f63f42ae63aa4d8191" +DOWNLOAD="http://downloads.sf.net/lxde/lxlauncher-0.2.5.tar.xz" +MD5SUM="94a7a36af92f8409365b6a25b6904eeb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lxmenu-data menu-cache" diff --git a/desktop/lxlauncher/patches/0001-Fix-crash-in-case-libmenu-cache-returned-empty-menu.patch b/desktop/lxlauncher/patches/0001-Fix-crash-in-case-libmenu-cache-returned-empty-menu.patch deleted file mode 100644 index 7278b0641c..0000000000 --- a/desktop/lxlauncher/patches/0001-Fix-crash-in-case-libmenu-cache-returned-empty-menu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1828b0bf6a0193cf51bad92c034cdff0cf39953d Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko -Date: Thu, 4 Sep 2014 05:02:42 +0300 -Subject: [PATCH 1/2] Fix crash in case libmenu-cache returned empty menu. - ---- - src/lxlauncher.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/lxlauncher.c b/src/lxlauncher.c -index d48e994..9d5a516 100644 ---- a/src/lxlauncher.c -+++ b/src/lxlauncher.c -@@ -697,6 +697,8 @@ static void create_notebook_pages() - GSList* l; - - // build pages for toplevel groups -+ if (root_dir == NULL) -+ return; - #ifdef HAVE_MENU_CACHE_DIR_LIST_CHILDREN /* menu-cache 0.4.0 or newer */ - children = menu_cache_dir_list_children(root_dir); - for( l = children; l; l = l->next ) --- -2.1.0 - diff --git a/desktop/lxlauncher/patches/0002-Remove-call-to-libtoolize-from-autogen.sh-it-never-u.patch b/desktop/lxlauncher/patches/0002-Remove-call-to-libtoolize-from-autogen.sh-it-never-u.patch deleted file mode 100644 index 45e57d8475..0000000000 --- a/desktop/lxlauncher/patches/0002-Remove-call-to-libtoolize-from-autogen.sh-it-never-u.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d529db70aa51a8e4f2b89339d7de9a81122414e2 Mon Sep 17 00:00:00 2001 -From: Andriy Grytsenko -Date: Thu, 4 Sep 2014 21:49:08 +0300 -Subject: [PATCH 2/2] Remove call to libtoolize from autogen.sh - it never - used. - ---- - autogen.sh | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/autogen.sh b/autogen.sh -index a282893..7fd9bd6 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -26,7 +26,6 @@ set -x - - ${ACLOCAL:-aclocal$AM_VERSION} ${ACLOCAL_ARG} - ${AUTOHEADER:-autoheader$AC_VERSION} --force --AUTOMAKE=$AUTOMAKE libtoolize -c --automake --force - AUTOMAKE=$AUTOMAKE intltoolize -c --automake --force - $AUTOMAKE --add-missing --copy --include-deps - ${AUTOCONF:-autoconf$AC_VERSION} --- -2.1.0 -