Fix building with libpng15

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

8 files changed, 79 insertions, 49 deletions

diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog
index 8eec5cea81be..edcbcd4f638c 100644
--- a/media-gfx/gimageview/ChangeLog
+++ b/media-gfx/gimageview/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimageview
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.25 2011/03/28 19:46:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.26 2011/08/07 06:05:45 ssuominen Exp $
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org>
+  gimageview-0.2.27-r2.ebuild, +files/gimageview-0.2.27-libpng15.patch:
+  Fix building with libpng15 wrt #361941. Fix missing bzip2 and libXinerama
+  deps. Disable "deprecated" imlib-1.x support.
 
   28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
   gimageview-0.2.27-r2.ebuild:
diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest
index bb88707bf8db..082318acff4f 100644
--- a/media-gfx/gimageview/Manifest
+++ b/media-gfx/gimageview/Manifest
@@ -1,8 +1,18 @@
-AUX gimageview-0.2.27-gtk12_fix.diff 476 RMD160 fb81bcfd4d88206449a29ad53952291de9a32164 SHA1 557516b2aca148d6cd3a1234f62bfaf0d6d7b3d7 SHA256 45623481372e74e96363c3a1c0921758cd1eb34a5047dbb06ef79db1eecd71d6
-AUX gimageview-0.2.27-gtk2.patch 1030 RMD160 cbd839b6c21fbe8326461063df5deeaafe0f834a SHA1 c2b49e21174bdd4714c98121cf0dec1fd65da7d9 SHA256 0ab0d374e219526c406c42e6d10b5f24aa04f5a102c2b84d26e7c78d7506bb91
-AUX gimageview-0.2.27-sort_fix.diff 920 RMD160 c06ff47bcd3ea48c58975b4ef992e559085c0d7e SHA1 7e81fce94ab5ac89cb8cf71c0520556934922df9 SHA256 955aa19153dbfeda17404915ecad08e238b1f1f77aeadb6c0eecc7c376aeb5fe
-AUX gimv-gcc34.patch 851 RMD160 b553f5854e20bd32fc78af049ecfeb991bc5f54b SHA1 cc44d048344290496aa8fa2cec35662eb395b8ca SHA256 1a45e77459b74ed762c51ccbb330850e8739e5102562780f98c31817a7ff3d4d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gimageview-0.2.27-gtk12_fix.diff 272 RMD160 c1271721304b56c3edb42dd4ea105c40f7464499 SHA1 53fb9d2f22079cfe7c0679ccba7e7ae1b931aa63 SHA256 4aae464b117de3f86d4280a9dc25c24dfb987e08cbe7bc59fb16c5c1d37abd71
+AUX gimageview-0.2.27-gtk2.patch 624 RMD160 308bc209c09cb5b7d64f5d9e6683cd72cf6a212f SHA1 105e9a0368665199cc51672214ff45511cfdd32a SHA256 db861067fd6a67ce47f1065fe99ed0ebf8ad0d10742bbd4ff2322fadc5d53991
+AUX gimageview-0.2.27-libpng15.patch 601 RMD160 ba486ead1e69ede8fe5bc4a8a72d5959d54b880d SHA1 bc5868df1ad55d15bcd8d18dce46029ba691d5a1 SHA256 04b468f51bb6b806a2d46860a2bc53eda7bcb49590d918482498ccbde8b9461f
+AUX gimageview-0.2.27-sort_fix.diff 714 RMD160 bd477ae61ca1a592c2d919299b0612f5284af89c SHA1 2429a326b55f77336876ddefa3c48ca4d2fcbd84 SHA256 fbb4e239b49daad78d27d5cd6b029ab1f68813fe4ca07be090a45206a1c72100
 DIST gimageview-0.2.27.tar.gz 1348286 RMD160 1d35b3a1b453f87dc232b84407524c3011ec91eb SHA1 333f0682e4f8f8ead4abb24f6eddf86f776c2478 SHA256 4bc899d734e9833478c1ae8fc6d9db0971d812aeefe6f1295b5edbd4e4639060
