diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2015-04-23 21:38:04 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2015-04-23 21:38:04 +0000 |
| commit | 17d93a1fb3a45800c16fc7535f224de920ea5ce1 (patch) | |
| tree | 425d80f5a67a80dc679e3d2c64faa6483834d7f8 /games-puzzle/meandmyshadow | |
| parent | Version bump. (diff) | |
| download | gentoo-2-17d93a1fb3a45800c16fc7535f224de920ea5ce1.tar.gz gentoo-2-17d93a1fb3a45800c16fc7535f224de920ea5ce1.tar.bz2 gentoo-2-17d93a1fb3a45800c16fc7535f224de920ea5ce1.zip | |
add patch to fix building with newer versions of cmake (bug #547494)
(Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'games-puzzle/meandmyshadow')
| -rw-r--r-- | games-puzzle/meandmyshadow/ChangeLog | 7 | ||||
| -rw-r--r-- | games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch | 17 | ||||
| -rw-r--r-- | games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild | 10 |
3 files changed, 30 insertions, 4 deletions
diff --git a/games-puzzle/meandmyshadow/ChangeLog b/games-puzzle/meandmyshadow/ChangeLog index 088667410025..b1dd15700b84 100644 --- a/games-puzzle/meandmyshadow/ChangeLog +++ b/games-puzzle/meandmyshadow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/meandmyshadow # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/meandmyshadow/ChangeLog,v 1.12 2015/02/22 20:22:37 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/meandmyshadow/ChangeLog,v 1.13 2015/04/23 21:38:04 mr_bones_ Exp $ + + 23 Apr 2015; Michael Sterrett <mr_bones_@gentoo.org> + +files/meandmyshadow-0.4-cmake.patch, meandmyshadow-0.4.ebuild: + add patch to fix building with newer versions of cmake (bug #547494) 22 Feb 2015; Tupone Alfredo <tupone@gentoo.org> meandmyshadow-0.4.ebuild: EAPI 5 @@ -48,4 +52,3 @@ +metadata.xml: Initial commit; ebuild submission and patch from hasufell and barul (bug #408811) - diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch new file mode 100644 index 000000000000..0bd66d5d284a --- /dev/null +++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch @@ -0,0 +1,17 @@ +--- meandmyshadow-0.4.orig/CMakeLists.txt ++++ meandmyshadow-0.4/CMakeLists.txt +@@ -15,13 +15,12 @@ + Find_Package(CURL REQUIRED)
+ Find_Package(LibArchive REQUIRED)
+ Find_Package(OpenSSL REQUIRED)
++Find_Package(X11 REQUIRED)
+
+ #Use openGL only when compiling with HARDWARE_ACCELERATION.
+ #Otherwise we try to find XLib.
+ if(HARDWARE_ACCELERATION)
+ Find_Package(OpenGL REQUIRED)
+-else(HARDWARE_ACCELERATION)
+- INCLUDE(FindX11)
+ endif(HARDWARE_ACCELERATION)
+
+ #Add the include dirs of the libraries.
diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild index b565ebec6194..fa299096365d 100644 --- a/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild +++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4.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-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild,v 1.6 2015/02/22 20:22:37 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/meandmyshadow/meandmyshadow-0.4.ebuild,v 1.7 2015/04/23 21:38:04 mr_bones_ Exp $ EAPI=5 inherit cmake-utils gnome2-utils games @@ -24,7 +24,13 @@ DEPEND="media-libs/libsdl[sound,video] app-arch/libarchive x11-libs/libX11 opengl? ( virtual/opengl )" -RDEPEND="${DEPEND}" +RDEPEND=${DEPEND} + +PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) + +src_prepare() { + cmake-utils_src_prepare +} src_configure() { local mycmakeargs=( |