Patch double-free of PangoFontDescription (Bug #284504)

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 55 insertions, 3 deletions

diff --git a/x11-plugins/gkrellsun/ChangeLog b/x11-plugins/gkrellsun/ChangeLog
index 8a188e670978..719e63727658 100644
--- a/x11-plugins/gkrellsun/ChangeLog
+++ b/x11-plugins/gkrellsun/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/gkrellsun
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/ChangeLog,v 1.27 2007/03/12 17:52:07 lack Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/ChangeLog,v 1.28 2010/07/28 14:41:54 lack Exp $
+
+*gkrellsun-1.0.0-r2 (28 Jul 2010)
+
+  28 Jul 2010; Jim Ramsay <lack@gentoo.org> +gkrellsun-1.0.0-r2.ebuild,
+  +files/gkrellsun-1.0.0-reenable.patch:
+  Patch double-free of PangoFontDescription (Bug #284504)
 
   12 Mar 2007; Jim Ramsay <lack@gentoo.org> gkrellsun-1.0.0-r1.ebuild:
   Updated to use new gkrellm-plugin eclass
diff --git a/x11-plugins/gkrellsun/Manifest b/x11-plugins/gkrellsun/Manifest
index 96d6b2217feb..9bf46be0e7cf 100644
--- a/x11-plugins/gkrellsun/Manifest
+++ b/x11-plugins/gkrellsun/Manifest
@@ -1,4 +1,6 @@
+AUX gkrellsun-1.0.0-reenable.patch 520 RMD160 14d384fbf7ca1558ec4c473191992dec2c7e03bd SHA1 8746bddf46bd597edc58b38f56637a19b43cdfe3 SHA256 d073ca64238612357f4b7d40b0da24ecbebe87e5f6a260c7050c8abe24641447
 DIST gkrellsun-1.0.0.tar.gz 96970 RMD160 603fe037e80d2e2d1ec952f235a4e27ef6e49f27 SHA1 3f5159fed83fb9dde37b6f009152d82acc273e5d SHA256 a9fbf23c69fbaec7b0395e9adf78e98af3f9e8263a01c0312faa27c287757608
 EBUILD gkrellsun-1.0.0-r1.ebuild 652 RMD160 fa8304bc9ab9df5affc47303abe33e5ab556855e SHA1 7e9946e859c21c7bd972e33348ef909839541756 SHA256 f4e3d8a0c9ce836c40197d3b3fde964b8cf7f31752faf5eaaaa95b32787441f2
-MISC ChangeLog 3467 RMD160 845cafae015bc4b8fc9a559f55dcb0d248cc4b35 SHA1 93afd0b8dc5bcbb75df0a9f949f62232c0402eb5 SHA256 314ace63a84d9c795ae03b7c004efc38c5bf7d491b75d4ccbe0f7583e57b5e07
+EBUILD gkrellsun-1.0.0-r2.ebuild 731 RMD160 c35f87e7cc2cbdf3acacf0be4700f21517673efc SHA1 643539a84ee7ff9d967bd7802cc8e8c6e0e70383 SHA256 5d5876eef52c6183ab6f69c35f3827ccaa813fe603a5250dd69d624a1e6fbb06
+MISC ChangeLog 3674 RMD160 ec24594f324117b71298adcc74e63171daa0bb8e SHA1 ad1e11394935c4562e51ad4e2314af23ce622be8 SHA256 66d79d85535c424153dbdd774ee8766cbe4b7fe5369b9f2c225b4a0e3037f69c
 MISC metadata.xml 254 RMD160 415926d9875e8fe9b0d03e74435ad2521fac159c SHA1 172a4c3880766b1bb7e75f4f2b4ed0b62c1d2d6c SHA256 dafc7e6c5cb681b9d6ecbe2ff4280bb987d3533c30bb334b4845faee02aa7279
diff --git a/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch
new file mode 100644
index 000000000000..f47b96e88905
--- /dev/null
+++ b/x11-plugins/gkrellsun/files/gkrellsun-1.0.0-reenable.patch
@@ -0,0 +1,16 @@
+diff --git a/src20/gkrellsun.c b/src20/gkrellsun.c
+index f3adff5..0738bfc 100644
+--- a/src20/gkrellsun.c
++++ b/src20/gkrellsun.c
+@@ -1140,7 +1140,10 @@ cb_plugin_disabled()
+ 
+    save_sun_data();
+ 
+-   if (textOptions.fontDesc) pango_font_description_free (textOptions.fontDesc);
++   if (textOptions.fontDesc) {
++      pango_font_description_free (textOptions.fontDesc);
++      textOptions.fontDesc = NULL;
++   }
+ 
+    /* This happens when user quits X Windows and gkrellm2 is still running */
+    if (colormap == NULL)
diff --git a/x11-plugins/gkrellsun/gkrellsun-1.0.0-r2.ebuild b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..c8b870f2c55e
--- /dev/null
+++ b/x11-plugins/gkrellsun/gkrellsun-1.0.0-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellsun/gkrellsun-1.0.0-r2.ebuild,v 1.1 2010/07/28 14:41:54 lack Exp $
+
+EAPI="3"
+inherit gkrellm-plugin eutils
+
+IUSE="nls"
+DESCRIPTION="A GKrellM plugin that shows sunrise and sunset times."
+HOMEPAGE="http://gkrellsun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gkrellsun/${P}.tar.gz"
+
+SLOT="1"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+PLUGIN_SO=src20/gkrellsun.so
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-reenable.patch"
+}
+
+src_compile() {
+	use nls && myconf="$myconf enable_nls=1"
+	emake ${myconf}
+}