diff options
Diffstat (limited to 'source/xfce')
69 files changed, 597 insertions, 424 deletions
diff --git a/source/xfce/FTBFSlog b/source/xfce/FTBFSlog new file mode 100644 index 000000000..522490bf7 --- /dev/null +++ b/source/xfce/FTBFSlog @@ -0,0 +1,2 @@ +Thu Feb 1 01:00:13 UTC 2018 + All packages tested and found to compile properly. diff --git a/source/xfce/Thunar/0001-Deactivate-SEND_MOVED-code-paths.patch b/source/xfce/Thunar/0001-Deactivate-SEND_MOVED-code-paths.patch deleted file mode 100644 index ed1e9ecaa..000000000 --- a/source/xfce/Thunar/0001-Deactivate-SEND_MOVED-code-paths.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 95ed18a7322c5cb27024547425a05522d5f34d7b Mon Sep 17 00:00:00 2001 -From: Harald Judt <h.judt@gmx.at> -Date: Fri, 13 Nov 2015 13:29:49 +0100 -Subject: Deactivate SEND_MOVED code paths - ---- - thunar/thunar-file.c | 4 ++-- - thunar/thunar-folder.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c -index 3262dfb..e3f9076 100644 ---- a/thunar/thunar-file.c -+++ b/thunar/thunar-file.c -@@ -853,7 +853,7 @@ thunar_file_watch_reconnect (ThunarFile *file) - } - - /* create a file or directory monitor */ -- file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS | G_FILE_MONITOR_SEND_MOVED, NULL, NULL); -+ file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL); - if (G_LIKELY (file_watch->monitor != NULL)) - { - /* watch monitor for file changes */ -@@ -3854,7 +3854,7 @@ thunar_file_watch (ThunarFile *file) - file_watch->watch_count = 1; - - /* create a file or directory monitor */ -- file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS | G_FILE_MONITOR_SEND_MOVED, NULL, NULL); -+ file_watch->monitor = g_file_monitor (file->gfile, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL); - if (G_LIKELY (file_watch->monitor != NULL)) - { - /* watch monitor for file changes */ -diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c -index 9decb89..bd8249d 100644 ---- a/thunar/thunar-folder.c -+++ b/thunar/thunar-folder.c -@@ -569,7 +569,7 @@ thunar_folder_finished (ExoJob *job, - - /* add us to the file alteration monitor */ - folder->monitor = g_file_monitor_directory (thunar_file_get_file (folder->corresponding_file), -- G_FILE_MONITOR_SEND_MOVED, NULL, NULL); -+ G_FILE_MONITOR_NONE, NULL, NULL); - if (G_LIKELY (folder->monitor != NULL)) - g_signal_connect (folder->monitor, "changed", G_CALLBACK (thunar_folder_monitor), folder); - --- -2.6.3 - diff --git a/source/xfce/Thunar/Thunar.SlackBuild b/source/xfce/Thunar/Thunar.SlackBuild index 012b24e4d..c59cb3eb6 100755 --- a/source/xfce/Thunar/Thunar.SlackBuild +++ b/source/xfce/Thunar/Thunar.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=Thunar -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -61,7 +70,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 find . -exec touch {} \; @@ -73,8 +82,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/0001-Deactivate-SEND_MOVED-code-paths.patch.gz | patch -p1 --verbose || exit 1 - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -91,6 +98,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/Thunar/Thunar.url b/source/xfce/Thunar/Thunar.url new file mode 100644 index 000000000..47bb0609f --- /dev/null +++ b/source/xfce/Thunar/Thunar.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/xfce/thunar/1.6/Thunar-1.6.15.tar.bz2 diff --git a/source/xfce/Thunar/slack-desc b/source/xfce/Thunar/slack-desc index afd93c05a..f78b6af65 100644 --- a/source/xfce/Thunar/slack-desc +++ b/source/xfce/Thunar/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| @@ -10,10 +10,10 @@ Thunar: Thunar (file manager) Thunar: Thunar: Thunar is a modern file manager for the Xfce Desktop Environment. Thunar: Thunar has been designed from the ground up to be fast and -Thunar: easy-to-use. Its user interface is clean and intuitive, and does not -Thunar: include any confusing or useless options. Thunar is fast and +Thunar: easy-to-use. Its user interface is clean and intuitive, and does not +Thunar: include any confusing or useless options. Thunar is fast and Thunar: responsive with a good start up time and directory load time. Thunar: -Thunar: Homepage: http://thunar.xfce.org +Thunar: Homepage: http://thunar.xfce.org Thunar: Thunar: diff --git a/source/xfce/exo/exo.SlackBuild b/source/xfce/exo/exo.SlackBuild index ee299a2e3..1a469caa4 100755 --- a/source/xfce/exo/exo.SlackBuild +++ b/source/xfce/exo/exo.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=exo -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -61,7 +70,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 find . -exec touch {} \; @@ -73,8 +82,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/0001-Do-not-use-x-scheme-handler-file-mimetype-bug-7257.patch - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -91,6 +98,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/exo/exo.url b/source/xfce/exo/exo.url index 9a66d2ebd..f18c85b1b 100644 --- a/source/xfce/exo/exo.url +++ b/source/xfce/exo/exo.url @@ -1 +1 @@ -http://archive.xfce.org:/src/xfce/exo/0.10/ +http://archive.xfce.org:/src/xfce/exo/0.12/exo-0.12.0.tar.bz2 diff --git a/source/xfce/exo/slack-desc b/source/xfce/exo/slack-desc index 6bd9c8269..285151f56 100644 --- a/source/xfce/exo/slack-desc +++ b/source/xfce/exo/slack-desc @@ -1,17 +1,17 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| exo: exo (libexo extension library) exo: exo: This is libexo, an extension library to Xfce, developed by -exo: os-cillation. While Xfce comes with quite a few libraries that are +exo: os-cillation. While Xfce comes with quite a few libraries that are exo: targeted at desktop development, libexo is targeted at application -exo: development. It also has some helper applications that are used +exo: development. It also has some helper applications that are used exo: throughout the entire desktop. exo: exo: diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild index 6f7c6d59c..fe6f10d4a 100755 --- a/source/xfce/garcon/garcon.SlackBuild +++ b/source/xfce/garcon/garcon.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=garcon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -71,10 +80,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/0013-Don-t-force-URLs-to-be-opened-in-a-web-browser-bug-1.patch -patch -p1 < $CWD/0014-Add-case-insensitive-sorting-to-the-menu-bug-10594.patch -patch -p1 < $CWD/0017-Fix-menu-icons-for-misconfigured-desktop-files-Bug-1.patch - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -91,6 +96,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/garcon/slack-desc b/source/xfce/garcon/slack-desc index abc2d786a..ddbacd336 100644 --- a/source/xfce/garcon/slack-desc +++ b/source/xfce/garcon/slack-desc @@ -1,15 +1,15 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| garcon: garcon (menu implementation for Xfce) garcon: garcon: This is garcon, a freedesktop.org compliant menu implementation based -garcon: on GLib and GIO. It was started as a rewrite of the former Xfce menu +garcon: on GLib and GIO. It was started as a rewrite of the former Xfce menu garcon: library called libxfce4menu. garcon: garcon: diff --git a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild index ae7f56661..5da0ff58c 100755 --- a/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild +++ b/source/xfce/gtk-xfce-engine/gtk-xfce-engine.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=gtk-xfce-engine VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/gtk-xfce-engine/slack-desc b/source/xfce/gtk-xfce-engine/slack-desc index 1ccfa128b..74b8d7918 100644 --- a/source/xfce/gtk-xfce-engine/slack-desc +++ b/source/xfce/gtk-xfce-engine/slack-desc @@ -1,15 +1,15 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| gtk-xfce-engine: gtk-xfce-engine (Xfce Gtk+ engines) gtk-xfce-engine: gtk-xfce-engine: The GTK-Xfce-Engine package contains several GTK+-2/3 themes and the -gtk-xfce-engine: applications and libraries needed to display them. This is useful for +gtk-xfce-engine: applications and libraries needed to display them. This is useful for gtk-xfce-engine: customizing the appearance of your Xfce desktop. gtk-xfce-engine: gtk-xfce-engine: diff --git a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild index e707077b0..94958d0c0 100755 --- a/source/xfce/libxfce4ui/libxfce4ui.SlackBuild +++ b/source/xfce/libxfce4ui/libxfce4ui.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=libxfce4ui VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -88,6 +97,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Add vendor info in /usr/share/xfce4/vendorinfo mkdir -p $PKG/usr/share/xfce4 cat $CWD/vendorinfo > $PKG/usr/share/xfce4/vendorinfo diff --git a/source/xfce/libxfce4ui/slack-desc b/source/xfce/libxfce4ui/slack-desc index d774e673e..f24b66bdd 100644 --- a/source/xfce/libxfce4ui/slack-desc +++ b/source/xfce/libxfce4ui/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/libxfce4util/libxfce4util.SlackBuild b/source/xfce/libxfce4util/libxfce4util.SlackBuild index a7b107179..449aad7c7 100755 --- a/source/xfce/libxfce4util/libxfce4util.SlackBuild +++ b/source/xfce/libxfce4util/libxfce4util.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=libxfce4util VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -87,6 +96,12 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + +# Make sure shared libraries are executable: +chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.* + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/libxfce4util/slack-desc b/source/xfce/libxfce4util/slack-desc index b5c92596b..1b68b2b60 100644 --- a/source/xfce/libxfce4util/slack-desc +++ b/source/xfce/libxfce4util/slack-desc @@ -1,14 +1,14 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| libxfce4util: libxfce4util (basic utility library for Xfce) libxfce4util: -libxfce4util: Basic utility library for Xfce. This provides useful functions not +libxfce4util: Basic utility library for Xfce. This provides useful functions not libxfce4util: relating to the handling of the user interface. libxfce4util: libxfce4util: diff --git a/source/xfce/orage/orage.SlackBuild b/source/xfce/orage/orage.SlackBuild index 81e57e0f7..c17be29e2 100755 --- a/source/xfce/orage/orage.SlackBuild +++ b/source/xfce/orage/orage.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for orage @@ -22,9 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=orage VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-5} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -34,9 +36,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -67,6 +76,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/orage.libical3.diff.gz | patch -p1 --verbose || exit 1 + # Yes, libical's pkgconfig file is incomplete, it seems CFLAGS="$SLKCFLAGS -I/usr/include/libical" \ CXXFLAGS="$SLKCFLAGS -I/usr/include/libical" \ diff --git a/source/xfce/orage/orage.libical3.diff b/source/xfce/orage/orage.libical3.diff new file mode 100644 index 000000000..af962b367 --- /dev/null +++ b/source/xfce/orage/orage.libical3.diff @@ -0,0 +1,59 @@ +diff -up orage-4.12.1/src/ical-code.c.libical-3.0 orage-4.12.1/src/ical-code.c +--- orage-4.12.1/src/ical-code.c.libical-3.0 2017-11-14 08:41:30.917375493 +0100 ++++ orage-4.12.1/src/ical-code.c 2017-11-14 08:41:56.823375135 +0100 +@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr + && (strcmp(g_par.local_timezone, "floating") != 0)) + ctime = icaltime_current_time_with_zone(local_icaltimezone); + else { / * use floating time * / +- ctime.is_utc = 0; + ctime.is_date = 0; + ctime.is_daylight = 0; + ctime.zone = NULL; +@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a + * when counting alarm time. */ + if (rel == ICAL_RELATED_START) { + per.stime.is_date = 0; +- per.stime.is_utc = 1; + per.stime.is_daylight = 0; + per.stime.zone = utc_icaltimezone; + per.stime.hour = 0; +@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a + } + else { + per.etime.is_date = 0; +- per.etime.is_utc = 1; + per.etime.is_daylight = 0; + per.etime.zone = utc_icaltimezone; + per.etime.hour = 0; +@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al + /* HACK: convert to UTC time so that we can use time arithmetic + * when counting alarm time. */ + start_time.is_date = 0; +- start_time.is_utc = 1; + start_time.is_daylight = 0; + start_time.zone = utc_icaltimezone; + start_time.hour = 0; +@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } +@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } +@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop + */ + if (icaltime_is_date(per.stime)) { + if (local_icaltimezone != utc_icaltimezone) { +- next_alarm_time.is_utc = 0; + next_alarm_time.is_daylight = 0; + next_alarm_time.zone = local_icaltimezone; + } diff --git a/source/xfce/orage/slack-desc b/source/xfce/orage/slack-desc index 665765d06..5023eae5b 100644 --- a/source/xfce/orage/slack-desc +++ b/source/xfce/orage/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/thunar-volman/slack-desc b/source/xfce/thunar-volman/slack-desc index 900d22a44..1b8871397 100644 --- a/source/xfce/thunar-volman/slack-desc +++ b/source/xfce/thunar-volman/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------| diff --git a/source/xfce/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild index 37918aa9f..ba057ef5b 100755 --- a/source/xfce/thunar-volman/thunar-volman.SlackBuild +++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for thunar-volman @@ -22,10 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=thunar-volman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -35,9 +36,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/tumbler/slack-desc b/source/xfce/tumbler/slack-desc index d40670e40..89d74bd73 100644 --- a/source/xfce/tumbler/slack-desc +++ b/source/xfce/tumbler/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| @@ -10,7 +10,7 @@ tumbler: tumbler (thumbnail generator) tumbler: tumbler: Tumbler is a D-Bus service for applications to request thumbnails tumbler: for various URI schemes and MIME types. It is written in an object- -tumbler: oriented fashion using GLib and GObject. It provides plugin +tumbler: oriented fashion using GLib and GObject. It provides plugin tumbler: interfaces for extending the URI schemes and MIME types for which tumbler: thumbnails can be generated as well as for replacing the storage tumbler: backend that is used to store the thumbnails on disk. diff --git a/source/xfce/tumbler/tumbler.SlackBuild b/source/xfce/tumbler/tumbler.SlackBuild index a6e538d75..186467f7d 100755 --- a/source/xfce/tumbler/tumbler.SlackBuild +++ b/source/xfce/tumbler/tumbler.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=tumbler VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -62,7 +71,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +cd $PKGNAM-$VERSION || cd $PKGNAM-$PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -71,6 +80,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +if [ ! -x configure ]; then + ./autogen.sh +fi + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ @@ -87,6 +100,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/tumbler/tumbler.url b/source/xfce/tumbler/tumbler.url new file mode 100644 index 000000000..b5e7e85f9 --- /dev/null +++ b/source/xfce/tumbler/tumbler.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/apps/tumbler/0.2/tumbler-0.2.1.tar.bz2 diff --git a/source/xfce/xfce-build-all.sh b/source/xfce/xfce-build-all.sh index 5a67a4ba2..45b1216cd 100755 --- a/source/xfce/xfce-build-all.sh +++ b/source/xfce/xfce-build-all.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2012, 2015, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2015, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -33,21 +33,21 @@ for package in \ libxfce4ui \ exo \ garcon \ - tumbler \ - Thunar \ + gtk-xfce-engine \ xfce4-panel \ + Thunar \ + thunar-volman \ + tumbler \ + xfce4-appfinder \ + xfce4-power-manager \ xfce4-settings \ - xfce4-session \ xfdesktop \ xfwm4 \ - xfce4-appfinder \ - gtk-xfce-engine \ + xfce4-session \ xfce4-terminal \ + xfce4-notifyd \ orage \ - thunar-volman \ - xfce4-power-manager \ xfce4-pulseaudio-plugin \ - xfce4-notifyd \ xfce4-clipman-plugin \ xfce4-screenshooter \ xfce4-systemload-plugin \ diff --git a/source/xfce/xfce4-appfinder/slack-desc b/source/xfce/xfce4-appfinder/slack-desc index ef06f7053..8801d8c75 100644 --- a/source/xfce/xfce4-appfinder/slack-desc +++ b/source/xfce/xfce4-appfinder/slack-desc @@ -1,15 +1,15 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| xfce4-appfinder: xfce4-appfinder (Application finder) xfce4-appfinder: xfce4-appfinder: The Xfce application finder is a tool to find and launch installed -xfce4-appfinder: applications on your system and execute commands. It can also be used +xfce4-appfinder: applications on your system and execute commands. It can also be used xfce4-appfinder: to quickly add launchers to the Xfce Panel by dragging an item from xfce4-appfinder: the view and dropping it on the panel. xfce4-appfinder: diff --git a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild index 4fe30b44e..1a9e30379 100755 --- a/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild +++ b/source/xfce/xfce4-appfinder/xfce4-appfinder.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-appfinder VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/xfce4-clipman-plugin/slack-desc b/source/xfce/xfce4-clipman-plugin/slack-desc index def918455..736905dd8 100644 --- a/source/xfce/xfce4-clipman-plugin/slack-desc +++ b/source/xfce/xfce4-clipman-plugin/slack-desc @@ -1,15 +1,15 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| xfce4-clipman-plugin: xfce4-clipman-plugin (clipman plugin for the Xfce panel) xfce4-clipman-plugin: xfce4-clipman-plugin: Clipman allows you to keep several clipboard selections in memory -xfce4-clipman-plugin: which you can then use to toggle. It can pull the clips from both +xfce4-clipman-plugin: which you can then use to toggle. It can pull the clips from both xfce4-clipman-plugin: the selection and the copy buffer, restore your clipboard on login, xfce4-clipman-plugin: and prevent an empty clipboard. xfce4-clipman-plugin: diff --git a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild index 1ab4e87d5..0b136b945 100755 --- a/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild +++ b/source/xfce/xfce4-clipman-plugin/xfce4-clipman-plugin.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-clipman-plugin @@ -22,9 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-clipman-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,9 +38,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/xfce4-dev-tools/slack-desc b/source/xfce/xfce4-dev-tools/slack-desc index a5d0a4dfc..0e89e3b58 100644 --- a/source/xfce/xfce4-dev-tools/slack-desc +++ b/source/xfce/xfce4-dev-tools/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild index 6389c8f33..d16cb174b 100755 --- a/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild +++ b/source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-dev-tools VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/xfce4-notifyd/0001-Set-notifications-as-override-redirect-windows-bug-1.patch b/source/xfce/xfce4-notifyd/0001-Set-notifications-as-override-redirect-windows-bug-1.patch deleted file mode 100644 index 140e1d126..000000000 --- a/source/xfce/xfce4-notifyd/0001-Set-notifications-as-override-redirect-windows-bug-1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 24d77f5b06c704506b4ae9d2eabdb96e56e12dae Mon Sep 17 00:00:00 2001 -From: Liquider <liquiderz@gmail.com> -Date: Sun, 16 Feb 2014 14:04:20 +0100 -Subject: [PATCH 1/3] Set notifications as override redirect windows (bug - #10686). - ---- - xfce4-notifyd/xfce-notify-window.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c -index f8ffdf6..29287fa 100644 ---- a/xfce4-notifyd/xfce-notify-window.c -+++ b/xfce4-notifyd/xfce-notify-window.c -@@ -318,6 +318,7 @@ xfce_notify_window_realize(GtkWidget *widget) - - gdk_window_set_type_hint(widget->window, - GDK_WINDOW_TYPE_HINT_NOTIFICATION); -+ gdk_window_set_override_redirect(gtk_widget_get_window(widget), TRUE); - xfce_notify_window_start_expiration(window); - } - --- -2.3.0 - diff --git a/source/xfce/xfce4-notifyd/0002-Use-accessor-function-to-get-the-GdkWindow.patch b/source/xfce/xfce4-notifyd/0002-Use-accessor-function-to-get-the-GdkWindow.patch deleted file mode 100644 index a50d31856..000000000 --- a/source/xfce/xfce4-notifyd/0002-Use-accessor-function-to-get-the-GdkWindow.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 93123ab4b7b73e8295102e709d5eeea398774650 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Guelfucci?= <jeromeg@xfce.org> -Date: Sun, 16 Feb 2014 14:09:36 +0100 -Subject: [PATCH 2/3] Use accessor function to get the GdkWindow. - ---- - xfce4-notifyd/xfce-notify-window.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xfce4-notifyd/xfce-notify-window.c b/xfce4-notifyd/xfce-notify-window.c -index 29287fa..e2fc40a 100644 ---- a/xfce4-notifyd/xfce-notify-window.c -+++ b/xfce4-notifyd/xfce-notify-window.c -@@ -316,7 +316,7 @@ xfce_notify_window_realize(GtkWidget *widget) - - GTK_WIDGET_CLASS(xfce_notify_window_parent_class)->realize(widget); - -- gdk_window_set_type_hint(widget->window, -+ gdk_window_set_type_hint(gtk_widget_get_window(widget), - GDK_WINDOW_TYPE_HINT_NOTIFICATION); - gdk_window_set_override_redirect(gtk_widget_get_window(widget), TRUE); - xfce_notify_window_start_expiration(window); --- -2.3.0 - diff --git a/source/xfce/xfce4-notifyd/slack-desc b/source/xfce/xfce4-notifyd/slack-desc index 1463db0bd..b826a4661 100644 --- a/source/xfce/xfce4-notifyd/slack-desc +++ b/source/xfce/xfce4-notifyd/slack-desc @@ -1,18 +1,18 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' on -# the right side marks the last column you can put a character in. You must make -# exactly 11 lines for the formatting to be correct. It's also customary to +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| xfce4-notifyd: xfce4-notifyd (Xfce Notify Daemon) xfce4-notifyd: xfce4-notifyd: Xfce4-notifyd is a simple, visually-appealing notification daemon -xfce4-notifyd: for Xfce. Applications can use xfce4-notifyd to pop up a notification +xfce4-notifyd: for Xfce. Applications can use xfce4-notifyd to pop up a notification xfce4-notifyd: bubble by sending messages through D-Bus. xfce4-notifyd: -xfce4-notifyd: Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd +xfce4-notifyd: xfce4-notifyd: xfce4-notifyd: xfce4-notifyd: diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild index aa5ead86c..8b7909b5d 100755 --- a/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild +++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for Xfce4-notifyd # Copyright 2008 Frank Caraballo <fecaraballo{at}gmail{dot}com> -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,10 +23,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-notifyd -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -38,9 +39,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -62,7 +70,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -71,9 +79,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/0001-Set-notifications-as-override-redirect-windows-bug-1.patch -patch -p1 < $CWD/0002-Use-accessor-function-to-get-the-GdkWindow.patch - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/xfce/xfce4-notifyd/xfce4-notifyd.url b/source/xfce/xfce4-notifyd/xfce4-notifyd.url new file mode 100644 index 000000000..e21c5ad31 --- /dev/null +++ b/source/xfce/xfce4-notifyd/xfce4-notifyd.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/apps/xfce4-notifyd/0.4/xfce4-notifyd-0.4.2.tar.bz2 diff --git a/source/xfce/xfce4-panel/slack-desc b/source/xfce/xfce4-panel/slack-desc index 0711bf8b0..784729568 100644 --- a/source/xfce/xfce4-panel/slack-desc +++ b/source/xfce/xfce4-panel/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild index 6d98f8ad5..6d27f5227 100755 --- a/source/xfce/xfce4-panel/xfce4-panel.SlackBuild +++ b/source/xfce/xfce4-panel/xfce4-panel.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-panel VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -91,6 +100,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/xfce4-power-manager/slack-desc b/source/xfce/xfce4-power-manager/slack-desc index 8c79d3d78..1d3144dc9 100644 --- a/source/xfce/xfce4-power-manager/slack-desc +++ b/source/xfce/xfce4-power-manager/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------| diff --git a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild index d4130a3a8..4b04345fc 100755 --- a/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild +++ b/source/xfce/xfce4-power-manager/xfce4-power-manager.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-power-manager # Copyright 2006-2012 Robby Workman Northport, Alabama, USA -# Copyright 2009, 2010, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2016, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,10 +23,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xfce4-power-manager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,9 +37,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/xfce4-pulseaudio-plugin/slack-desc b/source/xfce/xfce4-pulseaudio-plugin/slack-desc index 1417d6764..020d8f626 100644 --- a/source/xfce/xfce4-pulseaudio-plugin/slack-desc +++ b/source/xfce/xfce4-pulseaudio-plugin/slack-desc @@ -2,7 +2,7 @@ # The "handy ruler" below makes it easier to edit a package description. # Line up the first '|' above the ':' following the base package name, and # the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also +# You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| @@ -10,7 +10,7 @@ xfce4-pulseaudio-plugin: xfce4-pulseaudio-plugin (PulseAudio plugin for Xfce pan xfce4-pulseaudio-plugin: xfce4-pulseaudio-plugin: xfce4-pulseaudio-plugin is a plugin for the Xfce panel which provides xfce4-pulseaudio-plugin: a convenient way to adjust the audio volume of the PulseAudio sound -xfce4-pulseaudio-plugin: system and to an auto mixer tool like pavucontrol. It can optionally +xfce4-pulseaudio-plugin: system and to an auto mixer tool like pavucontrol. It can optionally xfce4-pulseaudio-plugin: handle multimedia keys for controlling the audio volume. xfce4-pulseaudio-plugin: xfce4-pulseaudio-plugin: diff --git a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild index 7d3984c32..cada16b5c 100755 --- a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild +++ b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-pulseaudio-plugin @@ -22,9 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-pulseaudio-plugin -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -34,9 +36,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -58,7 +67,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url new file mode 100644 index 000000000..4376b0a53 --- /dev/null +++ b/source/xfce/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/panel-plugins/xfce4-pulseaudio-plugin/0.4/xfce4-pulseaudio-plugin-0.4.0.tar.bz2 diff --git a/source/xfce/xfce4-screenshooter/slack-desc b/source/xfce/xfce4-screenshooter/slack-desc index 83eeaf7b5..5f0103142 100644 --- a/source/xfce/xfce4-screenshooter/slack-desc +++ b/source/xfce/xfce4-screenshooter/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild index 244a7bb6e..2b921964c 100755 --- a/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild +++ b/source/xfce/xfce4-screenshooter/xfce4-screenshooter.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-screenshooter @@ -22,9 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-screenshooter VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,9 +38,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} diff --git a/source/xfce/xfce4-session/slack-desc b/source/xfce/xfce4-session/slack-desc index 235feb30c..21f856f77 100644 --- a/source/xfce/xfce4-session/slack-desc +++ b/source/xfce/xfce4-session/slack-desc @@ -1,16 +1,16 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| xfce4-session: xfce4-session (Xfce session manager) xfce4-session: -xfce4-session: Xfce4-session is a session manager for Xfce. Its task is to save the +xfce4-session: Xfce4-session is a session manager for Xfce. Its task is to save the xfce4-session: state of your desktop (opened applications and their location) and -xfce4-session: restore it during a next startup. You can create several different +xfce4-session: restore it during a next startup. You can create several different xfce4-session: sessions and choose one of them on startup. xfce4-session: xfce4-session: diff --git a/source/xfce/xfce4-session/xfce4-session.SlackBuild b/source/xfce/xfce4-session/xfce4-session.SlackBuild index 03308f697..4fd868d82 100755 --- a/source/xfce/xfce4-session/xfce4-session.SlackBuild +++ b/source/xfce/xfce4-session/xfce4-session.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-session VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -87,6 +96,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch b/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch deleted file mode 100644 index c8f9cd8ca..000000000 --- a/source/xfce/xfce4-settings/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b2c3df6015d2ab1b57e2532b05298803b28f2902 Mon Sep 17 00:00:00 2001 -From: Peter de Ridder <peter@xfce.org> -Date: Wed, 4 Mar 2015 11:03:28 +0100 -Subject: [PATCH] Make sure icon == NULL if no icon is found - ---- - dialogs/appearance-settings/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dialogs/appearance-settings/main.c b/dialogs/appearance-settings/main.c -index 3eeb348..6532182 100644 ---- a/dialogs/appearance-settings/main.c -+++ b/dialogs/appearance-settings/main.c -@@ -720,6 +720,7 @@ appearance_settings_load_icon_themes (preview_data *pd) - - for (p = 0; p < 4; p++) - { -+ icon = NULL; - if (gtk_icon_theme_has_icon (icon_theme, preview_icons[p])) - icon = gtk_icon_theme_load_icon (icon_theme, preview_icons[p], 16, 0, NULL); - else if (gtk_icon_theme_has_icon (icon_theme, "image-missing")) --- -2.3.1 - diff --git a/source/xfce/xfce4-settings/slack-desc b/source/xfce/xfce4-settings/slack-desc index 590a3b3e4..3774be250 100644 --- a/source/xfce/xfce4-settings/slack-desc +++ b/source/xfce/xfce4-settings/slack-desc @@ -1,14 +1,14 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| xfce4-settings: xfce4-settings (Xfce settings manager) xfce4-settings: -xfce4-settings: xfce4-settings is the Xfce settings manager front-end. It comes with +xfce4-settings: xfce4-settings is the Xfce settings manager front-end. It comes with xfce4-settings: several different components for configuring application-independent xfce4-settings: settings inside xfconf. xfce4-settings: diff --git a/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff b/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff deleted file mode 100644 index 73fc826be..000000000 --- a/source/xfce/xfce4-settings/xfce.xfsettingsd.display.crtc.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c -index 095e323..af70256 100644 ---- a/xfsettingsd/displays.c -+++ b/xfsettingsd/displays.c -@@ -415,6 +415,7 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent, - XfceRROutput *output, *o; - XEvent *e = xevent; - gint event_num; -+ gint j; - guint n, m, nactive = 0; - gboolean found = FALSE, changed = FALSE; - -@@ -496,9 +497,37 @@ xfce_displays_helper_screen_on_event (GdkXEvent *xevent, - { - xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "New output connected: %s", - output->info->name); -+ /* need to enable crtc for output ? */ -+ if (output->info->crtc == None) -+ { -+ xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "enabling crtc for %s", output->info->name); -+ crtc = xfce_displays_helper_find_usable_crtc (helper, output); -+ if (crtc) -+ { -+ crtc->mode = output->preferred_mode; -+ crtc->rotation = RR_Rotate_0; -+ crtc->x = crtc->y = 0; -+ /* set width and height */ -+ for (j = 0; j < helper->resources->nmode; ++j) -+ { -+ if (helper->resources->modes[j].id == output->preferred_mode) -+ { -+ crtc->width = helper->resources->modes[j].width; -+ crtc->height = helper->resources->modes[j].height; -+ break; -+ } -+ } -+ xfce_displays_helper_set_outputs (crtc, output); -+ crtc->changed = TRUE; -+ } -+ } -+ - changed = TRUE; - } - } -+ if (changed) -+ xfce_displays_helper_apply_all (helper); -+ - /* Start the minimal dialog according to the user preferences */ - if (changed && xfconf_channel_get_bool (helper->channel, NOTIFY_PROP, FALSE)) - xfce_spawn_command_line_on_screen (NULL, "xfce4-display-settings -m", FALSE, - diff --git a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild index cc85ed8ce..45405ab4f 100755 --- a/source/xfce/xfce4-settings/xfce4-settings.SlackBuild +++ b/source/xfce/xfce4-settings/xfce4-settings.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012, 2016 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2016, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-settings -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -61,7 +70,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . @@ -74,11 +83,6 @@ find . \ zcat $CWD/xfce4-settings.theme.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/xfce4-settings.xft.defaults.diff.gz | patch -p1 --verbose || exit 1 -# Fix monitor wake from standby with 4.4.x kernel: -zcat $CWD/xfce.xfsettingsd.display.crtc.diff.gz | patch -p1 --verbose || exit 1 - -patch -p1 < $CWD/0001-Make-sure-icon-NULL-if-no-icon-is-found.patch - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/xfce/xfce4-settings/xfce4-settings.url b/source/xfce/xfce4-settings/xfce4-settings.url new file mode 100644 index 000000000..87f91747e --- /dev/null +++ b/source/xfce/xfce4-settings/xfce4-settings.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/xfce/xfce4-settings/4.12/xfce4-settings-4.12.3.tar.bz2 diff --git a/source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch b/source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch deleted file mode 100644 index a40bedff0..000000000 --- a/source/xfce/xfce4-systemload-plugin/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ca2b7fdf3f684a55280174ecf20935c7f2e7c897 Mon Sep 17 00:00:00 2001 -From: Robby Workman <rw@rlworkman.net> -Date: Tue, 17 Mar 2015 22:10:56 +0100 -Subject: [PATCH] g_free() on a GtkWidget is wrong on so many levels.. (bug - #11713) - ---- - panel-plugin/systemload.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c -index 628947e..4df29e5 100644 ---- a/panel-plugin/systemload.c -+++ b/panel-plugin/systemload.c -@@ -394,7 +394,6 @@ monitor_free(XfcePanelPlugin *plugin, t_global_monitor *global) - g_source_remove(global->timeout_id); - - g_free(global->command.command_text); -- g_free(global->menu_item); - - for(count = 0; count < 3; count++) - { --- -2.3.3 - diff --git a/source/xfce/xfce4-systemload-plugin/slack-desc b/source/xfce/xfce4-systemload-plugin/slack-desc index e83e9306d..1f57f4003 100644 --- a/source/xfce/xfce4-systemload-plugin/slack-desc +++ b/source/xfce/xfce4-systemload-plugin/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff new file mode 100644 index 000000000..2cdd26f82 --- /dev/null +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.HOVER_TIMEOUT.diff @@ -0,0 +1,51 @@ +--- ./panel-plugin/systemload.c.orig 2017-02-09 13:22:46.000000000 -0600 ++++ ./panel-plugin/systemload.c 2018-04-15 14:28:15.729304272 -0500 +@@ -55,6 +55,8 @@ + static gchar *DEFAULT_COLOR[] = { "#0000c0", "#00c000", "#f0f000" }; + static gchar *DEFAULT_COMMAND_TEXT = "xfce4-taskmanager"; + ++/* HOVER_TIMEOUT is a fixed constant in gtk+-3; this must match - Aargh */ ++#define HOVER_TIMEOUT 500 + #define UPDATE_TIMEOUT 250 + #define UPDATE_TIMEOUT_SECONDS 1 + +@@ -107,6 +109,7 @@ + guint timeout, timeout_seconds; + gboolean use_timeout_seconds; + guint timeout_id; ++ guint tooltip_timeout; + t_command command; + t_monitor *monitor[3]; + t_uptime_monitor *uptime; +@@ -174,6 +177,9 @@ + global->monitor[count]->value_read / 100.0); + } + } ++/* don't write tooltip too often */ ++ if((global->tooltip_timeout += global->timeout) <= HOVER_TIMEOUT) return TRUE; ++ global->tooltip_timeout = 0; + if (global->monitor[0]->options.enabled) + { + g_snprintf(caption, sizeof(caption), _("System Load: %ld%%"), +@@ -338,6 +344,7 @@ + #endif + global->plugin = plugin; + global->timeout = UPDATE_TIMEOUT; ++ global->tooltip_timeout = 0; + global->timeout_seconds = UPDATE_TIMEOUT_SECONDS; + global->use_timeout_seconds = TRUE; + global->timeout_id = 0; +@@ -435,13 +442,6 @@ + } + #endif + global->timeout_id = g_timeout_add(global->timeout, (GSourceFunc)update_monitors, global); +- /* reduce the default tooltip timeout to be smaller than the update interval otherwise +- * we won't see tooltips on GTK 2.16 or newer */ +- settings = gtk_settings_get_default(); +- if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout")) +- g_object_set(settings, "gtk-tooltip-timeout", +- global->timeout - 10, NULL); +- + } + + static void diff --git a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild index 427a3487d..f4b93c557 100755 --- a/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild +++ b/source/xfce/xfce4-systemload-plugin/xfce4-systemload-plugin.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-systemload-plugin @@ -24,6 +24,8 @@ # Maintained by Ozan Turkyilmaz ozan.turkyilmaz@gmail.com +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-systemload-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} @@ -36,9 +38,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -69,7 +78,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/0001-g_free-on-a-GtkWidget-is-wrong-on-so-many-levels.-bu.patch +zcat $CWD/xfce4-systemload-plugin.HOVER_TIMEOUT.diff.gz | patch -p1 --verbose || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/xfce/xfce4-taskmanager/slack-desc b/source/xfce/xfce4-taskmanager/slack-desc index f4e05a135..a47e8f53a 100644 --- a/source/xfce/xfce4-taskmanager/slack-desc +++ b/source/xfce/xfce4-taskmanager/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild index 9485ec772..347b111f9 100755 --- a/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild +++ b/source/xfce/xfce4-taskmanager/xfce4-taskmanager.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-taskmanager @@ -22,6 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-taskmanager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} @@ -34,9 +36,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/xfce4-terminal/slack-desc b/source/xfce/xfce4-terminal/slack-desc index a76b06b85..cce31b6cb 100644 --- a/source/xfce/xfce4-terminal/slack-desc +++ b/source/xfce/xfce4-terminal/slack-desc @@ -1,14 +1,14 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| xfce4-terminal: xfce4-terminal (Xfce's Terminal Emulator) xfce4-terminal: -xfce4-terminal: This is the Xfce terminal emulator application. xfce4-terminal is +xfce4-terminal: This is the Xfce terminal emulator application. xfce4-terminal is xfce4-terminal: a lightweight and easy to use terminal emulator for the X windowing xfce4-terminal: system, with some new ideas and features that make it unique among xfce4-terminal: X terminal emulators. diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild index 182886e34..a0eb1db39 100755 --- a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild +++ b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild @@ -1,8 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-terminal # Copyright 2010-2014 Robby Workman, Northport, Alabama, USA +# Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +23,13 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-terminal -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j7 "} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -58,7 +68,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -77,6 +87,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-debug \ + --with-utempter \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.url b/source/xfce/xfce4-terminal/xfce4-terminal.url new file mode 100644 index 000000000..25ecf17de --- /dev/null +++ b/source/xfce/xfce4-terminal/xfce4-terminal.url @@ -0,0 +1 @@ +http://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-0.8.7.4.tar.bz2 diff --git a/source/xfce/xfce4-weather-plugin/slack-desc b/source/xfce/xfce4-weather-plugin/slack-desc index 7d9b0675f..0335acf81 100644 --- a/source/xfce/xfce4-weather-plugin/slack-desc +++ b/source/xfce/xfce4-weather-plugin/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild index dca7152ae..6de2aee6b 100755 --- a/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild +++ b/source/xfce/xfce4-weather-plugin/xfce4-weather-plugin.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for xfce4-weather-plugin @@ -22,9 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfce4-weather-plugin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -36,9 +38,16 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/xfconf/slack-desc b/source/xfce/xfconf/slack-desc index a48abb4bb..26bb06fe7 100644 --- a/source/xfce/xfconf/slack-desc +++ b/source/xfce/xfconf/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfconf/xfconf.SlackBuild b/source/xfce/xfconf/xfconf.SlackBuild index 8e6604040..ff00d38d9 100755 --- a/source/xfce/xfconf/xfconf.SlackBuild +++ b/source/xfce/xfconf/xfconf.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfconf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -87,6 +96,9 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries: ( cd $PKG find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/xfce/xfdesktop/slack-desc b/source/xfce/xfdesktop/slack-desc index e98b02b86..44ad77b5b 100644 --- a/source/xfce/xfdesktop/slack-desc +++ b/source/xfce/xfdesktop/slack-desc @@ -1,15 +1,15 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| xfdesktop: xfdesktop (Xfce desktop manager) xfdesktop: xfdesktop: Xfdesktop is a desktop manager for the Xfce Desktop Environment. -xfdesktop: Desktop in this respect means the root window. The manager handles +xfdesktop: Desktop in this respect means the root window. The manager handles xfdesktop: tasks such as the background image and color, the root menu and window xfdesktop: list, minimized application icons, and file icons on the desktop. xfdesktop: diff --git a/source/xfce/xfdesktop/xfdesktop.SlackBuild b/source/xfce/xfdesktop/xfdesktop.SlackBuild index aabc3537f..18d63ca0a 100755 --- a/source/xfce/xfdesktop/xfdesktop.SlackBuild +++ b/source/xfce/xfdesktop/xfdesktop.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,6 +20,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfdesktop VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-2} @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/xfce/xfwm4/slack-desc b/source/xfce/xfwm4/slack-desc index 89db3f577..46bc5e5c9 100644 --- a/source/xfce/xfwm4/slack-desc +++ b/source/xfce/xfwm4/slack-desc @@ -1,8 +1,8 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# The "handy ruler" below makes it easier to edit a package description. Line # up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild index 3ad03bf4d..ef10f8000 100755 --- a/source/xfce/xfwm4/xfwm4.SlackBuild +++ b/source/xfce/xfwm4/xfwm4.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2012, 2013 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,9 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=xfwm4 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) @@ -36,6 +38,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:--j6} if [ "$ARCH" = "i586" ]; then @@ -52,7 +62,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM |