add patch from Michael Palimaka to fix building with newer cmake (bug #548488)

Package-Manager: portage-2.2.18/cvs/Linux x86_64

5 files changed, 69 insertions, 6 deletions

diff --git a/games-strategy/megaglest/ChangeLog b/games-strategy/megaglest/ChangeLog
index ed5563e0a51b..564668ea6544 100644
--- a/games-strategy/megaglest/ChangeLog
+++ b/games-strategy/megaglest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/megaglest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.29 2015/05/10 04:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/ChangeLog,v 1.30 2015/05/13 16:57:34 mr_bones_ Exp $
+
+  13 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/megaglest-3.11.1-cmake.patch, files/megaglest-3.9.1-cmake.patch,
+  megaglest-3.11.1.ebuild:
+  add patch from Michael Palimaka to fix building with newer cmake (bug #548488)
 
   10 May 2015; Michael Sterrett <mr_bones_@gentoo.org> megaglest-3.11.1.ebuild:
   add slot on virtual/jpeg dep
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
index d66e161bbb47..6dd18c0d705a 100644
--- a/games-strategy/megaglest/Manifest
+++ b/games-strategy/megaglest/Manifest
@@ -1,9 +1,10 @@
+AUX megaglest-3.11.1-cmake.patch 897 SHA256 9e1d077a849a0dc8edc7ce91f4b2519597f67859c7759b138ae5a4193748a8c2 SHA512 f49580a2b87fbc1e9aa3bec7313bdff36f78404aa97ac9f0cef790202c7d92439ad3fd8a9bdc991540048adb771e22f36c946f44a967cacae5157ef98b41c6cc WHIRLPOOL e2517d41f078cc869b4c060e7d86eefebfb3dd0281f7833c9ef69ce14124a41eca16e07f1240dc19cb55b8a7912ed3319a054450b9b9d26f4da225dcf337a487
 AUX megaglest-3.11.1-static-build.patch 1939 SHA256 c34102f40497240a659540bbf4926e9b8ac02aec2e6202b94eb10e923a224e5f SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5 WHIRLPOOL f6df24ade01171ab5095b3b6b8034c92183fbc5df64154e393d20c2a2ebf87c5dd8736684402103d945c544c3c0009f7865d485ede205fcb0f2c439e868ca09c
-AUX megaglest-3.9.1-cmake.patch 800 SHA256 2d773202f24a25bedf0369a5000de5a5d024cebad21685f62fac532c07b31c98 SHA512 063ff67139ec702c100b93a488daa6cf6b34909860fdbb964c242c7464876947ba45dd9dfee084f8f37dcc2c16dc8bb80842cbf497e36810745df5a29d73d7da WHIRLPOOL fbc198abc48a6d09d1247d8fd7bed084acf9b9d60e74ea3a4e90d19390ed09eeb9820861ec3096dce9943c850216addd195b91bf9231de4419f256fa758124da
+AUX megaglest-3.9.1-cmake.patch 1697 SHA256 af6d44fac15bc0946bb97555214b27a60448626f24c719ee305d00138d440b62 SHA512 80c26b86be64ac510e39db793f85b6d931801ecf5c2b0f64b94527531a214ead7fcb97ce52f778c091975d3233bc95da162ab8b0b4abd4fa5fd451f40e4c5b3c WHIRLPOOL 6da4a25f18948bda1c729ee25045630a0ce639a85b5437c0a8c5b3d7b8d41b8bd0ce9e51655fe2895a0af45347acb99e973e07462615dd4dc6113d28b4d9795e
 AUX megaglest-3.9.1-static-build.patch 1939 SHA256 c34102f40497240a659540bbf4926e9b8ac02aec2e6202b94eb10e923a224e5f SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5 WHIRLPOOL f6df24ade01171ab5095b3b6b8034c92183fbc5df64154e393d20c2a2ebf87c5dd8736684402103d945c544c3c0009f7865d485ede205fcb0f2c439e868ca09c
 DIST megaglest-source-3.11.1.tar.xz 2863180 SHA256 94e28a9628f3593ce337ce663f258a125176b11128f16afb8c947f2763930841 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225 WHIRLPOOL 7a6b0908da7c6164f3baa71ea10c1f09fca86581b9da4930c3a0aa70e2c25d582349772d45ec8edee91ded2cbe1e68ee66e8756d1d23205c5d751eae135758b0
 DIST megaglest-source-3.9.1.tar.xz 2957360 SHA256 e62314b8108ba3c80706aa896f4fed5992a8ea8d82a410e09fbb242c4bf54edc SHA512 2a3d402aa68a1b1ee326bf49b6b6dee5ed561623b541ab47c1545596fa9c77f805245b66bd8457ecd82625a3f1d4868269a4a3888a54245c73d9cb6babbace70 WHIRLPOOL 59ad629c66633b2f320c7c80eef627f4326cbacb0cc48169c33b6783bfc26d1a8baef1773f0d05a1bc589ec5ae6bbedbb1f394c34616b166faa6e7f9630a22e5
-EBUILD megaglest-3.11.1.ebuild 4474 SHA256 4f678e3f6488b5d3a2c591efd7a38c1ce0eb5646ad402b70c37768beaa9817d0 SHA512 98c49a1bb589e794d4cc01826966ed02c6cd3ed9c3d220ee630cdb1c06e8d71b67ac57c072ab0c23269dcc3b713c59b26bd38be242fda45b7bdfca1502ebff55 WHIRLPOOL 2b077f179e597764ea0b28c0769f1b723a190f28c4bfa76f4f0402e117044df3547cefed7566960eb984f09fb7e4183f3e36e0adc56adff1110943ec2b46b4e6
+EBUILD megaglest-3.11.1.ebuild 4509 SHA256 0dece780e7ebd9e3ed14b7370b2c5b157ae73f076dd01fa396023627b0ea8a25 SHA512 68a3d431aabe725ffa92422b077ee2442f9c7192bd0fe1d248371604797bdba4c27f8521ff3f65c2a634af733e7ff970786ed834b929b217c7908ff97d521713 WHIRLPOOL 604c4a6cd1f3feb3ed942a1c3b007ce8508d6aa51c812b54141c8b76137c23ad709915d330324591f576aa787ae32659266a67740e0d78d1b4e40aff514b88a1
 EBUILD megaglest-3.9.1-r1.ebuild 4594 SHA256 f69260e3b2db6449cb6e91523b9c96bf61b681b46f1b1443c01890e93aacdd9e SHA512 ffe9b431ecd7b04bae6552a2fcca7b508c87e1617f2258690b705189a4ce91f0dedd9678f2fb543e9317bc8556a0c65098a05365335cb1787b197559cfecbef8 WHIRLPOOL ca3a5c251c485074db63e9953222ba4b74e29f6248f41df89b900fa20a2e3d1e36fc7cceb8dcd95837fca1a7f969ed26c0629b55ad2e91d7a3628d4e89bee0f2
-MISC ChangeLog 5507 SHA256 91024d74294fb741460f036da3976ee86f5f77ad29c35d305cd044690d6ca896 SHA512 a0dce207264a28fe71b30100c33658e1ba62a4760e7b5a672c6526a3f708604fbf601a7bdec81117282efaaf963019d7c202305b0ffa43f955ec3622625ca059 WHIRLPOOL f531d2cab4a966d6c5537148d4444abb8dc25b968ae6b4a3d624cf4e954cc2273fd3b981bbc8977792751d2dec0aa567418c054f8690ae89da6ea069732f0e26
+MISC ChangeLog 5745 SHA256 22205bb89d945a5b00ff2e35826a3f318a0dfbb9c44f16c5132c0d32be78ed91 SHA512 bd91fc58f61076439d12e9a8fe5ba758de083f9dc165877bbe99550e1ec8e943c36c14569721ba72e27a5b8e899e3b28633f9b7b612385601c900826790231c2 WHIRLPOOL e645256ac9c10f6d18ebbc3b08480eb3dfcdc0820f889e1e3ec5e365d9ee04b07e26f66501e8f53169c08f267e214b7edd4766821997bed095647b4e8e3de591
 MISC metadata.xml 1508 SHA256 b48e1ebe66f512e94842536838ff7a5c2de67c47f45bbc86bcd07032e6451e16 SHA512 d76111a570d1681c89f6376915bf0f455f301a7ec9cd7afec4b7308bd9b33fc0d4e44da0c07d7e1a1b237286fd9d36c766fd8083e2aefaf27bf224d1285f846d WHIRLPOOL c3ceac103e3c0e626a25b5ba8dadba1360bd5d05c24af127140d030094d75de250fe9f161556769004326ce76cd98ac4d526cf8c0a21980b2babd69f9065aca9
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
new file mode 100644
index 000000000000..527671246e98
--- /dev/null
+++ b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
@@ -0,0 +1,28 @@
+From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 13 May 2015 04:22:45 +1000
+Subject: [PATCH] Fix build with >=cmake-3.2.
+
+The FindOpenGL module no longer pulls in X11 libraries.
+---
+ source/shared_lib/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
+index 3da563e..e5a06fc 100644
+--- a/source/shared_lib/CMakeLists.txt
++++ b/source/shared_lib/CMakeLists.txt
+@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
+ 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
+ 	ENDIF()
+ 
++        IF(UNIX)
++		FIND_PACKAGE(X11 REQUIRED)
++		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
++        ENDIF()
+ 
+         IF(WANT_XERCES)
+ 	        FIND_PACKAGE(XercesC REQUIRED)
+-- 
+2.3.6
+
diff --git a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
index 1c04ea28262e..c7801466f5ca 100644
--- a/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
+++ b/games-strategy/megaglest/files/megaglest-3.9.1-cmake.patch
@@ -16,3 +16,31 @@ Subject: fix installation
  		          DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
  	        ELSE()
  
+From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Wed, 13 May 2015 04:22:45 +1000
+Subject: [PATCH] Fix build with >=cmake-3.2.
+
+The FindOpenGL module no longer pulls in X11 libraries.
+---
+ source/shared_lib/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
+index 3da563e..e5a06fc 100644
+--- a/source/shared_lib/CMakeLists.txt
++++ b/source/shared_lib/CMakeLists.txt
+@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
+ 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
+ 	ENDIF()
+ 
++        IF(UNIX)
++		FIND_PACKAGE(X11 REQUIRED)
++		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
++        ENDIF()
+ 
+         IF(WANT_XERCES)
+ 	        FIND_PACKAGE(XercesC REQUIRED)
+-- 
+2.3.6
+
diff --git a/games-strategy/megaglest/megaglest-3.11.1.ebuild b/games-strategy/megaglest/megaglest-3.11.1.ebuild
index 5a598e847465..3ab98490e4fd 100644
--- a/games-strategy/megaglest/megaglest-3.11.1.ebuild
+++ b/games-strategy/megaglest/megaglest-3.11.1.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/megaglest/megaglest-3.11.1.ebuild,v 1.2 2015/05/10 04:39:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/megaglest/megaglest-3.11.1.ebuild,v 1.3 2015/05/13 16:57:34 mr_bones_ Exp $
 
 # google-breakpad
 # TODO: fribidi, libvorbis static
@@ -70,7 +70,8 @@ src_prepare() {
 		need-wxwidgets unicode
 	fi
 
-	epatch "${FILESDIR}"/${P}-static-build.patch
+	epatch "${FILESDIR}"/${P}-static-build.patch \
+		"${FILESDIR}"/${P}-cmake.patch
 }
 
 src_configure() {