Fix build with gcc 4.3, bug #230321, fix a bunch of trivial implicit declarations warnings, remove the build dir runpath, bug #215203.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.7 x86_64

7 files changed, 222 insertions, 4 deletions

diff --git a/media-video/cinepaint/ChangeLog b/media-video/cinepaint/ChangeLog
index 7122282f5cf3..2152410ac325 100644
--- a/media-video/cinepaint/ChangeLog
+++ b/media-video/cinepaint/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-video/cinepaint
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.21 2008/04/05 13:46:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/ChangeLog,v 1.22 2008/07/22 10:31:02 aballier Exp $
+
+  22 Jul 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/cinepaint-0.22.1-gcc43.patch,
+  +files/cinepaint-0.22.1-implicitdecls.patch,
+  +files/cinepaint-0.22.1-multiple_parameters_named.patch,
+  +files/cinepaint-0.22.1-rpath.patch, cinepaint-0.22.1.ebuild:
+  Fix build with gcc 4.3, bug #230321, fix a bunch of trivial implicit
+  declarations warnings, remove the build dir runpath, bug #215203.
 
   05 Apr 2008; Stefan Schweizer <genstef@gentoo.org>
   -files/cinepaint-0.22.0-as-needed.patch, -cinepaint-0.22.0.ebuild,
diff --git a/media-video/cinepaint/Manifest b/media-video/cinepaint/Manifest
index 5305ffa50154..07998d9d9c01 100644
--- a/media-video/cinepaint/Manifest
+++ b/media-video/cinepaint/Manifest
@@ -1,7 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cinepaint-0.22.1-gcc43.patch 2712 RMD160 8659917fab6443a91bd175cfad75f9faf2ac079c SHA1 7f8907973757d8fba37df96f7a3071d3937d92a4 SHA256 eaaf7167ac85919fc817a0c2fd5583a116e04cfc9797f3f04f4e59e325dfe6ae
+AUX cinepaint-0.22.1-implicitdecls.patch 1935 RMD160 be1bb63e6da59410af2d699d025b02a313613fe5 SHA1 bb3598c21683544c0385477a7b3e5713812608bc SHA256 b3cbb64e4c2b3ba67ef756c1f198e8d2f0d2af1e137710bfda4096bd78aa77be
+AUX cinepaint-0.22.1-multiple_parameters_named.patch 2225 RMD160 dc5b5722b621336d575564c4a7c6d40c8d22e9ff SHA1 b844721ca4389d31b694f396be24777f4dae96dc SHA256 24dda50d856fbd884215e79c340b1765113dec598ae48affbf5a819e250c1693
+AUX cinepaint-0.22.1-rpath.patch 549 RMD160 ae0d5f85fb1893533ac526bfa01e2bdc38b275e6 SHA1 356f8d298f86110cd85e1feb72ee79562aca5c77 SHA256 db73dc75151e3f89d5caef4df5f8110271d55896c6ba8a0357bfb0de4aae0d4e
 DIST cinepaint-0.21-1.tar.gz 10847794 RMD160 ea03815ae8bec644678878c7377b22c14a37af95 SHA1 275d7c5b4c44bc485938d8248d5aa03c43103b29 SHA256 8b46d98da2eb8e88332b7664983e54bb71122499ce9d970601f7e8059a54ab93
 DIST cinepaint-0.21.1-patches.tar.bz2 2478 RMD160 c5989d05478b31fc76b653298237bc163ccb53a9 SHA1 2ac8c7e1c941b6c92ff94c3173855c499477a02b SHA256 78fcb5f5f50513388bd98285f364026d6b5646aff426e93994a5e6df667d3e65
 DIST cinepaint-0.22-1.tar.gz 12380745 RMD160 1f8e06486ed5e74ad483abec305d4fcef0538572 SHA1 717580b9b8b1044d76f1f0e4330e1c8104e2a206 SHA256 bb08a9210658959772df12408769d660999ede168b7431514e1f3cead07c0fea
 EBUILD cinepaint-0.21.1.ebuild 1256 RMD160 b2fa62e64ae2feabcf76a660a96caf96e974a759 SHA1 f9ce04f830bf8037415a3d618bf791b6bc3fe98e SHA256 36649b56f5286841ffa08948c7744a7b0add2d817b877e6ac7bc60390acae0ad
