Bump to 2.24.2-r3. Fix scaling of thumbnails, bug #261219.

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

4 files changed, 161 insertions, 5 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 9d79ab4cf5ae..16f2aa90509b 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.300 2009/03/21 12:59:21 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.301 2009/03/21 13:32:36 eva Exp $
+
+*nautilus-2.24.2-r3 (21 Mar 2009)
+
+  21 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-2.24.2-thumbnail-scaling.patch,
+  +nautilus-2.24.2-r3.ebuild:
+  Bump to 2.24.2-r3. Fix scaling of thumbnails, bug #261219.
 
 *nautilus-2.24.2-r2 (21 Mar 2009)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 60f96b1bd0d9..409f891a06e6 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -17,6 +17,7 @@ AUX nautilus-2.22.5.1-fix-stat-include.patch 1036 RMD160 741bb6328bce3a09a3821ed
 AUX nautilus-2.24.2-filechooser-icon.patch 1630 RMD160 8f7fc892670a5b85f0a176bff89199c5a09e1a69 SHA1 defb885cbe8ba014d8787a08b3c703ed54ee829b SHA256 e86ac2512ae66ba3b4ec285f0a88b58387e64d3490c4172f03fd846881ebcb2f
 AUX nautilus-2.24.2-playlist-preview.patch 1036 RMD160 16e9a0239f1f162cb9683cf08f0d9e1b2c46230f SHA1 31ddf4cb3a1eb940aebedbbed9b4822759d361f5 SHA256 cddf52194fc6ae542dbb58b047fd5b65f20eb874f0468ec448b35ec0a6bd498a
 AUX nautilus-2.24.2-scrollbars.patch 732 RMD160 6856d895ec70d6e24f3bd3f112141dceb25eb896 SHA1 62570bad726066dd0238aee0a203fa3895f3a556 SHA256 93f5dacec1a88fbbdb32fe75fde52301053f5c29aadb483ad1d59fb7c107b344
+AUX nautilus-2.24.2-thumbnail-scaling.patch 2597 RMD160 b82748147f709118b060224a0458f16f74d7ddd9 SHA1 eb22ebc617d615832c943f2b24811ae08cb88304 SHA256 7948ae9ef56bf8c6e9d296ba741472fe8ad6faae8adb8f98e96b4002c3302f42
 DIST nautilus-2.20.0.tar.bz2 4916284 RMD160 9eeb18c886795ebbdd6dfc61ccddaee8eab81808 SHA1 f6a75a854728ef308e2721424a9638d228661b1d SHA256 98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
 DIST nautilus-2.22.5.1.tar.bz2 5017090 RMD160 102c5608e3dbf9815cb9b82262799ac0001870a4 SHA1 81c1d875779f5d95ad7bf7dc18ab8a8244abb429 SHA256 3c98d410f2d535ab2f000df91527b4a30c8d3ce2a7f6c7d1697e89f3868c66b9
 DIST nautilus-2.24.2.tar.bz2 5356516 RMD160 a0159b7a6814a731bdbbcee33f4c6aafaee4c8ef SHA1 9bc2cf110ae50d69633095aa8115cf89c095ef42 SHA256 a793ebe4245656f0ae23d5a87895555182f62943e02e9667303ad20c4e690c1d
@@ -24,13 +25,14 @@ EBUILD nautilus-2.20.0-r1.ebuild 2909 RMD160 ddc0bff7eee69c87ecc4a3bb77432ac2f2d
 EBUILD nautilus-2.22.5.1-r1.ebuild 2180 RMD160 6e5363cf410aa0b8f6c7a77f44b0b7ba91a06264 SHA1 284ad9a8eb49e04e35fa01bb181b14e98a613b1e SHA256 ab2fd7636d5c804b6995a9d12ad2854ab252cadba89c81e496ec52526787220e
 EBUILD nautilus-2.24.2-r1.ebuild 1898 RMD160 ebaa5d84b4ed103741d7d9faaa06de47e5d7a7fd SHA1 d01a03dd4d85dc3a4ae00600d4cc52c72ac9bb17 SHA256 4486dfc7b5252ece9c2f8e6735b3bf97bc32e9ad9fc7ca2b5f2511258753c9a0
 EBUILD nautilus-2.24.2-r2.ebuild 2102 RMD160 c03c60f9d908437029e19640894d104edd02fcaf SHA1 6fc041fb25fd4cd375e26f0599152262e702bd19 SHA256 f01fa454626028d6e725ec663eefec6c9af7b5440a99edaf39036279ca074ebb
