Bug 200055: TaskTray was incompatible with >=python-gnome-desktop-2.20

Package-Manager: portage-2.1.3.18

6 files changed, 87 insertions, 11 deletions

diff --git a/rox-base/tasktray/ChangeLog b/rox-base/tasktray/ChangeLog
index bf7691526dfb..6588575d0ca9 100644
--- a/rox-base/tasktray/ChangeLog
+++ b/rox-base/tasktray/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for rox-base/tasktray
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/tasktray/ChangeLog,v 1.19 2007/11/15 20:18:02 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/tasktray/ChangeLog,v 1.20 2007/11/26 13:10:52 lack Exp $
+
+*tasktray-0.5.3-r1 (26 Nov 2007)
+
+  26 Nov 2007; Jim Ramsay <lack@gentoo.org>
+  +files/TaskTray-0.5.3-libwnck-2.20.patch, tasktray-0.5.3.ebuild,
+  +tasktray-0.5.3-r1.ebuild:
+  Bug 200055: TaskTray was incompatible with >=python-gnome-desktop-2.20
 
   15 Nov 2007; Samuli Suominen <drac@gentoo.org> tasktray-0.5.3.ebuild:
   amd64 stable wrt #197514
diff --git a/rox-base/tasktray/Manifest b/rox-base/tasktray/Manifest
index 21eccf009450..e0a4c94ba915 100644
--- a/rox-base/tasktray/Manifest
+++ b/rox-base/tasktray/Manifest
@@ -1,3 +1,7 @@
+AUX TaskTray-0.5.3-libwnck-2.20.patch 1204 RMD160 79efb52b9f12643fb2e678b61d7c6a12b4e5c17a SHA1 18f22dadebc98d783744b7605b69cf99d56f8999 SHA256 905952e3c2d0a4614271a934b63aeeba9543cb93bba5b47cb9afa35804a4e5cc
+MD5 e791ff5246ebcd35bd33c004ff38edf8 files/TaskTray-0.5.3-libwnck-2.20.patch 1204
+RMD160 79efb52b9f12643fb2e678b61d7c6a12b4e5c17a files/TaskTray-0.5.3-libwnck-2.20.patch 1204
+SHA256 905952e3c2d0a4614271a934b63aeeba9543cb93bba5b47cb9afa35804a4e5cc files/TaskTray-0.5.3-libwnck-2.20.patch 1204
 DIST TaskTray-0.4.2.1.tgz 36911 RMD160 bababe3a317048056940cf9ce10d32b52996215b SHA1 0e3c8c25caaa6320fe9a86faa5a577fc9b65b667 SHA256 2bc54bf6c664f8e33f21679e9a82c17fb87d2c78a956b72360e1e527a226bca8
 DIST TaskTray-0.5.2.tgz 51905 RMD160 76228e88d9f3674d9ee86340f9ffc879b18f40a6 SHA1 505e701ed227a985837677d8ca52df365dd54996 SHA256 4b465fa50d43c68a476de4c67dfb20bbf4bd059e895d4af22ba0d78dbe83c934
 DIST TaskTray-0.5.3.tgz 54913 RMD160 c0f67eb37a1f2697418b5014d966c291a7ffbb4e SHA1 ea0355eee7b742ab35178ac1508a5b68a3124d0c SHA256 dbef3090d42a9c74666ba7ffe8e6e4c4dc3c16696e7828de2659d301e1615927
@@ -10,18 +14,22 @@ EBUILD tasktray-0.5.2.ebuild 600 RMD160 3e2077bfa88fb3ee7e9c00e7f0e31838c2d9e429
 MD5 0780393593d9ab0e3b1a571154cd5060 tasktray-0.5.2.ebuild 600
 RMD160 3e2077bfa88fb3ee7e9c00e7f0e31838c2d9e429 tasktray-0.5.2.ebuild 600
 SHA256 e56144cd60dcce85a9a8502182088b9803abe51a0ac0d1c0dfebb819e4a6bcdb tasktray-0.5.2.ebuild 600
