Fix building with GCC 4.4. Patch by caolan mcnamara.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 126 insertions, 4 deletions

diff --git a/app-editors/xmlcopyeditor/ChangeLog b/app-editors/xmlcopyeditor/ChangeLog
index 2f07328dc27d..df41e54ac649 100644
--- a/app-editors/xmlcopyeditor/ChangeLog
+++ b/app-editors/xmlcopyeditor/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/xmlcopyeditor
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.12 2009/04/29 18:58:32 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/ChangeLog,v 1.13 2009/07/01 06:18:08 dirtyepic Exp $
+
+  01 Jul 2009; Ryan Hill <dirtyepic@gentoo.org>
+  xmlcopyeditor-1.2.0.2-r2.ebuild, +files/xmlcopyeditor-1.2.0.2-gcc44.patch:
+  Fix building with GCC 4.4. Patch by caolan mcnamara.
 
 *xmlcopyeditor-1.2.0.2-r2 (29 Apr 2009)
 
diff --git a/app-editors/xmlcopyeditor/Manifest b/app-editors/xmlcopyeditor/Manifest
index 25db03b4c5d2..5a8becb17766 100644
--- a/app-editors/xmlcopyeditor/Manifest
+++ b/app-editors/xmlcopyeditor/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xmlcopyeditor-1.2.0.2-gcc44.patch 2540 RMD160 60e0b45a8f867a6ec89cea02b5be4b07daa56e19 SHA1 e898ab53b0de688de6ad372c9f08b57f47246a8a SHA256 065ea01c407de936a2f18114052a22ba20013e660d445322f1b8c48d688cba62
 DIST GuideXML-templates.tar.gz 884 RMD160 0f4cbdf795a65fb1006fe5a43cb5ca18d594cf1a SHA1 c23e3540350129403e28298def1b171d082d6f0e SHA256 3ede041b74a64a3f262455728486a616ffb496fa0d6f3c50610387d9de0d742e
 DIST xmlcopyeditor-1.2.0.1.tar.gz 2232784 RMD160 cec1d4dc2e67f486f7416ba9aae37fcd3ce4219e SHA1 994619ecc6e49b20604e8252ce006170a5a43ad6 SHA256 979c7e1a8298f5d20ce7afdf8452587bd720e78bcb6e3e9cc473c2c7ad18e65e
 DIST xmlcopyeditor-1.2.0.2.tar.gz 2233862 RMD160 2d33cb889e45060c5d1f255191ee1177886c40b0 SHA1 c79d5206c443b639e40600b929f8b0fe6ede7c70 SHA256 c8be0b3ef8533ea3dc5aae475fa153b60901b84174e92f2d7542a0a19200a718
 EBUILD xmlcopyeditor-1.2.0.1.ebuild 1030 RMD160 1a3cb4f0b626401424214478fdc45472bbde2d41 SHA1 c89b16cd91e79e8b8162f3a31e0be47ac3447226 SHA256 65a22e1942dc7874359cb6931dcd7f72adf6dea8ca3970a2367e8f73155871d3
 EBUILD xmlcopyeditor-1.2.0.2-r1.ebuild 1115 RMD160 71049c8414ed16efcb5e54405fc40f511cae1ff2 SHA1 00f9d63e283400679bf6612a40d55f4b30ade4e0 SHA256 859959e49118b1d46d3cdfac0f06453ca4115d094e9d00e7233a8dbb10585e08
