gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-games/clanlib: Fix building with GCC-6

Browse Source 
Closes: https://bugs.gentoo.org/596112
Closes: https://github.com/gentoo/gentoo/pull/5915
Package-Manager: Portage-2.3.10, Repoman-2.3.3
This commit is contained in:
Peter Levine
2017-10-11 01:24:28 -04:00
committed by Andreas K. Hüttel
parent ef610550ba
commit f928bd3c92
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev-games/clanlib/clanlib-0.8.1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -40,6 +40,7 @@ src_prepare() {
"${FILESDIR}"/${P}-gcc43.patch \
"${FILESDIR}"/${P}-gcc44.patch \
"${FILESDIR}"/${P}-gcc47.patch \
"${FILESDIR}"/${P}-gcc6.patch \
"${FILESDIR}"/${P}-libpng15.patch
}

16
dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch Normal file
View File

@@ -0,0 +1,16 @@
Bug: https://bugs.gentoo.org/596112
--- a/Sources/Core/IOData/Generic/datafile_inputprovider.h
+++ b/Sources/Core/IOData/Generic/datafile_inputprovider.h
@@ -142,9 +142,9 @@
void insert(const std::string &resource_id, int data_pos, int data_size)
{
cache.insert(
- std::make_pair<std::string const, std::pair<int, int> >(
+ std::pair<std::string const, std::pair<int, int> >(
resource_id,
- std::make_pair<int,int>(data_pos, data_size)));
+ std::pair<int,int>(data_pos, data_size)));
}
private: