summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-engines/odamex')
-rw-r--r--games-engines/odamex/ChangeLog6
-rw-r--r--games-engines/odamex/Manifest27
-rw-r--r--games-engines/odamex/files/odamex-0.6.2-libagar.patch15
-rw-r--r--games-engines/odamex/odamex-0.6.2.ebuild7
4 files changed, 36 insertions, 19 deletions
diff --git a/games-engines/odamex/ChangeLog b/games-engines/odamex/ChangeLog
index f52d603745ea..d0f6d8c20402 100644
--- a/games-engines/odamex/ChangeLog
+++ b/games-engines/odamex/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-engines/odamex
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.6 2013/02/16 22:38:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/ChangeLog,v 1.7 2013/02/23 20:23:15 hasufell Exp $
+
+ 23 Feb 2013; Julian Ospald <hasufell@gentoo.org> odamex-0.6.2.ebuild,
+ +files/odamex-0.6.2-libagar.patch:
+ fix bug #458902
16 Feb 2013; Agostino Sarubbo <ago@gentoo.org> odamex-0.6.2.ebuild:
Stable for x86, wrt bug #457894
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
index 5fb0fc6d67b7..def17e5ea055 100644
--- a/games-engines/odamex/Manifest
+++ b/games-engines/odamex/Manifest
@@ -1,28 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
AUX odamex-0.6.1-build.patch 5903 SHA256 9654f26beaf684831347a2970ab959b27561b9772595a4a900ce589683a5b062 SHA512 29df1ad3f86dbf6e1dc92c2c01ce3e223ed0d38eb1fe8c1e1a06c2d158f67330f68e7fa542770fe0bf68ce8d8785371959f391cf98b8334b40fd0b9cb4b635c3 WHIRLPOOL 67d757cd882831fd86a007081d465183d184a4f06f3bd7d930b634bcc6b5124c2c793ef891420a77a243e686cc46a53a9f0a44bdf65e2902187aba76aeb6491a
AUX odamex-0.6.2-build.patch 5923 SHA256 d08e7420d38e503baa26291088fa612576bc90439e80095b9237b22b616b8dc1 SHA512 8a9c498750a1ad8efcc436bbbc699152f30c4a1b8a366b78c3eb285646a8b0ed84c260650376766372d671ef7e243337b267e621c2f403971c35442eb28c3768 WHIRLPOOL d0f722b2b5a56006f979af195acc106456b22a2753c5af1c860c521c9926ebb2d67fabbf0a9f8eefe4ef5dcce68e839934fec1bc96d8755dc1f22fc0e47ad7e5
+AUX odamex-0.6.2-libagar.patch 429 SHA256 d6b6d691946fc1a97d12e281226d08a1e913de7c75cfb8a4f778566dd33e08fc SHA512 010c557770742d541d3e1ae3f744625da9e87b8cf56b27d770fd6ecd9ad68d0a15f63603db1e99c52866d91b6453ec2813cb7c16ace94411e122f92d198e3181 WHIRLPOOL 0b84e375658c6a8d0c47170d66561c573092ce42b65a44038d8bce345e39612988a6b8858e2539b8092515751e263cc04af7545679b93adbe3e526cf28a10c34
DIST odamex-src-0.6.1.tar.bz2 7522333 SHA256 d7758141d00510eae55132a2376326560a206c772da3d604666dc2c62009f861 SHA512 bb506ec912dbd63e68be2f1ef3ae7c0bdd800ac39ab56ddeb270c707584c1a34c83a729ef9bf3f8a5d24599b220d526ca9559fc9a2e3c561af3fe3ab134aa7f9 WHIRLPOOL 31d4adc826a3a2ffa1d5c9e3872edb6a702c9b6695f268ecba324fb27aa8f29db05d525972fbdafc1c5c8c58d991b2600674bb9ff674cf3d6991d3d3ba82a68d
DIST odamex-src-0.6.2.tar.bz2 8451290 SHA256 70534ee0b88f759269b807190f347acacc1a0ff4f9e9e90edeab9aa99d4f316e SHA512 83bdb7b850a6a6c3670fa9eeeccca6501ea90f26bcef2437e5530a43d40c9cdd408de15183d4fe991becc13f58666c86586660522d102680148df4c12dd27104 WHIRLPOOL d024220bc2b743fd6512981ce3d58fa8562e9cfc3712158e308172ba1c3b1a2de076969015601a418d14be25af5ebe366e6353bb66f523837a29ad5c56af1c64
EBUILD odamex-0.6.1.ebuild 2166 SHA256 cd4a3a47923f81c1bc1debff517a203844e03ee0ccaeb638ba7fca1034c47fea SHA512 bdfd0dfc04827f79ebd6567a046841d6aefa73208f4a14b20f13dc5d1543724914da3448dac897c95dc638200a0b2fea5b4930efff42f3d828bd2fd1ef2c43bc WHIRLPOOL d35e94b1cacee8dd2e5af4613f1264775ff66b924f87d8bc6beed9f72c8ff0162e4aaf73f5f13414c1590b62c85828934c1aaabdb32990217252505953196047
-EBUILD odamex-0.6.2.ebuild 2159 SHA256 de9edf2d9aa67a935aecabbb8be4ab19b336bf05debdde4aa7b821822a23345b SHA512 c793c95eb94227dbc80a2135b3814fbba7527a5469a9c8f3b17c7f01572ebaf9391f26de4fc4e7a8c0dddda9a9eea40812f96e7352c45937547e8d4b2f111877 WHIRLPOOL 008363e50f91a0d461a2645db07ccd46cb97240195e50c971f3859bee2e7c1d6d4b105bc3980ac3ca98c8005d33bef59a7e7813878ed65838d0de38c5e7c5109
-MISC ChangeLog 937 SHA256 d2c7de082ed1ab69e7ea16d8b48b9081b69ace6a5c1c44c02ff5216cb2257f64 SHA512 bbfac357abc8af0899b820cd8d84faa092cc1dfc6f2f854af2b8a4d1f3150ed89c5a49940387258b045c241679680b945b6dabf447c7e2d85cf2e6ae34bbe9d9 WHIRLPOOL 99737d763dc3d49a56b23be611418e4d9ffbdb68412482590868824ea9141730ed2776be2770fc5e4a6e161ce1fbf3693eef0c25d9432f4fdb6781d0e783219b
+EBUILD odamex-0.6.2.ebuild 2215 SHA256 beeaa771aa0daa33959f06f808100a59a48c95a712159790ed0f4cac1df67eb3 SHA512 364439cdae5956c9edd67d32e3995339c81e5c830a410e69d8ddd07d46d45464d90e19d3710d911f686bfadaddb13e215f5cf4a6cdde8e51ae9d5bd755c7559f WHIRLPOOL 15e45f6522e0b5c9c16e5acf7269ffd2c1cb8f472c2ac85164469ba07c9b90ce0ec3e23580b0fc59d1d4bb2b977382e5bad0b736d0995307861f7a3390749232
+MISC ChangeLog 1070 SHA256 070b83c8ddf37f3581aa4dd76e81b3af85ad11e497a5879633a12e0894128038 SHA512 fb25358562cf254392975d9ff517f83098337d28ace519fdbd329c407f30349405053e71810471fd4fed56c3317474fc4680a0a31202d82264dd4dff69a38d9b WHIRLPOOL 152438e98198c4b1f306116ad03cf05e90113c62295eb9e48c4a1d4324521707df5d7328c08d01c1cfb6af4cd33f4bd40fb1fe9ae60e50b1781e5506650b1a9c
MISC metadata.xml 1409 SHA256 a34f34c1a8940990b36b4e2b90b438aa20bd27248379bd25ad6d1fb5fb2d005c SHA512 46a7870945deac5e43b90f5c25c5d742c10926356a0f122bf7c8f79cd0f814e81a8560b4317ecc5f2bbe1807867667e2840529432fd58d6c5f547db453bb33be WHIRLPOOL 7ad416d13c6052026ab76d9c50810a708c70af7ea44450ca422dfd9ede924b41e2f4a71a4ab5c6ce2c66507a7b8282c6bfeaed278dec65c5a2cc11968ea8eabc
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCgAGBQJRIApcAAoJELp701BxlEWfIgIP/0udgppkvPbQ+1ppq3FkpzQ3
-W2qrbTgy/5wzddNpR1NX/4MUHtfCPdC/YU99kkWcI728Qd9xURZjk/v5OTxoWlxm
-AAOrco/jThBJb39465z4Jst0J8/WFvaz/S/BNcf7a81OQwOubBKqCG8a9eu2/TAD
-EZzaO4rco4HaCXBMlt+GXpeD2T0DULqUtHUTA954LP6/2Mv2MCScbkC9v5jYLmj/
-LTmDlUu7RJglzKvhanI4Z38c3aQpNPFJd7Hts7I4r6x5dQWqbu4UAlA/2swMOfJy
-cagiNVtw/N7m93g28loLcqN1+NNxsZP9rrPtqkyaL05lBShWcW7aw2acLUyIYfIg
-3qreIdb8PF1sXq1BRHGUeAsNFYRtFNfCIjR5a2iVgwcpxhGazxQEknXk8wnk/9Gb
-bLewEzmhkuZ0rMAbt66pZxazUuVQ7CUE8ed0AqxVH6ogZEpZ51Nettw4NBRhMWF8
-CXrx0MkdmWQ0dRrPstrExJfrd6zRKzatrfIhkam7+tINepOW/ATNe3Fa72j1Pu7W
-ev15K/A+7ykheDUYkTCRpG/Y3YtBJFTDU4EW8GeW/i+8+/qguIH9nBWbkrQwsYfD
-wEyYWAxXhBQuu/NOXcN1KkAtRrr1j8a9TRHpiXklT3cNwykaviHLiPQPPzwgrhhM
-kCpjHc4X8Rd0KBrNPmox
-=YoaX
+iQEcBAEBCAAGBQJRKSU2AAoJEFpvPKfnPDWz9SYH/1PQhrs8Lzt51V8aGIdohEkd
+8V33vyWqVTun2mOfOKRGnQfiqqbrHl93Yvb1lN7zOBKUeQobhO3MVAkQ69EtC0nC
+vd/jpSCxoC+LweXDiekMQMbQLHpzlqzyKUm0J4mFCrrUBCmmcqEn8BN6pwSXsF+m
+bCOHmDRZ6tAP1kFBDYfT71G0lB1eA0SuoU5WRX5GmZ7WEg23dOQd4bJby5roUGLw
+4MMUbh03KvRSxLbfY9IFn5ivwgsSTw+pKq1j+SvtctcqX4Ujauv/GFuq6294esWL
+Psle85sYnc/hMt244xmKgQVM9GOZb81LRU1sNmTC3SnD+PjRAQQxUFhj/oo1nVo=
+=xeTD
-----END PGP SIGNATURE-----
diff --git a/games-engines/odamex/files/odamex-0.6.2-libagar.patch b/games-engines/odamex/files/odamex-0.6.2-libagar.patch
new file mode 100644
index 000000000000..5f367aff1d6e
--- /dev/null
+++ b/games-engines/odamex/files/odamex-0.6.2-libagar.patch
@@ -0,0 +1,15 @@
+http://odamex.net/svn/revision.php?rev=3691
+
+Index: ag-odalaunch/src/main.cpp
+===================================================================
+--- ag-odalaunch/src/main.cpp (revision 3668)
++++ ag-odalaunch/src/main.cpp (working copy)
+@@ -52,7 +52,7 @@
+ {
+ AG_Window *win;
+
+- if((win = AG_GuiDebugger(agWindowFocused)) != NULL)
++ if((win = (AG_Window*)AG_GuiDebugger(agWindowFocused)) != NULL)
+ {
+ AG_WindowShow(win);
+ }
diff --git a/games-engines/odamex/odamex-0.6.2.ebuild b/games-engines/odamex/odamex-0.6.2.ebuild
index 6cb7a5312ad4..b746f3d7a9f9 100644
--- a/games-engines/odamex/odamex-0.6.2.ebuild
+++ b/games-engines/odamex/odamex-0.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/odamex-0.6.2.ebuild,v 1.3 2013/02/16 22:38:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/odamex/odamex-0.6.2.ebuild,v 1.4 2013/02/23 20:23:15 hasufell Exp $
EAPI=5
WX_GTK_VER="2.8"
@@ -28,7 +28,10 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/${MY_P}
src_prepare() {
- epatch "${FILESDIR}"/${P}-build.patch
+ epatch "${FILESDIR}"/${P}-build.patch \
+ "${FILESDIR}"/${P}-libagar.patch
+
+ epatch_user
}
src_configure() {