Fix icons not probably resizing when requested wrt #447182 by Carlos Silva. The patch is from upstream git.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 99 insertions, 11 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 216312dc3bb2..8fd0f27de2f3 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for xfce-base/xfce4-panel
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.229 2012/11/28 12:27:36 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.230 2013/01/13 06:03:33 ssuominen Exp $
+
+*xfce4-panel-4.10.0-r1 (13 Jan 2013)
+
+  13 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +xfce4-panel-4.10.0-r1.ebuild, +files/xfce4-panel-4.10.0-icons.patch:
+  Fix icons not probably resizing when requested wrt #447182 by Carlos Silva.
+  The patch is from upstream git.
 
   28 Nov 2012; Samuli Suominen <ssuominen@gentoo.org>
   xfce4-panel-4.10.0.ebuild:
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 3697b7ad3bf2..8a99811b6f07 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST xfce4-panel-4.10.0.tar.bz2 1036257 SHA256 3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9
+AUX xfce4-panel-4.10.0-icons.patch 1356 SHA256 552c67962b78f607513da5eb7a590cd10b0ab09a025f0b1ea0d33d292475a218 SHA512 7f6f8d5e57e371e4e9c361f54b6375ccfa2e4d4de92eca4c8d91df282291bc5da63e558cf091cdb762b1fd6cb657e2ec164fa5ef76f557a9de4f3683effa30c6 WHIRLPOOL 13a10741052d5f130e3f6f884a15ae7b14b4ad9ef46d4c3fc83c87a3e60d3550267892fa6545c0403b86f096067a1b35521a18f8f015af340741408021cbdf88
+DIST xfce4-panel-4.10.0.tar.bz2 1036257 SHA256 3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9 SHA512 d37ebeabcb3b532c41199c25b071a518743460e8e2107ab24af67b099ad829fa625599436ff5bb4ce5b0b8e641a1d29d7fd18b35048e15a11cf490eab1ade60e WHIRLPOOL 44acdd49eb3480449f24b8aedc655ccf1da2d527c4edb31f7bc766b2a81d0f2c34e619e4b4f65722d67be65028e0fce9dec0eda045be607f1cda8a5485735081
+EBUILD xfce4-panel-4.10.0-r1.ebuild 1216 SHA256 28bff14c4e11097ded447bd949a35365c0ce747c3621fd4d1f030aeb556354e3 SHA512 7cc00a8fead8fc9fd1593e77b6858afa50227e370019c36bcbce6222c1837deb20ceba666828fe65ebf73b9fa269e08791109bf4e713690cbfe495d352f2796b WHIRLPOOL 2c30069306a12d6034d3e887391b8583c6b8a159569f0f2575276cb106d9264d8709b08f54e61bf7e74cc5b45e5a196012d81214dc8887bc93317e42ba8be944
 EBUILD xfce4-panel-4.10.0.ebuild 1159 SHA256 f51bc4a4b9da2968ffb5840115230a7a38d511ebf4e142799b08201ed56e3e73 SHA512 8d05f96756db34800e4f8006980160621f24b87232675307a49d5866cd7043d100e3badaf54ba6a039490bb32f51a01bf44d4466311568428846c91471951c78 WHIRLPOOL 5a5a6a28fab65cf8d360213f0b2f97f4e6068e44e4494da89827c245a115d4c535302144b23a1088ca909de3c0c00e59650856a28e68792d0bc2f6b44a796b1e
