Include zoom pref fix from bug #156342

Package-Manager: portage-2.1.2-r2

diff --git a/media-gfx/gthumb/ChangeLog b/media-gfx/gthumb/ChangeLog
index 9c1ac9dbcb6e25691a98976ccd960237f3cf8f48..a594a4cf65ea5b3cf1d66fe9e3e91c58439c7362 100644 (file)
--- a/media-gfx/gthumb/ChangeLog
+++ b/media-gfx/gthumb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gthumb
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.60 2007/01/23 19:15:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/ChangeLog,v 1.61 2007/01/23 19:31:59 dang Exp $
+
+  23 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/gthumb-2.8.1-respect-zoom-pref.patch, gthumb-2.8.1.ebuild:
+  Include zoom pref fix from bug #156342
 
   23 Jan 2007; Daniel Gryniewicz <dang@gentoo.org> ChangeLog:
   Bump to 2.8.1

diff --git a/media-gfx/gthumb/Manifest b/media-gfx/gthumb/Manifest
index a12a32ac73a57ec5407f537db7a99a8baa76201a..9896499778943a86d6100091191da50311fe82cf 100644 (file)
--- a/media-gfx/gthumb/Manifest
+++ b/media-gfx/gthumb/Manifest
@@ -21,6 +21,10 @@ AUX gthumb-2.8.1-as-needed.patch 1209 RMD160 a6d665eae7d10c86dcd797500bb7e4c68e7
 MD5 4b85ab4330466e3059e15c06032d6d16 files/gthumb-2.8.1-as-needed.patch 1209
 RMD160 a6d665eae7d10c86dcd797500bb7e4c68e770c10 files/gthumb-2.8.1-as-needed.patch 1209
 SHA256 3a4a7c9901e395c2b10c636d1190bf27dd8cc81d28313d39e0f8ce28765937f8 files/gthumb-2.8.1-as-needed.patch 1209
+AUX gthumb-2.8.1-respect-zoom-pref.patch 1738 RMD160 d40ec7765c2b5b5cd506a579424edd3934090c56 SHA1 acd397d23e1b0789379fca01a6c89a80213c450c SHA256 bc8233ef2b9f421772fafe8c29f3ed5effc807bd7d4a9b79947b23b92112d307
+MD5 7a725634b432c9965d325d48acabadaa files/gthumb-2.8.1-respect-zoom-pref.patch 1738
+RMD160 d40ec7765c2b5b5cd506a579424edd3934090c56 files/gthumb-2.8.1-respect-zoom-pref.patch 1738
+SHA256 bc8233ef2b9f421772fafe8c29f3ed5effc807bd7d4a9b79947b23b92112d307 files/gthumb-2.8.1-respect-zoom-pref.patch 1738
 DIST gthumb-2.6.3.tar.bz2 2186161 RMD160 6f68caf6517095e38505c67d6c32ee270d8ea7df SHA256 86218b1bfc57edbcbf6120552354b1606c9b54a899717e734b1cd4ce828b4097
 DIST gthumb-2.6.5.tar.bz2 2339545 RMD160 489233ca4e6e7e7bfab6483f2a2708c23f03dae9 SHA256 86a82035d47e6a74f98ee8e825c348935dd348647aca53ef7044976bc9aa9d23
 DIST gthumb-2.6.7.tar.bz2 2342501 RMD160 7002dac786ed73c37785d9a9c96172cfe3beb2d3 SHA1 e2714652f76d06da8d79366e9fd4da26824ff463 SHA256 0ecddfe0b2fb3d8cc3a3c3282beed75f8bc9b4262781556aff3604d75200f35d
@@ -55,14 +59,14 @@ EBUILD gthumb-2.6.9.ebuild 1644 RMD160 876a1f9e922d9a2b16ba9ee0b722987a9461b021
 MD5 def173b20c86c350f2198a8b79d1fdfd gthumb-2.6.9.ebuild 1644
 RMD160 876a1f9e922d9a2b16ba9ee0b722987a9461b021 gthumb-2.6.9.ebuild 1644
 SHA256 13ba37c824ba839e9c2c2c641347044dab8085b2485fff8fbb496634a77e087d gthumb-2.6.9.ebuild 1644
