summaryrefslogtreecommitdiffstats
path: root/pasture/source/xfce4-volumed
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--extra/source/pure-alsa-system/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch (renamed from pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch)0
-rw-r--r--extra/source/pure-alsa-system/xfce4-volumed/0003-Removing-edge-case-memleaks.patch (renamed from pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch)0
-rw-r--r--extra/source/pure-alsa-system/xfce4-volumed/slack-desc (renamed from pasture/source/xfce4-volumed/slack-desc)6
-rwxr-xr-xextra/source/pure-alsa-system/xfce4-volumed/xfce4-volumed.SlackBuild (renamed from pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild)18
4 files changed, 16 insertions, 8 deletions
diff --git a/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch b/extra/source/pure-alsa-system/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch
index f3f43ea1f..f3f43ea1f 100644
--- a/pasture/source/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch
+++ b/extra/source/pure-alsa-system/xfce4-volumed/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch
diff --git a/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch b/extra/source/pure-alsa-system/xfce4-volumed/0003-Removing-edge-case-memleaks.patch
index 8d45bae32..8d45bae32 100644
--- a/pasture/source/xfce4-volumed/0003-Removing-edge-case-memleaks.patch
+++ b/extra/source/pure-alsa-system/xfce4-volumed/0003-Removing-edge-case-memleaks.patch
diff --git a/pasture/source/xfce4-volumed/slack-desc b/extra/source/pure-alsa-system/xfce4-volumed/slack-desc
index e9266cbca..d7918924f 100644
--- a/pasture/source/xfce4-volumed/slack-desc
+++ b/extra/source/pure-alsa-system/xfce4-volumed/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/pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild b/extra/source/pure-alsa-system/xfce4-volumed/xfce4-volumed.SlackBuild
index d1123f784..ea72fdf94 100755
--- a/pasture/source/xfce4-volumed/xfce4-volumed.SlackBuild
+++ b/extra/source/pure-alsa-system/xfce4-volumed/xfce4-volumed.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for xfce4-volumed
# Copyright 2006-2011 Robby Workman Northport, Alabama, USA
-# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 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-volumed
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4_alsa}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -39,7 +40,6 @@ fi
NUMJOBS=${NUMJOBS:-" -j7 "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -57,6 +57,14 @@ else
LIBDIRSUFFIX=""
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
+
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
@@ -70,8 +78,8 @@ 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-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch
-patch -p1 < $CWD/0003-Removing-edge-case-memleaks.patch
+zcat $CWD/0001-Removed-deprecated-Encoding-entry-in-.desktop-file-t.patch | patch -p1 --verbose || exit 1
+zcat $CWD/0003-Removing-edge-case-memleaks.patch | patch -p1 --verbose || exit 1
CFLAGS="$SLKCFLAGS" \
./configure \