summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman2012-02-19 18:45:31 +0100
committer Robby Workman2012-02-20 19:20:45 +0100
commit4fc8040b016a18ca00747853a48e045963a86859 (patch)
treec900ea5dac2479c9098766eebbc2c476262b0874
parent0505d75629095b0d7f6b7c9630740bbd12c8e825 (diff)
downloadslackbuilds-4fc8040b016a18ca00747853a48e045963a86859.tar.gz
desktop/xfce4-screenshooter: Fix a crash bug (xfce bz #6460)
Thanks to Marc Dix for the heads-up. Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r--desktop/xfce4-screenshooter/patches/fix_crash_when_config_is_not_yet_present.diff34
-rw-r--r--desktop/xfce4-screenshooter/patches/xfce4-screenshooter-1.7.9-no_libsoup.diff (renamed from desktop/xfce4-screenshooter/xfce4-screenshooter-1.7.9-no_libsoup.diff)0
-rw-r--r--desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild7
3 files changed, 39 insertions, 2 deletions
diff --git a/desktop/xfce4-screenshooter/patches/fix_crash_when_config_is_not_yet_present.diff b/desktop/xfce4-screenshooter/patches/fix_crash_when_config_is_not_yet_present.diff
new file mode 100644
index 0000000000..a91ce62915
--- /dev/null
+++ b/desktop/xfce4-screenshooter/patches/fix_crash_when_config_is_not_yet_present.diff
@@ -0,0 +1,34 @@
+From 0dee91880c1cdb78a42ec0f4710c7457442ec34b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Guelfucci?= <jeromeg@xfce.org>
+Date: Fri, 21 May 2010 10:14:26 +0200
+Subject: [PATCH] Fix a crash when the config file does not exist yet (bug
+ #6460).
+
+Calling xfce_rc_close on a NULL rc file is not exactly a good idea.
+Patch by Thomas (tg42@gmx.de).
+---
+ lib/screenshooter-utils.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/screenshooter-utils.c b/lib/screenshooter-utils.c
+index 9615c66..ec84657 100644
+--- a/lib/screenshooter-utils.c
++++ b/lib/screenshooter-utils.c
+@@ -94,11 +94,11 @@ screenshooter_read_rc_file (const gchar *file, ScreenshotData *sd)
+ g_free (title);
+ title =
+ g_strdup (xfce_rc_read_entry (rc, "title", _("Screenshot")));
+- }
+
+- TRACE ("Close the rc file");
++ TRACE ("Close the rc file");
+
+- xfce_rc_close (rc);
++ xfce_rc_close (rc);
++ }
+ }
+
+ /* And set the sd values */
+--
+1.7.9
+
diff --git a/desktop/xfce4-screenshooter/xfce4-screenshooter-1.7.9-no_libsoup.diff b/desktop/xfce4-screenshooter/patches/xfce4-screenshooter-1.7.9-no_libsoup.diff
index 419305b2f3..419305b2f3 100644
--- a/desktop/xfce4-screenshooter/xfce4-screenshooter-1.7.9-no_libsoup.diff
+++ b/desktop/xfce4-screenshooter/patches/xfce4-screenshooter-1.7.9-no_libsoup.diff
diff --git a/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild b/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild
index f7bba3185f..c173e694b6 100644
--- a/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild
+++ b/desktop/xfce4-screenshooter/xfce4-screenshooter.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=xfce4-screenshooter
VERSION=1.7.9
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
SOUPFORME=${SOUPFORME:-no}
@@ -73,9 +73,12 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix http://bugzilla.xfce.org/show_bug.cgi?id=6460
+patch -p1 < $CWD/patches/fix_crash_when_config_is_not_yet_present.diff
+
if [ "$SOUPFORME" = "no" ]; then
# Strip out the libsoup requirement, which will disable uploads to zimagez
- patch -p1 < $CWD/xfce4-screenshooter-1.7.9-no_libsoup.diff
+ patch -p1 < $CWD/patches/xfce4-screenshooter-1.7.9-no_libsoup.diff
fi
CFLAGS="$SLKCFLAGS" \