Fix support with gtk+ >= 2.18, bug #304087

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

5 files changed, 75 insertions, 3 deletions

diff --git a/x11-plugins/wmfire/ChangeLog b/x11-plugins/wmfire/ChangeLog
index 897f009774b2..935a4a60fce3 100644
--- a/x11-plugins/wmfire/ChangeLog
+++ b/x11-plugins/wmfire/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-plugins/wmfire
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.15 2010/03/15 22:03:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/ChangeLog,v 1.16 2010/06/28 22:00:03 voyageur Exp $
+
+*wmfire-1.2.4-r1 (28 Jun 2010)
+
+  28 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +wmfire-1.2.4-r1.ebuild, +files/wmfire-1.2.4-no_display.patch,
+  metadata.xml:
+  Fix support with gtk+ >= 2.18, bug #304087
 
 *wmfire-1.2.4 (15 Mar 2010)
 
diff --git a/x11-plugins/wmfire/Manifest b/x11-plugins/wmfire/Manifest
index beb06f7903b1..84eb69d4aa57 100644
--- a/x11-plugins/wmfire/Manifest
+++ b/x11-plugins/wmfire/Manifest
@@ -1,7 +1,9 @@
 AUX wmfire-1.2.3-stringh.patch 352 RMD160 f73e89b652caad5a306c955af25a96e524aba036 SHA1 6c386924c343844e1647cd17c1acef6cefcc0441 SHA256 e3058bfc7c44584a405e16232747559e264153800e3b04309931ac5ce4cd1991
+AUX wmfire-1.2.4-no_display.patch 561 RMD160 7d77455d382cf1fcd2b72b78a0f267e6f801da76 SHA1 5e04a2e851cf092ab487ea9b14cb5cc7c9c9d2b9 SHA256 12ea9b3631b174d8c38f8f4d5eef0479c6424d2274f52285e5f8d11cbe3ba64b
 DIST wmfire-1.2.3.tar.gz 90979 RMD160 af3e38cb2fbf7f5dfe5e0776d43ca3b8117fc813 SHA1 a0e296c454571dd650abd7d830a311c2c84e9339 SHA256 a254ca65b1df302c35dc5cdabd1d991889816389fb3e92084469c27a090559ba
 DIST wmfire-1.2.4.tar.gz 91144 RMD160 a0bdb91c589d12cffbc323949ceffb4c90b7f145 SHA1 9818cddaa5d32389d0706ede2d97c96a22725928 SHA256 e38b508519faf132273a9eaf75db56f1b14a5912667dd6843fc902d4a0ca2f80
 EBUILD wmfire-1.2.3.ebuild 955 RMD160 5f2651e049d2b1a35af7f6679289278f1112cb63 SHA1 b5a54651306239675909c5842da4be4ff97452e6 SHA256 25e97f5af23cf46618ab9311b66e5df395f0d3a1d85555a3a07b65841f8eef91
+EBUILD wmfire-1.2.4-r1.ebuild 1006 RMD160 62b0d44b21b068412e52a4eff58c2ff6045f3571 SHA1 ba8cb4a58bec9795bfac696646f770307e2e868d SHA256 603f4080952b4af73e394f9d43a548e20ae697b6949b8a6eeff2a951c6bbd005
 EBUILD wmfire-1.2.4.ebuild 960 RMD160 50571931c3ebccb8073f5c9e61ff9f99429e3d38 SHA1 65f9263bacea6b675215097d8938418219eb3145 SHA256 cd2791153e540dd633e02b73dc756f46c9ce82a2d292c94f59355b802309f80a
-MISC ChangeLog 1810 RMD160 29a41dfcf84e7ea89a666fe5fa633ab07f19c009 SHA1 5f1857b2d5da0c30e2aebf4961cca63ed610bac9 SHA256 69a0f5ab965025a52dcdffe71bee02191032519d28da3702c1aef1fa9c72f58f
-MISC metadata.xml 421 RMD160 d9a5c39a31136c612f1518921057d32bb57c53e3 SHA1 77c979a18412dc528fde2ae8fa1c25f24724bc6d SHA256 98ce3884e560229475281ea34d58758df80ec962f9730e0f58a634694220865c
+MISC ChangeLog 2023 RMD160 0c782beeb27f48b2470b9526539ad7669d55754c SHA1 f3c81ebd21b2116862bb69d761b6f466223c7f66 SHA256 0aa982050d683f89e6bada53d4b2c62f463ce41f747a7b7c10f6360278827f7c
+MISC metadata.xml 489 RMD160 ae1c206da8b6b1698e330e462cafac5275da1f47 SHA1 109e676e339c5907ef565e4d1a362d489bea3981 SHA256 85390853aeb9cc92782817b6ed2d921d2efb15e312d6ed20e98afaebe687c1cd
diff --git a/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch b/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch
new file mode 100644
index 000000000000..a2540a247cf6
--- /dev/null
+++ b/x11-plugins/wmfire/files/wmfire-1.2.4-no_display.patch
@@ -0,0 +1,19 @@
+--- src/wmfire.c.orig	2010-06-28 23:53:35.000000000 +0200
++++ src/wmfire.c	2010-06-28 23:54:35.000000000 +0200
+@@ -150,6 +150,8 @@
+ int
+ main(int argc, char **argv)
+ {
++	/* This is needed to proper dockapp work on >=GTK+-2.18 */
++	setenv("GDK_NATIVE_WINDOWS", "1", 0);
+ 	GdkEvent *event;
+ 	GdkCursor *cursor;
+ 	int i;
+@@ -632,6 +634,7 @@
+ 
+ 	/* Moved after gdk_window_show due to change in GTK 2.4 */
+ 	XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++	gdk_window_show(bm.iconwin);
+ 
+ 	if (bm.x > 0 || bm.y > 0)
+ 		gdk_window_move(bm.win, bm.x, bm.y);
diff --git a/x11-plugins/wmfire/metadata.xml b/x11-plugins/wmfire/metadata.xml
index 2383f97840cd..93b239563828 100644
--- a/x11-plugins/wmfire/metadata.xml
+++ b/x11-plugins/wmfire/metadata.xml
@@ -7,4 +7,7 @@ wmfire is an eye-candy dock applet for Window Maker that displays generated
 fire, possibly according to how much load the system is experiencing, or from a 
 number somewhere in a file. wmfire requires very little CPU.
 </longdescription>
+<use>
+	<flag name='session'>Enable session management</flag>
+</use>
 </pkgmetadata>
diff --git a/x11-plugins/wmfire/wmfire-1.2.4-r1.ebuild b/x11-plugins/wmfire/wmfire-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..a3869dfa28a4
--- /dev/null
+++ b/x11-plugins/wmfire/wmfire-1.2.4-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfire/wmfire-1.2.4-r1.ebuild,v 1.1 2010/06/28 22:00:03 voyageur Exp $
+
+EAPI=2
+inherit autotools eutils
+
+DESCRIPTION="Load monitoring dockapp displaying dancing flame."
+HOMEPAGE="http://www.swanson.ukfsn.org/#wmfire"
+SRC_URI="http://www.swanson.ukfsn.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="session"
+
+RDEPEND="x11-libs/gtk+:2
+	>=gnome-base/libgtop-2
+	x11-libs/libX11
+	x11-libs/libXext
+	session? ( x11-libs/libSM
+		x11-libs/libICE )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.2.3-stringh.patch
+	epatch "${FILESDIR}"/${P}-no_display.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable session)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ALL_I_GET_IS_A_GREY_BOX AUTHORS ChangeLog NEWS README
+}