Add patch for freeglut-2.4, bug #133062

Package-Manager: portage-2.1.2_pre1-r3

5 files changed, 50 insertions, 28 deletions

diff --git a/games-strategy/netherearth/ChangeLog b/games-strategy/netherearth/ChangeLog
index 5d862a180102..e1bffbd2f687 100644
--- a/games-strategy/netherearth/ChangeLog
+++ b/games-strategy/netherearth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/netherearth
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.2 2006/06/27 20:48:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/ChangeLog,v 1.3 2006/09/26 16:51:23 nyhm Exp $
+
+  26 Sep 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/netherearth-0.52-freeglut.patch, netherearth-0.52.ebuild:
+  Add patch for freeglut-2.4, bug #133062
 
   27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   netherearth-0.52.ebuild:
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
index 293ae6df56be..0721d9184295 100644
--- a/games-strategy/netherearth/Manifest
+++ b/games-strategy/netherearth/Manifest
@@ -1,10 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Makefile 1003 RMD160 ef32ff40017278bd3ec72397fec294890064c670 SHA1 bead9ede2d198f81ca8d8afef12f9a8e701e6576 SHA256 436792a5c1763fff48f7ec33175b323da36c3ceed89fcb3b4d30692a216ebbce
 MD5 743a943130080746a237aaca99a32f1d files/Makefile 1003
 RMD160 ef32ff40017278bd3ec72397fec294890064c670 files/Makefile 1003
 SHA256 436792a5c1763fff48f7ec33175b323da36c3ceed89fcb3b4d30692a216ebbce files/Makefile 1003
+AUX netherearth-0.52-freeglut.patch 367 RMD160 2bc91ec5643945940f67554570e5017995681555 SHA1 a0da0404801572a3bc81667bf1b1a8c5c3357f2b SHA256 6a2a6bd3f11b326f8e5c5d4729fe72fb51d04f6cbd75136b4fe5178de5aa027e
+MD5 6debe4427c6a81b6a9a888e3096b61bd files/netherearth-0.52-freeglut.patch 367
+RMD160 2bc91ec5643945940f67554570e5017995681555 files/netherearth-0.52-freeglut.patch 367
+SHA256 6a2a6bd3f11b326f8e5c5d4729fe72fb51d04f6cbd75136b4fe5178de5aa027e files/netherearth-0.52-freeglut.patch 367
 AUX netherearth-0.52-gentoo-paths.patch 4356 RMD160 c9a5d588e509d2709623ae269269c9d1b461ff48 SHA1 4f3bf07b9a8d294d8a0da84be016697f47bfcbef SHA256 62a2243f3244f0d238383d61909cbd4ebc6c3f6a24e6093bac05657c48913a36
 MD5 eaafb11314df445e9792778c9741d7e1 files/netherearth-0.52-gentoo-paths.patch 4356
 RMD160 c9a5d588e509d2709623ae269269c9d1b461ff48 files/netherearth-0.52-gentoo-paths.patch 4356
@@ -13,27 +14,20 @@ AUX netherearth-0.52-linux.patch 1255 RMD160 c8b679407421d1eb1af37ed59357624bf6c
 MD5 20198e78dc33ad3838798bfc53120260 files/netherearth-0.52-linux.patch 1255
 RMD160 c8b679407421d1eb1af37ed59357624bf6cd74f0 files/netherearth-0.52-linux.patch 1255
 SHA256 3761a82cfb8aa70781a83a9af5d7a2eca5dd0dac98adb14aa232785cdf37a315 files/netherearth-0.52-linux.patch 1255
-DIST netherearth052.zip 872397
-DIST sources.zip 75918
-EBUILD netherearth-0.52.ebuild 2074 RMD160 89ab9f9b41ef9f39894beb600455d38539bb4dfd SHA1 2c5d21e9a08ba4b1a9ce2399630526764468f504 SHA256 de208829b2865d985fdfd0af230265ef479d2cba22a5083b1e8a72464b6151a3
-MD5 db895c4eea61957575fa4bf26df15116 netherearth-0.52.ebuild 2074
-RMD160 89ab9f9b41ef9f39894beb600455d38539bb4dfd netherearth-0.52.ebuild 2074
-SHA256 de208829b2865d985fdfd0af230265ef479d2cba22a5083b1e8a72464b6151a3 netherearth-0.52.ebuild 2074
-MISC ChangeLog 702 RMD160 15c020744a7e1d54286002d5ecb4e58d9947bccb SHA1 e8fdc300c8f7167bf57a90a6591ca0646ba4a36f SHA256 c27499cbc84b6b449f10a49c929f436be50c98dc46a0845ecedd52ba70d6c81e
-MD5 5286681951a70f35b6562599b28814e7 ChangeLog 702
-RMD160 15c020744a7e1d54286002d5ecb4e58d9947bccb ChangeLog 702
-SHA256 c27499cbc84b6b449f10a49c929f436be50c98dc46a0845ecedd52ba70d6c81e ChangeLog 702
+DIST netherearth052.zip 872397 RMD160 124ca449b3bf02336f765e673e9307dea693f349 SHA1 6a968dfc4e1c7622c243c5123c29e2b5b02bc890 SHA256 79d533a56b4939a402edd7665f234e7f462e68b00ea36d9ae110f02a36357caf
+DIST sources.zip 75918 RMD160 ba75e3356ea4cae49b548ee9aaa46b70f677903f SHA1 04fe9d3b4428b2f57b160b6eb125865f594faa62 SHA256 0d4f80f5d3f73e957ccb7c292dcc830b88cb5624aa086ea3416522a8a66b766f
+EBUILD netherearth-0.52.ebuild 2067 RMD160 80673e272d23acc0ec27b9afafbaf8457f4ab007 SHA1 1b6b29a0ef7496837e5b3420cb13d385767872e5 SHA256 5c5d64909e847ec26a14a7a05f5e13515c32384c41164fd864b2016d9164d6d2
+MD5 35c6c647ea4a5e21281b2638e2afb564 netherearth-0.52.ebuild 2067
+RMD160 80673e272d23acc0ec27b9afafbaf8457f4ab007 netherearth-0.52.ebuild 2067
+SHA256 5c5d64909e847ec26a14a7a05f5e13515c32384c41164fd864b2016d9164d6d2 netherearth-0.52.ebuild 2067
+MISC ChangeLog 856 RMD160 80a53999ab88629c8ee3a6abdb44d8b9a3b8855e SHA1 31a531b04ef3980a739d775b39ab31a97b8147a6 SHA256 42b6e5738795b32b8f534cb4a26b8388ddb20989897a4ad89bd4833d3db3256c
+MD5 822abc4e55eacb0e1f147e0f03393fc7 ChangeLog 856
+RMD160 80a53999ab88629c8ee3a6abdb44d8b9a3b8855e ChangeLog 856
+SHA256 42b6e5738795b32b8f534cb4a26b8388ddb20989897a4ad89bd4833d3db3256c ChangeLog 856
 MISC metadata.xml 507 RMD160 4fa464fd086ef1489df4543147a673d47b5678ee SHA1 3d7fac8732f9f3d5187f3e17578ee666bc93d63e SHA256 cd7b24e73596edcf660fb7b58cbcc06324f3b1393f94edcad4a5890aaf38a843
 MD5 9dfa6fe4146063c9a1a5496fbc503f26 metadata.xml 507
 RMD160 4fa464fd086ef1489df4543147a673d47b5678ee metadata.xml 507
 SHA256 cd7b24e73596edcf660fb7b58cbcc06324f3b1393f94edcad4a5890aaf38a843 metadata.xml 507
