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

(Portage version: 2.1.3.18)

5 files changed, 68 insertions, 3 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/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}"