add patch to work with newer cmake (bug #551260)

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

7 files changed, 32 insertions, 14 deletions

diff --git a/games-action/supertuxkart/ChangeLog b/games-action/supertuxkart/ChangeLog
index 750da0adb5f3..675b5bd3fd18 100644
--- a/games-action/supertuxkart/ChangeLog
+++ b/games-action/supertuxkart/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-action/supertuxkart
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/ChangeLog,v 1.45 2015/06/01 22:10:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/ChangeLog,v 1.46 2015/06/05 07:08:00 mr_bones_ Exp $
+
+  05 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/supertuxkart-0.8.1-cmake.patch,
+  files/supertuxkart-0.8.1-desktopfile.patch,
+  files/supertuxkart-0.8.1-gentoo.patch,
+  files/supertuxkart-0.8.1-icon-dest.patch,
+  files/supertuxkart-0.8.1-irrlicht.patch, files/supertuxkart-0.8.1-jpeg9.patch,
+  files/supertuxkart-0.8.1-mesa-10.x.patch, supertuxkart-0.8.1.ebuild:
+  add patch to work with newer cmake (bug #551260)
 
   01 Jun 2015; Michael Sterrett <mr_bones_@gentoo.org>
   supertuxkart-0.8.1.ebuild:
diff --git a/games-action/supertuxkart/Manifest b/games-action/supertuxkart/Manifest
index 7e6e0da49897..6bb16a6a435a 100644
--- a/games-action/supertuxkart/Manifest
+++ b/games-action/supertuxkart/Manifest
@@ -1,11 +1,12 @@
+AUX supertuxkart-0.8.1-cmake.patch 333 SHA256 56c65fd7b55ea8cf8a2e4e9ffb70e735899eada54dc4c85382713ed210b43b37 SHA512 9c1a517ff9381290469ea84b19c420cc06d1656fac21ce71d99e829d4933da6df726aeec201a9ce3e6534c71acbc7ded1bba580f9208858a6b9c2b2286ad1d88 WHIRLPOOL 9a4513403c595236462b37db2b2f4a75bc4685337645f7dfb9cbc06fa6624fecb0a29ed78ebe716071deda19e77e3d41f18a2e157d02ef678479ab0006997b0a
 AUX supertuxkart-0.8.1-desktopfile.patch 816 SHA256 db24b15856c36c8f3cd505ad9ea5b5c823cbf562307d9db3996fca4fed3dec90 SHA512 58b3006d4b41599426d9dfa1ab56e94088addfec20681566d66aa8e57f05d82d25655247b7f69ec89fbf60b1679c7a89072f8591e8a3c9ba16f85d7632000bfb WHIRLPOOL 190ae2d0d615ec289e9ede6a12e4a752e457221d8ad08b01ab5ab6b1bb4c88c5a2e842364aae94b1ff7d271a4d557f458ddf57451a6cfb9b8822846816105e02
-AUX supertuxkart-0.8.1-gentoo.patch 1292 SHA256 36c2ad9f7faaf1bf910e68d00a53c358a56de88326991d6953dc8d05ee891969 SHA512 65786e8dc3e21545788f61e783bb274bfbf6aecd26ef53dd8d6c53d6e64d60adf82f774f52531855d6b60c2928b1213fa3419111b7e377fe99b1829c419be357 WHIRLPOOL 4c021e758ac5ca7805c13124b4cd32d08c8514228919cee959dd2ab1e840f7fe5c8cea5675f1147130e203336e4ae6a9d24b767e136bf55449b62dd600174e0a
-AUX supertuxkart-0.8.1-icon-dest.patch 1008 SHA256 32cb1d16af8071e0efcc68fbae356cfde135f75e3ec1981cc4f3a19445f2a611 SHA512 3e0f5f4f08661570fb04e178d8b18d9b5557fcf40e806f93431ab9f0ff9ac4277c6ad6b6d1353ec3d1600bcda4e2b18e7e7c5eb684f24ff95ef8007b6c8f0155 WHIRLPOOL a1f2a0f508bfb925e72dd6504b1dfb46297f37a9e5e171ab4bc62ff288d3af57ecfc370013cc19e41f9d4218d7206336d4f98fc2d4b681ec50d2493f7e0d1f63
+AUX supertuxkart-0.8.1-gentoo.patch 1217 SHA256 44e5fbcf9132393a198f21f4ba4cdfa0db53720d8ef2228a3e436a7ddc7114db SHA512 3255e1767e917da49ddd0c1a1120694851e57435f639c73b6104212f45ba19d357bf666517e290f64f14523770913f82c786dea5f7c8f7fcb66e41fa8663d1e1 WHIRLPOOL 765ddd20ed9aa830cdfeb5176fe8d3550c6095a297234ce83e908846a7bbeb9cb8c3b5c00fd28b56ccab5b148514c9addc89fb48cf43fc6f75d1890360bc6ea7
+AUX supertuxkart-0.8.1-icon-dest.patch 933 SHA256 060cbe4114df2baf3bddcfac29563afd38c968540f487d6efc4c2105e4e47642 SHA512 b662355a5576e465113e378f57cb5d7b12bf003a97fd16d4594e4132fe8dae12e2dc699787145989e5f5625f1412f81bd3db6d480ec677df1132bbc58f66a088 WHIRLPOOL 29596941c38e7b91432b5ca16ad102f1a8bac26f9adc8d4068c021cbfa20487ede6e13575e688b5480008d3c43a59437289e6b323e03aa72f135690e60210da0
 AUX supertuxkart-0.8.1-irrlicht.patch 4824 SHA256 0388d3e5f5519039208069e0ff88edb7936ccf8038e3082c4ed432ab46deb09d SHA512 1ac949874baf83ae501bbf01b0678fe91a9d019b9939f7f1383c182a0ff0ace0b9154c23d14fc2bca8b4e7d8708d81b4f3a58e0019032c2a8738f887ad7990ce WHIRLPOOL 06b719b6136841baff4c9d81f386f4d56bda04ab224c21522c54369af1259f01a1e85e372a675aa5d78b6c1e8221fc45012d869dfe5c034bb4de25df1acc7add
-AUX supertuxkart-0.8.1-jpeg9.patch 330 SHA256 fa6236637dd64cc71b1f3c6a8ce3772c6b1c1c933d1ef052a5120a0ce2077bde SHA512 b8a3bc2163eafcc4c1a3be33394f8910777397a529521d57b50c254c1a8c6effae8b64be5aefb0a470cedd0d2553c307edd4817d47a493a032cff5b7108b4cfa WHIRLPOOL 0a31f331e0795c927e3c2f71e5ba32b28f2889b33a21e427928b79490b43333b7c915eac8a21245b8c4343210732120e48ca0bd2c3c7162de91e8ab236a1b4f0
+AUX supertuxkart-0.8.1-jpeg9.patch 258 SHA256 93b63a30dc9b4d4bd224df6d59e6b8e3f5452961f88b3ae972311dfa2c769603 SHA512 0db1815709ec34b795857ef9867b1f255875870b085d001e9dcd24d747f343155d3bf81f427de759e0b8de0e26241d6f4ee4ee6d066995790dd9f745530332d9 WHIRLPOOL f296a94cdd388a08e514209033702f282de02ddb53a90a967ceead8e965e63bec2eab33f2014f6cca8440a4af9fd6db43b0007763a8dca863ee082659ae3f2c0
 AUX supertuxkart-0.8.1-mesa-10.x.patch 1269 SHA256 6c68576cc86d7703c2b839d6a2ea1c7372450f5b61327827e3e13a8a78f9befc SHA512 f2dd22d4e03431f7cf89430bf7c7d3dba25b4a814f232b96021e6bd3b34ab9128537f890788fb6e3dc2109ab901eeb5a940107506010b429c8f12caf3e7fc291 WHIRLPOOL 080b288b464ad02523cf0e66a35916bc84af25e3023369be40b37f76b4f8c5159bc588f8fbe3c1eb02738c09f85c40f0ef046660c6a483669df36b6feb97bb79
 DIST supertuxkart-0.8.1-src.tar.bz2 229944480 SHA256 335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6 SHA512 1d72230a2cfa6196c6ea6c5464f01d1a0064994c9dafbf5d47c04b5db87e82590fde57a88d5316f2cf6094dcebae5e115b81e5ecc964a29bd669bc83d527d13a WHIRLPOOL 5cf87e57cd5b5d12e4549bf49efb0596e4a1fafa7cba58e366c843e2ebf61c02e5c3471d1591f1231194021cbcb6082829e026616403680fc7ad05bd235b155e
 DIST supertuxkart.png 4435 SHA256 99bc1801cb0514946cb0171d6d5a84484b6dc881edfa7f096b6eb5fea2f28828 SHA512 a180332f79220431922fa8b351cb476ebc5d9d1df09f20707eb3bdd7002fd264cb027b8190c73c5221050e6e8601beb6758a5809d05aedfb18f0bdb426f47eda WHIRLPOOL eef651802a927b451226fc06a682d7dea68b65b05195130ccfc7544165f26f65bda4fc9565e09d6487d02be3cf57880b0c6c257f26587c6bc6d30afc6aa5d3c2
-EBUILD supertuxkart-0.8.1.ebuild 2257 SHA256 984d47038e041017287459954c3c2f9c3f1b4c4bd9d11e49cd1dc0e5acdc9c20 SHA512 4a27b5a56cc6b4be817364fb58adc5cc70805b85fbbd88e5c06753aa41f5ebcce497e6746552cbec232051056dcba7bfbec0a64f3161e747808da50bc604714a WHIRLPOOL f49539cbcdee4b2b665ff5c325363a6ff4234f18e1300ec7a3535c850f2ebe0ce324e9c7d304483b7c8d29545c63304d413950a46962aba3097ac23c291d8ffa
-MISC ChangeLog 6558 SHA256 f59304d2126cbe88578b945db1cd686d3645adcd4cbcbef08e6bed98bf7dbe05 SHA512 d099c054cfc894540c34c96b7573018f71180496f20f9b34dbfd3d0964e40e242b2ccfbf6741ae273296ea6f33d351583aba3f0a8fb7c9face5b666f88cdbd4f WHIRLPOOL 50e7298db4dc363909f5536cc88e6c77ab4d7e533ad946c8b358135ca910b610159066fac5d19a50863f13b411e687c78e5e7fe17dec4ffe01e63e32d14b79c3
+EBUILD supertuxkart-0.8.1.ebuild 2263 SHA256 2a5e4ad3f89685b80cae08a80279aed4b98484649c85de875cc322dba30e4cf8 SHA512 fe08109ddc7f39530e1b3c1ab57dcc0f62700c976ac1f551c785e905a42f20a9c1583a37ab677458a6ababe5b5493c8b7ef3892c00b379c5b327d7d283124431 WHIRLPOOL 1c3cfb49d9d686122196210031c5a5bbaa5a53222d805f5d62bbd0e9d82dc2b0d802717d521cbdcaa4d3e537130f7b4a6398ac1494da55be937b66f0052ab61b
+MISC ChangeLog 6989 SHA256 0988d2310dcef2955dd5492918a44463f1faa9407a5710d006863cdf2175b9fb SHA512 fba834c48de5a983a2c14fbc46e708674d07a4aeaa9bcc9a590c181831b49a361e10e268bb10680f0c7f7fc4d0928dc1472df56d0cbd4dc43cd7ab785ac077ae WHIRLPOOL c3a9499b29bab8bee093f2a3ce711193afd28c16f2fbb54dfadd3488e07305011231d6513db28ad2b6b2f5f165726151f96896576b86deb5375ba92c18a76071
 MISC metadata.xml 304 SHA256 c2f56f7331dacff1457f169ffa337644ef213137f773c3a928f994a02f30addf SHA512 67508dfacc718dce4cb1b79a521be15b40ad4a892390a7f23972b09e1761ff76bd7e334d6054e685d70cb9fd8f759b4d8ed3a9fb46f0f4a6b1f96ffdfb0c25bb WHIRLPOOL 85448baf9c5513bdd24f200b1eed9aac64de4837cc93ce948485265261aa2bed4d3215e4ee4561519fcdf141fd1d127b0ad1ddc3a110428a1a97c7627490561b
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch
new file mode 100644
index 000000000000..d5c038a5f922
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-cmake.patch
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -128,6 +128,9 @@
+ find_package(OpenGL REQUIRED)
+ include_directories(${OPENGL_INCLUDE_DIR})
+ 
++find_package(X11 REQUIRED)
++include_directories(${X11_INCLUDE_DIR})
++
+ if(UNIX AND NOT APPLE)
+     find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
+     mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
index 071c1b053f7a..647c52245dab 100644
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-gentoo.patch
@@ -1,8 +1,6 @@
 gentoo specific hacks because we unbundle the
 deps of irrlicht
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 09edd58..1f51a30 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -45,7 +45,6 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch
index f9a5a04d676a..5ce3fff0dd39 100644
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-icon-dest.patch
@@ -4,8 +4,6 @@ Date:   Tue Nov 26 22:13:21 2013 +0100
 
     fix icon install dest
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1f51a30..9c07659 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -304,7 +304,9 @@ endif()
diff --git a/games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch b/games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch
index 3c120c9b22e2..b1bae371b71d 100644
--- a/games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch
+++ b/games-action/supertuxkart/files/supertuxkart-0.8.1-jpeg9.patch
@@ -1,5 +1,5 @@
---- lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp.old	2014-09-25 06:56:46.911153643 +0200
-+++ lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp	2014-09-25 06:55:52.817175916 +0200
+--- lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp.old
++++ lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
 @@ -66,7 +66,7 @@
  boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)

  {

diff --git a/games-action/supertuxkart/supertuxkart-0.8.1.ebuild b/games-action/supertuxkart/supertuxkart-0.8.1.ebuild
index 0fdec1ea828e..28d466c171e9 100644
--- a/games-action/supertuxkart/supertuxkart-0.8.1.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.8.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-action/supertuxkart/supertuxkart-0.8.1.ebuild,v 1.7 2015/06/01 22:10:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/supertuxkart/supertuxkart-0.8.1.ebuild,v 1.8 2015/06/05 07:08:00 mr_bones_ Exp $
 
 EAPI=5
 inherit gnome2-utils cmake-utils eutils games
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/SuperTuxKart-${PV}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-{gentoo,icon-dest,irrlicht,desktopfile,mesa-10.x,jpeg9}.patch
+	epatch "${FILESDIR}"/${P}-{gentoo,icon-dest,irrlicht,desktopfile,mesa-10.x,jpeg9,cmake}.patch
 
 	# inconsistent handling of debug definition
 	# avoid using Debug build type