fix build with gcc 4.6, bug #367435, by Pavel Sanda

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

4 files changed, 156 insertions, 8 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index 55d0ffdaef1e..d86671e7d031 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/lyx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.228 2011/05/21 04:25:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.229 2011/05/23 03:00:03 aballier Exp $
+
+  23 May 2011; Alexis Ballier <aballier@gentoo.org> +files/1.6.10-gcc.patch,
+  lyx-1.6.10.ebuild:
+  fix build with gcc 4.6, bug #367435, by Pavel Sanda
 
   21 May 2011; Samuli Suominen <ssuominen@gentoo.org> lyx-1.5.7.ebuild,
   lyx-1.6.8.ebuild, lyx-1.6.9.ebuild, lyx-1.6.10.ebuild, lyx-2.0.0.ebuild:
diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest
index 36de15db5a35..ef92b3919f03 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX 1.6.10-gcc.patch 3854 RMD160 54e31aebe6245f1273d4e354d47e3047c98b17d4 SHA1 796bc80bbc807d066bc8f4e757a6b5da994bae80 SHA256 4d6b90463207787e7d50a3672222e29ed6738772e6e9fe3cf67cac0a9e07a609
 AUX 1.6.7-python.patch 906 RMD160 74a2f14445d6b011fe04d06f3bd6710d36ab6351 SHA1 a9bc180553105b61767a82280e211a2c187cfbd4 SHA256 ad4ebb8d3837536eea869e15b3759840a1153d64d74b744e956ce9bdf5e5651d
 AUX lyx-1.5.0-gentoo.patch 1298 RMD160 69b7ce68234e7f5c2fee708944267f1974aa10d0 SHA1 16c3e6f846c55c3eb5fd9d7da1247a3429efa7a4 SHA256 36be1ea2577cce270319a7a3b4bed92e5925c0e974edda8729bda2179ac8ffe2
 AUX lyx.desktop 215 RMD160 13192f0f4e84e870565a3daff7d46c56954ed0fe SHA1 f72f3ff17a3a1b84cbb0aaf12c9e75387879a420 SHA256 b0ffd201e0a2e0cb39a52aadb9921e86fbb31c8d3cac04526371d6606246898c
@@ -13,16 +14,16 @@ DIST lyx-1.6.9.tar.bz2 12560174 RMD160 30e37efc4c9cf3d335e78a1a1940dba2a0df1645
 DIST lyx-2.0.0.tar.xz 10011408 RMD160 9d2974ae03a986effcd0bccac04a6c877f976f33 SHA1 27bf0ee623aae0e59780d9f627cdf5cb788a2516 SHA256 a790951d6ed660b254e82d682b478665f119dd522ab4759fdeb5cd8d42f66f61
 DIST preferences 1669 RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 SHA1 3567ad4d4a2a041c295e40fef76ca53de6cb260d SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43
 EBUILD lyx-1.5.7.ebuild 3377 RMD160 0a4976c0c7efd837bf086c4c43528b0c4b15b35f SHA1 c8eea4ff0158d887495b5b0b5cadcb99e1e99aad SHA256 eb18e010c43d3d564eceaad094ca2cf7ba8d5e7c30d2c79e4ad6042d7b017e49
-EBUILD lyx-1.6.10.ebuild 4016 RMD160 8bc5ae7e3af87d4d85d0d84e5edaec2a8c98064e SHA1 77af277c0f5e5ad0c332f75be1beb394d13b276d SHA256 0cdfce71f4c5108c1c16682a9b0fd2f2ba19b4b8bafe987d46dd093f88c4464b
+EBUILD lyx-1.6.10.ebuild 4054 RMD160 62759efd75ba59ee2a01ec8b5ae135ecd92be791 SHA1 22fdc3ce98fb7227df1193ee5439aeaf44b89981 SHA256 163b095e6a72128f15ad2a90657e2c642c529f0b87ce6fe121829342ca88d8f6
 EBUILD lyx-1.6.8.ebuild 4104 RMD160 7174a9904ef34e711e114867a95c4e5fc5ac4db1 SHA1 83c3d3e6646cc2f45741e42da8927a8df247a60b SHA256 8d497e2c9f614b31183a06eb0f7e170c95397beee04a87dec7909cb9a2c8cdb7
 EBUILD lyx-1.6.9.ebuild 4015 RMD160 0a7d8ee10c60a3a0248d7178deab89c7c28e165d SHA1 cc1c30e94ea118ef6349ad95e84af922b2f83af3 SHA256 b6cc9e2f498a07361b0a5d1938fde8e7bd959d60b3bf7c26cc7993dcf6cd1a65
 EBUILD lyx-2.0.0.ebuild 4588 RMD160 d970fab4fac640c786403cd2819f9a4bd51a83d2 SHA1 04af6818ffab2e30ba86918f77438b9ae9517710 SHA256 cf2c2502464e45b82dbcb7cbfa4aaaabc329dda4648dff6811fc0602c5c7b4c8
-MISC ChangeLog 31539 RMD160 fff0202418a6e35ec21c234050a17a9f00048ee6 SHA1 195bca4ab46bce5627efd1f58529f6dc53cd1a1e SHA256 04f3d3d19c7464eedee6f97513dd7386f728cc4324973262ed86c077f4f94267
+MISC ChangeLog 31691 RMD160 3496f40e77582f7ed492507a6c709f511919453b SHA1 e5709a73a30a291978d7a8d7ab437517fb9cfab5 SHA256 c3123f4c9e6000b5536ae6c3a75d8a81622349c916b6a874d4c75b93a62babcd
 MISC metadata.xml 1572 RMD160 850394a1700004439f7258d04732517216d8e31c SHA1 99c60675f6273f853498479676a4be74e07182b3 SHA256 330d0d86b06c6ce15cea6cfdd3bd070bddc82309346902481883575fd211ec14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3XPmwACgkQXkR9YqOcLPFkwQEAiFDMaahG6zPrHQ7KQRaD2oLK
-B3qb+kdaNnZnKgyQME8BAJd4wiqU1CW60Gii8+yTlSYY9AzvJhZ9AkeXu1wETqp9
-=cnCk
+iEYEARECAAYFAk3ZzbkACgkQvFcC4BYPU0rEtQCfV3EL92EWsc2fRXT5ZnFo0Vhl
+mqMAoJwLMZE6xl27mNGtL9bUqsKKop8K
+=XVh2
 -----END PGP SIGNATURE-----
diff --git a/app-office/lyx/files/1.6.10-gcc.patch b/app-office/lyx/files/1.6.10-gcc.patch
new file mode 100644
index 000000000000..44e0fc94627b
--- /dev/null
+++ b/app-office/lyx/files/1.6.10-gcc.patch
@@ -0,0 +1,142 @@
+diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
+index 68cf1d2..16a3c94 100644
+--- a/src/insets/InsetInclude.cpp
++++ b/src/insets/InsetInclude.cpp
+@@ -806,7 +806,7 @@ support::FileNameList const &
+ 		tmp->setParent(&buffer);
+ 		return cache;
+ 	}
+-	static support::FileNameList const empty;
++	static support::FileNameList const empty = support::FileNameList();
+ 	return empty;
+ }
+ 
+diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
+index 4a267e9..7a165e2 100644
+--- a/src/insets/InsetTabular.cpp
++++ b/src/insets/InsetTabular.cpp
+@@ -188,62 +188,6 @@ TabularFeature tabularFeature[] =
+ };
+ 
+ 
+-template <class T>
+-string const write_attribute(string const & name, T const & t)
+-{
+-	string const s = tostr(t);
+-	return s.empty() ? s : " " + name + "=\"" + s + "\"";
+-}
+-
+-template <>
+-string const write_attribute(string const & name, string const & t)
+-{
+-	return t.empty() ? t : " " + name + "=\"" + t + "\"";
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, docstring const & t)
+-{
+-	return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, bool const & b)
+-{
+-	// we write only true attribute values so we remove a bit of the
+-	// file format bloat for tabulars.
+-	return b ? write_attribute(name, convert<string>(b)) : string();
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, int const & i)
+-{
+-	// we write only true attribute values so we remove a bit of the
+-	// file format bloat for tabulars.
+-	return i ? write_attribute(name, convert<string>(i)) : string();
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, Tabular::idx_type const & i)
+-{
+-	// we write only true attribute values so we remove a bit of the
+-	// file format bloat for tabulars.
+-	return i ? write_attribute(name, convert<string>(i)) : string();
+-}
+-
+-
+-template <>
+-string const write_attribute(string const & name, Length const & value)
+-{
+-	// we write only the value if we really have one same reson as above.
+-	return value.zero() ? string() : write_attribute(name, value.asString());
+-}
+-
+-
+ string const tostr(LyXAlignment const & num)
+ {
+ 	switch (num) {
+@@ -503,6 +447,61 @@ void l_getline(istream & is, string & str)
+ 	}
+ }
+ 
++template <class T>
++string const write_attribute(string const & name, T const & t)
++{
++	string const s = tostr(t);
++	return s.empty() ? s : " " + name + "=\"" + s + "\"";
++}
++
++template <>
++string const write_attribute(string const & name, string const & t)
++{
++	return t.empty() ? t : " " + name + "=\"" + t + "\"";
++}
++
++
++template <>
++string const write_attribute(string const & name, docstring const & t)
++{
++	return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
++}
++
++
++template <>
++string const write_attribute(string const & name, bool const & b)
++{
++	// we write only true attribute values so we remove a bit of the
++	// file format bloat for tabulars.
++	return b ? write_attribute(name, convert<string>(b)) : string();
++}
++
++
++template <>
++string const write_attribute(string const & name, int const & i)
++{
++	// we write only true attribute values so we remove a bit of the
++	// file format bloat for tabulars.
++	return i ? write_attribute(name, convert<string>(i)) : string();
++}
++
++
++template <>
++string const write_attribute(string const & name, Tabular::idx_type const & i)
++{
++	// we write only true attribute values so we remove a bit of the
++	// file format bloat for tabulars.
++	return i ? write_attribute(name, convert<string>(i)) : string();
++}
++
++
++template <>
++string const write_attribute(string const & name, Length const & value)
++{
++	// we write only the value if we really have one same reson as above.
++	return value.zero() ? string() : write_attribute(name, value.asString());
++}
++
+ } // namespace
+ 
+ 
diff --git a/app-office/lyx/lyx-1.6.10.ebuild b/app-office/lyx/lyx-1.6.10.ebuild
index 0b3d9f2089c3..3048a47e6c29 100644
--- a/app-office/lyx/lyx-1.6.10.ebuild
+++ b/app-office/lyx/lyx-1.6.10.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-office/lyx/lyx-1.6.10.ebuild,v 1.2 2011/05/21 04:25:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.6.10.ebuild,v 1.3 2011/05/23 03:00:03 aballier Exp $
 
 EAPI=2
 
@@ -94,6 +94,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/1.6.7-python.patch
+	epatch "${FILESDIR}"/1.6.10-gcc.patch
 	echo "#!/bin/sh" > config/py-compile
 	sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die
 }