Handle large avatars wrt #265813, thanks to Alexandre Nuno Milheiro.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 49 insertions, 5 deletions

diff --git a/net-misc/twitux/ChangeLog b/net-misc/twitux/ChangeLog
index f1f20fd2a957..6e39bfbf51a2 100644
--- a/net-misc/twitux/ChangeLog
+++ b/net-misc/twitux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/twitux
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/ChangeLog,v 1.8 2009/07/21 11:10:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/ChangeLog,v 1.9 2009/07/21 23:44:28 ssuominen Exp $
+
+*twitux-0.69-r1 (21 Jul 2009)
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +twitux-0.69-r1.ebuild, +files/twitux-0.69-large_avatars.patch:
+  Handle large avatars wrt #265813, thanks to Alexandre Nuno Milheiro.
 
   21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> twitux-0.69.ebuild:
   twitux.xml is broken and doesn't validate with xmllint wrt #277159.
diff --git a/net-misc/twitux/Manifest b/net-misc/twitux/Manifest
index f89a95ce4bd8..74fb0815de90 100644
--- a/net-misc/twitux/Manifest
+++ b/net-misc/twitux/Manifest
@@ -1,4 +1,5 @@
+AUX twitux-0.69-large_avatars.patch 967 RMD160 65e7dfd9890e25198053db0ba7f072cd741be1e5 SHA1 6dd72c87f6a3c5ad970f60cf7509a5ea7a6c2b29 SHA256 05676ee9ed665bce674006cf2f0d9c3ddbea2c8baf9b98fb40f4e1ebf4571a46
 DIST twitux-0.69.tar.bz2 474366 RMD160 68ef7e357fa69618f80a1356f116aa3ad7cb08ea SHA1 8693115c0016aec33c859fbaaf2557e6c3102160 SHA256 374f429b248f2aaa42d55676a6524644df29893981c7481442663ae63ba97cf0
-EBUILD twitux-0.69.ebuild 1195 RMD160 3182fdcec494aa6e169b62b5999d875ef733a255 SHA1 26dbe4bde59f1390fbb8f774c2fec76ab6fee90b SHA256 795b96b9f417a75f26a08e20f35a2e7c6708c165d2a7f5329c5041d51a12078b
-MISC ChangeLog 1048 RMD160 f6861139dc548d0c9eba6a93f369b86df2903f2f SHA1 ebd12e8a3aa8de5061cf274cb590d89a102dfbf1 SHA256 6770d051945e1b78cafdb98162bd729d61f89593b75d6f16649baf830e2dfd7e
+EBUILD twitux-0.69-r1.ebuild 1318 RMD160 ec57957d84aa2f470fe49865c22b9d7565244cce SHA1 87f38f1dec22a0f1bec323845fe859144da91e4a SHA256 e8d699f78b847a279d4decc5b4a07833657cb7ff8c22b99bf29ff1c7db1a501c
+MISC ChangeLog 1271 RMD160 5165113105c9a4a1b5e0cc869dc676026bada4ff SHA1 2b7be225958627629417b970f9ea37718f05446d SHA256 177fd5053b30dd92653db2d7848da5bb035b587843647b6dd524ce16c799676d
 MISC metadata.xml 340 RMD160 201cfaabb47663b9b64f119874691fdcec083e53 SHA1 8fba4db4eb5e2f0a4160fc022e7808d84655da1b SHA256 c6875c40aa677298740478d76b251f7a866b5e1e6749c0038d503cbf274f6e47
diff --git a/net-misc/twitux/files/twitux-0.69-large_avatars.patch b/net-misc/twitux/files/twitux-0.69-large_avatars.patch
new file mode 100644
index 000000000000..422e59351562
--- /dev/null
+++ b/net-misc/twitux/files/twitux-0.69-large_avatars.patch
@@ -0,0 +1,30 @@
+Handle large avatars. http://bugs.gentoo.org/show_bug.cgi?id=265813.
+
+diff -abBU 1 -rP twitux-0.69/src/twitux-app.c twitux-0.69-r1/src/twitux-app.c
+--- twitux-0.69/src/twitux-app.c	2009-01-25 01:24:00.000000000 +0000
++++ twitux-0.69-r1/src/twitux-app.c	2009-04-12 00:15:23.000000000 +0100
+@@ -68,2 +68,3 @@
+ #define TYPE_TWITTER "twitter"
++#define MAX_SIZE 73
+ 
+@@ -1472,4 +1473,20 @@
+ 
++	int height, width;
+ 	pixbuf = gdk_pixbuf_new_from_file (file, &error);
++	height = gdk_pixbuf_get_height(pixbuf);
++	width = gdk_pixbuf_get_width(pixbuf);
+ 
++	if (height > MAX_SIZE || width > MAX_SIZE)
++	{
++		double ratio;
++		GdkPixbuf *scaled;
++
++		ratio = width/(height*1.0);
++		if (ratio >= 1.0) /* width is bigger */
++			scaled = gdk_pixbuf_scale_simple(pixbuf, MAX_SIZE, MAX_SIZE/ratio,GDK_INTERP_BILINEAR);
++		else
++			scaled = gdk_pixbuf_scale_simple(pixbuf, MAX_SIZE*ratio, MAX_SIZE,GDK_INTERP_BILINEAR);
++		g_object_unref(pixbuf);
++		pixbuf = scaled;
++	}
+ 	if (!pixbuf){
diff --git a/net-misc/twitux/twitux-0.69.ebuild b/net-misc/twitux/twitux-0.69-r1.ebuild
index da5848dfea29..390b05a0a4ee 100644
--- a/net-misc/twitux/twitux-0.69.ebuild
+++ b/net-misc/twitux/twitux-0.69-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/twitux-0.69.ebuild,v 1.4 2009/07/21 11:10:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/twitux/twitux-0.69-r1.ebuild,v 1.1 2009/07/21 23:44:28 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="A Twitter client for the Gnome desktop"
 HOMEPAGE="http://live.gnome.org/DanielMorales/Twitux"
@@ -11,11 +12,13 @@ SRC_URI="mirror://sourceforge/twitux/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="dbus gnome-keyring nls spell"
+IUSE="+dbus gnome-keyring nls spell"
 
 RDEPEND="net-libs/libsoup:2.4
 	dev-libs/libxml2
 	gnome-base/gconf
+	x11-libs/libsexy
+	x11-libs/libnotify
 	>=x11-libs/gtk+-2.14:2
 	dbus? ( dev-libs/dbus-glib )
 	app-text/iso-codes
@@ -32,6 +35,10 @@ DEPEND="${RDEPEND}
 # twitux.xml is broken and doesn't validate with xmllint
 RESTRICT="test"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-large_avatars.patch
+}
+
 src_configure() {
 	econf \
 		--disable-dependency-tracking \