-EBUILD gthumb-2.8.1.ebuild 1379 RMD160 21fe56ad54a5a1dac23cdbc0773d40ca24828d59 SHA1 6ce9b7aa033cf703370597e327c56c1eab57fde8 SHA256 9a53cbb81cf0e871c8bddede5c502cc205ad7cbb7386949d233269e6f70546a5
-MD5 b1458ddc883e276f9e819cfbb694a012 gthumb-2.8.1.ebuild 1379
-RMD160 21fe56ad54a5a1dac23cdbc0773d40ca24828d59 gthumb-2.8.1.ebuild 1379
-SHA256 9a53cbb81cf0e871c8bddede5c502cc205ad7cbb7386949d233269e6f70546a5 gthumb-2.8.1.ebuild 1379
-MISC ChangeLog 8316 RMD160 87c1fd7159ea9aa70dfb37d5387e178d88dde4f2 SHA1 aeb54f73ecc57277c31541c25413767084ba1c98 SHA256 c606929ccee84d7719e56aae6f3ff234ee3b8a2f0005855c2b8d565685107223
-MD5 3a9c41095415b2d8e4acdfdf67812f5c ChangeLog 8316
-RMD160 87c1fd7159ea9aa70dfb37d5387e178d88dde4f2 ChangeLog 8316
-SHA256 c606929ccee84d7719e56aae6f3ff234ee3b8a2f0005855c2b8d565685107223 ChangeLog 8316
+EBUILD gthumb-2.8.1.ebuild 1480 RMD160 587093f6e9c5bdc8313b64616f45c5f22c4ba065 SHA1 186683859f3d809044696656f2417ff59877fb25 SHA256 5174fca3720c3fe8332775aa7bb17b5046470609f83ef7e29cfa642fbf1d5167
+MD5 be110a27cd54d598b2f5f69815a0e77d gthumb-2.8.1.ebuild 1480
+RMD160 587093f6e9c5bdc8313b64616f45c5f22c4ba065 gthumb-2.8.1.ebuild 1480
+SHA256 5174fca3720c3fe8332775aa7bb17b5046470609f83ef7e29cfa642fbf1d5167 gthumb-2.8.1.ebuild 1480
+MISC ChangeLog 8477 RMD160 a63f74e52aec7f7356eeaaa130f2ea83bc253bcc SHA1 05382654c8a86b8fab167b336991aa68fdadb471 SHA256 8e59396fed1fcb928c5f7dca44bd345220232c070ce20c446cc9558f21c6cb06
+MD5 0f94cefc0ee8be9dd174d9213bbd7def ChangeLog 8477
+RMD160 a63f74e52aec7f7356eeaaa130f2ea83bc253bcc ChangeLog 8477
+SHA256 8e59396fed1fcb928c5f7dca44bd345220232c070ce20c446cc9558f21c6cb06 ChangeLog 8477
 MISC metadata.xml 222 RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 SHA1 e78ebe8223fab03acef8562079599d6d962e494e SHA256 c7f626d802a17a56823c72e1d7ffab65565e530144d38af0caec6198f12c5f5f
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
 RMD160 96c8a2e104ee15c6bce7aaf7c73398f3287e6357 metadata.xml 222
