Revision bump, with patch to fix dock loading. Fixes bug #216065.

Package-Manager: portage-2.1.4.4

4 files changed, 153 insertions, 2 deletions

diff --git a/x11-plugins/wmcliphist/ChangeLog b/x11-plugins/wmcliphist/ChangeLog
index 2f4d399c5663..32fed838c86c 100644
--- a/x11-plugins/wmcliphist/ChangeLog
+++ b/x11-plugins/wmcliphist/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmcliphist
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/ChangeLog,v 1.10 2008/03/27 21:25:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/ChangeLog,v 1.11 2008/08/18 13:03:36 s4t4n Exp $
+
+*wmcliphist-0.6-1 (18 Aug 2008)
+
+  18 Aug 2008; Michele Noberasco <s4t4n@gentoo.org>
+  +files/wmcliphist-0.6-fix-docking.patch, +wmcliphist-0.6-r1.ebuild:
+  Revision bump, with patch to fix dock loading. Fixes bug #216065.
 
   27 Mar 2008; Markus Meier <maekke@gentoo.org> wmcliphist-0.6.ebuild:
   x86 stable, bug #214876
diff --git a/x11-plugins/wmcliphist/Manifest b/x11-plugins/wmcliphist/Manifest
index 1f78632dd4ad..e3826e370b09 100644
--- a/x11-plugins/wmcliphist/Manifest
+++ b/x11-plugins/wmcliphist/Manifest
@@ -1,5 +1,7 @@
 AUX wmcliphist-0.6-Makefile.patch 1389 RMD160 40304461387a175237d3a1695afd0fa2b9d025de SHA1 26356572eb12e0dab39db2fea9a92282fbea848a SHA256 e395d9f582fee83aaf3b781718bbb9cfbfb2a928b5c628390518b70481ad7d11
+AUX wmcliphist-0.6-fix-docking.patch 3565 RMD160 f1a1d4ac8b920589d2a3620bd4092e6191415a98 SHA1 152ae7ea3fbf618238820a8ce26bae36209dde65 SHA256 a13c2a461c3cc7308bc56b0bd0a14767609045bed67992e290787ac977ec26e8
 DIST wmcliphist-0.6.tar.gz 88733 RMD160 283672d9e01471560b4ed47ef6a6efb014780c64 SHA1 0bb416ca9bea1ce7db8f1f5d617c10deae9b6ca2 SHA256 a775bea29c11ff06fb7eb43cc21aa2e3aff57a692b1edafbb6ba8ecf417f4148
+EBUILD wmcliphist-0.6-r1.ebuild 845 RMD160 a864eb1534ad64abca382dcfb9f1168a243c2793 SHA1 2b5967a23365cd522818c8b7a967e4e2e2b31eee SHA256 340d7a3517b01ba183e48b5d3f5e0c65cb73bc39c60ce954f10ab5b8bbdef958
 EBUILD wmcliphist-0.6.ebuild 795 RMD160 ddf65bf96605666b213207916b512733b12dd3f7 SHA1 9f2f461bc35d263ba1fcb42ad870ddd58fb46527 SHA256 21ae18e4005d55f21c19c7a2a9c8cd917223b4fe8dfe9a044a70e924987060a7
-MISC ChangeLog 1227 RMD160 80ead4866f0aed6e2c769efe2efa63e40e638608 SHA1 48019a68ea354b395be5434b8c802ee71943d967 SHA256 62467fe5e042e9add54ffe762117f8859603674a1230faee0c1fb53a93f19927
+MISC ChangeLog 1450 RMD160 bdee758d74f6e59248981b0d6a14f67b478fb519 SHA1 f1f6852711c82796a73c4be4c76ff591e16f63df SHA256 b56900654106e6c510e514fcd50c4a2c68f9a525ad74676018404bac74001155
 MISC metadata.xml 460 RMD160 748d26d25097f5a488315c395f584f127ac99ab2 SHA1 eecff02ca4ee2926e478deff48fc9fc567ce2e3c SHA256 ede1f96fab01ff65f7aad64086fea3990e3c13732bb20d2846f1ff7d243302b6
