Make the application to compile with gcc-4.3 series thanks to patch by Ian Abbott <ian@abbott.org> in #230731

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-mactel i686

5 files changed, 291 insertions, 6 deletions

diff --git a/app-editors/xmlcopyeditor/ChangeLog b/app-editors/xmlcopyeditor/ChangeLog
index a03491685641..c2ea12036df3 100644
--- a/app-editors/xmlcopyeditor/ChangeLog
+++ b/app-editors/xmlcopyeditor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/xmlcopyeditor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.4 2008/07/03 22:24:36 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.5 2008/07/04 19:43:04 yoswink Exp $
+
+  04 Jul 2008; Jose Luis Rivero <yoswink@gentoo.org>
+  +files/gcc-4.3-header-dependency.patch, xmlcopyeditor-1.1.0.6.ebuild,
+  xmlcopyeditor-1.1.0.7.ebuild:
+  Make the application to compile with gcc-4.3 series thanks to patch by Ian
+  Abbott <ian@abbott.org> in #230731
 
 *xmlcopyeditor-1.1.0.7 (03 Jul 2008)
 
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 715820fdbfd3..231a8018d7c7 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,7 +1,8 @@
+AUX gcc-4.3-header-dependency.patch 8039 RMD160 dd271875e8e1eecc325c8f6798902923481842a8 SHA1 5f8470a41dbbe7fa484d7d07adf49d88a16ca4a9 SHA256 017a0297d491eeccc831c647edf26eac14d56f8a5ad51d1909776ba025417224
 DIST GuideXML-templates.tar.gz 884 RMD160 0f4cbdf795a65fb1006fe5a43cb5ca18d594cf1a SHA1 c23e3540350129403e28298def1b171d082d6f0e SHA256 3ede041b74a64a3f262455728486a616ffb496fa0d6f3c50610387d9de0d742e
 DIST xmlcopyeditor-1.1.0.6.tar.gz 2202764 RMD160 f5e370f92cd4c6e40a43e48cd9d72654f2a398f4 SHA1 58b2bfa7aca37bf6a0c877af72f726363b8b57f9 SHA256 b4b9a203c23daddf926cc41841416c2fc08a6979f3019feae984d087e2851111
 DIST xmlcopyeditor-1.1.0.7.tar.gz 2233717 RMD160 139c4c9a88aab544043281399fb4d69a0d8c53c0 SHA1 a60af11fe8f65169d675f59d2f264c489b73be6d SHA256 68a711ca9c4be50529bc1cdf2cf94bce58ef3ea55081c76f07a6b107837f8eca
-EBUILD xmlcopyeditor-1.1.0.6.ebuild 1030 RMD160 8dbc91ca73d483fcbeeb9906c489c16cd4969540 SHA1 848d87cff84cb4b6688fdd608acdf567c4ff3863 SHA256 312986ab40998a090de09af19dbea8dde08fb512cf56ef9b933a33e168eda556
-EBUILD xmlcopyeditor-1.1.0.7.ebuild 1030 RMD160 6a05d94f2b3e3851f1e23eeb30e06d9731ef28a4 SHA1 0c16207d9ef271361e31c697a84f4d8998606f09 SHA256 1f0e156148dddb4a4ae6470a2a944f2d1b68645d35c834f89228d15c6f1f4fde
-MISC ChangeLog 1245 RMD160 1660cd6ffbc8dc1e8b56e9573b19731c04ac7339 SHA1 61b37a0c7c7ac462eb7011a4262c2bbb0c3828f8 SHA256 b16d8876e210f0ab8285aca6dfe006ad5cbbb7d43bd4d0df3106e65ed651e9ae
+EBUILD xmlcopyeditor-1.1.0.6.ebuild 1127 RMD160 b97ecc496405e709440c0ac12faf4a05a4b9fd8e SHA1 a8d120f101392c1550a8d2e4f22a9a85f5f4f2cc SHA256 e12c86bb19caf61f79443ca5246ef9030743ee1915aaaff70d214f4d58eb4dcc
+EBUILD xmlcopyeditor-1.1.0.7.ebuild 1127 RMD160 cc4206af3446ee76ab058970202b3f2516a9440b SHA1 3c4a3d0d5e2a404419a5bedadaf5ad1e1c511b4a SHA256 4c1bb0b102f89c46e3bea187ab670b1d2b4ca8b4a92b9578256406a230d484dc
+MISC ChangeLog 1517 RMD160 1259086881b02017b02eb9cf08f4ce9cba80c3bd SHA1 2696535564be0544b690cc80c78a218c4d5afc2e SHA256 c35071d735ae10ed0dda4ce83a35afa057f74bcf309c4097dffcf60f61a7ebc0
 MISC metadata.xml 327 RMD160 30b29eff98d49ffc2db74b03131b9cf134a78d5f SHA1 94e5efbfb87bdf7c7d6d751c474d44b9fb175840 SHA256 0af463762d10b05141fe2f31e2d0a9a2100fe9b562184359f4051748b1ab69dc
