summaryrefslogtreecommitdiff
path: root/dev-games/clanlib
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-15 02:11:33 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-15 02:11:33 +0100
commit0fdd4074ff3dc0c507a9867380a4f91250a0b610 (patch)
tree83d3b64438d2f29b375d895f12b82d5c484db219 /dev-games/clanlib
parent8fbd420dce8836e6503b162092e07b6a77a89f1d (diff)
gentoo resync : 15.10.2017
Diffstat (limited to 'dev-games/clanlib')
-rw-r--r--dev-games/clanlib/Manifest3
-rw-r--r--dev-games/clanlib/clanlib-0.8.1.ebuild3
-rw-r--r--dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch16
3 files changed, 20 insertions, 2 deletions
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index a730e7e6fe29..86a3f9a86a4b 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,6 +1,7 @@
AUX clanlib-0.8.1-gcc43.patch 605 SHA256 97420cdbef4a3f09b61ddf54881a907616b8c73337928fcdc6e11d783f584320 SHA512 c1269c01852fd2912e895af82f2b109e7d81120a18dc3a7e2542a7bdc80e1da151c5e8a82914eb1fece2e51db17b7f1b99198dde6a36fa437dad3e9b4d6a8b83 WHIRLPOOL 8ac30a9eb0fff42711af134ca4f1f6559c902c76cbdc4584723b40bf48da47df40531205556cddc95bcb6efe022311e890c1a15474ee19c371f15a8faea39bff
AUX clanlib-0.8.1-gcc44.patch 1523 SHA256 e6b8dc302fc3587fae86d1ecf4ac5fbaf2a0563996887b38ea3f55d84b79e979 SHA512 7c3b154affede758a0ac93f5c142144e8a26c65b7c50a443b49633e0c2835fdfab90c6363d4b1997bfb53b0112bc16ca12abc44aacf7af927329e102fc1424b7 WHIRLPOOL 9551cfd00c00711127a51f1680b148b0b93ccd3bfa22d60150a73e1d45d7e7df949c3571f932bbd695e229bccf4a5fc2463d9e5bb4d152838db52553a1b9b26a
AUX clanlib-0.8.1-gcc47.patch 338 SHA256 fd5a02a670575f6298516d201bdaecabacb13ea01015e8d6abca1ee1fa41b06f SHA512 08f9719c97e0bf5fab83e56a881ac7a3edd162b052b5e8fea5878badedbf266b36788f77afd93032f4129ea8e50a83046f5672675e6616cdb29cb6fc5b6c635a WHIRLPOOL 6231a9b6270ac4da92c1a7d8645bb0dc492454eba89f51b559d103e37a3ce56bd1905726515fea18cff1bce8e1b50b2d8cf69db3a516dbda99174e471b67b2cd
+AUX clanlib-0.8.1-gcc6.patch 530 SHA256 5f8f08aaaa23c733645e984b67bdd39203b0bcec3d0853f7b707b7c6053f0dd3 SHA512 94a49f2aed8487fb03b97219802fd4b525b1de304d1dd3fcc9f7ccc392d5385438005c8198e3db8ec666f4fc875860159fbac94e5d90626c8aaf8730d3831f72 WHIRLPOOL 4c686f0d7b59904950dabf449aa813dce2dc51a18c74716c4d4ff3fff94d60d8977f2659aa7908d5c06a35d5847c47fe40cd11a9c4c26dda22752969bc05f709
AUX clanlib-0.8.1-libpng15.patch 377 SHA256 6e6a878d16292255cff4f64605db6478ac855f079505434ca9a2f61aadb88342 SHA512 735fd6cadbd1c76ff38a229361c82c1208ea8ba8db60bd8bff082424244da9e88f1c74d8067991516866887d6240846c551a24a7f392a12ae3a2d6ce50e8644f WHIRLPOOL e35e13c89f90583fd4878b149fd9d6e8ad50131e11f94672171779f397fc020c58e5465a61774dedf467b02916acf113a5af28fddb502ae7f5f815df45474fa4
AUX clanlib-0.8.1-ndebug.patch 866 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5 SHA512 653e70a71961e654bcdd488ccf4583c33dcb601fdef54fe15724e22cc0f0d51f265620137b4a2f194f1a915390c6be06adf66602b93c89d946a0a1650eee6419 WHIRLPOOL 05e452b4d264619eaa8e30e5449389974a6d75e8d064931ad40e308a94203e0858813234be8a1e44b3c6279c25a95d3f6592a4f6b753e3255329d858a2a4e0df
AUX clanlib-2.3.7-autotools.patch 1602 SHA256 9e75ca32d249d8103906a3ba681eb2b8b007939971630c7dd81fc01b006828d8 SHA512 d19fb6435adfe54fe1a6b2bff78dbb87bcf037ded720c4535dbfafef6bdd92c6c002f2ffdd6e563a360531b9a62817baf65ff959e44c0881fb0d95253a92b6fa WHIRLPOOL 46b6c21469a435656b6422eec7fa8c6237b5826c773372450ad177e62036e021d9c4708cf6b25646b0686c879b669d842813c63c4ce8281f87d3911752abbe10
@@ -9,7 +10,7 @@ AUX clanlib-4.0.0-fix-build-system.patch 622 SHA256 cb81f0954ced1d4f320435724f0b
DIST ClanLib-0.8.1.tgz 7629019 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495 SHA512 277daaf1055ae0198be7a6bbfd415c79cfae9e2145f62553e83849d670f56e50b8484c83f8b85f23290002e0b0c72c1e01ca597ad608a0954a4add828177293b WHIRLPOOL be486125f406a307676c4957f977b6ccc6bc2ce527a72fb4febcb3d1c7e2acdc4fc6706b66b75412184c3a0744c53e962011b0c3ac22958da5e987f0fccc9d87
DIST ClanLib-2.3.7.tgz 26132425 SHA256 d46127c08103f48d15936ceb9f95b3dfb1ff8ccba667cef1b3f8e639cb2601c2 SHA512 73169afc0f639390f80403150757a8a14f842bc291a9457c9bca1319642b78bc4d03a93327d75254230e39545c5b4b690e56dc0149ed7b60b223e5a5364e882a WHIRLPOOL a6547d0bc8d254e887c427dfff63deb2b69790124da3db49d54cf853f8c834d44172a06e92ef7fc5222c8c81f903ab29f186f85da698dc085f4138d147ddad68
DIST clanlib-4.0.0.tar.gz 7435551 SHA256 9b35052308a2b933bba76596930ab550fc8cd1f80155fc62aa648a23c3f4406f SHA512 e727239d782d2d52ce2f927e16a88c469b30f46d5b9eba4573baa520d98f60515df7ff4dd921092ddd5cfe4c6f5c441e0f33469b774287003db439feb8b027fe WHIRLPOOL b541c0dca233570f5c203269684de2a187391f35278722e81ca64b5f9fc3d61cb2f3cb615db6d4d7956369c04fbb9aea165a0ee5df0210b5bd50ab669d4fd691
-EBUILD clanlib-0.8.1.ebuild 2045 SHA256 ada284bfc014683723b20c8be67f4b8c636b7d5fa1e265b53a118c2889b0c14b SHA512 6080681892d8a0e5dad2d8a8e075e83efb9ce65583cb0d711c6fe38828613ed6d6fc754ac5786737946963c456f4e2a554265ebc313a3c54b21e41a3fa9f2350 WHIRLPOOL 5b76357490f2eb34883e49d4429625dec7aabd6927b33e7405cc783f861ab1951d1a0ac058b7c61a9eb5133fd77f20d27c2eae3353919bfbc51d0aaacc3191ce
+EBUILD clanlib-0.8.1.ebuild 2079 SHA256 82184e3bc5354fcbc857ae5201b0e93f20e6dd42fdb64e3d5979126dbda56536 SHA512 3e7bd7c08bc21337c31632275fbaa8c677f59e7d892be6d36740c3ea06610191920994ae4383026db46cd1d2521d7aca576d779c809179a90442ab8401e65860 WHIRLPOOL db124c08b169ec51c87748b64bd7312355f36e06cde3f7b339956d7e7c1e4ba7de2bc41939f637e4f582846e8863e8c93bb2245356aa4ffffbd7a73e892b2b31
EBUILD clanlib-2.3.7.ebuild 2150 SHA256 5d25b701681f474fe338ab61c12601e792c2672dda867db83b0f9ca98cc8be06 SHA512 845fea2f039d35a937f75b88deb866c7db55903254b664ae0fa86520f5d0a7ba111466284f6be99ef6422403b1cdfd45ba6f7ba0ff97d26309ab65ba80eeef57 WHIRLPOOL 495c69a0fbb5c7ccc427621609e8d056d968712642bfb176914759760a7f79203372db6c6d141338bc81b99c767264818e3269e50337eb01c9cbd21a6a7758ed
EBUILD clanlib-4.0.0.ebuild 1476 SHA256 bce1aaa77aa718a04c3c84442e34b7db8b17806928831cd5594f9e2e42a06f7a SHA512 ea1285fabb1db6cbf41f3f92e948b9627d832e53c7ef3de7dae23c42a790d85b0f06f1860da98b9e7367809148fead5c5a70928ea007451cbcb46ddb461aca12 WHIRLPOOL 6db03aa0e805615169fb4883c4f6f84bde7b955a07eea2d45ae226b5c331b9d1026f1f8ca40640e6e738bc28cfa368e74a5edb198a83139096f03b6d585a8d79
MISC ChangeLog 3462 SHA256 7f8c3a60ef606da2ff52ae6fb26f65453000880ae7fff2bb80f0d268837b6176 SHA512 da85daa7455b4a25ce5fb470d772bae2276375cb4466ef5e6c3a143dc13e043c24b9904097fd1768fdff680ebdb38993ea0729d2cb0938c8c7f1698fef72c142 WHIRLPOOL 446ed0a8066a39b0faec14072dedebc9b0e032acb512a121e61276c34134ef3ce82076f14e60e5e00595ce145fa144800d301b3cff571d9562110f50f1a00ea4
diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild
index 0e13a37d97d2..dbd437a41db7 100644
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -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
}
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
new file mode 100644
index 000000000000..95284c2de4ca
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc6.patch
@@ -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: