Add patch to build with GCC 4.3, thanks to Peter Alfredsen in bug #214364.

Package-Manager: portage-2.1.5_rc10

4 files changed, 65 insertions, 13 deletions

diff --git a/media-gfx/showimg/ChangeLog b/media-gfx/showimg/ChangeLog
index 05f98093f9b9..c51fc186f674 100644
--- a/media-gfx/showimg/ChangeLog
+++ b/media-gfx/showimg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/showimg
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.40 2008/02/19 01:41:17 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/ChangeLog,v 1.41 2008/05/11 18:17:12 flameeyes Exp $
+
+  11 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/showimg-0.9.5+gcc-4.3.patch, showimg-0.9.5.ebuild:
+  Add patch to build with GCC 4.3, thanks to Peter Alfredsen in bug #214364.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> showimg-0.9.4.1.ebuild,
   showimg-0.9.5.ebuild:
diff --git a/media-gfx/showimg/Manifest b/media-gfx/showimg/Manifest
index 845d2f04cdd5..0ec2304a7627 100644
--- a/media-gfx/showimg/Manifest
+++ b/media-gfx/showimg/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX showimg-0.9.5+gcc-4.3.patch 1700 RMD160 69314a70e781db6193e640304194d1901f36c23d SHA1 d5e87de38c0956e8322fafca96eca1884e938839 SHA256 54012e4a4682a8d36c67bc84d8a4f880e2534d3a4cade64e7cdd9a45853484b4
 AUX showimg-0.9.5-as-needed.patch 1027 RMD160 06d412091020a7bb391c3df6f2356c525d1a54f5 SHA1 1585f168f6ddc7a7dece90ade5a11ed25d5dc26f SHA256 96a0caf6086ee675c87db6e22dc4e8a0c9cad9c41f5552573ac44c1a53abd341
 DIST showimg-0.9.4-1.tar.bz2 1574750 RMD160 e92de226e97256fe5cb2d4b1f899a084fd158d90 SHA1 3bb382d5a41257305c668256dc04b5a1a9e6298b SHA256 241f92a7e4495336e4b54c6d335349f7df406ec3e6e341edb6e3a32dbfe67256
 DIST showimg-0.9.5.tar.bz2 4117897 RMD160 150dc74f400b72a22f6a117aa3acd8201a059a39 SHA1 59d3a1f1a22761e0576d98e6cc6f430cc3822643 SHA256 d9c5e3174551272fffba1a530e83d2b2db60bb80e88af9dc2c060337e60bc105
 EBUILD showimg-0.9.4.1.ebuild 767 RMD160 733930ea1b2778348bd96665ffa6479cce7eeb83 SHA1 8571eb683b71e9c172a9c98d35099a1c91a1a4fe SHA256 6987cc5d7013f330df7f7b84b5bf9fc1d7f32f4d1321d8ebb8e07b9ec97effdc
