diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2012-12-07 16:31:28 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2012-12-07 16:31:28 +0000 |
| commit | c84018cfa517f3d9688ee3fa73bfb995083a5f1b (patch) | |
| tree | 9b61cf188078589205b5348d5e3c86660c1c94c1 /games-rpg | |
| parent | dont (diff) | |
| download | historical-c84018cfa517f3d9688ee3fa73bfb995083a5f1b.tar.gz historical-c84018cfa517f3d9688ee3fa73bfb995083a5f1b.tar.bz2 historical-c84018cfa517f3d9688ee3fa73bfb995083a5f1b.zip | |
fix compilation for cmake-2.8.10
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3
Diffstat (limited to 'games-rpg')
6 files changed, 101 insertions, 8 deletions
diff --git a/games-rpg/arx-libertatis/ChangeLog b/games-rpg/arx-libertatis/ChangeLog index 390546c9c927..cf9ade3e56ef 100644 --- a/games-rpg/arx-libertatis/ChangeLog +++ b/games-rpg/arx-libertatis/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-rpg/arx-libertatis # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.9 2012/12/01 21:30:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/ChangeLog,v 1.10 2012/12/07 16:31:24 hasufell Exp $ + + 07 Dec 2012; Julian Ospald <hasufell@gentoo.org> + arx-libertatis-1.0.2-r1.ebuild, +files/arx-libertatis-1.0.2-cmake2.8.patch, + arx-libertatis-1.0.3.ebuild, +files/arx-libertatis-1.0.3-cmake2.8.patch: + fix compilation for cmake-2.8.10 01 Dec 2012; <ago@gentoo.org> arx-libertatis-1.0.3.ebuild: Stable for amd64, wrt bug #428222 diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest index 3eda2fcd3180..db75c481a95f 100644 --- a/games-rpg/arx-libertatis/Manifest +++ b/games-rpg/arx-libertatis/Manifest @@ -1,9 +1,25 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX arx-data-copy 3090 SHA256 9f24928ec21c495147ff0c1c9fd88ab352fd300022bb0751d58b533a96d099d2 SHA512 dfbe8c97b9c7562062eb83f6558d23833a70ab8ca5e42f6cbadbdb97fd3e1cd4f568c415203e7c7aae36522187453f38304afac8a7e2cdc6f3288f76f915ffcb WHIRLPOOL 7db29955044aea81efc75958107d93d98b10d0170d654a8561361331d6f9038fb0ab0f7b2ac656067c67fddd91b80e1d4aec8f6b4ff2126939a565f4b135b788 +AUX arx-libertatis-1.0.2-cmake2.8.patch 1025 SHA256 4deb878b260d9dd11b587ed4c710f11bf4a010dd1611a6335b851ff202536b66 SHA512 6d0fdde817aef14dc84513213dcc0a9de560082207f0ca06d618a65b73ae6b96c4249b8c062dc864075d763d9667f5fc815f553d889582590d69226d0db3ff8e WHIRLPOOL 7920c60e82af9db05cb621d7674cb83958b52ee7a5449a39091694440c8c73310128fa0e75bac82a2ecc1920ef3fbfddb1e1acdf268551a321ded145d981df22 AUX arx-libertatis-1.0.2-gentoo.patch 2009 SHA256 99ee2ac74a12adf7d614a1561e4eeced9adc5f6498c613e6e3cf6455913c333f SHA512 f92e51b4e14cefb35a0afb4a17a8e4a8c3ab816273c45fe89f7cf02197f5fd749d4547605e8eebd872dcf0b000b2fdc55a5e1c5442e93a9b6e3bd85362079909 WHIRLPOOL a93ef0ac90afd7e8830960c9929c1d7a8fb987e6cc1de30e78222267c5be13a93fcb95950f52f7ad79d91d41ff6ab9e2934322481595bedc25acab9ec73cd2fa +AUX arx-libertatis-1.0.3-cmake2.8.patch 1025 SHA256 4deb878b260d9dd11b587ed4c710f11bf4a010dd1611a6335b851ff202536b66 SHA512 6d0fdde817aef14dc84513213dcc0a9de560082207f0ca06d618a65b73ae6b96c4249b8c062dc864075d763d9667f5fc815f553d889582590d69226d0db3ff8e WHIRLPOOL 7920c60e82af9db05cb621d7674cb83958b52ee7a5449a39091694440c8c73310128fa0e75bac82a2ecc1920ef3fbfddb1e1acdf268551a321ded145d981df22 AUX arx-libertatis-1.0.3-gentoo.patch 2009 SHA256 99ee2ac74a12adf7d614a1561e4eeced9adc5f6498c613e6e3cf6455913c333f SHA512 f92e51b4e14cefb35a0afb4a17a8e4a8c3ab816273c45fe89f7cf02197f5fd749d4547605e8eebd872dcf0b000b2fdc55a5e1c5442e93a9b6e3bd85362079909 WHIRLPOOL a93ef0ac90afd7e8830960c9929c1d7a8fb987e6cc1de30e78222267c5be13a93fcb95950f52f7ad79d91d41ff6ab9e2934322481595bedc25acab9ec73cd2fa DIST arx-libertatis-1.0.2.tar.xz 912096 SHA256 cd40510563f93149f237df55d373900f85eb05c9cc5731efe4d173f314d4fadd SHA512 87b52feac0edaea009c25cab84cf206322be7440dc4ee04484578ae18bd340a11dde3fd10dce13c801d510d335d0afb219d4b6fb2eae4fdda2136caeaf1e9e9e WHIRLPOOL 7c8855868fd9fa865af1eaa88aa8c99e59f1db8a62eb3de407e5163eeb8f529e6709c7269ef8cd617131f0b5c5f5efdf97270bb2590be8f2291baeaee6267bbb DIST arx-libertatis-1.0.3.tar.xz 912288 SHA256 5719e1602051f6a6dc13ac0366ff03804f914ffbd855e7e06fdeb0d065fb6d32 SHA512 e1e8d581b6a7928911abad124a6f9670c28f2a56bc7f7f3bae965f717977a0e9a3953514a663c3f7eb4a802cca8e5607feec829a3b7ffeccc83a835fd77a74b6 WHIRLPOOL 321ec489a474b9a63a762756d929371bd8c05ea5d2fa7994c597a86dc20009f385c5f8d23c1da5f978e9f358949a96bf23bf218245633fd5f4393294fbecee75 -EBUILD arx-libertatis-1.0.2-r1.ebuild 2367 SHA256 c48e9da7f9dc966d646f831f4b467c093e51e9eaf2f98c38e03a4a1af3d8cd59 SHA512 45012118625086b10b2854db8a72143e2d042520f8085a6833f6ce00729a36587cd423842c7bea8f3a9d8da4826ea9b47d97864252c5e652be460bb0c4e60799 WHIRLPOOL 0520739f547852ac6f11980f6d272f793f49984952ae1e3b8589c615ab8338b6c64bf80f270c33b3c29a79fb1068a6ca279ab8b359db997b2ac6f194adf9ee57 -EBUILD arx-libertatis-1.0.3.ebuild 2364 SHA256 05dff6ac5e64d6216c9956e52e16b8160187e04446490e4acea1c74f95f50c8b SHA512 16e078db427af60fc91764bf0a4db22b0e73151ace5836b6ca0c3af03b5e590f722f31c1b98b7eb869f966428b2262bd2889e77fd46aaf063ef28b3f0c8c9f7a WHIRLPOOL 07c613029a66f6e5f0a74ce2b800d5715862086438791f4d6cacd1bcaacf8949a34e66db4999dea42b35ae567ff07a6a113ed69e27164d17113dcedb9bffa4c6 -MISC ChangeLog 1494 SHA256 615cc8023a77a34b44a9465ceffd96426df2bc8ebccbf9083e063377c055043b SHA512 6f557c10c3e3e92668e538d87e28c26bf2d43b0f5844725329484cb8f055b1783bb522372b711f9352a141c5db722056bce5e1c919e0dcd31823240a900b2e3c WHIRLPOOL 772d820a01faefaf55e8459d74dba835b177b46bd8e3f305cb0b7ca4ee9347fdfb9ad79904afc509e998b7280a84fb97d437c94361bdee93fd4f18c83e537921 +EBUILD arx-libertatis-1.0.2-r1.ebuild 2383 SHA256 037dc3ac46b0f90905be7cc0c939bd427ba0d3d946210527dfe1d9eb013869f9 SHA512 131fdba029ece715a7e4ab23559df3a6360b0d5bedcc3a817efa2826fc9e3502512fe805c031793fa4b8cd1d22c7930ea27d8fcaa3cfb2d8b61429b076832988 WHIRLPOOL a0eb226d5e5741910aa40183d663e0a29c13a216794c538d5294fa23b154fa577fb9d4522d108d8dfa263917864b4ec589448f28810ae51242ce1e136c144293 +EBUILD arx-libertatis-1.0.3.ebuild 2380 SHA256 23f8d7d723f3997b41b2f180fe0dd27c1da7da5010534c681b2bff42e1020ecc SHA512 402cb83615c178d43b44fa778e17815587e16fb3e294503f1e1cbddbaee90ee3e7f8f79b95dbe011c92674ede461594b14f0c2426fe5d0373f2dc2ac1ca42dcb WHIRLPOOL d87a0c2a3d04117a1414db5c03fee5b0f85385ff436a8c86fb63ce04fc82b0864141c01b38e150dfd4dd28caf6e9e240784377e40f3b2275d75023aa68d6af00 +MISC ChangeLog 1740 SHA256 02ced32c1efc7cae8c7960d5c323001efa991fd145683e547192daa00f554200 SHA512 01a3f39c59cf68c64d1bc04c7862acd3b81695555164467beb6e75686238e85e95480b7a57d221255a796ec9177f82db5d5bd52624b21edbb04a10b80caab206 WHIRLPOOL f3bc4d1e95eba9d59c2411b2bdeb362835a4728fb13892b2a150bd2aa97c9003383c2fc983baf73863f7b39a376f2f15a0e9f7d9f928f8414cce4ea4baca1d4f MISC metadata.xml 952 SHA256 b74747eda1686586d9c7fbeaf3f52102af43f468704707c5702670caa5e03aed SHA512 6c28dedbf6902a0228332a987c46730171c8cb380eefadaa52d87a181225207a8713888ac99d0eb6f2211eccdc670c866f0c7cbe8525b2300fd910c4091bd4b4 WHIRLPOOL bafeee8fc21e22dad3106367d52eecefeb1885e287a273c1ef7f66d9b02804a317bc05e58eba6e0db5a9403f8df015749e3f2bc588e5a10392237707ec589043 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQwhngAAoJEFpvPKfnPDWzRIUIAINRA8rPNhNArwlYvOzTR2ke +vJ3npbW18eGfgj9BKD6rItVRT2drjGGHq3erhAxKbSp7/iuHtPzD0YAGJzr2Xa2I +SmGPHhgMfMomPXxx6IywVASOEiRleyF+JmKKyGFvGEc2nfVaEBQDoRe7axPr0RcY +4+zZ8KYvXSdycRiE5SerV9ajIl+539VhcH6RCXqcr36M74SkuT09oZrG3nDTK0kG +CuAssIB9sdU+FQOTUdFqMtTp7qsYW60HJhrC7mLLXroalZmJLo5kImNTiuCj8iZ2 +GcHCxfAW6ue3akIq38iXub402tlkv1ff0PS8bEzcuYk6kdYkZai2kEpwWbHvegc= +=+Td/ +-----END PGP SIGNATURE----- diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild index 4b0f0e0a4103..9ffdd2a23ec0 100644 --- a/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild +++ b/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild,v 1.5 2012/08/11 10:19:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.2-r1.ebuild,v 1.6 2012/12/07 16:31:24 hasufell Exp $ EAPI=4 @@ -37,7 +37,7 @@ PDEPEND="cdinstall? ( >=games-rpg/arx-fatalis-data-1.21 ) DOCS=( README.md AUTHORS CHANGELOG ) src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-{gentoo,cmake2.8}.patch } src_configure() { diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild index 298e547ead68..4f5be057c826 100644 --- a/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild +++ b/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild,v 1.2 2012/12/01 21:30:51 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-rpg/arx-libertatis/arx-libertatis-1.0.3.ebuild,v 1.3 2012/12/07 16:31:24 hasufell Exp $ EAPI=4 @@ -37,7 +37,7 @@ PDEPEND="cdinstall? ( >=games-rpg/arx-fatalis-data-1.21 ) DOCS=( README.md AUTHORS CHANGELOG ) src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch + epatch "${FILESDIR}"/${P}-{gentoo,cmake2.8}.patch } src_configure() { diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.2-cmake2.8.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.2-cmake2.8.patch new file mode 100644 index 000000000000..b44dce2570c5 --- /dev/null +++ b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.2-cmake2.8.patch @@ -0,0 +1,36 @@ +From 1cd224fe2933edf33fa1fe7003fc6580e38217fa Mon Sep 17 00:00:00 2001 +From: Daniel Scharrer <daniel@constexpr.org> +Date: Sat, 3 Nov 2012 04:43:42 +0100 +Subject: [PATCH] Fix build with CMake 2.8.10 + +Previously we checked for SDL by using + find_package(SDL 1.2 EXACT) + +This worked with earlier CMake versions as the find script for SDL +didn't provide any version, so CMake just ignored the '1.2 EXACT' part. + +In CMake 2.8.10, FindSDL.cmake reports the SDL version number as +major.minor.patch, which is never exactly equal to 1.2. + +This commit relaxes the check by removing the 'EXACT' requirement. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14ec2fe..5690176 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -145,7 +145,7 @@ if(USE_SDL) + # due to the need to have NSApplication correctly setup by SDLmain. + set(SDL_BUILDING_LIBRARY 1) + endif() +- find_package(SDL 1.2 EXACT) ++ find_package(SDL 1.2) + endif() + + if(MSVC) +-- +1.7.10 + + diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch new file mode 100644 index 000000000000..b44dce2570c5 --- /dev/null +++ b/games-rpg/arx-libertatis/files/arx-libertatis-1.0.3-cmake2.8.patch @@ -0,0 +1,36 @@ +From 1cd224fe2933edf33fa1fe7003fc6580e38217fa Mon Sep 17 00:00:00 2001 +From: Daniel Scharrer <daniel@constexpr.org> +Date: Sat, 3 Nov 2012 04:43:42 +0100 +Subject: [PATCH] Fix build with CMake 2.8.10 + +Previously we checked for SDL by using + find_package(SDL 1.2 EXACT) + +This worked with earlier CMake versions as the find script for SDL +didn't provide any version, so CMake just ignored the '1.2 EXACT' part. + +In CMake 2.8.10, FindSDL.cmake reports the SDL version number as +major.minor.patch, which is never exactly equal to 1.2. + +This commit relaxes the check by removing the 'EXACT' requirement. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 14ec2fe..5690176 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -145,7 +145,7 @@ if(USE_SDL) + # due to the need to have NSApplication correctly setup by SDLmain. + set(SDL_BUILDING_LIBRARY 1) + endif() +- find_package(SDL 1.2 EXACT) ++ find_package(SDL 1.2) + endif() + + if(MSVC) +-- +1.7.10 + + |