+EBUILD nautilus-2.24.2-r3.ebuild 2196 RMD160 4121110e11be6a325fa442d0cbbc587806a0229b SHA1 a3c39b918adad1e6e7e8fa7d4b9d049c1edccdf5 SHA256 25f05d5d9262087d8bbb6cb2910455843d9c57f81a9a361faebd749b1479fd0a
 EBUILD nautilus-2.24.2.ebuild 1780 RMD160 a866111a964080dcea5da0bfe347df1ffafe0908 SHA1 3355c82507ba83186d46ee4c4baa8c64e47a4d75 SHA256 b5f801e364ec5d5c4af6b71e0255631e30293108986310f52f38386fdb7e4b8f
-MISC ChangeLog 42387 RMD160 bdf9681395a5f227852359176dfee39370f9f9f2 SHA1 e8293ec54022edab98fdf71f046ce83217d36f94 SHA256 94012417bdb30d0a78f810ba450993a78f375c0fb93ab459205cc84c9b093d41
+MISC ChangeLog 42618 RMD160 e8a5a413a1110f1fca60be661bb1be266fe5af8e SHA1 11a56e16deef3ec8473d4115f16099cf1da7c854 SHA256 d979165fd18914ee5eed9c1233691b3e42e94a37d0d25e8589d7515bd2e875a1
 MISC metadata.xml 473 RMD160 d06a14b541ddb9774c9d81895146a14557c196fd SHA1 99497b8bede2582b76a802d7c3f75adbad6fc9a0 SHA256 8e0fbacc02474a585de7d90b28041754ae260c032ef32952ed5da3e0cc377dfc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAknE5K4ACgkQ1fmVwcYIWAbxxQCggbGpdsT1nNtDusruxpYoubiT