diff --git a/x11-plugins/wmcliphist/files/wmcliphist-0.6-fix-docking.patch b/x11-plugins/wmcliphist/files/wmcliphist-0.6-fix-docking.patch
new file mode 100644
index 000000000000..3e50600f51d8
--- /dev/null
+++ b/x11-plugins/wmcliphist/files/wmcliphist-0.6-fix-docking.patch
@@ -0,0 +1,107 @@
+diff -ru orig/wmcliphist-0.6/foodock/foodock.c wmcliphist-0.6/foodock/foodock.c
+--- orig/wmcliphist-0.6/foodock/foodock.c	2001-03-16 01:59:46.000000000 +0100
++++ wmcliphist-0.6/foodock/foodock.c	2007-08-12 16:34:44.818138390 +0200
+@@ -21,6 +21,8 @@
+  * before calling foo_create_main_icon_window. Returned event box
+  * will be realized by foo_create_main_icon_window. You should to show
+  * icon window as well as main window before gtk_main().
++ *
++ * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
+  * 
+  * Input:
+  *	mw		Pointer to main window
+@@ -34,20 +36,37 @@
+ 				       char *margv[]) {
+ 
+     GtkWidget *foobox; /* This will become icon box */
+-    Window xmw;
+-    XWMHints *wm_hints;
+-
+-    xmw = GDK_WINDOW_XWINDOW(mw->window);
+     
+     foobox = gtk_event_box_new();
+     gtk_widget_set_usize(foobox, s, s);
+     gtk_container_add (GTK_CONTAINER (mw), foobox);
+     gtk_widget_realize(foobox);
+-    
++
++    return foobox;
++}
++
++/*
++ * Set WMHints on the dockapp (icon) window. Needs to be called after
++ * the main window is shown, due to changes in GTK+ 2.4.
++ * 
++ * Input:
++ *	mw		Pointer to main window
++ *	dw		Pointer to icon (dockapp) window
++ *	margc, margv	argc and argv of main program for XSetCommand
++ */
++void foo_set_wmhints(GtkWidget *mw,
++		     GtkWidget *dw,
++		     int margc,
++		     char *margv[]) {
++    Window xmw;
++    XWMHints *wm_hints;
++
++    xmw = GDK_WINDOW_XWINDOW(mw->window);
++
+ /* Time for game with Xlib */
+     wm_hints = XAllocWMHints();
+     wm_hints->window_group = xmw;
+-    wm_hints->icon_window = GDK_WINDOW_XWINDOW(foobox->window);
++    wm_hints->icon_window = GDK_WINDOW_XWINDOW(dw->window);
+     wm_hints->icon_x = 0;
+     wm_hints->icon_y = 0; 
+     wm_hints->initial_state = WithdrawnState;
+@@ -60,6 +79,4 @@
+     XSetCommand(GDK_DISPLAY(), xmw, margv, margc);
+     
+     XFree(wm_hints);
+-    
+-    return foobox;
+ }
+diff -ru orig/wmcliphist-0.6/foodock/foodock.h wmcliphist-0.6/foodock/foodock.h
+--- orig/wmcliphist-0.6/foodock/foodock.h	2001-03-16 01:59:52.000000000 +0100
++++ wmcliphist-0.6/foodock/foodock.h	2007-08-12 16:34:40.317881934 +0200
+@@ -15,6 +15,8 @@
+  * before calling foo_create_main_icon_window. Returned event box
+  * will be realized by foo_create_main_icon_window. You should to show
+  * icon window as well as main window before gtk_main().
++ *
++ * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
+  * 
+  * Input:
+  *	mw		Pointer to main window
+@@ -25,3 +27,17 @@
+ 				       unsigned int size,
+ 				       int main_argc,
+ 				       char *main_argv[]);
++
++/*
++ * Set WMHints on the dockapp (icon) window. Needs to be called after
++ * the main window is shown, due to changes in GTK+ 2.4.
++ * 
++ * Input:
++ *	mw		Pointer to main window
++ *	dw		Pointer to icon (dockapp) window
++ *	margc, margv	argc and argv of main program for XSetCommand
++ */
++void foo_set_wmhints(GtkWidget *mw,
++		     GtkWidget *dw,
++		     int margc,
++		     char *margv[]);
+diff -ru orig/wmcliphist-0.6/wmcliphist.c wmcliphist-0.6/wmcliphist.c
+--- orig/wmcliphist-0.6/wmcliphist.c	2003-06-23 23:24:24.000000000 +0200
++++ wmcliphist-0.6/wmcliphist.c	2007-08-12 16:31:20.806512430 +0200
+@@ -333,6 +333,10 @@
+ 	/* show icon */
+ 	gtk_widget_show(dock_app);
+ 	gtk_widget_show(main_window);
++
++	/* Set WMHints - after gtk_widget_show() due to changes in GTK+ 2.4 */
++	foo_set_wmhints(main_window, dock_app, argc, argv);
++
+ 	gdk_window_shape_combine_mask(main_window->window, icon_mask, 0, 0);
+ 	gdk_window_shape_combine_mask(dock_app->window, icon_mask, 0, 0);
+ 
diff --git a/x11-plugins/wmcliphist/wmcliphist-0.6-r1.ebuild b/x11-plugins/wmcliphist/wmcliphist-0.6-r1.ebuild
new file mode 100644
index 000000000000..772ef64021e9
--- /dev/null
+++ b/x11-plugins/wmcliphist/wmcliphist-0.6-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmcliphist/wmcliphist-0.6-r1.ebuild,v 1.1 2008/08/18 13:03:36 s4t4n Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dockable clipboard history application for Window Maker"
+HOMEPAGE="http://linux.nawebu.cz/wmcliphist"
+SRC_URI="http://linux.nawebu.cz/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-fix-docking.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake || die "emake failed."
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc ChangeLog README
+	newdoc .${PN}rc ${PN}rc.sample
+}