-EBUILD cinepaint-0.22.1.ebuild 1397 RMD160 105860406ca60ddddb38fb581555294b1a7c4eed SHA1 e971621828e3caf38bca8b6f60ce13539c283b7c SHA256 f7fa0c5434a07cad7a0c4099b647e46d3790dba0e8947b89a33fee721601e35a
-MISC ChangeLog 3698 RMD160 83a2474bbea8e11bb586a45f9f44e86bac67dacb SHA1 446f50cfb48ecda71980c1982b9462e20035cddf SHA256 4dbbc6e63f7b46ff93adb315d19475ea5361445346c3f296f080e0d92795bac2
+EBUILD cinepaint-0.22.1.ebuild 1624 RMD160 19ac0d0c6453cc3c825d1d236eb7cee4da50cbaa SHA1 7679709013b5ffaedab6ab3148eeb189169dc84f SHA256 c693a078722850c1e76a1dd1b7b5802decd811324bdf0c5497abdb6c565b3f65
+MISC ChangeLog 4100 RMD160 3b3adc1bb06e45630d4af71f63f6360bd8951959 SHA1 64bcaa8b6d94444ecd23024a864a2dda60e9d30e SHA256 b16ca1801a64c5869161c318eac59b65b4634b1e67d0cb55e160a47e554a8f9a
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiFtvEACgkQvFcC4BYPU0o6agCgucvkyqsf40teFgG/7YvtgweH
+oOUAoIz6/jJIb4ipWj0UmNhkK2m9DiLB
+=b3vB
+-----END PGP SIGNATURE-----
diff --git a/media-video/cinepaint/cinepaint-0.22.1.ebuild b/media-video/cinepaint/cinepaint-0.22.1.ebuild
index bc6bfdb620a4..19de653d12a1 100644
--- a/media-video/cinepaint/cinepaint-0.22.1.ebuild
+++ b/media-video/cinepaint/cinepaint-0.22.1.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-video/cinepaint/cinepaint-0.22.1.ebuild,v 1.3 2008/04/05 13:46:55 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinepaint/cinepaint-0.22.1.ebuild,v 1.4 2008/07/22 10:31:02 aballier Exp $
 
 inherit eutils versionator flag-o-matic
 
