Added patches to fix bug #78648.

Package-Manager: portage-2.0.51-r15

5 files changed, 63 insertions, 14 deletions

diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index 3d144c344779..29610f2320b5 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimageview
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.11 2005/01/19 13:13:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.12 2005/02/05 05:34:01 usata Exp $
+
+  05 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/gimageview-0.2.27-gtk12_fix.diff,
+  +files/gimageview-0.2.27-sort_fix.diff, gimageview-0.2.27-r1.ebuild:
+  Added patches to fix bug #78648.
 
 *gimageview-0.2.27-r1 (19 Jan 2005)
 
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index aac445061d22..f77bd30bb2df 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7450fed134c76fa90e82a2586e19510b ChangeLog 1584
+MD5 5acd107f8e0771e87751cf370b320c9c ChangeLog 1783
 MD5 7dbdcb559d3684fa9b06ef8b421019c1 gimageview-0.2.25.ebuild 1912
 MD5 4368b20da8cb79a90eb16111f691f548 metadata.xml 379
 MD5 526389d38327d5dca4da682991421019 gimageview-0.2.26.ebuild 1637
-MD5 ffed5fa0974b65cd7fd4dc3612be2942 gimageview-0.2.27-r1.ebuild 1664
+MD5 5acfb51bf13066c2785f9146e7f33e3c gimageview-0.2.27-r1.ebuild 1799
 MD5 36f65a43da5f087e4bbc63ff7f8adad0 files/digest-gimageview-0.2.25 70
 MD5 9a949f1e3e1aebb680b0b2823db37bf1 files/gimv-gcc34.patch 851
 MD5 89b270a7d0a783ab34544f41c5224819 files/digest-gimageview-0.2.26 70
 MD5 f74096a129e40fbd3c7a911c3afe461a files/digest-gimageview-0.2.27-r1 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB7lsaVWNWqTUmv+0RAml/AJoC3+xbYXXhqs2clgK7LpeG+FNHTACdFyqY
-g9lNmyTg5U6TLGlQLHrjpHw=
-=gXc+
------END PGP SIGNATURE-----
+MD5 fb50f147b01c127505cc2bf9369bbc2a files/gimageview-0.2.27-gtk12_fix.diff 476
+MD5 e9ac8e8f3e77f9cb035a39c766211170 files/gimageview-0.2.27-sort_fix.diff 920
diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff
new file mode 100644
index 000000000000..8455d81084c3
--- /dev/null
+++ b/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff
@@ -0,0 +1,12 @@
+diff -Nur gimageview-0.2.27-bak/src/gimv_thumb_win.c gimageview-0.2.27/src/gimv_thumb_win.c
+--- gimageview-0.2.27-bak/src/gimv_thumb_win.c	2004-12-21 03:18:30.000000000 +0900
++++ gimageview-0.2.27/src/gimv_thumb_win.c	2005-01-07 13:46:40.805458176 +0900
+@@ -2542,7 +2542,7 @@
+ {
+    if (tw && tw->priv)
+       tw->priv->slideshow_selected_only
+-         = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
++         = GTK_CHECK_MENU_ITEM (widget)->active;
+ }
+ 
+ 
diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff b/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff
new file mode 100644
index 000000000000..236e51651a8e
--- /dev/null
+++ b/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff
@@ -0,0 +1,31 @@
+diff -Nur gimageview-0.2.27-bak/src/gimv_thumb_view.c gimageview-0.2.27/src/gimv_thumb_view.c
+--- gimageview-0.2.27-bak/src/gimv_thumb_view.c	2004-12-20 20:07:31.000000000 +0900
++++ gimageview-0.2.27/src/gimv_thumb_view.c	2005-01-11 20:00:00.039241976 +0900
+@@ -1533,9 +1533,13 @@
+ 
+    gimv_thumb_view_sort_data (tv);
+ 
++#if 0
+    for (node = new_thumb_list; node; node = g_list_next (node))
+       tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode);
+    g_list_free(new_thumb_list);
++#endif
++
++   gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode);
+ }
+ 
+ 
+@@ -1577,9 +1581,13 @@
+ 
+    gimv_thumb_view_sort_data (tv);
+ 
++#if 0
+    for (node = new_thumb_list; node; node = g_list_next (node))
+       tv->vfuncs->insert_thumb (tv, node->data, tv->summary_mode);
+    g_list_free(new_thumb_list);
++#endif
++
++   gimv_thumb_view_set_widget (tv, tv->tw, tv->container, tv->summary_mode);
+ }
+ 
+ 
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild
index 7b92f26ff892..c60f5148ab39 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild,v 1.1 2005/01/19 13:13:46 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild,v 1.2 2005/02/05 05:34:01 usata Exp $
+
+inherit eutils
 
 DESCRIPTION="Powerful GTK+ based image & movie viewer"
 HOMEPAGE="http://gtkmmviewer.sourceforge.net/"
@@ -27,6 +29,13 @@ DEPEND="virtual/x11
 		media-libs/gdk-pixbuf
 		) )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-sort_fix.diff
+	epatch ${FILESDIR}/${P}-gtk12_fix.diff
+}
+
 src_compile() {
 	local myconf=""