-EBUILD gimageview-0.2.27-r2.ebuild 1402 RMD160 04532d069cd52d89424f1aed0ac4a55fb35463c1 SHA1 5b0654b44bd52c90e93b35aa0ee38308b296909f SHA256 26f18783e2220831e5fd2280134f81fb35018e68a0e7a4cabc43f12c7edd49a5
-MISC ChangeLog 3531 RMD160 7aa0687c9df3a19f2d819f80fabdd25eb323765f SHA1 3ef91b561a87c9065d573b40a2b046df59a01e3e SHA256 dfc8b7c2a74861ef006ac01adb88eec52ea6fc822cef091872f3e3d465dfd427
+EBUILD gimageview-0.2.27-r2.ebuild 1556 RMD160 a86764fbcd98f41fe62ef98446413a13fd001652 SHA1 9bb7ceab69af343e83d926b89569afd75b463c56 SHA256 0277cd59b7496ed7d1d2139affe452a3c20c4e91b5e9992ccd4fffa1a5317caa
+MISC ChangeLog 3782 RMD160 79b8bc7644e3b082da89753fd042960f27945121 SHA1 b956a4605237a3d7bf5ca9ad371693fb37e8c210 SHA256 6ac94485799431e23c9b039e0988ba55ac884e7ac27c250a60dda194c1dbeddf
 MISC metadata.xml 162 RMD160 724f25e8bd2d17056a9f820449e0ddc858f31cce SHA1 620b205b2cddc55f63199267eeb30e9f4c6a817b SHA256 7cccbeab15ef93a962010750e32971ffff1226321adc83df7ff572dea8ff63c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4+KnQACgkQXkR9YqOcLPGj9wD8CQav4o1+YAXV5PVwe5DdE8Up
