summaryrefslogtreecommitdiff
path: root/source/xfce/Thunar
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2016-06-30 20:26:57 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:31:18 +0200
commitd31c50870d0bee042ce660e445c9294a59a3a65b (patch)
tree6bfc0de3c95267b401b620c2c67859557dc60f97 /source/xfce/Thunar
parent76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (diff)
downloadcurrent-d31c50870d0bee042ce660e445c9294a59a3a65b.tar.gz
Slackware 14.2slackware-14.2
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
Diffstat (limited to 'source/xfce/Thunar')
-rw-r--r--source/xfce/Thunar/0001-Deactivate-SEND_MOVED-code-paths.patch48
-rwxr-xr-xsource/xfce/Thunar/Thunar.SlackBuild10
2 files changed, 54 insertions, 4 deletions
diff --git a/source/xfce/Thunar/0001-Deactivate-SEND_MOVED-code-paths.patch b/source/xfce/Thunar/0001-Deactivate-SEND_MOVED-code-paths.patch
new file mode 100644
index 00000000..ed1e9eca
--- /dev/null
+++ b/source/xfce/Thunar/0001-Deactivate-SEND_MOVED-code-paths.patch
@@ -0,0 +1,48 @@
+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 9a49b089..012b24e4 100755
--- a/source/xfce/Thunar/Thunar.SlackBuild
+++ b/source/xfce/Thunar/Thunar.SlackBuild
@@ -22,13 +22,13 @@
PKGNAM=Thunar
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 )
if [ -z "$ARCH" ]; then
case "$MARCH" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
armv7hl) export ARCH=$MARCH ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
@@ -38,8 +38,8 @@ fi
NUMJOBS=${NUMJOBS:--j6}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -73,6 +73,8 @@ 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 \