-EBUILD tasktray-0.5.3.ebuild 600 RMD160 3d8dc33c251692556fc3ae2704ed6d6bb81e285d SHA1 7bf4ae159817165c26337a736423d12ea5a2bf33 SHA256 3a7574b12e1299780d81e1445b5e249b211490e377998f164acd2b6fc015598f
-MD5 152a9e486c8c388ac120a83add757046 tasktray-0.5.3.ebuild 600
-RMD160 3d8dc33c251692556fc3ae2704ed6d6bb81e285d tasktray-0.5.3.ebuild 600
-SHA256 3a7574b12e1299780d81e1445b5e249b211490e377998f164acd2b6fc015598f tasktray-0.5.3.ebuild 600
+EBUILD tasktray-0.5.3-r1.ebuild 692 RMD160 28ebacee4b356b76f5c07d2b31f242b9e2983e28 SHA1 720ea140489f1ea03ff2b6e805ad3854418b7b5f SHA256 d87b6f82f58fd6b7cded3fe77df8540bc7099c5bf5ee6098ddb6046d6fe144b0
+MD5 ded8313aa8cff447f7cf79fc5419c3db tasktray-0.5.3-r1.ebuild 692
+RMD160 28ebacee4b356b76f5c07d2b31f242b9e2983e28 tasktray-0.5.3-r1.ebuild 692
+SHA256 d87b6f82f58fd6b7cded3fe77df8540bc7099c5bf5ee6098ddb6046d6fe144b0 tasktray-0.5.3-r1.ebuild 692
+EBUILD tasktray-0.5.3.ebuild 599 RMD160 7110e248ad464664d835273416a705baac3dd697 SHA1 2a747868c3c0ea4c2b785c860b71911beb48b7d8 SHA256 9cd6e32e779e8ef73f5bf1b533e7b3ab87d12656a6dee9143497e1cfdf8a6b44
+MD5 f7dcc5e03ad9e076c36dca3e56acef86 tasktray-0.5.3.ebuild 599
+RMD160 7110e248ad464664d835273416a705baac3dd697 tasktray-0.5.3.ebuild 599
+SHA256 9cd6e32e779e8ef73f5bf1b533e7b3ab87d12656a6dee9143497e1cfdf8a6b44 tasktray-0.5.3.ebuild 599
 EBUILD tasktray-0.5.ebuild 598 RMD160 cbfed465d85c713c41c0e9915104a33714b0a94c SHA1 0ed8a28c095efead4b4e0bca09b35bf416312f92 SHA256 660dfded0408b59518113d2def1a34971d6c21032d3553845e35b169938f58f7
 MD5 4c5b8815ee2e9d3dd46d1eb78cec3a50 tasktray-0.5.ebuild 598
 RMD160 cbfed465d85c713c41c0e9915104a33714b0a94c tasktray-0.5.ebuild 598
 SHA256 660dfded0408b59518113d2def1a34971d6c21032d3553845e35b169938f58f7 tasktray-0.5.ebuild 598
-MISC ChangeLog 2994 RMD160 d3950d2b93c9e0e79846abbb2ef7aeab2155ac63 SHA1 3e983cc18e049a40973673bf4d7e4054863ac2df SHA256 d90d86e6c980df79516427d315c1b17017fff32f05ee9cb77040211cbfe6adc1
-MD5 be2cfa3a6885ad10cc0b35199e0a5b5a ChangeLog 2994
-RMD160 d3950d2b93c9e0e79846abbb2ef7aeab2155ac63 ChangeLog 2994
-SHA256 d90d86e6c980df79516427d315c1b17017fff32f05ee9cb77040211cbfe6adc1 ChangeLog 2994
+MISC ChangeLog 3242 RMD160 e12136594ffd562420d2ea9639bf79920fa83a8b SHA1 22609e2f7bba9235f539947d92e9a279ebc5f273 SHA256 bebe8e4b6793c295265e3e6e53669905566dbd1720afb33673ad942563ee99ea
+MD5 5cc6fd2dcd7e46c633cce8883796ef3a ChangeLog 3242
+RMD160 e12136594ffd562420d2ea9639bf79920fa83a8b ChangeLog 3242
+SHA256 bebe8e4b6793c295265e3e6e53669905566dbd1720afb33673ad942563ee99ea ChangeLog 3242
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
@@ -38,3 +46,6 @@ SHA256 c3fd3ed7fae49973c3fa2189cd8f44c56386dffaf5223b3b0d3e4c84cb0d179d files/di
 MD5 5644c62c4f14d51f74f80f796450b4fc files/digest-tasktray-0.5.3 232
 RMD160 e6f22526b3a78d2a593ff1d64176545401574dfe files/digest-tasktray-0.5.3 232
 SHA256 3c97878686c6a1201829f238e21707a70b53ba2acfd47000c0081adfa66193a0 files/digest-tasktray-0.5.3 232