-MD5 a617f2b3f264865654c4c847ff7eb11c files/digest-netherearth-0.52 118
-RMD160 d1ee49e477632be89da7e8e14b094576f7caf90d files/digest-netherearth-0.52 118
-SHA256 100565cdfc493b60e62de3598f5264a89f015f969fd4a92c5ef63593df826ec1 files/digest-netherearth-0.52 118
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEoZmjkT4lNIS36YERAvTYAJ0XvXg4TgmiR5ps/MVCmc8ezIj2BQCeNm9D
-DIoVKXA9dSELywbntN7NNtk=
-=sFFf
------END PGP SIGNATURE-----
+MD5 45c7230aa638d6d5184958665a9adc77 files/digest-netherearth-0.52 446
+RMD160 aac76681696812a1d201fd35c95f1465923b5f30 files/digest-netherearth-0.52 446
+SHA256 394f53e00dbdcbc332caf8bf7207bc7f04695db81021be45156ecd0fb29a8676 files/digest-netherearth-0.52 446
diff --git a/games-strategy/netherearth/files/digest-netherearth-0.52 b/games-strategy/netherearth/files/digest-netherearth-0.52
index 82d92e668372..4fcdcece10c0 100644
--- a/games-strategy/netherearth/files/digest-netherearth-0.52
+++ b/games-strategy/netherearth/files/digest-netherearth-0.52
@@ -1,2 +1,6 @@
-MD5 caace4bbfd32010c348f80cf0dba6e63 sources.zip 75918
 MD5 efbc914203944b6ec214884a00ed2b32 netherearth052.zip 872397
+RMD160 124ca449b3bf02336f765e673e9307dea693f349 netherearth052.zip 872397
+SHA256 79d533a56b4939a402edd7665f234e7f462e68b00ea36d9ae110f02a36357caf netherearth052.zip 872397
+MD5 caace4bbfd32010c348f80cf0dba6e63 sources.zip 75918
+RMD160 ba75e3356ea4cae49b548ee9aaa46b70f677903f sources.zip 75918
+SHA256 0d4f80f5d3f73e957ccb7c292dcc830b88cb5624aa086ea3416522a8a66b766f sources.zip 75918
diff --git a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
new file mode 100644
index 000000000000..0fc147f0b7aa
--- /dev/null
+++ b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
@@ -0,0 +1,18 @@
+--- main.cpp
++++ main.cpp
+@@ -8,6 +8,7 @@
+ 

+ #include <stdio.h>

+ #include <stdlib.h>

++#include <GL/glut.h>

+ #include "SDL/SDL.h"

+ #include "SDL/SDL_mixer.h"

+ 

+@@ -144,6 +145,7 @@
+     bool quit = false;

+ 

+ 	load_configuration();

++	glutInit(&argc, argv);

+ 

+ 	screen_sfc = initialization((fullscreen ? SDL_FULLSCREEN : 0));

+ 	if (screen_sfc==0) return 0;

diff --git a/games-strategy/netherearth/netherearth-0.52.ebuild b/games-strategy/netherearth/netherearth-0.52.ebuild
index 325479dbe2af..38729970aed6 100644
--- a/games-strategy/netherearth/netherearth-0.52.ebuild
+++ b/games-strategy/netherearth/netherearth-0.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.3 2006/06/27 20:48:31 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netherearth/netherearth-0.52.ebuild,v 1.4 2006/09/26 16:51:23 nyhm Exp $
 
 inherit eutils games
 
@@ -35,10 +35,12 @@ src_unpack() {
 	cp "${FILESDIR}/Makefile" . || die "Makefile copying failed"
 
 	# Fix compilation errors/warnings
-	epatch "${FILESDIR}/${P}-linux.patch" || die "epatch failed"
+	epatch "${FILESDIR}/${P}-linux.patch"
+
+	epatch "${FILESDIR}/${P}-freeglut.patch"
 
 	# Modify dirs and some fopen() permissions
-	epatch "${FILESDIR}/${P}-gentoo-paths.patch" || die "epatch failed"
+	epatch "${FILESDIR}/${P}-gentoo-paths.patch"
 	sed -i \
 		-e "s:models:${DATA_DIR}/models:" \
 		-e "s:textures:${DATA_DIR}/textures:" \