summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2014-11-04 22:04:31 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2014-11-04 22:04:31 +0000
commit63928739711f79643f41f777c4c355b54939681c (patch)
tree21a1fcdf15da6584e5581bed3ada96920fed5050 /games-strategy
parentarm stable, bug #527842 (diff)
downloadhistorical-63928739711f79643f41f777c4c355b54939681c.tar.gz
historical-63928739711f79643f41f777c4c355b54939681c.tar.bz2
historical-63928739711f79643f41f777c4c355b54939681c.zip
Add upstream patch for building with cmake-3 reported by zimous via bug #526624
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Diffstat (limited to 'games-strategy')
-rw-r--r--games-strategy/hedgewars/ChangeLog7
-rw-r--r--games-strategy/hedgewars/Manifest5
-rw-r--r--games-strategy/hedgewars/files/hedgewars-0.9.20.5-cmake3.patch10
-rw-r--r--games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild6
4 files changed, 24 insertions, 4 deletions
diff --git a/games-strategy/hedgewars/ChangeLog b/games-strategy/hedgewars/ChangeLog
index 3b87624807e0..40ad350c8650 100644
--- a/games-strategy/hedgewars/ChangeLog
+++ b/games-strategy/hedgewars/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-strategy/hedgewars
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.61 2014/09/06 01:08:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.62 2014/11/04 22:04:26 mr_bones_ Exp $
+
+ 04 Nov 2014; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/hedgewars-0.9.20.5-cmake3.patch, hedgewars-0.9.20.5.ebuild:
+ Add upstream patch for building with cmake-3 reported by zimous via bug
+ #526624
06 Sep 2014; Michael Sterrett <mr_bones_@gentoo.org>
-files/hedgewars-0.9.20-paths.patch, -hedgewars-0.9.20.ebuild:
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
index 0888ab272c8d..5d554866329c 100644
--- a/games-strategy/hedgewars/Manifest
+++ b/games-strategy/hedgewars/Manifest
@@ -1,6 +1,7 @@
+AUX hedgewars-0.9.20.5-cmake3.patch 512 SHA256 700c3e655db8aa67f08c9544d7487e5374ab7538a6a01184c1f93b2b314dfd0f SHA512 9439804a7383f6077a4dcef8987ecb15b24f017ce33bc594380daee90c7410126bbb124a2298714031d4e1c17df576becd580168a4492911097e6c913254f56c WHIRLPOOL 5da93929c81e7427a8d64626481874ff3550d08657312055bdcd2117c4de1832adf7e9c60286176104e284e5f028f47ee46988aa5c03cda5a2cf4fcc75464940
DIST hedgewars-src-0.9.19.3.tar.bz2 191688324 SHA256 93adb39268e92b730d1014897bfcf55e0ee46e31b174f769b11408690a33ae90 SHA512 6aeb63e999ecba30af08db9c895b24527c3372558c50e5c58640fcdd0c7d4d800ae35de42f18945b870a4dc20b1f259e6748cc968fd0fdf6575ad6acc5c0aefe WHIRLPOOL dc4bd983ba6066368a8d0d3c14be5bb1aab10169f1fc7d607a4009714d085b8f0ed85670de76f64051a7f2b4cbecadde5cf1aad96254064f80ee48a636f9a582
DIST hedgewars-src-0.9.20.5.tar.bz2 161550331 SHA256 a6d0896fe88d5746a4272c8f495c7457b17586e8d16ef429ce50dfa449c0adcc SHA512 f5e522008919c97f7826fe7fb9250ac0ae90041b3b672bb38593d3ed6dee424dad8daa2e7d176f392baa52bb5ade2c429957c52a1c092d565a10918d51fe3cb0 WHIRLPOOL 5102c676681b22e04248a67c51423a7564aa4a8b21d7fc24041b9eb920094208d2f849ba1b4a618d2b648996e820f03ae450bfc00817b9713c491d1bcb5c31f5
EBUILD hedgewars-0.9.19.3.ebuild 1748 SHA256 9a80b7cf3efc31099f2245ca305f6ba8ee88a2e75a99aec4816024ecc8eeffbd SHA512 a5d85a67baaeb4ca58ba13cdddc1817d0d6516d8a1b74e2c9ced439376dafd21b693ef756e310896d9a3318c8567d3d41f211e65218a385e731581fc8485597c WHIRLPOOL 5dd1ee7311bb7f24c38650ade958d9765dd137dae2effb8d0960196b7446daac24b4f7dc62592e7ef26c286a393229bf1fd9b435df31f5d2ad5df8a283fc220a
-EBUILD hedgewars-0.9.20.5.ebuild 2033 SHA256 7a8fb3998afe4f907c11e33212a46a1836abefa6adafa1354205d1e4a74f89ec SHA512 81618ab15ca21980ddf61a014f6fe07f83ef0dd3cb7ebe353a56855ac17b665023e8b08aa82e3ad2756a46743379dc29a245ac0866301d789f364ddb35da927b WHIRLPOOL 7bdb0d5225a438d62f89acaf2be952b470798a447decc9d567dcd97a720b48dc9a1b40782a659fe4fdf5663ecd9e19011cd82375edf3c909efb13cc22002cf3a
-MISC ChangeLog 8933 SHA256 a9a95d77811aa63333c001298e7a523c0df6bc7e93fd1c6d64197e948545efbe SHA512 44eac4364093b7947ef378b4dfa912550f844e35fae41fe8bbdf84643b08fa7e2e82cdce0c2d8046e2733de0eaf585811f8d0eb2b5d5a4d9bdd9627b490059c7 WHIRLPOOL b9972fb039140a0423f7cf1c2b8bfaebf72014cb55ff3bc9a0b39e24ae272a4aaa82b7b16e1bb2afaf7c3b8f7e9d8337162c49636dca5b0f00eaabef94062314
+EBUILD hedgewars-0.9.20.5.ebuild 2092 SHA256 318b4cfd965212cc7cef856280ced7e5812bd3fcc16fa08adf662d413a4797c9 SHA512 f42857d2aa06ec30ca7ca6951a4e4d11be8691455a0cdfb4c4d98a37cd00aa29327bddc70cfa76f7ebb61ed052639f81851da237b0d3aba7606f659afc759863 WHIRLPOOL 14c0dd43d5485a09d7b063f5983c9c5c3857357d5c8a4cf7eea6717413e36ad6030fdc34bae17af762889ae2250dc13604cc6b37a012de62ea10d9d5df2401cf
+MISC ChangeLog 9142 SHA256 2a77b090b62b7b65c2c3b9cd18307025118efe64dc932ff4fd022eb23fcea3ae SHA512 830fc55653ccbcaef9091f7d15577166301fc201e7c8fa22fe80990f3b48990dab9e1de404aef822fe33ef1c5dead41d14c782ba3a19e64df94f6c066bf1c35d WHIRLPOOL c1e35d33ef81eea76cf9faacdaf9c6ba07209fdc6097d15109813d5e991317fd966b3a366d7098d39f4efaf6bdca3dedd89ae5d7fb1f85ec4fdb99750f180ab8
MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.20.5-cmake3.patch b/games-strategy/hedgewars/files/hedgewars-0.9.20.5-cmake3.patch
new file mode 100644
index 000000000000..5adaf61b559b
--- /dev/null
+++ b/games-strategy/hedgewars/files/hedgewars-0.9.20.5-cmake3.patch
@@ -0,0 +1,10 @@
+diff -ur hedgewars-src-0.9.20.orig/share/hedgewars/Data/Locale/CMakeLists.txt hedgewars-src-0.9.20/share/hedgewars/Data/Locale/CMakeLists.txt
+--- hedgewars-src-0.9.20.orig/share/hedgewars/Data/Locale/CMakeLists.txt 2014-11-04 22:21:43.101323852 +0100
++++ hedgewars-src-0.9.20/share/hedgewars/Data/Locale/CMakeLists.txt 2014-11-04 22:22:51.166867233 +0100
+@@ -1,3 +1,6 @@
++find_package(Qt4 REQUIRED)
++include(${QT_USE_FILE})
++
+ file(GLOB txttrans2 ??.txt)
+ file(GLOB txttrans5 ?????.txt)
+ file(GLOB tsfiles *.ts)
diff --git a/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild b/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild
index 478535f8531c..fe86e41b7675 100644
--- a/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild
+++ b/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild,v 1.1 2014/08/27 07:51:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild,v 1.2 2014/11/04 22:04:26 mr_bones_ Exp $
# TODO: when physfs-2.1.0 hits the tree, set
# -DPHYSFS_SYSTEM=ON
@@ -42,6 +42,10 @@ RDEPEND="${RDEPEND}
S=${WORKDIR}/${PN}-src-0.9.20
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cmake3.patch
+}
+
src_configure() {
local mycmakeargs=(
-DMINIMAL_FLAGS=ON