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

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

4 files changed, 65 insertions, 3 deletions

diff --git a/x11-plugins/wmfishtime/ChangeLog b/x11-plugins/wmfishtime/ChangeLog
index be429ef58c6a..ee2386206667 100644
--- a/x11-plugins/wmfishtime/ChangeLog
+++ b/x11-plugins/wmfishtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmfishtime
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/ChangeLog,v 1.21 2008/01/15 12:50:06 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/ChangeLog,v 1.22 2010/06/28 09:09:44 voyageur Exp $
+
+*wmfishtime-1.24-r2 (28 Jun 2010)
+
+  28 Jun 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +wmfishtime-1.24-r2.ebuild, +files/wmfishtime-1.24-no_display.patch:
+  Fix support with gtk+ >= 2.18, bug #310779
 
   15 Jan 2008; Raúl Porcel <armin76@gentoo.org> wmfishtime-1.24-r1.ebuild:
   sparc stable wrt #205466, thanks to Tiago Cunha for testing
diff --git a/x11-plugins/wmfishtime/Manifest b/x11-plugins/wmfishtime/Manifest
index f7ce56fa3a8f..d0af09a69ce1 100644
--- a/x11-plugins/wmfishtime/Manifest
+++ b/x11-plugins/wmfishtime/Manifest
@@ -1,5 +1,7 @@
 AUX wmfishtime-1.24-gtk.patch 1884 RMD160 ecfa813ee49205d7773fe622228860225fe4cadb SHA1 384092b0d1cda44f39de420cdce1d4a6495d3972 SHA256 93bfe8894fbd62110279fb4b98631f7d4077924ca393fb25030085a438337e73
+AUX wmfishtime-1.24-no_display.patch 517 RMD160 cecc1c3c6917e9b6e88d505a3cb4332f9f1e4409 SHA1 99ef09d4cdc7d5d4dfd4bf9b3440811a3a5eaad6 SHA256 77aa776f5d660618efb5601675883eb1daf8d0125fb61d94e7e595914309d875
 DIST wmfishtime-1.24.tar.gz 21895 RMD160 9c705351ecbc28e15fd8e3b73712940fdb73baf1 SHA1 f5c730102787bac48b19bb5418a70333cbe22c31 SHA256 7d92889d295558acd8af79f4d74c6fa7c980ac1010b7f0691249a117b34bba07
 EBUILD wmfishtime-1.24-r1.ebuild 866 RMD160 f08303a739a0dae58cb67a4f405e127801c264a2 SHA1 35a6ab1a29cd4eebb016d50314dbf508adcc7d99 SHA256 ce649c8903de85df9d363a94446743926b18e4a323c0ae9312112c63d810c145
-MISC ChangeLog 2844 RMD160 395ad3c3512c3e52d4c18745ee8b128e3e9c5407 SHA1 62ac61a726ad71d2e8c705842a6943b300dd5891 SHA256 1de21fe8ad566cd6a27aae076a2ca14186ffa4c3e3999b3119eecf0d8a076412
+EBUILD wmfishtime-1.24-r2.ebuild 900 RMD160 5436eb156c9657cc224c891e74f678bed518c6bd SHA1 f5394aa8b6ca873e7537beb1e58db103ae69a21a SHA256 e987869036d9855daf1cc066d69ebc0d4959bb5c55eed67652d510a0e7861445
+MISC ChangeLog 3052 RMD160 c917355bede52b181fa1574e29a3b9ea31bac5b9 SHA1 eaf2591b643ae2c85b0d626daa68ceb7b0140951 SHA256 3e56bb84e5c0446f3a3becfe9da83514b1c31bf39fe08764175cc01a8c9fde2e
 MISC metadata.xml 396 RMD160 cba926ac579cdb4d135c5338b6597dd49ed5b120 SHA1 f32024f42bb6a9d6e032a67d9177cd94b4bcc2fb SHA256 408da5ae70622c2703307535092ef871ac1f9cb3abe178a18c7d2f0a462f452f
diff --git a/x11-plugins/wmfishtime/files/wmfishtime-1.24-no_display.patch b/x11-plugins/wmfishtime/files/wmfishtime-1.24-no_display.patch
new file mode 100644
index 000000000000..a991cdab934b
--- /dev/null
+++ b/x11-plugins/wmfishtime/files/wmfishtime-1.24-no_display.patch
@@ -0,0 +1,19 @@
+--- fishmon.c.orig	2010-06-27 18:38:42.000000000 +0200
++++ fishmon.c	2010-06-27 18:40:56.000000000 +0200
+@@ -152,6 +152,8 @@
+ 
+ int main(int argc, char **argv)
+ {
++    /* This is needed to proper dockapp work on >=GTK+-2.18 */
++    setenv("GDK_NATIVE_WINDOWS", "1", 0);
+     int ch;
+     GdkEvent *event;
+ #ifdef PRO
+@@ -694,6 +696,7 @@
+     gdk_window_show(bm.win);
+ 
+     XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
++    gdk_window_show(bm.iconwin);
+ 
+ #undef MASK
+ }				/* make_new_fishmon_dockapp */
diff --git a/x11-plugins/wmfishtime/wmfishtime-1.24-r2.ebuild b/x11-plugins/wmfishtime/wmfishtime-1.24-r2.ebuild
new file mode 100644
index 000000000000..6c2845c01dad
--- /dev/null
+++ b/x11-plugins/wmfishtime/wmfishtime-1.24-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/wmfishtime-1.24-r2.ebuild,v 1.1 2010/06/28 09:09:44 voyageur Exp $
+
+EAPI=3
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A fun clock applet for your desktop featuring swimming fish"
+HOMEPAGE="http://www.ne.jp/asahi/linux/timecop"
+SRC_URI="http://www.ne.jp/asahi/linux/timecop/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk.patch
+	epatch "${FILESDIR}"/${P}-no_display.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc ALL_I_GET_IS_A_GRAY_BOX AUTHORS ChangeLog CODING README
+}