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

(Portage version: 2.1.5_rc10)

3 files changed, 58 insertions, 7 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/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 \