diff --git a/app-editors/xmlcopyeditor/files/gcc-4.3-header-dependency.patch b/app-editors/xmlcopyeditor/files/gcc-4.3-header-dependency.patch
new file mode 100644
index 000000000000..7de4407197aa
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/gcc-4.3-header-dependency.patch
@@ -0,0 +1,264 @@
+diff -ur src/globalreplacedialog.cpp src/globalreplacedialog.cpp
+--- src/globalreplacedialog.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/globalreplacedialog.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <memory>
+ #include "globalreplacedialog.h"
+ #include "wrapregex.h"
+ 
+diff -ur src/housestyle.cpp src/housestyle.cpp
+--- src/housestyle.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/housestyle.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <cstring>
+ #include "housestyle.h"
+ #include "readfile.h"
+ 
+diff -ur src/housestylereader.h src/housestylereader.h
+--- src/housestylereader.h	2008-01-20 20:14:30.000000000 +0000
++++ src/housestylereader.h	2008-07-04 15:03:47.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <map>
+ #include <set>
+ #include <vector>
++#include <memory>
+ #include <expat.h>
+ #include "wrapexpat.h"
+ 
+diff -ur src/housestylewriter.h src/housestylewriter.h
+--- src/housestylewriter.h	2008-01-20 20:14:30.000000000 +0000
++++ src/housestylewriter.h	2008-07-04 15:03:47.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include <set>
+ #include <string>
++#include <memory>
+ #include <expat.h>
+ #include "wrapexpat.h"
+ #include "wrapregex.h"
+diff -ur src/stringset.h src/stringset.h
+--- src/stringset.h	2008-01-20 20:14:30.000000000 +0000
++++ src/stringset.h	2008-07-04 15:03:47.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <stdexcept>
+ #include <cmath>
+ #include <climits>
++#include <cstring>
+ #ifdef __WXMSW__
+ #include <mem.h>
+ #endif
+diff -ur src/wrapregex.cpp src/wrapregex.cpp
+--- src/wrapregex.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/wrapregex.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <string>
+ #include <ctype.h>
+ #include <stdexcept>
++#include <cstring>
+ #include "wrapregex.h"
+ #include "contexthandler.h"
+ 
+diff -ur src/xmlassociatedtd.h src/xmlassociatedtd.h
+--- src/xmlassociatedtd.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlassociatedtd.h	2008-07-04 15:03:47.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <expat.h>
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct DtdData : public ParserData
+diff -ur src/xmlassociatexsd.cpp src/xmlassociatexsd.cpp
+--- src/xmlassociatexsd.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/xmlassociatexsd.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <vector>
+ #include <stdexcept>
+ #include <expat.h>
++#include <cstring>
+ #include "xmlassociatexsd.h"
+ #include "xmlparseschemans.h"
+ #include "readfile.h"
+diff -ur src/xmlassociatexsd.h src/xmlassociatexsd.h
+--- src/xmlassociatexsd.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlassociatexsd.h	2008-07-04 15:03:47.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <expat.h>
+ #include <string>
+ #include <map>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct AssociateXsdData : public ParserData
+diff -ur src/xmlassociatexsl.cpp src/xmlassociatexsl.cpp
+--- src/xmlassociatexsl.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/xmlassociatexsl.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -21,6 +21,7 @@
+ #include <vector>
+ #include <stdexcept>
+ #include <expat.h>
++#include <cstring>
+ #include "xmlassociatexsl.h"
+ 
+ XmlAssociateXsl::XmlAssociateXsl ( const std::string& path, size_t size ) :
+diff -ur src/xmlassociatexsl.h src/xmlassociatexsl.h
+--- src/xmlassociatexsl.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlassociatexsl.h	2008-07-04 15:03:47.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <expat.h>
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct XslData : public ParserData
+diff -ur src/xmlencodinghandler.cpp src/xmlencodinghandler.cpp
+--- src/xmlencodinghandler.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/xmlencodinghandler.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+  */
+ 
++#include <cstring>
+ #include "xmlencodinghandler.h"
+ 
+ bool XmlEncodingHandler::hasDeclaration ( const std::string& utf8 )
+diff -ur src/xmlencodingspy.h src/xmlencodingspy.h
+--- src/xmlencodingspy.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlencodingspy.h	2008-07-04 15:03:47.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include <expat.h>
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct EncodingData : public ParserData
+diff -ur src/xmlfilterreader.cpp src/xmlfilterreader.cpp
+--- src/xmlfilterreader.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/xmlfilterreader.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <expat.h>
+ #include <map>
+ #include <set>
++#include <cstring>
+ #include "xmlfilterreader.h"
+ 
+ using namespace std;
+diff -ur src/xmlfilterreader.h src/xmlfilterreader.h
+--- src/xmlfilterreader.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlfilterreader.h	2008-07-04 15:03:47.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include <vector>
+ #include <map>
+ #include <set>
++#include <memory>
+ #include <expat.h>
+ #include "wrapexpat.h"
+ 
+diff -ur src/xmlparseschemans.h src/xmlparseschemans.h
+--- src/xmlparseschemans.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlparseschemans.h	2008-07-04 15:03:47.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <expat.h>
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct ParseSchemaNsData : public ParserData
+diff -ur src/xmlpromptgenerator.h src/xmlpromptgenerator.h
+--- src/xmlpromptgenerator.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlpromptgenerator.h	2008-07-04 15:03:47.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <expat.h>
+ #include <map>
+ #include <set>
++#include <memory>
+ #include "wrapexpat.h"
+ #include "parserdata.h"
+ 
+diff -ur src/xmlschemalocator.cpp src/xmlschemalocator.cpp
+--- src/xmlschemalocator.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/xmlschemalocator.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <string>
+ #include <vector>
+ #include <stdexcept>
++#include <cstring>
+ #include <expat.h>
+ #include "xmlschemalocator.h"
+ 
+diff -ur src/xmlschemalocator.h src/xmlschemalocator.h
+--- src/xmlschemalocator.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlschemalocator.h	2008-07-04 15:03:47.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include <expat.h>
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct SchemaLocatorData
+diff -ur src/xmlshallowvalidator.h src/xmlshallowvalidator.h
+--- src/xmlshallowvalidator.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlshallowvalidator.h	2008-07-04 15:03:47.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include <set>
+ #include <vector>
+ #include <utility>
++#include <memory>
+ #include <expat.h>
+ #include "wrapexpat.h"
+ 
+diff -ur src/xmlutf8reader.h src/xmlutf8reader.h
+--- src/xmlutf8reader.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlutf8reader.h	2008-07-04 15:03:47.000000000 +0100
+@@ -23,6 +23,7 @@
+ #include <vector>
+ #include <expat.h>
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct UtfData : public ParserData
+diff -ur src/xmlwordcount.h src/xmlwordcount.h
+--- src/xmlwordcount.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xmlwordcount.h	2008-07-04 15:03:47.000000000 +0100
+@@ -21,6 +21,7 @@
+ #define XML_WORD_COUNT_H
+ 
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct WordCountData : public ParserData
+diff -ur src/xsllocator.cpp src/xsllocator.cpp
+--- src/xsllocator.cpp	2008-01-20 20:14:24.000000000 +0000
++++ src/xsllocator.cpp	2008-07-04 15:03:47.000000000 +0100
+@@ -20,6 +20,7 @@
+ #include <string>
+ #include <vector>
+ #include <stdexcept>
++#include <cstring>
+ #include <expat.h>
+ #include "xsllocator.h"
+ 
+diff -ur src/xsllocator.h src/xsllocator.h
+--- src/xsllocator.h	2008-01-20 20:14:30.000000000 +0000
++++ src/xsllocator.h	2008-07-04 15:03:47.000000000 +0100
+@@ -22,6 +22,7 @@
+ 
+ #include <expat.h>
+ #include <string>
++#include <memory>
+ #include "wrapexpat.h"
+ 
+ struct XslLocatorData : public ParserData
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.6.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.6.ebuild
index 1413df65a6d0..dc51fc4e8933 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.6.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.6.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/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.6.ebuild,v 1.1 2008/01/23 00:23:37 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.6.ebuild,v 1.2 2008/07/04 19:43:04 yoswink Exp $
 
 WX_GTK_VER="2.8"
 
@@ -22,6 +22,13 @@ DEPEND="dev-libs/xerces-c \
 		app-text/aspell   \
 		=x11-libs/wxGTK-2.8*"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/gcc-4.3-header-dependency.patch"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.7.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.7.ebuild
index 3e5ef51d91ea..15879bd097ad 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.7.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.7.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/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.7.ebuild,v 1.1 2008/07/03 22:24:36 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.1.0.7.ebuild,v 1.2 2008/07/04 19:43:04 yoswink Exp $
 
 WX_GTK_VER="2.8"
 
@@ -22,6 +22,13 @@ DEPEND="dev-libs/xerces-c \
 		app-text/aspell   \
 		=x11-libs/wxGTK-2.8*"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/gcc-4.3-header-dependency.patch"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"