Patch to fix problem with taskbar and gtk+-2.8, closes bug #102912.

Package-Manager: portage-1.589-cvs

5 files changed, 50 insertions, 2 deletions

diff --git a/xfce-base/libxfcegui4/ChangeLog b/xfce-base/libxfcegui4/ChangeLog
index 5df713c049c9..35bc3870ea90 100644
--- a/xfce-base/libxfcegui4/ChangeLog
+++ b/xfce-base/libxfcegui4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/libxfcegui4
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.54 2005/07/12 12:42:07 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/ChangeLog,v 1.55 2005/10/06 04:32:04 bcowan Exp $
+
+*libxfcegui4-4.2.2-r1 (06 Oct 2005)
+
+  06 Oct 2005; Brad Cowan <bcowan@gentoo.org> +files/taskbar-gtk-2.8.patch,
+  +libxfcegui4-4.2.2-r1.ebuild:
+  Patch to fix problems with taskbar and gtk+-2.8 fixes bug #102912.
 
   12 Jul 2005; Simon Stelling <blubb@gentoo.org> libxfcegui4-4.2.2.ebuild:
   stable on amd64
diff --git a/xfce-base/libxfcegui4/Manifest b/xfce-base/libxfcegui4/Manifest
index 54e8d04abda3..67a99ff6c316 100644
--- a/xfce-base/libxfcegui4/Manifest
+++ b/xfce-base/libxfcegui4/Manifest
@@ -1,6 +1,9 @@
+MD5 f9541110f45bde9828d1dd4dff54b2f4 libxfcegui4-4.2.2-r1.ebuild 509
 MD5 4c0aa9e2cb3327324da76d4c3aee9bce libxfcegui4-4.2.1.ebuild 419
-MD5 488563c45799549966f4d9422be78468 ChangeLog 6625
+MD5 674151939399a94988edf7d8d0e32d85 ChangeLog 6841
 MD5 71b5bf09ddc03cca09d1d0f43b426559 libxfcegui4-4.2.2.ebuild 407
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 MD5 d07a25a965ca8315611ea916b2d60f3d files/digest-libxfcegui4-4.2.1 69
 MD5 daed0f9e9ebfcfd09728f348e74eb1b2 files/digest-libxfcegui4-4.2.2 69
+MD5 a1dfdce2e330255275e6bc6aa4a640f4 files/taskbar-gtk-2.8.patch 875
+MD5 daed0f9e9ebfcfd09728f348e74eb1b2 files/digest-libxfcegui4-4.2.2-r1 69
diff --git a/xfce-base/libxfcegui4/files/digest-libxfcegui4-4.2.2-r1 b/xfce-base/libxfcegui4/files/digest-libxfcegui4-4.2.2-r1
new file mode 100644
index 000000000000..aea7028a85bd
--- /dev/null
+++ b/xfce-base/libxfcegui4/files/digest-libxfcegui4-4.2.2-r1
@@ -0,0 +1 @@
+MD5 e88d6e8379eae60cee6dd6122bf3ae59 libxfcegui4-4.2.2.tar.gz 853844
diff --git a/xfce-base/libxfcegui4/files/taskbar-gtk-2.8.patch b/xfce-base/libxfcegui4/files/taskbar-gtk-2.8.patch
new file mode 100644
index 000000000000..9e792dcd6f78
--- /dev/null
+++ b/xfce-base/libxfcegui4/files/taskbar-gtk-2.8.patch
@@ -0,0 +1,20 @@
+--- libxfcegui4-4.2.2/libxfcegui4/netk-tasklist.c	2005-05-15 09:53:29.000000000 +0200
++++ libxfcegui4-4.2.2.new/libxfcegui4/netk-tasklist.c	2005-07-31 16:19:44.000000000 +0200
+@@ -2238,8 +2238,15 @@
+     if (task->tasklist->priv->show_label) {
+         task->label = gtk_label_new (text);
+         gtk_widget_show (task->label);
+-        gtk_table_attach (GTK_TABLE (table),
++        if(GTK_CHECK_VERSION(2, 7, 0)){
++            gtk_label_set_ellipsize(task->label, PANGO_ELLIPSIZE_END);
++            gtk_table_attach (GTK_TABLE (table),
++                      task->label, 1, 2, 0, 1, GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_EXPAND, 0, 0);
++        }
++        else{
++            gtk_table_attach (GTK_TABLE (table),
+                       task->label, 1, 2, 0, 1, GTK_EXPAND, GTK_EXPAND, 0, 0);
++        }
+     }
+ 
+     gtk_container_add (GTK_CONTAINER (task->button), table);
+
diff --git a/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
new file mode 100644
index 000000000000..8bab9155960a
--- /dev/null
+++ b/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/libxfcegui4/libxfcegui4-4.2.2-r1.ebuild,v 1.1 2005/10/06 04:32:04 bcowan Exp $
+
+DESCRIPTION="Libraries for Xfce 4"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~xfce-base/libxfce4util-${PV}"
+
+inherit xfce4 eutils
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/taskbar-gtk-2.8.patch
+}