From 130ec41e8378cba3d79146d630ab009c62e4a207 Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 23 Nov 2011 23:29:45 +0000 Subject: Fix build with newer GCC --- games/asc/distinfo | 7 ++- games/asc/patches/patch-source_ASCStringHelpers.h | 12 +++++ games/asc/patches/patch-source_Property.cpp | 12 +++++ games/asc/patches/patch-source_password.cpp | 12 +++++ games/asc/patches/patch-source_strtmesg.cpp | 13 +++++ .../patches/patch-source_tools_lib_errorout.cpp | 12 +++++ graphics/cinepaint/distinfo | 20 +++++--- graphics/cinepaint/patches/patch-aa | 4 +- graphics/cinepaint/patches/patch-ab | 4 +- graphics/cinepaint/patches/patch-ac | 4 +- graphics/cinepaint/patches/patch-ad | 4 +- graphics/cinepaint/patches/patch-ae | 4 +- graphics/cinepaint/patches/patch-af | 4 +- ...bracketing__to__hdr_br__core_ResponseSolver.hpp | 13 +++++ ...-ins_bracketing__to__hdr_br__core_br__Image.cpp | 12 +++++ ...plug-ins_icc__examin_icc__examin_icc__oyranos.h | 56 ++++++++++++++++++++++ ...cc__examin_icc__examin_icc__oyranos__extern.cpp | 12 +++++ ...lug-ins_icc__examin_icc__examin_icc__speicher.h | 13 +++++ .../cinepaint/patches/patch-plug-ins_pdf_pdf.cpp | 13 +++++ 19 files changed, 211 insertions(+), 20 deletions(-) create mode 100644 games/asc/patches/patch-source_ASCStringHelpers.h create mode 100644 games/asc/patches/patch-source_Property.cpp create mode 100644 games/asc/patches/patch-source_password.cpp create mode 100644 games/asc/patches/patch-source_strtmesg.cpp create mode 100644 games/asc/patches/patch-source_tools_lib_errorout.cpp create mode 100644 graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp create mode 100644 graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp create mode 100644 graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h create mode 100644 graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp create mode 100644 graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__speicher.h create mode 100644 graphics/cinepaint/patches/patch-plug-ins_pdf_pdf.cpp diff --git a/games/asc/distinfo b/games/asc/distinfo index 2fd963b60a4..cedae67c877 100644 --- a/games/asc/distinfo +++ b/games/asc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2007/03/10 17:08:18 wiz Exp $ +$NetBSD: distinfo,v 1.10 2011/11/23 23:29:45 joerg Exp $ SHA1 (asc/asc-source-1.16.4.0.tar.bz2) = 338081823943e08848325e6f2126e5c533517ae9 RMD160 (asc/asc-source-1.16.4.0.tar.bz2) = a4de675628875cc36f30b39d1fb1ef3ac879e369 @@ -12,3 +12,8 @@ Size (asc/machine_wars.mp3) = 2905989 bytes SHA1 (asc/time_to_strike.mp3) = 76abf03155d9a21584f30c20370db0a93449c78a RMD160 (asc/time_to_strike.mp3) = a402a00e490f7aca0871b52165d63f3bde3b3bff Size (asc/time_to_strike.mp3) = 3242969 bytes +SHA1 (patch-source_ASCStringHelpers.h) = e13e259fb2ce8ca674692b928e536594f243c0be +SHA1 (patch-source_Property.cpp) = a8a8e154f8aa5a884cb9fe0e74c806dcaf3020b2 +SHA1 (patch-source_password.cpp) = fa56110a045e111f772f09b9e9998d84a76e7d5a +SHA1 (patch-source_strtmesg.cpp) = 3aa86f7e739983294a86c9ab5a8c0c4a6007c449 +SHA1 (patch-source_tools_lib_errorout.cpp) = 9ccfa2d4447a3606fe72c9a60e79881fdfc1b080 diff --git a/games/asc/patches/patch-source_ASCStringHelpers.h b/games/asc/patches/patch-source_ASCStringHelpers.h new file mode 100644 index 00000000000..97d034e7c46 --- /dev/null +++ b/games/asc/patches/patch-source_ASCStringHelpers.h @@ -0,0 +1,12 @@ +$NetBSD: patch-source_ASCStringHelpers.h,v 1.1 2011/11/23 23:29:45 joerg Exp $ + +--- source/ASCStringHelpers.h.orig 2011-11-23 16:20:40.000000000 +0000 ++++ source/ASCStringHelpers.h +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + using std::auto_ptr; + using std::string; diff --git a/games/asc/patches/patch-source_Property.cpp b/games/asc/patches/patch-source_Property.cpp new file mode 100644 index 00000000000..8135213ad72 --- /dev/null +++ b/games/asc/patches/patch-source_Property.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-source_Property.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $ + +--- source/Property.cpp.orig 2011-11-23 16:22:56.000000000 +0000 ++++ source/Property.cpp +@@ -16,6 +16,7 @@ + ***************************************************************************/ + + #include ++#include + #include "Property.h" + + TextProperty::TextProperty() diff --git a/games/asc/patches/patch-source_password.cpp b/games/asc/patches/patch-source_password.cpp new file mode 100644 index 00000000000..9a1d22992f2 --- /dev/null +++ b/games/asc/patches/patch-source_password.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-source_password.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $ + +--- source/password.cpp.orig 2011-11-23 16:24:05.000000000 +0000 ++++ source/password.cpp +@@ -20,6 +20,7 @@ + * * + ***************************************************************************/ + ++#include + #include "password.h" + #include "misc.h" + diff --git a/games/asc/patches/patch-source_strtmesg.cpp b/games/asc/patches/patch-source_strtmesg.cpp new file mode 100644 index 00000000000..6c37abc6035 --- /dev/null +++ b/games/asc/patches/patch-source_strtmesg.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-source_strtmesg.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $ + +--- source/strtmesg.cpp.orig 2011-11-23 16:19:17.000000000 +0000 ++++ source/strtmesg.cpp +@@ -25,6 +25,8 @@ + const char* asc_release="ASC1.16.4.0"; + + #include ++#include ++#include + #include "strtmesg.h" + #include "stringtokenizer.h" + #include "misc.h" diff --git a/games/asc/patches/patch-source_tools_lib_errorout.cpp b/games/asc/patches/patch-source_tools_lib_errorout.cpp new file mode 100644 index 00000000000..7c1187fe6e8 --- /dev/null +++ b/games/asc/patches/patch-source_tools_lib_errorout.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-source_tools_lib_errorout.cpp,v 1.1 2011/11/23 23:29:45 joerg Exp $ + +--- source/tools/lib/errorout.cpp.orig 2011-11-23 16:28:24.000000000 +0000 ++++ source/tools/lib/errorout.cpp +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #ifdef _WIN32_ + # include diff --git a/graphics/cinepaint/distinfo b/graphics/cinepaint/distinfo index aa6d075186f..f89b8cd787a 100644 --- a/graphics/cinepaint/distinfo +++ b/graphics/cinepaint/distinfo @@ -1,14 +1,20 @@ -$NetBSD: distinfo,v 1.14 2011/04/03 13:47:01 wiz Exp $ +$NetBSD: distinfo,v 1.15 2011/11/23 23:30:30 joerg Exp $ SHA1 (cinepaint-0.22-1.tar.gz) = 717580b9b8b1044d76f1f0e4330e1c8104e2a206 RMD160 (cinepaint-0.22-1.tar.gz) = 1f8e06486ed5e74ad483abec305d4fcef0538572 Size (cinepaint-0.22-1.tar.gz) = 12380745 bytes -SHA1 (patch-aa) = 2259896756f3371589b4a83655e4c118d0247302 -SHA1 (patch-ab) = 1dfa4fe1c8f694e7e754cbf22c055ceb1a16d5d3 -SHA1 (patch-ac) = ac9d761565da357cb66851df97e8df1d2a599aec -SHA1 (patch-ad) = 855b8da71b13dde96bafc61e9b4a6ea02cdadfb2 -SHA1 (patch-ae) = c7467b3bfef017e140d8d743ecea34b25418d9d7 -SHA1 (patch-af) = 6232ac8b44bb3d112f12c6354d25e35a88dbf6a0 +SHA1 (patch-aa) = a9a08e9ee48d235a7b862ee660af64afb77036e3 +SHA1 (patch-ab) = 601c0cb6dabacb4d88120a6b2784588bcf06b8b5 +SHA1 (patch-ac) = 819bd88a7ed2a321d1ae7b1a37ac3e2551ff916d +SHA1 (patch-ad) = 643ad8210fa479d4f2c3b83cebc5af92c9a310a1 +SHA1 (patch-ae) = 37d0b131dc19406add4bde0af5affbcec7f5930d +SHA1 (patch-af) = 2e6f01e2b246570f1e8fda375a2f1e779d4c47da SHA1 (patch-ag) = 0ee39b21c552311dcaa63d801c6f2dc9c858270b SHA1 (patch-ah) = 3415f2b6f775a7b66b9d443cab94757b3b378928 +SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp) = e5e457d8f8ceb0ae3b4b965cbc740969b4ed81d4 +SHA1 (patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp) = a369c351d8bb05e79afa6c19592fbc148143d985 +SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h) = a5a72d106b655f79932b0d2d032136a32acbeafb +SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp) = 2e733a0c557236a735b97a7174795965b4bd4e0c +SHA1 (patch-plug-ins_icc__examin_icc__examin_icc__speicher.h) = 1eef5be81fe36c2eb9ecf50606ecb294644e15f4 +SHA1 (patch-plug-ins_pdf_pdf.cpp) = e0af79a6f2e8962edc90d53ceef1b521aacb8e55 SHA1 (patch-plug-ins_png_png.c) = 5f7e553bbdbca42f998b70993bc79c2ef94dc03e diff --git a/graphics/cinepaint/patches/patch-aa b/graphics/cinepaint/patches/patch-aa index 30c6893b2f0..19a0d38a1d5 100644 --- a/graphics/cinepaint/patches/patch-aa +++ b/graphics/cinepaint/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1 2005/01/17 13:38:37 adam Exp $ +$NetBSD: patch-aa,v 1.2 2011/11/23 23:30:30 joerg Exp $ ---- plug-ins/hdr/fromrad.h.orig 2005-01-17 13:36:50.000000000 +0000 +--- plug-ins/hdr/fromrad.h.orig 2004-11-19 06:52:27.000000000 +0000 +++ plug-ins/hdr/fromrad.h @@ -27,10 +27,9 @@ #define MAXELEN 0x7fff diff --git a/graphics/cinepaint/patches/patch-ab b/graphics/cinepaint/patches/patch-ab index a1141d6d746..a9f6268701f 100644 --- a/graphics/cinepaint/patches/patch-ab +++ b/graphics/cinepaint/patches/patch-ab @@ -1,6 +1,6 @@ -$NetBSD: patch-ab,v 1.2 2007/01/16 12:52:44 adam Exp $ +$NetBSD: patch-ab,v 1.3 2011/11/23 23:30:30 joerg Exp $ ---- plug-ins/tiff/tiff_plug_in.h.orig 2006-05-28 11:40:18.000000000 +0200 +--- plug-ins/tiff/tiff_plug_in.h.orig 2006-12-11 16:01:11.000000000 +0000 +++ plug-ins/tiff/tiff_plug_in.h @@ -144,9 +144,6 @@ #endif diff --git a/graphics/cinepaint/patches/patch-ac b/graphics/cinepaint/patches/patch-ac index c392c96528a..a8955de2e81 100644 --- a/graphics/cinepaint/patches/patch-ac +++ b/graphics/cinepaint/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.5 2008/11/10 19:04:45 adam Exp $ +$NetBSD: patch-ac,v 1.6 2011/11/23 23:30:30 joerg Exp $ ---- configure.orig 2007-06-12 07:51:31.000000000 +0200 +--- configure.orig 2007-06-12 05:51:31.000000000 +0000 +++ configure @@ -22331,13 +22331,13 @@ fi fi diff --git a/graphics/cinepaint/patches/patch-ad b/graphics/cinepaint/patches/patch-ad index 0c6d10cf206..42a91b2fe41 100644 --- a/graphics/cinepaint/patches/patch-ad +++ b/graphics/cinepaint/patches/patch-ad @@ -1,6 +1,6 @@ -$NetBSD: patch-ad,v 1.5 2008/11/10 19:04:45 adam Exp $ +$NetBSD: patch-ad,v 1.6 2011/11/23 23:30:30 joerg Exp $ ---- app/app_procs.c.orig 2007-01-16 09:43:41.000000000 +0100 +--- app/app_procs.c.orig 2007-01-16 08:43:41.000000000 +0000 +++ app/app_procs.c @@ -73,6 +73,7 @@ #include "brush.h" diff --git a/graphics/cinepaint/patches/patch-ae b/graphics/cinepaint/patches/patch-ae index 5cd27a2f2ac..65cb27a0a1d 100644 --- a/graphics/cinepaint/patches/patch-ae +++ b/graphics/cinepaint/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.3 2008/11/10 19:04:45 adam Exp $ +$NetBSD: patch-ae,v 1.4 2011/11/23 23:30:30 joerg Exp $ ---- plug-ins/icc_examin/icc_examin/threads.cpp.orig 2008-11-10 19:06:22.000000000 +0100 +--- plug-ins/icc_examin/icc_examin/threads.cpp.orig 2007-03-07 20:07:32.000000000 +0000 +++ plug-ins/icc_examin/icc_examin/threads.cpp @@ -58,10 +58,12 @@ int fl_create_thread(Fl_Thread& t, void ret = pthread_attr_getstacksize( &tattr, &size ); diff --git a/graphics/cinepaint/patches/patch-af b/graphics/cinepaint/patches/patch-af index ffe2d3a2f28..9b7a131e2d3 100644 --- a/graphics/cinepaint/patches/patch-af +++ b/graphics/cinepaint/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.3 2008/11/10 19:04:45 adam Exp $ +$NetBSD: patch-af,v 1.4 2011/11/23 23:30:30 joerg Exp $ ---- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig 2008-11-10 19:18:58.000000000 +0100 +--- plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp.orig 2007-04-21 09:24:09.000000000 +0000 +++ plug-ins/icc_examin/icc_examin/icc_helfer_fltk.cpp @@ -226,7 +226,7 @@ namespace icc_examin_ns { diff --git a/graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp b/graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp new file mode 100644 index 00000000000..0b823baca7b --- /dev/null +++ b/graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp @@ -0,0 +1,13 @@ +$NetBSD: patch-plug-ins_bracketing__to__hdr_br__core_ResponseSolver.hpp,v 1.1 2011/11/23 23:30:30 joerg Exp $ + +--- plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp.orig 2011-11-23 16:54:11.000000000 +0000 ++++ plug-ins/bracketing_to_hdr/br_core/ResponseSolver.hpp +@@ -44,7 +44,7 @@ + #include "Exception.hpp" // IF_FAIL_EXCEPTION() + #include "br_macros.hpp" + #include "ResponseSolverBase.hpp" +- ++#include + + namespace br { + diff --git a/graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp b/graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp new file mode 100644 index 00000000000..826c9a27baa --- /dev/null +++ b/graphics/cinepaint/patches/patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-plug-ins_bracketing__to__hdr_br__core_br__Image.cpp,v 1.1 2011/11/23 23:30:30 joerg Exp $ + +--- plug-ins/bracketing_to_hdr/br_core/br_Image.cpp.orig 2011-11-23 16:53:30.000000000 +0000 ++++ plug-ins/bracketing_to_hdr/br_core/br_Image.cpp +@@ -26,6 +26,7 @@ + */ + #include + #include // pow() ++#include + + #include "br_types.hpp" // ImageID + #include "br_enums.hpp" // DataType, ReportWhat diff --git a/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h new file mode 100644 index 00000000000..a67192eb2a7 --- /dev/null +++ b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h @@ -0,0 +1,56 @@ +$NetBSD: patch-plug-ins_icc__examin_icc__examin_icc__oyranos.h,v 1.1 2011/11/23 23:30:30 joerg Exp $ + +--- plug-ins/icc_examin/icc_examin/icc_oyranos.h.orig 2011-11-23 17:00:10.000000000 +0000 ++++ plug-ins/icc_examin/icc_examin/icc_oyranos.h +@@ -34,6 +34,7 @@ + #include "icc_speicher.h" + #include "icc_vrml_parser.h" + ++#include + #include + #include + #include +@@ -146,8 +147,8 @@ class Oyranos + int byte, + int kanaele, + const char* ausgangs_profil__geraet, +- int byte, +- int kanaele, ++ int ausgangs_byte, ++ int ausgangs_kanaele, + int farb_intent, + const char* cmm, // 4 bytes 'lcms' 'APPL' + int cmm_optionen); // BPC, precission +@@ -156,8 +157,8 @@ class Oyranos + int byte, + int kanaele, + const char* ausgangs_profil__geraet, +- int byte, +- int kanaele, ++ int ausgangs_byte, ++ int ausgangs_kanaele, + int farb_intent, + const char* cmm, // 4 bytes 'lcms' 'APPL' + int cmm_optionen, +@@ -167,8 +168,8 @@ class Oyranos + int byte, + int kanaele, + const char* ausgangs_profil__geraet, +- int byte, +- int kanaele, ++ int ausgangs_byte, ++ int ausgangs_kanaele, + int farb_intent, + const char* cmm, // 4 bytes 'lcms' 'APPL' + int cmm_optionen, +@@ -185,8 +186,8 @@ class Oyranos + int byte, + int kanaele, + const char* ausgangs_profil__geraet, +- int byte, +- int kanaele, ++ int ausgangs_byte, ++ int ausgangs_kanaele, + int farb_intent, + int cmm_optionen, + const char* simulations_profil, diff --git a/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp new file mode 100644 index 00000000000..060b821b55f --- /dev/null +++ b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp @@ -0,0 +1,12 @@ +$NetBSD: patch-plug-ins_icc__examin_icc__examin_icc__oyranos__extern.cpp,v 1.1 2011/11/23 23:30:30 joerg Exp $ + +--- plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp.orig 2011-11-23 17:11:56.000000000 +0000 ++++ plug-ins/icc_examin/icc_examin/icc_oyranos_extern.cpp +@@ -29,6 +29,7 @@ + + #include "icc_utils.h" + #include "icc_fenster.h" ++#include + + using namespace icc_examin_ns; + diff --git a/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__speicher.h b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__speicher.h new file mode 100644 index 00000000000..e92e8c03f6f --- /dev/null +++ b/graphics/cinepaint/patches/patch-plug-ins_icc__examin_icc__examin_icc__speicher.h @@ -0,0 +1,13 @@ +$NetBSD: patch-plug-ins_icc__examin_icc__examin_icc__speicher.h,v 1.1 2011/11/23 23:30:30 joerg Exp $ + +--- plug-ins/icc_examin/icc_examin/icc_speicher.h.orig 2011-11-23 17:06:00.000000000 +0000 ++++ plug-ins/icc_examin/icc_examin/icc_speicher.h +@@ -32,6 +32,8 @@ + #define ICC_SPEICHER_H + + #include "icc_utils.h" ++#include ++#include + #include + + #define DBG_SPEICHER_START if(icc_debug >= 3) DBG_PROG_START diff --git a/graphics/cinepaint/patches/patch-plug-ins_pdf_pdf.cpp b/graphics/cinepaint/patches/patch-plug-ins_pdf_pdf.cpp new file mode 100644 index 00000000000..84a070ad647 --- /dev/null +++ b/graphics/cinepaint/patches/patch-plug-ins_pdf_pdf.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-plug-ins_pdf_pdf.cpp,v 1.1 2011/11/23 23:30:30 joerg Exp $ + +--- plug-ins/pdf/pdf.cpp.orig 2011-11-23 17:14:05.000000000 +0000 ++++ plug-ins/pdf/pdf.cpp +@@ -40,6 +40,8 @@ + #include "pdf.h" + #include "pdf_dialog.h" + ++#include ++ + extern "C" { + #include + #include "lib/plugin_main.h" -- cgit v1.2.3