Fix compilation with gcc-4.6, thanks to Ryan Hill and Jean-Francis Roy (bug #358021)

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

4 files changed, 101 insertions, 5 deletions

diff --git a/app-text/openjade/ChangeLog b/app-text/openjade/ChangeLog
index 71b07ad52158..7d6c50d80616 100644
--- a/app-text/openjade/ChangeLog
+++ b/app-text/openjade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/openjade
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.63 2011/01/12 12:17:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/ChangeLog,v 1.64 2011/05/14 14:51:25 angelos Exp $
+
+  14 May 2011; Christoph Mende <angelos@gentoo.org> openjade-1.3.2-r3.ebuild,
+  +files/openjade-1.3.2-gcc46.patch:
+  Fix compilation with gcc-4.6, thanks to Ryan Hill and Jean-Francis Roy (bug
+  #358021)
 
   12 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -openjade-1.3.2-r1.ebuild, -openjade-1.3.2-r2.ebuild,
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 27becc88e580..b9def6ba80e1 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX openjade-1.3.2-deplibs.patch 1506 RMD160 146495883763799a655bf3884966668630041d06 SHA1 f5f54ab8d6f2f132930b6c160bcdcff32d0ab050 SHA256 93905d0b4878f580fece323c1ebb4b5d5db05f1e6f06dde39cfd9b2dd0a95433
+AUX openjade-1.3.2-gcc46.patch 2164 RMD160 392fa617ec263b1ff43ce8d6d635057f1e007deb SHA1 f49a264a21493c927b45bd6835a0a22a60775463 SHA256 fb873273dc31becdab60ff669c683bbb363ad3abb08949ad0ac54cfc28cf2214
 AUX openjade-1.3.2-ldflags.patch 819 RMD160 38223c38e115836b9b8e74c73a9a488154e59200 SHA1 a0735e43ecd493d0218f347b6c3fcfdc9a43b32d SHA256 7fd651fb682d70a3f5062a65d0da60bebdc5b958cc936d7980339f49b360c3a0
 AUX openjade-1.3.2-libosp-la.patch 1725 RMD160 5a84181aeeb1306ab5a63b1257e037115914f303 SHA1 5952f56ba22f9b0aa5a7ce106efb3bdba1bce9a3 SHA256 c0922350016fbd2784f9080a67b0f8d6171884d506216d7983dfdf95ef15ab11
 AUX openjade-1.3.2-msggen.pl.patch 418 RMD160 6af41427403575117dd03e157d8a5d057ed4743c SHA1 fa30539b34b7fda9d74a384465c69cb25dfc3660 SHA256 4dfb6018f13fcc0ec17637fc24fe69785e6efe6531d5ed248407046d31832449
 AUX openjade-1.3.2-respect-ldflags.patch 500 RMD160 9e273b9679bbb6b612196d92668eed9794a760e7 SHA1 3ff33a02e006b17bbc7345390400ef2d7665bb55 SHA256 498b8c9eb8eb4adea6bbe63c3e85f7a1aa619734caecd7ed4c0d70487850778b
 AUX openjade-1.3.2.dsssl-catalog 269 RMD160 fc328d135bf956fe7ae60f705979accd08bf74a8 SHA1 934043c60ca37fc9ce0fdee13c6706df89fb5acc SHA256 f33d7ce1b564b91bbdf5b8983f21ce4c6a0e420f0e8676a8439f460a49b16abc
 DIST openjade-1.3.2.tar.gz 894834 RMD160 3b12f6596a42c49a60cc07cd9b8f4c5fdf3bafd2 SHA1 54e1999f41450fbd62c5d466002d79d3efca2321 SHA256 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1
-EBUILD openjade-1.3.2-r3.ebuild 2876 RMD160 1495202a25fea3cf8911836307a27d0f7f048ff7 SHA1 16176a400235232d812ccd4b6d6bbd18f8b2dbf7 SHA256 30526a01d591042aef852669df2b9106f29906dd462f933c3701e48cd7b667e2
-MISC ChangeLog 9433 RMD160 98ddeb6513a7161366e58bf0df4b47def6c4160f SHA1 55c005b9f71290ca0f0f163e05bf8b2203c54a57 SHA256 f86d79cbd072bdc4a63f06c22f0f78bcf24a5fa8ae3e88eaf7631236866f6b91
+EBUILD openjade-1.3.2-r3.ebuild 3023 RMD160 71d69efd9178bdced8dab110244c9c3f6b62196e SHA1 0f1b455384ff6dcc7d383ed69a0b59fcb048b71f SHA256 53c33dd271fae9ff5e608a4f92a08d6e7f33b7782a01c1c86147f35425b183fc
+MISC ChangeLog 9637 RMD160 1a2522c56ecece4ad5e2fd42125fcb54a7342576 SHA1 657a649fdcfc4e6ad0a2b5caeb31033d64ec4a87 SHA256 6c2a9970d98126b58cb6e5aafd9c05f14821521a4bb2a98fc7227fc1c1f2d555
 MISC metadata.xml 159 RMD160 a94e7b2c191d1593b8bc416d266571e001c2f673 SHA1 3c1d0831d8acacef390234d20d7711cabded861a SHA256 52cf1b9dda72e2d61fef95515c8a124ac9f1196e5509e5636e269f396fcba8a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk3OlvMACgkQmWq1bYTyC0OILQEAgbMjcov74jswvmsF+g7eTWtx
+Vfk/+FtVuCeuTemwyTQBAMF/PICVfsgXwdU4AzuS+q/O2UhA8GruVD61aq38zo78
+=Ei8s
+-----END PGP SIGNATURE-----
diff --git a/app-text/openjade/files/openjade-1.3.2-gcc46.patch b/app-text/openjade/files/openjade-1.3.2-gcc46.patch
new file mode 100644
index 000000000000..e947ffe12f7f
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-gcc46.patch
@@ -0,0 +1,74 @@
+--- openjade-1.3.2-orig//jade/TeXFOTBuilder.cxx	2011-05-02 22:08:49.274006803 +0000
++++ openjade-1.3.2-orig//jade/TeXFOTBuilder.cxx	2011-05-02 22:14:09.849006939 +0000
+@@ -88,6 +88,8 @@ 
+       value.convertString(nic_.placement);
+       }
+     ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
++  public:
++    PageFloatFlowObj() {}
+   private:
+     PageFloatNIC nic_;
+     StringC name_;
+@@ -101,6 +103,8 @@ 
+       fotb.endPageFootnote();
+     }
+     ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
++  public:
++    PageFootnoteFlowObj() {}
+   private:
+   };
+   //////////////////////////////////////////////////////////////////////
+--- openjade-1.3.2-orig//jade/TransformFOTBuilder.cxx	2011-05-02 22:08:49.275006803 +0000
++++ openjade-1.3.2-orig//jade/TransformFOTBuilder.cxx	2011-05-02 22:18:31.614007052 +0000
+@@ -41,6 +41,7 @@ 
+   };
+   class EntityRefFlowObj : public TransformExtensionFlowObj {
+   public:
++    EntityRefFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.entityRef(name_);
+     }
+@@ -56,6 +57,7 @@ 
+   };
+   class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
+   public:
++    ProcessingInstructionFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.processingInstruction(data_);
+     }
+@@ -98,6 +100,8 @@ 
+       }
+     }
+     ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
++  public:
++    EmptyElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+@@ -133,6 +137,8 @@ 
+       }
+     }
+     ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
++  public:
++    ElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+@@ -150,6 +156,8 @@ 
+       value.convertString(systemId_);
+     }
+     ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
++  public:
++    EntityFlowObj() {};
+   private:
+     StringC systemId_;
+   };
+@@ -174,6 +182,8 @@ 
+       }
+     }
+     ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
++  public:
++    DocumentTypeFlowObj() {}
+   private:
+     DocumentTypeNIC nic_;
+   };
diff --git a/app-text/openjade/openjade-1.3.2-r3.ebuild b/app-text/openjade/openjade-1.3.2-r3.ebuild
index ca5f0d3dcf6b..15c5a68c769f 100644
--- a/app-text/openjade/openjade-1.3.2-r3.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r3.ebuild,v 1.8 2011/01/12 10:35:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/openjade/openjade-1.3.2-r3.ebuild,v 1.9 2011/05/14 14:51:25 angelos Exp $
 
 EAPI=2
 
@@ -21,7 +21,13 @@ DEPEND="dev-lang/perl
 	${RDEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{deplibs,ldflags,msggen.pl,respect-ldflags,libosp-la}.patch
+	epatch "${FILESDIR}"/${P}-deplibs.patch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-msggen.pl.patch \
+		"${FILESDIR}"/${P}-respect-ldflags.patch \
+		"${FILESDIR}"/${P}-libosp-la.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
+
 	# Please note!  Opts are disabled.  If you know what you're doing
 	# feel free to remove this line.  It may cause problems with
 	# docbook-sgml-utils among other things.