+MD5 5644c62c4f14d51f74f80f796450b4fc files/digest-tasktray-0.5.3-r1 232
+RMD160 e6f22526b3a78d2a593ff1d64176545401574dfe files/digest-tasktray-0.5.3-r1 232
+SHA256 3c97878686c6a1201829f238e21707a70b53ba2acfd47000c0081adfa66193a0 files/digest-tasktray-0.5.3-r1 232
diff --git a/rox-base/tasktray/files/TaskTray-0.5.3-libwnck-2.20.patch b/rox-base/tasktray/files/TaskTray-0.5.3-libwnck-2.20.patch
new file mode 100644
index 000000000000..e3c2c9d49419
--- /dev/null
+++ b/rox-base/tasktray/files/TaskTray-0.5.3-libwnck-2.20.patch
@@ -0,0 +1,29 @@
+--- TaskTray-orig/AppletRun	2007-06-29 16:06:19.000000000 -0400
++++ TaskTray/AppletRun	2007-11-25 14:42:27.000000000 -0500
+@@ -12,7 +12,7 @@
+ def debug(message):
+ 	sys.stderr.write(str(message) + "\n")
+ 
+-def active_workspace_changed(screen):
++def active_workspace_changed(screen, dummy=None):
+ 	"""Called when the active workspace has changed. Hides icons of that don't 
+ 	have windows open on the new workspace and updates the tooltips of all other
+ 	icons."""
+@@ -80,7 +80,7 @@
+ 	else:
+ 		icon.add_window(window)
+ 	icon.show_or_hide()
+-	window.connect("workspace_changed", active_workspace_changed)
++	window.connect("workspace_changed", active_workspace_changed,window)
+ 	window.connect("name_changed", window_name_changed)
+ 	window.connect("icon_changed", window_icon_changed)
+ 	window.connect("state_changed", window_state_changed)
+@@ -117,7 +117,7 @@
+ 	return (window.get_workspace() == screen.get_active_workspace() 
+ 			or window.is_pinned())
+ 
+-def active_window_changed(screen):
++def active_window_changed(screen,dummy=None):
+ 	"""Called when the active window has changed. If the new active window 
+ 	belongs to a different app, it is enlarged and the old one is resized to 
+ 	normal size."""
diff --git a/rox-base/tasktray/files/digest-tasktray-0.5.3-r1 b/rox-base/tasktray/files/digest-tasktray-0.5.3-r1
new file mode 100644
index 000000000000..6f853559a9de
--- /dev/null
+++ b/rox-base/tasktray/files/digest-tasktray-0.5.3-r1
@@ -0,0 +1,3 @@
+MD5 a4429f1b034b806e8c5d27e0632527d6 TaskTray-0.5.3.tgz 54913
+RMD160 c0f67eb37a1f2697418b5014d966c291a7ffbb4e TaskTray-0.5.3.tgz 54913
+SHA256 dbef3090d42a9c74666ba7ffe8e6e4c4dc3c16696e7828de2659d301e1615927 TaskTray-0.5.3.tgz 54913
diff --git a/rox-base/tasktray/tasktray-0.5.3-r1.ebuild b/rox-base/tasktray/tasktray-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..fd86db651052
--- /dev/null
+++ b/rox-base/tasktray/tasktray-0.5.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/tasktray/tasktray-0.5.3-r1.ebuild,v 1.1 2007/11/26 13:10:52 lack Exp $
+
+ROX_LIB_VER=1.9.6
+inherit rox
+
+MY_PN="TaskTray"
+DESCRIPTION="TaskTray is a rox panel applet to show running applications."
+HOMEPAGE="http://rox4debian.berlios.de"
+SRC_URI="ftp://ftp.berlios.de/pub/rox4debian/apps/${MY_PN}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/gnome-python-desktop-2.12"
+
+APPNAME="${MY_PN}"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${MY_PN}-${PV}-libwnck-2.20.patch"
+}
diff --git a/rox-base/tasktray/tasktray-0.5.3.ebuild b/rox-base/tasktray/tasktray-0.5.3.ebuild
index 2ab8bdac422f..bc58a8f3d8bb 100644
--- a/rox-base/tasktray/tasktray-0.5.3.ebuild
+++ b/rox-base/tasktray/tasktray-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/tasktray/tasktray-0.5.3.ebuild,v 1.5 2007/11/15 20:18:02 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/tasktray/tasktray-0.5.3.ebuild,v 1.6 2007/11/26 13:10:52 lack Exp $
 
 ROX_LIB_VER=1.9.6
 inherit rox
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="amd64 ~sparc x86"
 IUSE=""
 
-RDEPEND=">=dev-python/gnome-python-desktop-2.12"
+RDEPEND="<dev-python/gnome-python-desktop-2.20"
 
 APPNAME="${MY_PN}"
 S="${WORKDIR}"