patch to fix use of latest sdl-image (bug #141072), patch from Tristan Heaven

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 62 insertions, 27 deletions

diff --git a/games-sports/trigger/ChangeLog b/games-sports/trigger/ChangeLog
index 3878fd36fb6f..e1ff5b43a2e9 100644
--- a/games-sports/trigger/ChangeLog
+++ b/games-sports/trigger/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-sports/trigger
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.13 2006/06/14 12:12:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/ChangeLog,v 1.14 2006/07/23 03:36:30 mr_bones_ Exp $
+
+  23 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/trigger-0.5.2-physfs.patch, trigger-0.5.2.ebuild,
+  trigger-0.5.2-r1.ebuild:
+  patch to fix use of latest sdl-image (bug #141072), patch from Tristan Heaven
 
   14 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   trigger-0.5.2-r1.ebuild:
diff --git a/games-sports/trigger/Manifest b/games-sports/trigger/Manifest
index b94fd8cc3831..27ca95560fb0 100644
--- a/games-sports/trigger/Manifest
+++ b/games-sports/trigger/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX trigger-0.5.1c-glx-check.patch 590 RMD160 50dc898d7e31dc94eb43076f4027f485fcd8f443 SHA1 bb19c963876c10890846b7d03187d6cf3f3fb647 SHA256 42845b9e322cea9406e250e4cba80aa1825c4722c84834ca362747d7bcea8030
 MD5 fab012ed7b17d5eeb472e71a6c9c7c06 files/trigger-0.5.1c-glx-check.patch 590
 RMD160 50dc898d7e31dc94eb43076f4027f485fcd8f443 files/trigger-0.5.1c-glx-check.patch 590
@@ -13,6 +10,10 @@ AUX trigger-0.5.2-gcc41.patch 279 RMD160 c21a158a0f9882e43002589aee13fdeaebe34d8
 MD5 d589cd47037849a9fc9377dc7929ae84 files/trigger-0.5.2-gcc41.patch 279
 RMD160 c21a158a0f9882e43002589aee13fdeaebe34d87 files/trigger-0.5.2-gcc41.patch 279
 SHA256 86cafb5184da6c27373f3bffa8ce9083da6bd3c81faf9e17ba36ff3a3cdce44f files/trigger-0.5.2-gcc41.patch 279
+AUX trigger-0.5.2-physfs.patch 682 RMD160 4772478f7e60fc3ee36c5e9a1c3b8a5e190c43e2 SHA1 a4dbe148aebd341e0eb0cd28b85ff22a245add03 SHA256 6fa7629c1fda6ebeddb7994afc52f3d6902b9bb4db11e5082af3f8583d2c9aad
+MD5 23947c71d558095819f4387ede65c4ec files/trigger-0.5.2-physfs.patch 682
+RMD160 4772478f7e60fc3ee36c5e9a1c3b8a5e190c43e2 files/trigger-0.5.2-physfs.patch 682
+SHA256 6fa7629c1fda6ebeddb7994afc52f3d6902b9bb4db11e5082af3f8583d2c9aad files/trigger-0.5.2-physfs.patch 682
 DIST trigger-0.5.1c-data.tar.bz2 6165837
 DIST trigger-0.5.1c-src.tar.bz2 259508
 DIST trigger-0.5.2-data.tar.bz2 6189856 RMD160 945a6c491c3f490d5acdfe3ac3633d3ec839466c SHA1 2016262e3cbf4c8808c765c1e317fb3dda2a2a34 SHA256 2e922aa8117722c8524e4c63c3df79c368bae0fd1aeada6005c27c81d27de7a6
@@ -21,18 +22,18 @@ EBUILD trigger-0.5.1c.ebuild 1491 RMD160 2885a6c874aa8a669b7168c6b9c12ec3f33ff2a
 MD5 13baff2456a9cfcbf63a60e031ff6356 trigger-0.5.1c.ebuild 1491
 RMD160 2885a6c874aa8a669b7168c6b9c12ec3f33ff2af trigger-0.5.1c.ebuild 1491
 SHA256 40a6b06cccd52baa7ef2fedf3a9b1572a2fa2f09a1775310ffe1bf3c02fc71ea trigger-0.5.1c.ebuild 1491
-EBUILD trigger-0.5.2-r1.ebuild 1668 RMD160 a905f4a11d8a1600f0ad3dc7f9c0fd4e9e1b541b SHA1 1f8b16b6b746ea91420bfd5fc9e232b1d13f468d SHA256 8be71eccc80dc978563cba1d8735d2078766de2fc0003242a82c795819ac5f79
-MD5 36af32063758077b95ff8a6e41a6750c trigger-0.5.2-r1.ebuild 1668
-RMD160 a905f4a11d8a1600f0ad3dc7f9c0fd4e9e1b541b trigger-0.5.2-r1.ebuild 1668
-SHA256 8be71eccc80dc978563cba1d8735d2078766de2fc0003242a82c795819ac5f79 trigger-0.5.2-r1.ebuild 1668
-EBUILD trigger-0.5.2.ebuild 1583 RMD160 5efe4078de11e186c78082d220b8f017c5706524 SHA1 bd78e61ad0fddc15a27897cb7efb814c50aab592 SHA256 30133771a94865fb38558ae6236dd9aed16c19c548628fbdf1d13ca88e046c52
-MD5 183e20424fa8adc1d3b6374a403a1c23 trigger-0.5.2.ebuild 1583
-RMD160 5efe4078de11e186c78082d220b8f017c5706524 trigger-0.5.2.ebuild 1583
-SHA256 30133771a94865fb38558ae6236dd9aed16c19c548628fbdf1d13ca88e046c52 trigger-0.5.2.ebuild 1583
-MISC ChangeLog 2148 RMD160 d31f215752e8b170adfa07ae73b0572657cb28e1 SHA1 f7d45409993284f688f649b16d7a7a1d229c0369 SHA256 01b0aed2614263195566027bcd1984c1511e1ef825a3adfc1a1df36ac025cc88
-MD5 8b2d25622d16acceb49d71a6ba196107 ChangeLog 2148
-RMD160 d31f215752e8b170adfa07ae73b0572657cb28e1 ChangeLog 2148
-SHA256 01b0aed2614263195566027bcd1984c1511e1ef825a3adfc1a1df36ac025cc88 ChangeLog 2148
+EBUILD trigger-0.5.2-r1.ebuild 1706 RMD160 8ac132dd7488ab22626975aaffc06c544b0004aa SHA1 ac156ccb4c90b1ba4b59f6d206f22e92f427fd30 SHA256 82c3e05ab8d8f381064e265663c6b83fe9c8ae1724629a527eebb4733f41c1fc
+MD5 b29eaec18823ec29031b096a7bcb1d21 trigger-0.5.2-r1.ebuild 1706
+RMD160 8ac132dd7488ab22626975aaffc06c544b0004aa trigger-0.5.2-r1.ebuild 1706
+SHA256 82c3e05ab8d8f381064e265663c6b83fe9c8ae1724629a527eebb4733f41c1fc trigger-0.5.2-r1.ebuild 1706
+EBUILD trigger-0.5.2.ebuild 1622 RMD160 e82d601583c7ecf7086d3ca29d9b0888413424fc SHA1 f80ed9e9dc2e2cc848b3f6efb7deeea86c9cc181 SHA256 6239c770fea40b3cf653fd6899f221a6c49404d25f99bf4dae566eca702c3177
+MD5 1aef265a596ae067821021b2a59cbcce trigger-0.5.2.ebuild 1622
+RMD160 e82d601583c7ecf7086d3ca29d9b0888413424fc trigger-0.5.2.ebuild 1622
+SHA256 6239c770fea40b3cf653fd6899f221a6c49404d25f99bf4dae566eca702c3177 trigger-0.5.2.ebuild 1622
+MISC ChangeLog 2371 RMD160 a3eed193f9363e6b8e53857d86fbe08307eeb4c4 SHA1 c819e3a32635e6712de164ef15a25d751f48c727 SHA256 bf919958590203aca2867d79e2b8b06f01c2376d5d5acbc13675e14b3c6b7761
+MD5 d288f02af06f551dcecc67981846f7f7 ChangeLog 2371
+RMD160 a3eed193f9363e6b8e53857d86fbe08307eeb4c4 ChangeLog 2371
+SHA256 bf919958590203aca2867d79e2b8b06f01c2376d5d5acbc13675e14b3c6b7761 ChangeLog 2371
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -46,10 +47,3 @@ SHA256 a0ed004bff630f656c2e090b892f1d625f648b3458d778f259cce22c808baf2f files/di
 MD5 87f9ae9139f4c188b7c4f85b6ceb8231 files/digest-trigger-0.5.2-r1 518
 RMD160 1f7c5ce70c6fda01a424a92d50cd4f8e9fb141b9 files/digest-trigger-0.5.2-r1 518
 SHA256 a0ed004bff630f656c2e090b892f1d625f648b3458d778f259cce22c808baf2f files/digest-trigger-0.5.2-r1 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEj/0YkT4lNIS36YERAswwAKCJJ74fkkub7c4FnpLVyx+/uZnbywCgrwMH
-o/LIW59wCBgsZiX7AGVUaQ4=
-=kURV
------END PGP SIGNATURE-----
diff --git a/games-sports/trigger/files/trigger-0.5.2-physfs.patch b/games-sports/trigger/files/trigger-0.5.2-physfs.patch
new file mode 100644
index 000000000000..c29c6df70cc4
--- /dev/null
+++ b/games-sports/trigger/files/trigger-0.5.2-physfs.patch
@@ -0,0 +1,33 @@
+--- src/pengine/physfs_rw.cpp
++++ src/pengine/physfs_rw.cpp
+@@ -13,26 +13,20 @@
+ {

+ 	PHYSFS_file *pfile = (PHYSFS_file *)context->hidden.unknown.data1;

+ 	

+-	int target;

+-	

+-	int curpos = PHYSFS_tell(pfile);

+-	

+ 	switch (whence) {

+ 	default:

+ 	case SEEK_SET:

+-		target = offset;

++		PHYSFS_seek(pfile, offset);

+ 		break;

+ 	case SEEK_CUR:

+-		target = curpos + offset;

++		PHYSFS_seek(pfile, PHYSFS_tell(pfile) + offset);

+ 		break;

+ 	case SEEK_END:

+-		target = PHYSFS_fileLength(pfile) + offset;

++		PHYSFS_seek(pfile, PHYSFS_fileLength(pfile) + offset);

+ 		break;

+ 	}

+ 	

+-	PHYSFS_seek(pfile, target);

+-	

+-	return curpos;

++	return PHYSFS_tell(pfile);

+ }

+ 

+ 

diff --git a/games-sports/trigger/trigger-0.5.2-r1.ebuild b/games-sports/trigger/trigger-0.5.2-r1.ebuild
index 81a286833fbf..73eeead06d79 100644
--- a/games-sports/trigger/trigger-0.5.2-r1.ebuild
+++ b/games-sports/trigger/trigger-0.5.2-r1.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-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.4 2006/06/14 12:12:17 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2-r1.ebuild,v 1.5 2006/07/23 03:36:30 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -44,7 +44,9 @@ src_unpack() {
 		src/glew/GL/glxew.h \
 		|| die "sed failed"
 	epatch "${FILESDIR}"/${P}-freealut.patch \
-		"${FILESDIR}/${P}"-gcc41.patch
+		"${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-physfs.patch
+
 }
 
 src_compile() {
diff --git a/games-sports/trigger/trigger-0.5.2.ebuild b/games-sports/trigger/trigger-0.5.2.ebuild
index 848a37a2b5bd..c0b579135b2f 100644
--- a/games-sports/trigger/trigger-0.5.2.ebuild
+++ b/games-sports/trigger/trigger-0.5.2.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-sports/trigger/trigger-0.5.2.ebuild,v 1.3 2006/05/23 21:48:57 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-sports/trigger/trigger-0.5.2.ebuild,v 1.4 2006/07/23 03:36:30 mr_bones_ Exp $
 
 inherit eutils games
 
@@ -42,7 +42,8 @@ src_unpack() {
 		src/glew/glew.cpp \
 		src/glew/GL/glxew.h \
 		|| die "sed failed"
-	epatch "${FILESDIR}/${P}"-gcc41.patch
+	epatch "${FILESDIR}/${P}"-gcc41.patch \
+		"${FILESDIR}/${P}"-physfs.patch
 }
 
 src_compile() {