Fix segfaults at first startup (bug #320789), thanks to Thomas

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/xfce-extra/xfce4-screenshooter/ChangeLog b/xfce-extra/xfce4-screenshooter/ChangeLog
index 39af87b8166937fa61d37263062752a52f981f16..dbae46f175a8231e920eab721c6b9f750b1d1e24 100644 (file)
--- a/xfce-extra/xfce4-screenshooter/ChangeLog
+++ b/xfce-extra/xfce4-screenshooter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-extra/xfce4-screenshooter
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.72 2010/04/14 17:45:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/ChangeLog,v 1.73 2010/05/23 10:24:08 angelos Exp $
+
+*xfce4-screenshooter-1.7.9-r1 (23 May 2010)
+
+  23 May 2010; Christoph Mende <angelos@gentoo.org>
+  +xfce4-screenshooter-1.7.9-r1.ebuild,
+  +files/xfce4-screenshooter-1.7.9-fix-segfault-at-startup.patch:
+  Fix segfaults at first startup (bug #320789), thanks to Thomas
 
   14 Apr 2010; Jeroen Roovers <jer@gentoo.org>
   xfce4-screenshooter-1.7.9.ebuild:

diff --git a/xfce-extra/xfce4-screenshooter/Manifest b/xfce-extra/xfce4-screenshooter/Manifest
index d80dbc77561f394124c8d4f413ffe933ed4d1937..e8d9824c0e9d46f8f1f955607af0e8c284098b3b 100644 (file)
--- a/xfce-extra/xfce4-screenshooter/Manifest
+++ b/xfce-extra/xfce4-screenshooter/Manifest
@@ -1,4 +1,6 @@
+AUX xfce4-screenshooter-1.7.9-fix-segfault-at-startup.patch 530 RMD160 f37f842c987ba4766559ac8239bc7c9af43adaf8 SHA1 5493cccc4f906d8e4acb44f18e94c91e745b51a3 SHA256 51950dfd66a8e0fb02e6fd8f3eb071ed100fa0bada3478c99737c388c35e27ee
 DIST xfce4-screenshooter-1.7.9.tar.bz2 1352359 RMD160 f68fbca7e8c91dae913f1e7cf09e4e73cd49276c SHA1 541a28812ed4ada81b8e437a6246ce07c0dd9db6 SHA256 c895e0bb8371ec2922133e4d886dfdb401470fd8081162316e2bbc264d1f3358
+EBUILD xfce4-screenshooter-1.7.9-r1.ebuild 1053 RMD160 571593bf681698f30f5c62aa15e4f5fb552c70c3 SHA1 c5888edf5d8f3896366a5e593c3ec490f90a53b9 SHA256 91ffc72d274245b03d95ec5a4b7dd0adf4a4e316fa3ab541413b8bd2299e50ed
 EBUILD xfce4-screenshooter-1.7.9.ebuild 975 RMD160 0a6f149841332238128e3eba8dfb3447531ef373 SHA1 2a0410854297fd25b69efa431cbbb48b9cb6170f SHA256 db0800136e5f14c7e97de395e5e7ae61496d6798c2c18070a47893b41c8238bb
-MISC ChangeLog 10124 RMD160 8fb12eee211562d5b3979a78875a7595ab374573 SHA1 4e738396627145fff83250a3b5863d6576b38d3e SHA256 12e8f725dfe953ead2194124e5ef30e01c3ce827f83c97fb2fa18ea66979afb1
+MISC ChangeLog 10397 RMD160 720f529f265adc094ad834aab9588929412e576e SHA1 cf9aaa828f33bf1d8fb197eefd5f9634de750fd7 SHA256 1f08369e60794f66738493b64f03e96409f0faddfa87c5f3cd5af5aa3e5fa732
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63

diff --git a/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.7.9-fix-segfault-at-startup.patch b/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.7.9-fix-segfault-at-startup.patch
new file mode 100644 (file)
index 0000000..e2a2f3d
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/files/xfce4-screenshooter-1.7.9-fix-segfault-at-startup.patch
@@ -0,0 +1,17 @@
+--- xfce4-screenshooter-1.7.9/lib/screenshooter-utils.c.orig   2010-01-02 12:42:24.000000000 +0100
++++ xfce4-screenshooter-1.7.9/lib/screenshooter-utils.c        2010-05-20 22:40:38.347861374 +0200
+@@ -94,11 +94,11 @@
+           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 */

diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-r1.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-r1.ebuild
new file mode 100644 (file)
index 0000000..4b52fa4
--- /dev/null
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.7.9-r1.ebuild,v 1.1 2010/05/23 10:24:08 angelos Exp $
+
+EAPI=2
+inherit xfconf
+
+DESCRIPTION="Xfce4 screenshooter application and panel plugin"
+HOMEPAGE="http://goodies.xfce.org/projects/applications/xfce4-screenshooter"
+SRC_URI="mirror://xfce/src/apps/xfce4-screenshooter/1.7/xfce4-screenshooter-1.7.9.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND=">=x11-libs/gtk+-2.14:2
+       >=dev-libs/glib-2.16:2
+       >=net-libs/libsoup-2.26.0
+       >=xfce-base/xfce4-panel-4.4
+       >=xfce-base/libxfce4util-4.4
+       >=xfce-base/libxfcegui4-4.4"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig"
+
+pkg_setup() {
+       PATCHES=( "${FILESDIR}/${P}-fix-segfault-at-startup.patch" )
+       XFCONF="--disable-dependency-tracking
+               $(use_enable debug)"
+       DOCS="AUTHORS ChangeLog NEWS README TODO"
+}