-MISC ChangeLog 28491 SHA256 82d45eaefcd9478ebb595f8167ec07c37ac934e135553aa28dae587d357da76b SHA512 bcb9cc3dea467beaa0073e8dd2a3186ee32c539dd3f2556b8ee32ebf4262bcb0d6bd690df2812cb8979f5b121a8e096e551c8d5464adfb7ed7d774b7f0e2a62e WHIRLPOOL 9e227e47925ce1c623e9aa2389945eb9197dc6014cfef29ee576c7e101fc348f056ab25b1dd61cc6cce28c137442d1cc449b9f45cdd757e188f574b1a309b506
+MISC ChangeLog 28768 SHA256 5110af5d2854de1392e7ce73da7ccccbdec4aef6de317bed1331f89ab10f148b SHA512 8ca2fa22af250b0c7506daf7d3b5a16317e85507a5b396a51d68da1f1440299e257b98aee6b06cbe7737de80e2de8eb91e7c539bf7ea47c9435f34628c3eec47 WHIRLPOOL 23b03e100fdad314ab4b92d287c2272bc11034ad4a3f27c0dcd119ef75147b600b14469f47905c54c556a1a1085081a6424533f14ce8f0bf9d046ca14682be5b
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQtgMDAAoJEEdUh39IaPFNbs0H/08W7sawNtEGNJR+jRVE1gzK
-iaFxleGzMAYjsusVhpNuDTSfbmSfZ/2DP5I8YqW+dua9ZydWghpNs2Ie8tzbTaQo
-bHQGOp3J8Cybe04Ww46RSfD52C+TFG9CT0NjqmUR7+b1UhMT+KX0ba4OX0+l3mIj
-vafMBCHIf2MKsdlRebp7z3OXKWTlrxpUvzfsMORRpi24gDX1B6KQ37Znm4CaNUjZ
-JpSeHpn1mHIAvEu4TBl2mVdUl7MsNj//ErMG4ufKX7U1jRpqae8+aHqCAsMVEaQT
-xn5MX+Z88Q3X4eeo7kKqaO+Gyre1u1Ewlbi0Bs4pERM//K2WySqCi1CTJojb7Ls=
-=cto6
+iQEcBAEBCAAGBQJQ8k38AAoJEEdUh39IaPFNlOIH/Ri+Rr6Q6/fnxvzi+aTZQLr2
+F9CEdsEHJrKgc4tbs7gglw0MisHretomCs13olUOc+oX7u5hBsqaBBb9DLViJsVf
+Au/GpU7w7fZZoe6GjcA5C74vYzDADKeWe7kmo0gqYA1crWIQpKoh7rdBWm7j3Ssn
+ATchuan0QHPddOfq05QSQGSSe/biksdWtcxyB9ndqQCtPoLrtMCgIQ7Og4J3yW9a
++RxxqP2Z6geF58+d4avtbnd/DAfLt85mUBRMroyUXfcOsCuG2C9bqla5zKfJhObz
+9fa1OVwOKYhNXDPURQG772EAnkwePjQmuiVAKC1Cl6yFCUzGGoNYojVOmhIwX/I=
+=a853
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch
new file mode 100644
index 000000000000..0bc7d0f6b36e
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch
@@ -0,0 +1,35 @@
+http://bugs.gentoo.org/447182
+http://bugzilla.xfce.org/show_bug.cgi?id=9615
+
+From 48e1016394fa6bdb1d708823a23a12641482a561 Mon Sep 17 00:00:00 2001
+From: Carlos Silva <r3pek@r3pek.org>
+Date: Fri, 14 Dec 2012 01:14:36 +0000
+Subject: Fix icons not probably resizing when requested.
+
+Looks like gdk_pixbuf_new_from_file_at_scale and gdk_pixbuf_new_from_file_at_size really don't scale the image leaving the image loaded with its original size. So, just load the file without any scale and let the scale be done later on the function.
+
+Signed-off-by: Carlos Silva <r3pek@r3pek.org>
+---
+diff --git a/libxfce4panel/xfce-panel-convenience.c b/libxfce4panel/xfce-panel-convenience.c
+index 19c51bb..a3f3be1 100644
+--- a/libxfce4panel/xfce-panel-convenience.c
++++ b/libxfce4panel/xfce-panel-convenience.c
+@@ -170,15 +170,13 @@ xfce_panel_pixbuf_from_source_at_size (const gchar  *source,
+ 
+   if (G_UNLIKELY (g_path_is_absolute (source)))
+     {
+-      pixbuf = gdk_pixbuf_new_from_file_at_scale (source, dest_width, dest_height, TRUE, &error);
++      pixbuf = gdk_pixbuf_new_from_file (source, &error);
+       if (G_UNLIKELY (pixbuf == NULL))
+         {
+           g_message ("Failed to load image \"%s\": %s",
+                      source, error->message);
+           g_error_free (error);
+         }
+-
+-      return pixbuf;
+     }
+   else
+     {
+--
+cgit v0.9.0.3
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild
new file mode 100644
index 000000000000..8080de29dbb1
--- /dev/null
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 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.10.0-r1.ebuild,v 1.1 2013/01/13 06:03:33 ssuominen Exp $
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Panel for the Xfce desktop environment"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.24
+	>=x11-libs/cairo-1
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	>=x11-libs/libwnck-2.31:1
+	>=xfce-base/exo-0.8
+	>=xfce-base/garcon-0.2
+	>=xfce-base/libxfce4ui-4.10
+	>=xfce-base/libxfce4util-4.10
+	>=xfce-base/xfconf-4.10"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=( "${FILESDIR}"/${P}-icons.patch )
+
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(xfconf_use_debug)
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS THANKS )
+}