+1lHp3GjtPyr1YGN9Kq4A/32dwt/jGxAjCDgm8fG4s2lFMXUpzq2g8lTxCdTskUJz
+=JsP6
+-----END PGP SIGNATURE-----
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
index 8455d81084c3..9b82d2f6479e 100644
--- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff
+++ b/media-gfx/gimageview/files/gimageview-0.2.27-gtk12_fix.diff
@@ -1,6 +1,5 @@
-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
+--- src/gimv_thumb_win.c
++++ src/gimv_thumb_win.c
 @@ -2542,7 +2542,7 @@
  {
     if (tw && tw->priv)
diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch
index 52e62b19cb06..7ab7ebb03212 100644
--- a/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch
+++ b/media-gfx/gimageview/files/gimageview-0.2.27-gtk2.patch
@@ -1,6 +1,5 @@
-diff -ur gimageview-0.2.27.orig/src/gimv_cell_pixmap.c gimageview-0.2.27/src/gimv_cell_pixmap.c
---- gimageview-0.2.27.orig/src/gimv_cell_pixmap.c	2004-05-23 17:07:54.000000000 +0300
-+++ gimageview-0.2.27/src/gimv_cell_pixmap.c	2008-12-21 15:01:34.000000000 +0200
+--- src/gimv_cell_pixmap.c
++++ src/gimv_cell_pixmap.c
 @@ -25,10 +25,6 @@
   *  Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
   */
@@ -12,9 +11,8 @@ diff -ur gimageview-0.2.27.orig/src/gimv_cell_pixmap.c gimageview-0.2.27/src/gim
  #include "gimv_cell_pixmap.h"
  
  #if (GTK_MAJOR_VERSION >= 2)
-diff -ur gimageview-0.2.27.orig/src/gimv_image.c gimageview-0.2.27/src/gimv_image.c
---- gimageview-0.2.27.orig/src/gimv_image.c	2004-09-21 11:44:31.000000000 +0300
-+++ gimageview-0.2.27/src/gimv_image.c	2008-12-21 15:01:59.000000000 +0200
+--- src/gimv_image.c
++++ src/gimv_image.c
 @@ -35,7 +35,7 @@
  #include "gimv_io.h"
  #include "gimv_image_saver.h"
diff --git a/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch b/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch
new file mode 100644
index 000000000000..2df9712869e1
--- /dev/null
+++ b/media-gfx/gimageview/files/gimageview-0.2.27-libpng15.patch
@@ -0,0 +1,24 @@
+http://bugs.gentoo.org/361941
+
+--- plugins/image_loader/png_loader.c
++++ plugins/image_loader/png_loader.c
+@@ -255,7 +255,7 @@
+       return NULL;
+    }
+ 
+-   if (setjmp (png_ptr->jmpbuf)) goto ERROR;
++   if (setjmp (png_jmpbuf(png_ptr))) goto ERROR;
+ 
+    context.gio = gio;
+    context.bytes_read = 0;
+--- plugins/image_saver/png_saver.c
++++ plugins/image_saver/png_saver.c
+@@ -130,7 +130,7 @@
+       return FALSE;
+    }
+ 
+-   if (setjmp (png_ptr->jmpbuf)) {
++   if (setjmp (png_jmpbuf(png_ptr))) {
+       png_destroy_write_struct (&png_ptr, &info_ptr);
+       fclose (handle);
+       return FALSE;
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
index 236e51651a8e..d65b3a07ad56 100644
--- a/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff
+++ b/media-gfx/gimageview/files/gimageview-0.2.27-sort_fix.diff
@@ -1,6 +1,5 @@
-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
+--- src/gimv_thumb_view.c
++++ src/gimv_thumb_view.c
 @@ -1533,9 +1533,13 @@
  
     gimv_thumb_view_sort_data (tv);
diff --git a/media-gfx/gimageview/files/gimv-gcc34.patch b/media-gfx/gimageview/files/gimv-gcc34.patch
deleted file mode 100644
index 11b58c4bd9d0..000000000000
--- a/media-gfx/gimageview/files/gimv-gcc34.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gimageview-0.2.25/work/gimageview-0.2.25/src/gimv_thumb_win.c gimageview-0.2.25-fixed/work/gimageview-0.2.25/src/gimv_thumb_win.c
---- gimageview-0.2.25/work/gimageview-0.2.25/src/gimv_thumb_win.c	2003-07-06 09:46:21.000000000 -0700
-+++ gimageview-0.2.25-fixed/work/gimageview-0.2.25/src/gimv_thumb_win.c	2004-06-11 22:35:00.516094744 -0700
-@@ -202,7 +202,7 @@
-                                      guint          action,
-                                      GtkWidget     *widget);
- static void cb_move_tab             (GimvThumbWin  *tw,
--                                     GimvSortItem   sortitem,
-+                                     MoveTabItem    item,
-                                      GtkWidget     *widget);
- static void cb_cut_out_tab          (GimvThumbWin  *tw,
-                                      guint          action,
diff --git a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
index 73b645f8c49e..7f652c0ce991 100644
--- a/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
+++ b/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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-r2.ebuild,v 1.8 2011/03/28 19:46:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r2.ebuild,v 1.9 2011/08/07 06:05:45 ssuominen Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils libtool
 
 DESCRIPTION="Powerful GTK+ based image & movie viewer"
@@ -12,16 +12,18 @@ SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="nls imlib wmf mng svg xine mplayer"
+IUSE="nls wmf mng svg xine mplayer"
 
-RDEPEND="x11-libs/gtk+:2
+# note: bzip2 is for libbz2
+RDEPEND="app-arch/bzip2
+	x11-libs/gtk+:2
 	>=media-libs/libpng-1.4
+	x11-libs/libXinerama
 	wmf? ( >=media-libs/libwmf-0.2.8 )
-	mng? ( >=media-libs/libmng-1.0.3 )
-	svg? ( >=gnome-base/librsvg-1.0.3 )
-	xine? ( >=media-libs/xine-lib-0.9.13-r3 )
-	mplayer? ( >=media-video/mplayer-0.92 )
-	imlib? ( media-libs/imlib )"
+	mng? ( media-libs/libmng )
+	svg? ( gnome-base/librsvg )
+	xine? ( media-libs/xine-lib )
+	mplayer? ( media-video/mplayer )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig"
@@ -30,27 +32,32 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-sort_fix.diff \
 		"${FILESDIR}"/${P}-gtk12_fix.diff \
-		"${FILESDIR}"/${P}-gtk2.patch
+		"${FILESDIR}"/${P}-gtk2.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
+	# desktop-file-validate
+	sed -i -e '/^Term/s:0:false:' -e '/^Icon/s:.png::' etc/${PN}.desktop.in || die
 
 	elibtoolize
 }
 
 src_configure() {
 	econf \
+		--disable-imlib \
 		$(use_enable nls) \
-		$(use_with wmf libwmf) \
-		$(use_with mng libmng) \
-		$(use_with svg librsvg) \
-		$(use_with xine) \
+		--enable-splash \
 		$(use_enable mplayer) \
 		--with-gtk2 \
-		--enable-splash
+		$(use_with mng libmng) \
+		$(use_with svg librsvg) \
+		$(use_with wmf libwmf) \
+		$(use_with xine)
 }
 
 src_install() {
 	einstall \
-		desktopdir="${D}"/usr/share/applications \
-		gimv_docdir="${D}"/usr/share/doc/${PF} || die
+		desktopdir="${D}"usr/share/applications \
+		gimv_docdir="${D}"usr/share/doc/${PF}
 
-	find "${D}" -name '*.la' -exec rm -f {} +
+	find "${D}"usr -name '*.la' -exec rm -f {} +
 }