From ad59f7ca92044da0fb856627db6df54d99855f3a Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 8 Dec 2018 04:10:45 +0000
Subject: Sat Dec  8 04:10:45 UTC 2018

a/btrfs-progs-v4.19.1-x86_64-1.txz:  Upgraded.
a/dbus-1.12.12-x86_64-1.txz:  Upgraded.
ap/cups-2.2.10-x86_64-1.txz:  Upgraded.
ap/cups-filters-1.21.5-x86_64-1.txz:  Upgraded.
ap/hplip-3.18.12-x86_64-1.txz:  Upgraded.
d/mercurial-4.8.1-x86_64-1.txz:  Upgraded.
d/rust-1.31.0-x86_64-1.txz:  Upgraded.
l/libpng-1.6.36-x86_64-1.txz:  Upgraded.
l/python-idna-2.8-x86_64-1.txz:  Upgraded.
n/ntp-4.2.8p12-x86_64-5.txz:  Rebuilt.
  Fixed logrotate file. Thanks to allend and rworkman.
n/php-7.2.13-x86_64-1.txz:  Upgraded.
  This is a security release which also contains several minor bug fixes.
  For more information, see:
    https://php.net/ChangeLog-7.php#7.2.13
  (* Security fix *)
n/wpa_supplicant-2.7-x86_64-1.txz:  Upgraded.
x/mesa-18.3.0-x86_64-1.txz:  Upgraded.
x/xf86-video-i740-1.4.0-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-60.3.3-x86_64-1.txz:  Upgraded.
  This is a bugfix release. For more information, see:
  https://www.mozilla.org/en-US/thunderbird/60.3.3/releasenotes/
xfce/thunar-volman-0.9.1-x86_64-1.txz:  Upgraded.
---
 ...with-no-value-in-function-returning-non-v.patch | 26 ----------------------
 source/xfce/thunar-volman/thunar-volman.SlackBuild |  8 +++----
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch

(limited to 'source/xfce')

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 4e379ae9d..000000000
--- 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 85edb0e65..22285f7ff 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 \
-- 
cgit v1.2.3