Fix bug 170336. Thanks to doc|work at #gentoo-xfce for reporting..

Package-Manager: portage-2.1.2.2

5 files changed, 94 insertions, 5 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index f38bedefe4fe..e79d087ffa31 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.90 2007/03/10 16:46:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.91 2007/03/10 23:50:25 drac Exp $
+
+*xfce4-panel-4.4.0-r1 (10 Mar 2007)
+
+  10 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  +files/xfce4-panel-4.4.0-actions.patch, +xfce4-panel-4.4.0-r1.ebuild:
+  Fix bug 170336. Thanks to Dave O'Connor for reporting.
 
   10 Mar 2007; nixnut <nixnut@gentoo.org> xfce4-panel-4.4.0.ebuild:
   Stable on ppc wrt bug 169987
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 794bad847352..d57be7817b5b 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,17 +1,25 @@
+AUX xfce4-panel-4.4.0-actions.patch 1514 RMD160 733e198d798d44c204cedb33c080cb97418141a1 SHA1 6cd041fb0ba83101c5c8aaa4af2f41c07460315f SHA256 d62335fc5bd3d7c10dcb8ac7499c46328bb09a04254a5a83b18ac156d24d7c06
+MD5 408e046696d7a3223794993d9c2ba625 files/xfce4-panel-4.4.0-actions.patch 1514
+RMD160 733e198d798d44c204cedb33c080cb97418141a1 files/xfce4-panel-4.4.0-actions.patch 1514
+SHA256 d62335fc5bd3d7c10dcb8ac7499c46328bb09a04254a5a83b18ac156d24d7c06 files/xfce4-panel-4.4.0-actions.patch 1514
 DIST xfce4-panel-4.2.3.tar.gz 1395852 RMD160 05a7c450d4ef964ac0e39107a8f891ab307649b2 SHA1 d42a9e3c66b49c8fd4dcb15cd0b8776a60dd43c3 SHA256 cac07e51513ea3f1cf298b2be7dd9500bb81aae3806aaff64de8c15e19003262
 DIST xfce4-panel-4.4.0.tar.bz2 818534 RMD160 513f7edf39e0eb12ac029f923be895762fde973c SHA1 eb586f6bb62bfc0b7ed980a2f137474607f4c291 SHA256 28ab25d6933f40ac19a4b6c2b41374360193b8300ad14853fb4ca78d5c152926
 EBUILD xfce4-panel-4.2.3.ebuild 589 RMD160 c41365982da57974fda7fe248cfdd906c397dbc3 SHA1 a99a7cccb2d036de4829ef3970071cd65cafd52c SHA256 3c1ca33296d41ffce3b58763c60ed6aebe9678b47c1b490e741ffbb0aa06013b
 MD5 b3a9bc9a1c3e2c70668d34d58386b6aa xfce4-panel-4.2.3.ebuild 589
 RMD160 c41365982da57974fda7fe248cfdd906c397dbc3 xfce4-panel-4.2.3.ebuild 589
 SHA256 3c1ca33296d41ffce3b58763c60ed6aebe9678b47c1b490e741ffbb0aa06013b xfce4-panel-4.2.3.ebuild 589
+EBUILD xfce4-panel-4.4.0-r1.ebuild 1006 RMD160 3ffde78538d0db716fe2da379f61ce60cdc068bd SHA1 e422d3b6dd9968a48749e69f3178e22d4c32e5fe SHA256 f4f795f9c3589fb7650dadd264d6081c73dfc129335af690925c05750f204fe1
+MD5 7c8828c91332a646caf329fa972ab6e8 xfce4-panel-4.4.0-r1.ebuild 1006
+RMD160 3ffde78538d0db716fe2da379f61ce60cdc068bd xfce4-panel-4.4.0-r1.ebuild 1006
+SHA256 f4f795f9c3589fb7650dadd264d6081c73dfc129335af690925c05750f204fe1 xfce4-panel-4.4.0-r1.ebuild 1006
 EBUILD xfce4-panel-4.4.0.ebuild 911 RMD160 952c98c818a5b14158716ae3d4e5ce713baec0bc SHA1 d7dd62fb71f23cfdea9b7f7c61272244bacd3be9 SHA256 f97b866f59735e29dbaca9c78e9bc31702499a65f0f685ba938f15d96ae91df4
 MD5 872c946898ee469ad1a595c4007a3d5b xfce4-panel-4.4.0.ebuild 911
 RMD160 952c98c818a5b14158716ae3d4e5ce713baec0bc xfce4-panel-4.4.0.ebuild 911
 SHA256 f97b866f59735e29dbaca9c78e9bc31702499a65f0f685ba938f15d96ae91df4 xfce4-panel-4.4.0.ebuild 911
-MISC ChangeLog 11238 RMD160 c8d4e671d5f8e8e732bc75cf74a8b3227b8a1b17 SHA1 94557845a9a4555fba66b9be470ddf5bb4bd3a1c SHA256 152ecfd936ab93a219260ed001a9cbf868fa68f1d5b4af122ef6e22dba91dc6f
-MD5 0984d2f3a15a99e615157f2459ead64c ChangeLog 11238
-RMD160 c8d4e671d5f8e8e732bc75cf74a8b3227b8a1b17 ChangeLog 11238
-SHA256 152ecfd936ab93a219260ed001a9cbf868fa68f1d5b4af122ef6e22dba91dc6f ChangeLog 11238
+MISC ChangeLog 11452 RMD160 2dbbcf92c133930c9b6cf2c39c7f6ff6dafa6f06 SHA1 ab7efc0073bab9fd39d8aeca0081ac5b23672116 SHA256 f32592952ce0999fe354990e4c307bee7b8225a725be035e5aedc6e755dc1153
+MD5 352b4afb628b644efe158621f1e58cca ChangeLog 11452
+RMD160 2dbbcf92c133930c9b6cf2c39c7f6ff6dafa6f06 ChangeLog 11452
+SHA256 f32592952ce0999fe354990e4c307bee7b8225a725be035e5aedc6e755dc1153 ChangeLog 11452
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -22,3 +30,6 @@ SHA256 04139926a0ab7180337cfaa7b59b9905836a4bd427f6d17b6201ad26dfa599fc files/di
 MD5 b21e170922c761238f8deac129bca418 files/digest-xfce4-panel-4.4.0 256
 RMD160 96d8449f01e9db8a64ae6bca668beffe3fb31d6c files/digest-xfce4-panel-4.4.0 256
 SHA256 bc998f436cea91facd5fba11a4b21de2d257c9d1684e945b3a004aafe33e042a files/digest-xfce4-panel-4.4.0 256
+MD5 b21e170922c761238f8deac129bca418 files/digest-xfce4-panel-4.4.0-r1 256
+RMD160 96d8449f01e9db8a64ae6bca668beffe3fb31d6c files/digest-xfce4-panel-4.4.0-r1 256
+SHA256 bc998f436cea91facd5fba11a4b21de2d257c9d1684e945b3a004aafe33e042a files/digest-xfce4-panel-4.4.0-r1 256
diff --git a/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1 b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1
new file mode 100644
index 000000000000..b6a88e44d63f
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1
@@ -0,0 +1,3 @@
+MD5 c46925d2df393dba8f16979ba87d4776 xfce4-panel-4.4.0.tar.bz2 818534
+RMD160 513f7edf39e0eb12ac029f923be895762fde973c xfce4-panel-4.4.0.tar.bz2 818534
+SHA256 28ab25d6933f40ac19a4b6c2b41374360193b8300ad14853fb4ca78d5c152926 xfce4-panel-4.4.0.tar.bz2 818534
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch
new file mode 100644
index 000000000000..ee83c4da6bc6
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch
@@ -0,0 +1,33 @@
+diff -ur xfce4-panel-4.4.0.orig/plugins/actions/actions.c xfce4-panel-4.4.0/plugins/actions/actions.c
+--- xfce4-panel-4.4.0.orig/plugins/actions/actions.c	2007-01-20 18:32:58.000000000 +0200
++++ xfce4-panel-4.4.0/plugins/actions/actions.c	2007-03-11 01:28:23.000000000 +0200
+@@ -81,7 +81,7 @@
+     {
+         xfce_hvbox_set_orientation (XFCE_HVBOX (GTK_BIN (plugin)->child), 
+                 (orientation == GTK_ORIENTATION_HORIZONTAL) ?
+-                        GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
++                        GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
+     }
+ }
+ 
+@@ -127,7 +127,7 @@
+     switch (action->type)
+     {
+         case ACTION_QUIT_LOCK:
+-            width = size / 2 - 2 * border;
++            width = MIN(size - border, MAX(16, size/2 - border));
+             pb = actions_load_icon (ACTION_LOCK, width);
+             gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
+             g_object_unref (G_OBJECT (pb));
+@@ -241,9 +241,8 @@
+     {
+         case ACTION_QUIT_LOCK:
+             orientation = (xfce_panel_plugin_get_orientation (plugin) == 
+-                           GTK_ORIENTATION_HORIZONTAL) ?
+-                                GTK_ORIENTATION_VERTICAL : 
+-                                GTK_ORIENTATION_HORIZONTAL;
++                           GTK_ORIENTATION_VERTICAL) ?
++			   GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
+ 
+             box = xfce_hvbox_new (orientation, TRUE, 0);
+             gtk_widget_show (box);
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..8543a2ced94f
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild,v 1.1 2007/03/10 23:50:25 drac Exp $
+
+inherit eutils xfce44
+
+xfce44
+
+DESCRIPTION="Panel"
+HOMEPAGE="http://www.xfce.org/projects/xfce4-panel/"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug doc startup-notification"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	gnome-base/librsvg
+	>=x11-libs/gtk+-2.6
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )
+	!<xfce-base/xfce-utils-4.4"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README README.Plugins"
+
+xfce44_core_package
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-actions.patch
+}