-EBUILD xmlcopyeditor-1.2.0.2-r2.ebuild 1122 RMD160 a7b5ade09308878133ebc76eba9c8f685af61755 SHA1 dc2fe60dbdc4786da279298b855306c3abc312b8 SHA256 d35b13ab6169e693312628bc91a24f44a6e0476e04fbbaa9f5f20fe2d6e147a1
-MISC ChangeLog 3208 RMD160 ae33a90124bb17e1adaa36e3c88396afb45a9686 SHA1 0297dd4dbc476088d2074966841ad1636e6aed90 SHA256 fcc9364a88cf4302de0e485039c658a0a4e7f895626b9a0ecd78a4e2a65e62da
+EBUILD xmlcopyeditor-1.2.0.2-r2.ebuild 1182 RMD160 9cff04a94e1b39344fc1027f9139fb3ba8ae75a5 SHA1 8a48c31b0452f56d40e77ba938d87762a06d167d SHA256 9e9966722fd4eb8e0de986f4b54cbfa3e2323c0e5bd2f3c199c9bb1b999f7022
+MISC ChangeLog 3391 RMD160 f22e90b265fa70516136f06a16f8dca3f68dc20d SHA1 5b34e3b6d6f0738f48e33e8075e375206dd2b327 SHA256 660af3816fa6035613430158a898175a1d947d168efb84f6fdafa58cd03bb202
 MISC metadata.xml 432 RMD160 21b0ee84d332e5c9f355a64bcea27c81d22a7c81 SHA1 5334d050333b76098864a10aff2fe072c8b028bb SHA256 307328ae58a8f85f24f64a229910e7ed58336a1349405dbeabfbd2646281c028
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.12 (GNU/Linux)
+
+iEYEARECAAYFAkpK/7MACgkQiqiDRvmkBmJIRQCghCoKApMQQ3EzyhSayRtkuPYJ
+uCEAoMBXkvtBZi4oz6WplOIr+qEblQ8M
+=KpLS
+-----END PGP SIGNATURE-----
diff --git a/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.2-gcc44.patch b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.2-gcc44.patch
new file mode 100644
index 000000000000..dd7c8836796f
--- /dev/null
+++ b/app-editors/xmlcopyeditor/files/xmlcopyeditor-1.2.0.2-gcc44.patch
@@ -0,0 +1,103 @@
+--- xmlcopyeditor-1.2.0.4.orig/src/replace.cpp
++++ xmlcopyeditor-1.2.0.4/src/replace.cpp
+@@ -18,6 +18,7 @@
+  */
+ 
+ #include <cstring>
++#include <cstdio>
+ #include "replace.h"
+ 
+ int Replace::run (
+--- xmlcopyeditor-1.2.0.4.orig/src/stringset.h
++++ xmlcopyeditor-1.2.0.4/src/stringset.h
+@@ -25,6 +25,7 @@
+ #include <cmath>
+ #include <climits>
+ #include <cstring>
++#include <stdint.h>
+ #ifdef __WXMSW__
+ #include <mem.h>
+ #endif
+--- xmlcopyeditor-1.2.0.4.orig/src/wrapaspell.cpp
++++ xmlcopyeditor-1.2.0.4/src/wrapaspell.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <iostream>
+ #include <stdexcept>
++#include <cstdio>
+ #include "wrapaspell.h"
+ #include "aspell.h"
+ #include "casehandler.h"
+--- xmlcopyeditor-1.2.0.4.orig/src/xmlassociatedtd.h
++++ xmlcopyeditor-1.2.0.4/src/xmlassociatedtd.h
+@@ -24,6 +24,7 @@
+ #include <expat.h>
+ #include <string>
+ #include <memory>
++#include <cstdio>
+ #include "wrapexpat.h"
+ 
+ struct DtdData : public ParserData
+--- xmlcopyeditor-1.2.0.4.orig/src/xmlassociatexsd.h
++++ xmlcopyeditor-1.2.0.4/src/xmlassociatexsd.h
+@@ -25,6 +25,7 @@
+ #include <string>
+ #include <map>
+ #include <memory>
++#include <cstdio>
+ #include "wrapexpat.h"
+ 
+ struct AssociateXsdData : public ParserData
+--- xmlcopyeditor-1.2.0.4.orig/src/xmlassociatexsl.h
++++ xmlcopyeditor-1.2.0.4/src/xmlassociatexsl.h
+@@ -24,6 +24,7 @@
+ #include <expat.h>
+ #include <string>
+ #include <memory>
++#include <cstdio>
+ #include "wrapexpat.h"
+ 
+ struct XslData : public ParserData
+--- xmlcopyeditor-1.2.0.4.orig/src/xmlpromptgenerator.cpp
++++ xmlcopyeditor-1.2.0.4/src/xmlpromptgenerator.cpp
+@@ -31,7 +31,7 @@
+ #include "catalogresolver.h"
+ 
+ // Xerces-C req'd for Schema parsing
+-#define XERCES_TMPLSINC
++// #define XERCES_TMPLSINC
+ 
+ #include <xercesc/util/NameIdPool.hpp>
+ #include <xercesc/util/PlatformUtils.hpp>
+--- xmlcopyeditor-1.2.0.4.orig/src/xmlutf8reader.cpp
++++ xmlcopyeditor-1.2.0.4/src/xmlutf8reader.cpp
+@@ -20,6 +20,7 @@
+ #include <string>
+ #include <vector>
+ #include <stdexcept>
++#include <cstdio>
+ #include <expat.h>
+ #include "xmlutf8reader.h"
+ 
+--- xmlcopyeditor-1.2.0.4.orig/src/xsllocator.cpp
++++ xmlcopyeditor-1.2.0.4/src/xsllocator.cpp
+@@ -46,7 +46,7 @@
+ 		return;
+ 
+ 	char *value, *iterator;
+-	value = strstr ( ( const char * ) data, "href=" );
++	value = strstr ( ( char * ) data, "href=" );
+ 	if ( !value || strlen ( value ) < 7 )
+ 		return;
+ 	value += 6;
+@@ -55,7 +55,7 @@
+ 	{
+ 		if ( *iterator == '"' || *iterator == '\'' )
+ 		{
+-			*iterator = '\0';
++			*iterator = '\0'; //Danger, changing const char *data
+ 			break;
+ 		}
+ 	}
+
+ 	  	 
diff --git a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.2-r2.ebuild b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.2-r2.ebuild
index bdf3f0031d55..04e086f10cfc 100644
--- a/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.2-r2.ebuild
+++ b/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.2-r2.ebuild,v 1.1 2009/04/29 18:58:32 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xmlcopyeditor/xmlcopyeditor-1.2.0.2-r2.ebuild,v 1.2 2009/07/01 06:18:08 dirtyepic Exp $
 
 EAPI="2"
 
@@ -28,6 +28,10 @@ DEPEND=">=dev-libs/libxml2-2.7.3-r1 \
 
 RDEPEND=${DEPEND}
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"