diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2014-11-04 22:04:26 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-11-04 22:04:26 +0000 |
| commit | 46ef4180ce81577da623ee2d92de01c11d0ffd94 (patch) | |
| tree | 028f0b6ecd2f01b3df854472a6bdc1fa0dc21f8b /games-strategy | |
| parent | arm stable, bug #527842 (diff) | |
| download | gentoo-2-46ef4180ce81577da623ee2d92de01c11d0ffd94.tar.gz gentoo-2-46ef4180ce81577da623ee2d92de01c11d0ffd94.tar.bz2 gentoo-2-46ef4180ce81577da623ee2d92de01c11d0ffd94.zip | |
Add upstream patch for building with cmake-3 reported by zimous via bug #526624
(Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-strategy')
| -rw-r--r-- | games-strategy/hedgewars/ChangeLog | 7 | ||||
| -rw-r--r-- | games-strategy/hedgewars/files/hedgewars-0.9.20.5-cmake3.patch | 10 | ||||
| -rw-r--r-- | games-strategy/hedgewars/hedgewars-0.9.20.5.ebuild | 6 |
3 files changed, 21 insertions, 2 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/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 |