| 1 |
commit: f928bd3c92fca93814668701654a174e52e2ae5a |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Oct 11 05:24:28 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 13 19:27:09 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f928bd3c |
| 7 |
|
| 8 |
dev-games/clanlib: Fix building with GCC-6 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/596112 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/5915 |
| 12 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 13 |
|
| 14 |
dev-games/clanlib/clanlib-0.8.1.ebuild | 3 ++- |
| 15 |
dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch | 16 ++++++++++++++++ |
| 16 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild |
| 19 |
index 0e13a37d97d..dbd437a41db 100644 |
| 20 |
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild |
| 21 |
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2016 Gentoo Foundation |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
@@ -40,6 +40,7 @@ src_prepare() { |
| 29 |
"${FILESDIR}"/${P}-gcc43.patch \ |
| 30 |
"${FILESDIR}"/${P}-gcc44.patch \ |
| 31 |
"${FILESDIR}"/${P}-gcc47.patch \ |
| 32 |
+ "${FILESDIR}"/${P}-gcc6.patch \ |
| 33 |
"${FILESDIR}"/${P}-libpng15.patch |
| 34 |
} |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch |
| 38 |
new file mode 100644 |
| 39 |
index 00000000000..95284c2de4c |
| 40 |
--- /dev/null |
| 41 |
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch |
| 42 |
@@ -0,0 +1,16 @@ |
| 43 |
+Bug: https://bugs.gentoo.org/596112 |
| 44 |
+ |
| 45 |
+--- a/Sources/Core/IOData/Generic/datafile_inputprovider.h |
| 46 |
++++ b/Sources/Core/IOData/Generic/datafile_inputprovider.h |
| 47 |
+@@ -142,9 +142,9 @@ |
| 48 |
+ void insert(const std::string &resource_id, int data_pos, int data_size) |
| 49 |
+ { |
| 50 |
+ cache.insert( |
| 51 |
+- std::make_pair<std::string const, std::pair<int, int> >( |
| 52 |
++ std::pair<std::string const, std::pair<int, int> >( |
| 53 |
+ resource_id, |
| 54 |
+- std::make_pair<int,int>(data_pos, data_size))); |
| 55 |
++ std::pair<int,int>(data_pos, data_size))); |
| 56 |
+ } |
| 57 |
+ |
| 58 |
+ private: |
Archives