@@ -37,6 +37,15 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-multiple_parameters_named.patch"
+	epatch "${FILESDIR}/${P}-implicitdecls.patch"
+	epatch "${FILESDIR}/${P}-rpath.patch"
+}
+
 src_compile(){
 	econf $(use_enable gutenprint print) --enable-gtk2 || die "econf failed"
 	emake || die "emake failed"
diff --git a/media-video/cinepaint/files/cinepaint-0.22.1-gcc43.patch b/media-video/cinepaint/files/cinepaint-0.22.1-gcc43.patch
new file mode 100644
index 000000000000..64ba76099cbf
--- /dev/null
+++ b/media-video/cinepaint/files/cinepaint-0.22.1-gcc43.patch
@@ -0,0 +1,73 @@
+Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
++++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp
+@@ -34,6 +34,7 @@
+ 
+ 
+ #include <fstream>
++#include <cstring>
+ #include "TNT/tnt_misc.hpp"     // proof_least_square_fit()
+ #include "TNT/tnt_stopwatch.hpp"
+ #include "TNT/jama_qr.hpp"      // JAMA::QR
+Index: cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
++++ cinepaint-0.22-1/plug-ins/bracketing_to_hdr/br_core/br_Image.cpp
+@@ -26,6 +26,7 @@
+ */
+ #include <iostream>
+ #include <cmath>                    // pow()
++#include <cstring>
+ 
+ #include "br_types.hpp"             // ImageID
+ #include "br_enums.hpp"             // DataType, ReportWhat
+Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp
+@@ -29,6 +29,7 @@
+ 
+ #include "icc_utils.h"
+ #include "icc_fenster.h"
++#include <cstdlib>
+ 
+ using namespace icc_examin_ns;
+ 
+Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/icc_speicher.h
++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/icc_speicher.h
+@@ -33,6 +33,8 @@
+ 
+ #include "icc_utils.h"
+ #include <string>
++#include <cstdlib>
++#include <cstring>
+ 
+ #define DBG_SPEICHER_START   if(icc_debug >= 3) DBG_PROG_START
+ #define DBG_SPEICHER_ENDE    if(icc_debug >= 3) DBG_PROG_ENDE
+Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/threads.cpp
++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/threads.cpp
+@@ -42,6 +42,7 @@
+ #include <iostream>
+ #  if HAVE_PTHREAD_H
+ // Use POSIX threading...
++#include <climits>
+ 
+ int fl_create_thread(Fl_Thread& t, void *(*f) (void *), void* p)
+ {
+Index: cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/pdf/pdf.cpp
++++ cinepaint-0.22-1/plug-ins/pdf/pdf.cpp
+@@ -39,6 +39,7 @@
+ 
+ #include "pdf.h"
+ #include "pdf_dialog.h"
++#include <cstring>
+ 
+ extern "C" {
+ #include <gtk/gtk.h>
diff --git a/media-video/cinepaint/files/cinepaint-0.22.1-implicitdecls.patch b/media-video/cinepaint/files/cinepaint-0.22.1-implicitdecls.patch
new file mode 100644
index 000000000000..85c94ced7cb8
--- /dev/null
+++ b/media-video/cinepaint/files/cinepaint-0.22.1-implicitdecls.patch
@@ -0,0 +1,59 @@
+Index: cinepaint-0.22-1/app/base_frame_manager.c
+===================================================================
+--- cinepaint-0.22-1.orig/app/base_frame_manager.c
++++ cinepaint-0.22-1/app/base_frame_manager.c
+@@ -13,6 +13,9 @@
+    - bfm_check() has become public
+ */ 
+ 
++
++#include <sys/stat.h>
++#include <sys/types.h>
+ #include "base_frame_manager.h"
+ #include "store_frame_manager.h"
+ #include "clone.h"
+Index: cinepaint-0.22-1/app/object.c
+===================================================================
+--- cinepaint-0.22-1.orig/app/object.c
++++ cinepaint-0.22-1/app/object.c
+@@ -1,3 +1,4 @@
++#include <string.h>
+ #include "object.h"
+ #include "objectF.h"
+ #include "objectP.h"
+Index: cinepaint-0.22-1/libgimp/stdplugins-intl.h
+===================================================================
+--- cinepaint-0.22-1.orig/libgimp/stdplugins-intl.h
++++ cinepaint-0.22-1/libgimp/stdplugins-intl.h
+@@ -23,6 +23,7 @@
+ #define __STDPLUGINS_INTL_H__
+ 
+ #include "gimpintl.h"
++#include <stdlib.h>
+ 
+ #if defined (HAVE_BIND_TEXTDOMAIN_CODESET) && defined (GDK_WINDOWING_WIN32)
+ #define BTDCS(d) bind_textdomain_codeset (d, "UTF-8")
+Index: cinepaint-0.22-1/lib/drawable.c
+===================================================================
+--- cinepaint-0.22-1.orig/lib/drawable.c
++++ cinepaint-0.22-1/lib/drawable.c
+@@ -16,6 +16,7 @@
+  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  * Boston, MA 02111-1307, USA.
+  */                                                                             
++#include <string.h>
+ #include "plugin_main.h"
+ #include "../lib/wire/libtile.h"
+ 
+Index: cinepaint-0.22-1/lib/wire/wirebuffer.c
+===================================================================
+--- cinepaint-0.22-1.orig/lib/wire/wirebuffer.c
++++ cinepaint-0.22-1/lib/wire/wirebuffer.c
+@@ -5,6 +5,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <string.h>
+ #include "wire.h"
+ #include "wirebuffer.h"
+ #include "iodebug.h"
diff --git a/media-video/cinepaint/files/cinepaint-0.22.1-multiple_parameters_named.patch b/media-video/cinepaint/files/cinepaint-0.22.1-multiple_parameters_named.patch
new file mode 100644
index 000000000000..e030593c2e38
--- /dev/null
+++ b/media-video/cinepaint/files/cinepaint-0.22.1-multiple_parameters_named.patch
@@ -0,0 +1,42 @@
+--- ./plug-ins/icc_examin/icc_examin/icc_oyranos.h.orig	2008-06-27 19:28:52.000000000 +0200
++++ ./plug-ins/icc_examin/icc_examin/icc_oyranos.h	2008-06-27 19:31:34.000000000 +0200
+@@ -142,9 +142,6 @@
+ 
+     // colour transformations
+     ColourTransformKey erzeugeTrafo (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
+@@ -152,9 +149,6 @@
+                                   const char* cmm, // 4 bytes 'lcms' 'APPL'
+                                   int         cmm_optionen); // BPC, precission
+     ColourTransformKey erzeugeTrafo (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
+@@ -163,9 +157,6 @@
+                                   int         cmm_optionen,
+                                   std::list<const char*> &profile );
+     ColourTransformKey erzeugeTrafo (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
+@@ -181,9 +172,6 @@
+     std::string cmm;
+   private:
+     ColourTransformKey erzeugeSchluessel_ (
+-                                  const char* eingangs_profil__geraet,
+-                                  int         byte,
+-                                  int         kanaele,
+                                   const char* ausgangs_profil__geraet,
+                                   int         byte,
+                                   int         kanaele,
diff --git a/media-video/cinepaint/files/cinepaint-0.22.1-rpath.patch b/media-video/cinepaint/files/cinepaint-0.22.1-rpath.patch
new file mode 100644
index 000000000000..bd95444296ac
--- /dev/null
+++ b/media-video/cinepaint/files/cinepaint-0.22.1-rpath.patch
@@ -0,0 +1,13 @@
+Index: cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/makefile.in
+===================================================================
+--- cinepaint-0.22-1.orig/plug-ins/icc_examin/icc_examin/makefile.in
++++ cinepaint-0.22-1/plug-ins/icc_examin/icc_examin/makefile.in
+@@ -242,7 +242,7 @@ $(CINEPAINT):	$(BASE) $(CINEPAINT_OBJECT
+ 	echo Verknuepfen $@ ...
+ 	$(CXX) $(CXXFLAGS_) `$(CP_FLAGS)` -o $@ \
+ 	$(CINEPAINT_OBJECTS) $(OBJECTS) \
+-	`$(CP_LIBS)` $(LDLIBS) $(LINK_LIB_PATH) $(LINK_SRC_PATH)
++	`$(CP_LIBS)` $(LDLIBS) $(LINK_LIB_PATH)
+ 	$(REZ)
+ 
+