summaryrefslogtreecommitdiff
path: root/source/xfce/garcon
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-07-29 23:17:22 +0000
committerEric Hameleers <alien@slackware.com>2019-07-30 08:59:48 +0200
commitaf4fda568788c131ce0a660dc40f621e2bbec3e1 (patch)
treeb16fee5c2b9d93c898f85f11206dc3a68da5390c /source/xfce/garcon
parent110278b262dbdbd27af3dc1e21c4e072462208c4 (diff)
downloadcurrent-af4fda568788c131ce0a660dc40f621e2bbec3e1.tar.gz
Mon Jul 29 23:17:22 UTC 201920190729231722
a/aaa_elflibs-15.0-x86_64-10.txz: Rebuilt. Upgraded: libglib-2.0.so.0.6000.6, libgmodule-2.0.so.0.6000.6, libgobject-2.0.so.0.6000.6, libgthread-2.0.so.0.6000.6, liblber-2.4.so.2.10.11, libldap-2.4.so.2.10.11. Added: libargon2.so.1, libjson-c.so.4.0.0. a/cryptsetup-2.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. Thanks to Robby Workman. a/efibootmgr-20190528_d9eb7f1-x86_64-1.txz: Upgraded. Even though efibootmgr-17 will compile against efivar from git, it's probably best to take this from git as well to keep things closely synced. a/efivar-20190618_272b216-x86_64-1.txz: Upgraded. Switch to git to fix "efibootmgr -v" failing with a parse error. a/elilo-3.16-x86_64-10.txz: Rebuilt. eliloconfig: If /boot/initrd.gz exists, install the generic kernel and initrd. Otherwise, install the huge kernel. a/lvm2-2.03.05-x86_64-1.txz: Upgraded. Back to lvm2-2.03.x (cryptsetup needs it). Hopefully there's been enough time for most of the bugs to have been ironed out. l/argon2-20190702-x86_64-3.txz: Rebuilt. Fix shared library permissions. l/aspell-0.60.7-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_57-x86_64-1.txz: Upgraded. l/python-docutils-0.15.1-x86_64-1.txz: Upgraded. n/ipset-7.3-x86_64-1.txz: Upgraded. xap/geeqie-1.5-x86_64-1.txz: Upgraded. xfce/garcon-0.6.4-x86_64-1.txz: Upgraded. xfce/thunar-volman-0.9.4-x86_64-1.txz: Upgraded. xfce/tumbler-0.2.6-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xfce/garcon')
-rw-r--r--source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch25
-rwxr-xr-xsource/xfce/garcon/garcon.SlackBuild4
-rw-r--r--source/xfce/garcon/garcon.url2
3 files changed, 2 insertions, 29 deletions
diff --git a/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch b/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch
deleted file mode 100644
index 92ba106b..00000000
--- a/source/xfce/garcon/0001-Fix-use-after-free-crash-Bug-15679.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6f452937366bb1599fb0ae986958786d52946f15 Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm@xfce.org>
-Date: Sat, 6 Jul 2019 13:42:20 -0300
-Subject: [PATCH] Fix use after free crash (Bug #15679)
-
----
- garcon/garcon-menu-item.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
-index 35f6bed..5f23467 100644
---- a/garcon/garcon-menu-item.c
-+++ b/garcon/garcon-menu-item.c
-@@ -1154,6 +1154,8 @@ garcon_menu_item_reload_from_file (GarconMenuItem *item,
-
- /* Update application actions */
- _garcon_g_list_free_full (item->priv->actions, garcon_menu_item_action_unref);
-+ item->priv->actions = NULL;
-+
- str_list = xfce_rc_read_list_entry (rc, G_KEY_FILE_DESKTOP_KEY_ACTIONS, ";");
- if (G_LIKELY (str_list != NULL))
- {
---
-2.22.0
-
diff --git a/source/xfce/garcon/garcon.SlackBuild b/source/xfce/garcon/garcon.SlackBuild
index 405d00aa..3954dc4e 100755
--- a/source/xfce/garcon/garcon.SlackBuild
+++ b/source/xfce/garcon/garcon.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=garcon
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
@@ -80,8 +80,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-zcat $CWD/0001-Fix-use-after-free-crash-Bug-15679.patch.gz | patch -p1 --verbose || exit 1
-
if [ ! -r configure ]; then
NOCONFIGURE=1 ./autogen.sh
fi
diff --git a/source/xfce/garcon/garcon.url b/source/xfce/garcon/garcon.url
index 2c03b35c..369d7a86 100644
--- a/source/xfce/garcon/garcon.url
+++ b/source/xfce/garcon/garcon.url
@@ -1 +1 @@
-http://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.3.tar.bz2
+http://archive.xfce.org/src/xfce/garcon/0.6/garcon-0.6.4.tar.bz2