diff options
Diffstat (limited to 'source/xfce/thunar-volman')
| -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 | 12 |
2 files changed, 33 insertions, 5 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 new file mode 100644 index 00000000..4e379ae9 --- /dev/null +++ b/source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch @@ -0,0 +1,26 @@ +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 89fd5ab8..37918aa9 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-2012 Robby Workman, Northport, Alabama, USA +# Copyright 2007-2015 Robby Workman, Tuscaloosa, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,11 +25,11 @@ PKGNAM=thunar-volman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +41,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -68,6 +68,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-Fix-return-with-no-value-in-function-returning-non-v.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |