summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-05-18 10:33:38 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-05-18 10:33:38 +0000
commit07c6d94d7a82029a739027ad858ea11837d0b106 (patch)
treede43390b1450d059444930104060691809099a12 /dev-libs
parentDo not start pcmanfm with -d option. Bug #367639 (diff)
downloadhistorical-07c6d94d7a82029a739027ad858ea11837d0b106.tar.gz
historical-07c6d94d7a82029a739027ad858ea11837d0b106.tar.bz2
historical-07c6d94d7a82029a739027ad858ea11837d0b106.zip
Fix build with gcc-4.6 Bug #367883
Package-Manager: portage-2.1.9.49/cvs/Linux x86_64
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/libbulletml/ChangeLog6
-rw-r--r--dev-libs/libbulletml/Manifest11
-rw-r--r--dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch20
-rw-r--r--dev-libs/libbulletml/libbulletml-0.0.6.ebuild5
4 files changed, 34 insertions, 8 deletions
diff --git a/dev-libs/libbulletml/ChangeLog b/dev-libs/libbulletml/ChangeLog
index 41b78919b589..5942e781a72b 100644
--- a/dev-libs/libbulletml/ChangeLog
+++ b/dev-libs/libbulletml/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libbulletml
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/ChangeLog,v 1.8 2011/04/13 14:34:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/ChangeLog,v 1.9 2011/05/18 10:33:38 tupone Exp $
+
+ 18 May 2011; Tupone Alfredo <tupone@gentoo.org> libbulletml-0.0.6.ebuild,
+ +files/libbulletml-0.0.6-gcc46.patch:
+ Fix build with gcc-4.6 Bug #367883 by Diego Elio Pettenò
13 Apr 2011; Alfredo Tupone <tupone@gentoo.org> libbulletml-0.0.6.ebuild:
Depend on dev-libs/boost, remove local copy. Bug #363187 by Steven Wilson
diff --git a/dev-libs/libbulletml/Manifest b/dev-libs/libbulletml/Manifest
index de4d82ba559e..a348ef5db504 100644
--- a/dev-libs/libbulletml/Manifest
+++ b/dev-libs/libbulletml/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX libbulletml-0.0.6-gcc43.patch 589 RMD160 2156ca25e5dbde78d62291bc5ae0182cf745f4c2 SHA1 2202e8c4ca0d440c1159c1696d99b2222c3255c3 SHA256 86e34792a212498cd2ffa86abe8ce595479a904f434d60ba4df924c51bc9455b
+AUX libbulletml-0.0.6-gcc46.patch 400 RMD160 34fa6f34ae020a1d9ae01d6ac026c8418762b3b7 SHA1 7d56502886c1abde7d76da36f35f931f25b38987 SHA256 8dd0e9476cfd425328f117dddff597b6368eed83dada83373e91c2c18663f26c
DIST libbulletml-0.0.6.tar.bz2 94529 RMD160 acdb028e2fc2a355e2a9bc38677d001bcd20ae5c SHA1 31a1937a772f7cf208064d3fa294c1055a50e8d7 SHA256 c7770f37c5a870ce2f2640c83378c0ee4da9d77bcdd286ce33d0de6c4d5f4524
-EBUILD libbulletml-0.0.6.ebuild 1117 RMD160 93509a44127dfeb21fbee2ca10d332e1c070caa4 SHA1 1baf514f1ea130c28db9037589bbf119530ce215 SHA256 56d35f30b6aa9447a4176768c1a0a176d8c6782269f8cb92ebc5faf4e663d5f3
-MISC ChangeLog 1317 RMD160 39626cf9b4f9038bddb37450f2ccb9f78242bb3b SHA1 f7ba970ab2d2d538604e5a92711488bb739631b5 SHA256 6b1fa0e7af72a9d4f8d3cd171df838b15d3f0570c385b7ce5818c74811d94222
+EBUILD libbulletml-0.0.6.ebuild 1152 RMD160 f9509068ae35851f619e153a49fc3017dee08c0b SHA1 396bc7c9ad76f1ae576d37990f9a77f5dbd1c43c SHA256 7827435146d65ebb33fe6ece93a18ff3fbefbffaf7e9c4f69c90522e6801fd53
+MISC ChangeLog 1494 RMD160 17023e5dc0b2194c293c2db5bed6a8457c85d579 SHA1 70b75e46dd0e4a4fdc9aa0d8a3903aa897097bb5 SHA256 2dc2beb633170fbe7168b702c66ae559997afce411096ec82bfb67983c4706fa
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2ltGkACgkQIY77eQFFFC1q0wCgtmvSaD+5/qvNoVgYL3Jw5+7h
-ImYAnj7TuY/EWM9T8trA9y7OuGhtutGr
-=+o5Y
+iEYEARECAAYFAk3ToIwACgkQIY77eQFFFC04SACfTYyqVxIld+kOSIrFRWSBjiw6
+hGAAoNl9OelMQfQd27mEiDPKVBI1l0PY
+=ZK5Q
-----END PGP SIGNATURE-----
diff --git a/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
new file mode 100644
index 000000000000..47e0dc411ac9
--- /dev/null
+++ b/dev-libs/libbulletml/files/libbulletml-0.0.6-gcc46.patch
@@ -0,0 +1,20 @@
+--- calc.yy.old 2011-05-18 12:26:38.701666366 +0200
++++ calc.yy 2011-05-18 12:27:43.020672135 +0200
+@@ -17,7 +17,7 @@
+ #include "formula.h"
+ #include "formula-variables.h"
+
+-int yyerror(char* s);
++int yyerror(const char* s);
+ int yylex();
+
+ const char* yyinStr;
+@@ -149,7 +149,7 @@
+ return c;
+ }
+
+-int yyerror(char* s) {
++int yyerror(const char* s) {
+ printf("yyerror: %s\n", s);
+ return 0;
+ }
diff --git a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild b/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
index 2433c62427a2..aef91ca172e6 100644
--- a/dev-libs/libbulletml/libbulletml-0.0.6.ebuild
+++ b/dev-libs/libbulletml/libbulletml-0.0.6.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/dev-libs/libbulletml/libbulletml-0.0.6.ebuild,v 1.7 2011/04/13 14:34:06 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libbulletml/libbulletml-0.0.6.ebuild,v 1.8 2011/05/18 10:33:38 tupone Exp $
EAPI=2
inherit eutils
@@ -20,7 +20,8 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN#lib}/src"
src_prepare() {
- epatch "${FILESDIR}"/${P}-gcc43.patch
+ epatch "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-gcc46.patch
rm -r boost || die "remove of local boost failed"
}