@@ -94,7 +98,7 @@ SHA256 e92bcb154026ce912806ae9d39302c5e092e715d20f451996de426b1514d2d2b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFtl7UomPajV0RnrERAr+DAJ9aFhUYhnvwweY1wEAXzZ887DtJQwCfY1yX
-kNvAGoMHl8ADlO3AnaI9+GM=
-=B6Q1
+iD8DBQFFtmKoomPajV0RnrERAthJAJ9mZoDzHNGPv1AEIMNryRdfze8/wgCfVh92
+y8qYqALptNl+fkKf/An+XX4=
+=RCbS
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/gthumb/files/gthumb-2.8.1-respect-zoom-pref.patch b/media-gfx/gthumb/files/gthumb-2.8.1-respect-zoom-pref.patch
new file mode 100644 (file)
index 0000000..7c2ac56
--- /dev/null
+++ b/media-gfx/gthumb/files/gthumb-2.8.1-respect-zoom-pref.patch
@@ -0,0 +1,34 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN gthumb-2.8.1.orig/src/gth-fullscreen.c gthumb-2.8.1/src/gth-fullscreen.c
+--- gthumb-2.8.1.orig/src/gth-fullscreen.c     2006-08-17 12:16:45.000000000 -0400
++++ gthumb-2.8.1/src/gth-fullscreen.c  2007-01-23 14:17:54.000000000 -0500
+@@ -1468,6 +1468,7 @@ gth_fullscreen_construct (GthFullscreen 
+ {
+       GthFullscreenPrivateData *priv = fullscreen->priv;
+       GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (fullscreen));
++      GthZoomChange zoom_change = pref_get_zoom_change ();
+ 
+       gtk_window_set_default_size (GTK_WINDOW (fullscreen),
+                                    gdk_screen_get_width (screen),
+@@ -1495,7 +1496,7 @@ gth_fullscreen_construct (GthFullscreen 
+       image_viewer_set_zoom_quality (IMAGE_VIEWER (priv->viewer),
+                                      pref_get_zoom_quality ());
+       image_viewer_set_zoom_change  (IMAGE_VIEWER (priv->viewer),
+-                                     GTH_ZOOM_CHANGE_FIT_IF_LARGER);
++                                     zoom_change);
+       image_viewer_set_check_type   (IMAGE_VIEWER (priv->viewer),
+                                      pref_get_check_type ());
+       image_viewer_set_check_size   (IMAGE_VIEWER (priv->viewer),
+@@ -1504,7 +1505,12 @@ gth_fullscreen_construct (GthFullscreen 
+                                      pref_get_transp_type ());
+       image_viewer_set_black_background (IMAGE_VIEWER (priv->viewer), TRUE);
+       image_viewer_hide_frame (IMAGE_VIEWER (priv->viewer));
+-      image_viewer_zoom_to_fit_if_larger (IMAGE_VIEWER (priv->viewer));
++      if(zoom_change == GTH_ZOOM_CHANGE_ACTUAL_SIZE)
++              image_viewer_set_zoom (IMAGE_VIEWER (priv->viewer), 1.0);
++      else if(zoom_change == GTH_ZOOM_CHANGE_FIT)
++              image_viewer_zoom_to_fit (IMAGE_VIEWER (priv->viewer));
++      else
++              image_viewer_zoom_to_fit_if_larger (IMAGE_VIEWER (priv->viewer));
+ 
+       g_signal_connect (G_OBJECT (priv->viewer),
+                         "key_press_event",

diff --git a/media-gfx/gthumb/gthumb-2.8.1.ebuild b/media-gfx/gthumb/gthumb-2.8.1.ebuild
index 918702c2ff217031e8af030691f4ab6fdc1cd957..777832894edfc5f7d2466fe10ad5365799b05bc5 100644 (file)
--- a/media-gfx/gthumb/gthumb-2.8.1.ebuild
+++ b/media-gfx/gthumb/gthumb-2.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.8.1.ebuild,v 1.1 2007/01/23 19:15:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gthumb/gthumb-2.8.1.ebuild,v 1.2 2007/01/23 19:31:59 dang Exp $
 
 inherit gnome2 eutils autotools
 
@@ -49,5 +49,8 @@ src_unpack() {
        # New as-needed, including gphoto fixes
        epatch "${FILESDIR}"/${PN}-2.8.1-as-needed.patch
 
+       # Respect zoom preferences.  Bug #156342
+       epatch "${FILESDIR}"/${PN}-2.8.1-respect-zoom-pref.patch
+
        eautoreconf
 }