summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2009-11-19 12:38:38 +0000
committerAlfredo Tupone <tupone@gentoo.org>2009-11-19 12:38:38 +0000
commitb72c8664e328f64c5c3f74d2133c8fac1be9924c (patch)
tree7262368deff2a944ad17171989e914694f33dbee /games-emulation
parentStable on amd64 (bug #293421) (diff)
downloadhistorical-b72c8664e328f64c5c3f74d2133c8fac1be9924c.tar.gz
historical-b72c8664e328f64c5c3f74d2133c8fac1be9924c.tar.bz2
historical-b72c8664e328f64c5c3f74d2133c8fac1be9924c.zip
Fix X_ShmAttach not defined. Bug #293440
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/tuxnes/ChangeLog8
-rw-r--r--games-emulation/tuxnes/Manifest5
-rw-r--r--games-emulation/tuxnes/files/tuxnes-0.75-xshm.patch13
-rw-r--r--games-emulation/tuxnes/tuxnes-0.75-r1.ebuild5
4 files changed, 25 insertions, 6 deletions
diff --git a/games-emulation/tuxnes/ChangeLog b/games-emulation/tuxnes/ChangeLog
index 5807acd0568b..fc7dfdad1a9a 100644
--- a/games-emulation/tuxnes/ChangeLog
+++ b/games-emulation/tuxnes/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-emulation/tuxnes
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.10 2009/03/14 08:08:29 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/ChangeLog,v 1.11 2009/11/19 12:38:38 tupone Exp $
+
+ 19 Nov 2009; Alfredo Tupone <tupone@gentoo.org> tuxnes-0.75-r1.ebuild,
+ +files/tuxnes-0.75-xshm.patch:
+ Fix X_ShmAttach not defined. Bug #293440 by Peter
14 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org>
+files/tuxnes-0.75-gcc43.patch, tuxnes-0.75-r1.ebuild:
diff --git a/games-emulation/tuxnes/Manifest b/games-emulation/tuxnes/Manifest
index 50f0b80ece5c..6ff1b60f459e 100644
--- a/games-emulation/tuxnes/Manifest
+++ b/games-emulation/tuxnes/Manifest
@@ -3,7 +3,8 @@ AUX tuxnes-0.75-exec-stack.patch 387 RMD160 5906d11d02f47d482e114ab236d656e9469c
AUX tuxnes-0.75-gcc34.patch 1068 RMD160 f574b3cbe13c3fffb7091c925cf316c2ccae7f5b SHA1 96c28b4e1fad6446b828e7d2a29a12b7409e4cd9 SHA256 15bd1c1a83cf143416d53676007957e4764930e02b25fd3da5b988ebb422e9c0
AUX tuxnes-0.75-gcc43.patch 398 RMD160 45ea4f9bdea343f516e645f7cc7eb3f7609d48be SHA1 f628f66e871e5664d75946e009e0fc7e051a9302 SHA256 8b96120db828b5c95ed8146f3c658a62db9339d09fd691fb546fdcf79a376f7a
AUX tuxnes-0.75-include.patch 885 RMD160 043f601f56f62a64b0b15157be002ba26dd62514 SHA1 d6e2cfe789c073a1fa2b7918a03393f27067df37 SHA256 88d6f5053ceba0164437282ba4bf3b5e71116ed54d6f61b5d0beca5bc8dbdd13
+AUX tuxnes-0.75-xshm.patch 315 RMD160 ae1d24d3cc8c70ae93c5d46e3209027cc74977b8 SHA1 bf63215bf12596c5e97e35409763b263e5a06f75 SHA256 84d4e1c69b7989c14ea85213b9f494c35c1c1e2078a6a26f2db18ab69d14dc2e
DIST tuxnes-0.75.tar.gz 198735 RMD160 d4a94e00f7c90cbf6fbf19537ede22aca05eeafd SHA1 1729cb3a33a5a3e0c8fa81a1341f912cd0b8d18b SHA256 217fc57fdd2a5ec360c197ea36110ec929d3f27c88cf875f0f4723b3496ed7c2
-EBUILD tuxnes-0.75-r1.ebuild 1194 RMD160 d78e51a8e7d874389634943d3f4df91f77bbda3a SHA1 168cafe45409cac7a8ea9a404625472018c19c8d SHA256 6dbb4159aabe8e69ec56fa702a250931c8302d68f7c0334651b06210717c53ad
-MISC ChangeLog 1534 RMD160 9f1f469f7fcd32eaf6f5065f7dc264795bcd460c SHA1 a87cf935c0b900427fb19bbc53bce74a1ec6b09f SHA256 56b79360dbfb8dc7c229c84591ad9fb735071f9c7de4fa067829ff11177e5d84
+EBUILD tuxnes-0.75-r1.ebuild 1225 RMD160 5c919a2490b17631d5cead1085b09784cecd8dfa SHA1 60b6fad4ae30ad0e195e9623019ca29c1866db78 SHA256 61595219271abd52ee471b9592e95b0be9c3f2925bd29a12c93245a3369e91ef
+MISC ChangeLog 1690 RMD160 523d963f5ee5ba495672ad27877563a6ea02a685 SHA1 2c086ab5daac9ac1bba7b0204f8b61b3000082b4 SHA256 15ee5837ac20e05e1cc9c8708f3b2479705ae97718ea6729c308550b5205979e
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-emulation/tuxnes/files/tuxnes-0.75-xshm.patch b/games-emulation/tuxnes/files/tuxnes-0.75-xshm.patch
new file mode 100644
index 000000000000..de7b4b56fc4c
--- /dev/null
+++ b/games-emulation/tuxnes/files/tuxnes-0.75-xshm.patch
@@ -0,0 +1,13 @@
+--- x11.c.old 2009-11-19 12:27:42.000000000 +0100
++++ x11.c 2009-11-19 13:32:41.000000000 +0100
+@@ -102,6 +102,10 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
++#ifndef X_ShmAttach
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
++#endif
+ #endif
+
+ #endif /* HAVE_X */
diff --git a/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild b/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild
index 46292e683788..204f70b155aa 100644
--- a/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild
+++ b/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild,v 1.2 2009/03/14 08:08:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/tuxnes/tuxnes-0.75-r1.ebuild,v 1.3 2009/11/19 12:38:38 tupone Exp $
EAPI=2
inherit autotools eutils games
@@ -32,7 +32,8 @@ src_prepare() {
"${FILESDIR}"/${P}-gcc34.patch \
"${FILESDIR}"/${P}-gcc43.patch \
"${FILESDIR}"/${P}-include.patch \
- "${FILESDIR}"/${P}-exec-stack.patch
+ "${FILESDIR}"/${P}-exec-stack.patch \
+ "${FILESDIR}"/${P}-xshm.patch
eautoreconf
}