-fDcAoNa8iNj9SnnzNNgl4Xh34M1x9HUy
-=PpAo
+iEYEARECAAYFAknE7HkACgkQ1fmVwcYIWAZ9JQCgxUP/Cx8oefUTMeUG751NhiWs
+q1UAn1wqEnqjl7t4r9zbKxG679oy1Fwa
+=MhTq
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.24.2-thumbnail-scaling.patch b/gnome-base/nautilus/files/nautilus-2.24.2-thumbnail-scaling.patch
new file mode 100644
index 000000000000..cbec1a547e40
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.24.2-thumbnail-scaling.patch
@@ -0,0 +1,65 @@
+# https://bugs.gentoo.org/show_bug.cgi?id=261219
+# https://bugzilla.gnome.org/show_bug.cgi?id=574708
+#
+#        Bug 523883 – Thumbnails for 200% zoom are regenerated each time a folder is opened.
+#
+#        * libnautilus-private/nautilus-file.c:
+#        (nautilus_file_get_icon):
+#        allow scaling up thumbnails, use the scaled up thumnail
+#        for up to 25% size increase.
+#
+#        * src/file-manager/fm-icon-container.c:
+#        (fm_icon_container_get_icon_images):
+#        Force thumbnail size for compact view to avoid loading at wrong size
+#        and then rescaling
+#
+--- a/libnautilus-private/nautilus-file.c	2009/03/16 12:13:10	15121
++++ b/libnautilus-private/nautilus-file.c	2009/03/16 14:18:13	15122
+@@ -3579,27 +3579,17 @@
+ 			scale = (double)modified_size / s;
+ 
+ 
+-			if (scale > 0.99) {
+-				/* never scale any thumbnails up */
+-				scaled_pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+-								gdk_pixbuf_get_has_alpha (raw_pixbuf),
+-								gdk_pixbuf_get_bits_per_sample (raw_pixbuf),
+-								w * scale, h * scale);
+-				gdk_pixbuf_fill (scaled_pixbuf, 0xffffff00);
+-				gdk_pixbuf_copy_area (raw_pixbuf,
+-						      0, 0, w, h,
+-						      scaled_pixbuf,
+-						      (gdk_pixbuf_get_width (scaled_pixbuf) - w) / 2,
+-						      (gdk_pixbuf_get_height (scaled_pixbuf) - h) / 2);
+-			} else {
+-				scaled_pixbuf = gdk_pixbuf_scale_simple (raw_pixbuf,
+-									 w * scale, h * scale,
+-									 GDK_INTERP_BILINEAR);
+-			}
++			scaled_pixbuf = gdk_pixbuf_scale_simple (raw_pixbuf,
++								 w * scale, h * scale,
++								 GDK_INTERP_BILINEAR);
+ 			nautilus_thumbnail_frame_image (&scaled_pixbuf);
+ 			g_object_unref (raw_pixbuf);
+ 
+-			if (modified_size > 128 &&
++			/* Don't scale up if more than 25%, then read the original
++			   image instead. We don't want to compare to exactly 100%,
++			   since the zoom level 150% gives thumbnails at 144, which is
++			   ok to scale up from 128. */
++			if (modified_size > 128*1.25 &&
+ 			    !file->details->thumbnail_wants_original) {
+ 				/* Invalidate if we resize upward */
+ 				file->details->thumbnail_wants_original = TRUE;
+--- a/src/file-manager/fm-icon-container.c	2009/03/16 12:13:10	15121
++++ b/src/file-manager/fm-icon-container.c	2009/03/16 14:18:13	15122
+@@ -99,6 +99,9 @@
+ 	if (!fm_icon_view_is_compact (icon_view) ||
+ 	    nautilus_icon_container_get_zoom_level (container) > NAUTILUS_ZOOM_LEVEL_STANDARD) {
+ 		flags |= NAUTILUS_FILE_ICON_FLAGS_USE_THUMBNAILS;
++		if (fm_icon_view_is_compact (icon_view)) {
++			flags |= NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE;
++		}
+ 	}
+ 
+ 	if (use_embedding) {
diff --git a/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild b/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild
new file mode 100644
index 000000000000..03f0f9f2a0cf
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.24.2-r3.ebuild,v 1.1 2009/03/21 13:32:36 eva Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="beagle doc gnome tracker xmp"
+
+RDEPEND=">=gnome-base/libbonobo-2.1
+	>=gnome-base/eel-2.24.0
+	>=dev-libs/glib-2.17.5
+	>=gnome-base/gnome-desktop-2.10
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/orbit-2.4
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.13.0
+	>=gnome-base/librsvg-2.0.1
+	>=dev-libs/libxml2-2.4.7
+	>=x11-libs/startup-notification-0.8
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2.0
+	>=gnome-base/gvfs-0.1.2
+	beagle? ( || (
+		dev-libs/libbeagle
+		=app-misc/beagle-0.2* ) )
+	tracker? ( >=app-misc/tracker-0.6.4 )
+	xmp? ( >=media-libs/exempi-2 )"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		$(use_enable beagle)
+		$(use_enable tracker)
+		$(use_enable xmp)"
+}
+
+src_prepare() {
+	# Fix update of scrollbars, bug #260965
+	epatch "${FILESDIR}/${P}-scrollbars.patch"
+
+	# Fix preview on playlists, bug #263162
+	epatch "${FILESDIR}/${P}-playlist-preview.patch"
+
+	# Fix non asyncness in custom icon filechooser, bug #263165
+	epatch "${FILESDIR}/${P}-filechooser-icon.patch"
+
+	# Fix scaling of thumbnails, bug #261219
+	epatch "${FILESDIR}/${P}-thumbnail-scaling.patch"
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview"
+}