-EBUILD showimg-0.9.5.ebuild 1176 RMD160 e64f1bea52ecb857aac6f8eb1f4ca822422ce319 SHA1 b2f435936a5461d252888532bb3984ce1fe235e5 SHA256 897e52d17c7a62228f23236412e74ab673500656c8e5bbac1bc2a4e275141801
-MISC ChangeLog 4473 RMD160 9f4faa9fa9e50faccd6b6f0d7021044c7c5d602c SHA1 a049a0b03049c8898d674bd1e67216a9c1cb7ffa SHA256 b43b936e2d781acd65396ceff16b264951e11a773162881ca610ce76dfcf290c
+EBUILD showimg-0.9.5.ebuild 1176 RMD160 605f0fc47c81051d65f307b0d2fe912a6b315c39 SHA1 4d2dff26d93481c418e513549da157d529c90d34 SHA256 26025a182cdde33090d0c19bbf673f94a7414b0ff90623a35ae9f0dbf44591f9
+MISC ChangeLog 4667 RMD160 484ab460d9c1413fa1d04d9cd4760676cf0d749f SHA1 c6f38d1e2f76123fc606f9bf9dac70908103d781 SHA256 04030b7b5ff93dd5f6054bf80000942f35eba50e40b7526ee6cd9f6c43e5971b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHujORB18eXLOpYdkRAqUAAJ9F4fZ9FNhMfE6MbuPQ1WQRcznyYwCfSYEf
-2YrR32CV7tF5/DbRpvwDbMk=
-=n3rJ
+iEYEARECAAYFAkgnOC4ACgkQAiZjviIA2Xi/tACgsxgciH6ZB8VozJ3LnkEmrJmM
+EC8AoOqvgsaYRbSq6Y5JxtUhMGc/Xb+J
+=vcla
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch b/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch
new file mode 100644
index 000000000000..b100dd03d836
--- /dev/null
+++ b/media-gfx/showimg/files/showimg-0.9.5+gcc-4.3.patch
@@ -0,0 +1,48 @@
+diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.cpp	2006-01-07 09:47:45.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.cpp	2008-04-27 21:30:03.000000000 +0200
+@@ -357,10 +357,11 @@
+ #include <string.h>
+ #include <string>
+ #include <iostream>
+ #include <assert.h>
+ #include <limits.h>
++#include <cstdlib>
+ //TODO OK?
+ #ifdef Q_WS_WIN
+ //workaround for bug on msvc
+ # undef LLONG_MIN
+ #endif
+diff -NrU5 showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y
+--- showimg-0.9.5.orig/showimg/kexi/kexidb/parser/sqlparser.y	2006-01-07 09:47:45.000000000 +0100
++++ showimg-0.9.5/showimg/kexi/kexidb/parser/sqlparser.y	2008-04-27 21:17:31.000000000 +0200
+@@ -438,10 +438,12 @@
+ #include <string.h>
+ #include <string>
+ #include <iostream>
+ #include <assert.h>
+ #include <limits.h>
++#include <alloca.h>
++#include <cstdlib>
+ //TODO OK?
+ #ifdef Q_WS_WIN
+ //workaround for bug on msvc
+ # undef LLONG_MIN
+ #endif
+diff -NrU5 showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp showimg-0.9.5/showimg/showimg/imagelistview.cpp
+--- showimg-0.9.5.orig/showimg/showimg/imagelistview.cpp	2006-01-07 09:48:04.000000000 +0100
++++ showimg-0.9.5/showimg/showimg/imagelistview.cpp	2008-04-27 21:17:31.000000000 +0200
+@@ -47,10 +47,13 @@
+ #include "imagefileiconitem.h"
+ #include "dirfileiconitem.h"
+ #include "imageviewer.h"
+ #include "imagemetainfo.h"
+ 
++#include <cstdlib>
++#include <climits>
++
+ #ifdef HAVE_KIPI
+ #include "kipiplugins/kipipluginmanager.h"
+ #endif /* HAVE_KIPI */
+ 
+ #ifdef HAVE_LIBKEXIF
diff --git a/media-gfx/showimg/showimg-0.9.5.ebuild b/media-gfx/showimg/showimg-0.9.5.ebuild
index 898c220ab750..82a5623f511e 100644
--- a/media-gfx/showimg/showimg-0.9.5.ebuild
+++ b/media-gfx/showimg/showimg-0.9.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5.ebuild,v 1.11 2008/02/19 01:41:17 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/showimg/showimg-0.9.5.ebuild,v 1.12 2008/05/11 18:17:12 flameeyes Exp $
 
 inherit kde eutils
 
@@ -26,11 +26,10 @@ DEPEND="|| ( =kde-base/libkonq-3.5* =kde-base/kdebase-3.5* )
 	media-libs/libexif"
 need-kde 3.4
 
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-as-needed.patch"
+	"${FILESDIR}/${P}+gcc-4.3.patch"
+	)
 
 src_compile() {
 	local myconf="--with-showimgdb \