From 996c73bac685a46905c9f70531483748761c97a1 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Tue, 20 Jan 2015 01:25:42 +0000 Subject: [PATCH] fix build with USE=dedicated Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- games-strategy/wesnoth/ChangeLog | 6 ++++- games-strategy/wesnoth/Manifest | 5 +++-- .../wesnoth/files/wesnoth-1.12-cmake.patch | 22 +++++++++++++++++++ games-strategy/wesnoth/wesnoth-1.12.ebuild | 3 ++- 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch diff --git a/games-strategy/wesnoth/ChangeLog b/games-strategy/wesnoth/ChangeLog index 84419ff39b89..89813ed44fba 100644 --- a/games-strategy/wesnoth/ChangeLog +++ b/games-strategy/wesnoth/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/wesnoth # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.237 2015/01/13 18:11:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/ChangeLog,v 1.238 2015/01/20 01:25:36 mr_bones_ Exp $ + + 20 Jan 2015; Michael Sterrett + +files/wesnoth-1.12-cmake.patch, wesnoth-1.12.ebuild: + fix build with USE=dedicated *wesnoth-1.12 (13 Jan 2015) diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest index a470942372df..a58ea6bceee8 100644 --- a/games-strategy/wesnoth/Manifest +++ b/games-strategy/wesnoth/Manifest @@ -1,7 +1,8 @@ +AUX wesnoth-1.12-cmake.patch 776 SHA256 67fbcc67dd63d24a330d5bc58e98070bc8f12718442261a013017909f159e435 SHA512 ca359b97fc803691aa4f5b19cd2084558cf8e6b0f1f3b9beebfc09122b10d2bfbb79a5d497dca7f05017eb834f06ab690b9c958c430d07fcd9a8aa02588a22d4 WHIRLPOOL ab890cd57cc8451ea6b0e23b8d336880e76b88dd63f38f965f508f3c5434a28ee73f321302271e2dc9534741e8efe3f08383f5071df7b434a164991763cba7ef AUX wesnothd.rc 619 SHA256 23e250272768e1fb540104b96c96a24da09fedc9f89a6867adcae046160c0065 SHA512 b9f08d1e026ef8e970e8c7eb1533b91b9185917697bacf874970108f515b4d8af5ebc9a4ff2335f1fb19c37ca6fd281bd7153e773bcace22acf7f0772d2beb43 WHIRLPOOL fd35eeb82f6b15663194e28f301452753d8d0892df2f516dac7d579629978d5804fb277d930b0dcedf219fcd28f5389f8f6b89fd25a858c2402be4d1c19b788c DIST wesnoth-1.10.7.tar.bz2 347431490 SHA256 8a3b5a3409a57b646536e547094e1bb8bcd87797e00cd63184152222e377253e SHA512 3df710bfc9d5737b651dc7520d9692a6a12f8c5c41db518d36c45dfda072f42073059c2d31dc8a835b1b6d4956921ae75484750c51d9175266c96dc2297d2b8d WHIRLPOOL a190a1cae2fdb885a3ff7908a21646306eb5bca22eb4417b258cf7640fab67fb01582f8c5afac2ee9f496443686f9a9e0d1d28aaad8de30722d2669a9dcddb21 DIST wesnoth-1.12.tar.bz2 385428948 SHA256 9e2b15cf6196ae7059fc48b5483aa6973473688602958dd64211b1775b513e0a SHA512 6b39b8a27e4d86b1055bd69a8baad247acbf4c50f2b80ab4681e47e9d8e5095e9ad55d9c3fc18f8dc649ee3e72554c084d005e61799bcfc258dd5573bd07fe4e WHIRLPOOL c35abaf2346e0d3f135f8e0e7894786f30c36f5671f328043a04b507da618f7d0789451631db9ad0e5ad538adb222ffcfdc81447b278f77d7c37c3406a8bb401 EBUILD wesnoth-1.10.7.ebuild 3559 SHA256 54ad8fb62961d5ed246d3386a6452b8ee358f34d997e1cc80eefe7c342ca83b4 SHA512 37db5038ccba06a3df1c5f6540a22521a39ff7292dca5e2ecac36d9d1b31a93268b1f3102c740e0758e0908a637a5c16dc8230ac576cbb5681289563cc1ba212 WHIRLPOOL 18e351a6aa0ed95518fc3373d7f40d44db1f10eb2cd446dbb4cd0cf1d03b1c30cc3bd74382f1779cc1c37c8b535acccc8266b82f8f51d3954030c0e276d0121f -EBUILD wesnoth-1.12.ebuild 3226 SHA256 8bce45e1b46cefd2a4041adefca8bb4f7a2b3689ae869259df4c8ef28eb7e977 SHA512 b5236372f0c39ca77ece070042778fef83f6e612e9316c100b271ccdf384ca979eb9bf4dcdb86705c70fcd29792a917edac4072d037e3bd9da9e9008e3f48111 WHIRLPOOL 545b5dd450762c52e1369ffe5860cfee4452f834dc8c75a933a7872d73389e3be987fbe03766864f363c64182daa3b0303fdbfdee2ed0acb8266dd04b489a2a9 -MISC ChangeLog 30327 SHA256 d2a1bf28a5303dc8102c752be87080b4974512949f73152759de2ba0239fc425 SHA512 ce16e5880d913f08d834ec507d089120065eca40a0e2684f796a39ece89f5e4c34c812264b352403ca356fdc9d081e62c43553af32881c85b63f9791b5643089 WHIRLPOOL ef25176a9f2f4be6501b5234e4d5c1acb49f613367537ca283345281fc904286a3a08f630b2c9ee2c64589684377a63d909539c84c7543112f1b2a9213ca62f3 +EBUILD wesnoth-1.12.ebuild 3265 SHA256 01aaab109b4532cd902c4077ab15c91afb2a5f2b7325ee7f90291ec8028152c6 SHA512 88ddc38239fc23461e9505d118e3ad1940fa1dd60cf8a4a7188a89539a6ae9121ecd3b62554e0b3616629b4862af222481d7215dba063c4ec6b53c871e086b4c WHIRLPOOL 0a1c4bfd88a9cbea9c04a069d0efae124c801a4ba4980e63a2e5a1950fffbbde42381f697a45baf88801e135f06ddf73c08ac7b8406d54267bd53f026843ac37 +MISC ChangeLog 30470 SHA256 4345fdb1b640eb7bfcbed6c5998389760370cfd4752480a3e00b8ad83bb0258c SHA512 bd4ae18c27299ce7394b6370cc370603d7bb93adf5573b7ba1242264de9932765da0917eb8ffc01b2debc36ec542a46316f0cdac2378f5dcfb6525589bf1f6d3 WHIRLPOOL 784ae6f5d005e21cb3b0a8e050b5ca5a1079f37fd90d227f3c1e5a770aa58e428002c5490c3bad5cecf340563c57539ae1ab462a4f7dd84a9bc8db1594418ca1 MISC metadata.xml 302 SHA256 afd1ff335c3bb72bc79f1dd4129c02ef626dbc6014a707eee751423617c7ea95 SHA512 748c7f5671781c960c364a103fc1a8ecc1a0816f2096ced4a67cda1fd19506387845fc76b1b52af226147797ba08edc8a335beec0febaded243efadfc2e31f9e WHIRLPOOL a654cec8b79da00f18046a8fcf5755603bf9dcff2be8abfd0b869d3afa659dfbd78964388a5ae425aae30ff621119895c649eaef421db5fbc4bb08f7c6c835b9 diff --git a/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch b/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch new file mode 100644 index 000000000000..767dd6c8a3ae --- /dev/null +++ b/games-strategy/wesnoth/files/wesnoth-1.12-cmake.patch @@ -0,0 +1,22 @@ +--- CMakeLists.txt.orig 2015-01-19 18:46:51.019420318 -0500 ++++ CMakeLists.txt 2015-01-19 18:47:15.977567447 -0500 +@@ -590,13 +590,14 @@ + endif(LIBDBUS_FOUND) + endif(ENABLE_NOTIFICATIONS) + +- if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) +- find_package( Boost 1.44 REQUIRED COMPONENTS filesystem ) +- find_package( Boost 1.48 REQUIRED COMPONENTS locale ) +- endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) +- + endif(ENABLE_GAME) + ++if(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) ++ find_package( Boost 1.44 REQUIRED COMPONENTS filesystem ) ++ find_package( Boost 1.48 REQUIRED COMPONENTS locale ) ++endif(ENABLE_BOOST_FILESYSTEM AND NOT ENABLE_PANDORA) ++ ++ + if(ENABLE_POT_UPDATE_TARGET) + find_package(TranslationTools REQUIRED) + endif(ENABLE_POT_UPDATE_TARGET) diff --git a/games-strategy/wesnoth/wesnoth-1.12.ebuild b/games-strategy/wesnoth/wesnoth-1.12.ebuild index 7390716dae86..8891d825fc64 100644 --- a/games-strategy/wesnoth/wesnoth-1.12.ebuild +++ b/games-strategy/wesnoth/wesnoth-1.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.12.ebuild,v 1.1 2015/01/13 18:11:11 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.12.ebuild,v 1.2 2015/01/20 01:25:36 mr_bones_ Exp $ EAPI=5 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games @@ -62,6 +62,7 @@ src_prepare() { done echo "$langs" > po/LINGUAS || die fi + epatch "${FILESDIR}/${P}-cmake.patch" } src_configure() { -- 2.26.2