diff options
Diffstat (limited to 'source/xfce')
-rw-r--r-- | source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch | 26 | ||||
-rwxr-xr-x | source/xfce/thunar-volman/thunar-volman.SlackBuild | 8 |
2 files changed, 3 insertions, 31 deletions
diff --git a/source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch b/source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch deleted file mode 100644 index 4e379ae9..00000000 --- a/source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2e295e9ce8f7f60a271adf004588b0d8db88db09 Mon Sep 17 00:00:00 2001 -From: Matt Thirtytwo <matt.59491@gmail.com> -Date: Sat, 7 Mar 2015 22:50:32 +0100 -Subject: [PATCH] Fix return with no value in function returning non-void (bug - #11656) - ---- - thunar-volman/tvm-block-device.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c -index da31efa..edb6cad 100644 ---- a/thunar-volman/tvm-block-device.c -+++ b/thunar-volman/tvm-block-device.c -@@ -714,7 +714,7 @@ tvm_block_device_mount (TvmContext *context) - GMountOperation *mount_operation; - GVolume *volume; - -- g_return_if_fail (context != NULL); -+ g_return_val_if_fail ((context != NULL), FALSE); - - /* determine the GVolume corresponding to the udev device */ - volume = --- -2.3.3 - diff --git a/source/xfce/thunar-volman/thunar-volman.SlackBuild b/source/xfce/thunar-volman/thunar-volman.SlackBuild index 85edb0e6..22285f7f 100755 --- a/source/xfce/thunar-volman/thunar-volman.SlackBuild +++ b/source/xfce/thunar-volman/thunar-volman.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for thunar-volman -# Copyright 2007-2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2007-2018 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ 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:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -67,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 . \ @@ -76,8 +76,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-Fix-return-with-no-value-in-function-returning-non-v.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |