diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2009-11-12 07:59:49 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2009-11-12 07:59:49 +0000 |
| commit | 17667b9b355ba906c74e2fbdd0ee4a3f5b2e955a (patch) | |
| tree | ea64580fcccd55d38cb076bf4041093f06db5522 /app-emulation | |
| parent | Fix collision issues. Per bug #276966 and #282565. (diff) | |
| download | historical-17667b9b355ba906c74e2fbdd0ee4a3f5b2e955a.tar.gz historical-17667b9b355ba906c74e2fbdd0ee4a3f5b2e955a.tar.bz2 historical-17667b9b355ba906c74e2fbdd0ee4a3f5b2e955a.zip | |
Fix X_ShmAttach not declared. Bug #292508
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/vice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/vice/Manifest | 5 | ||||
| -rw-r--r-- | app-emulation/vice/files/vice-2.1-xshm.patch | 16 | ||||
| -rw-r--r-- | app-emulation/vice/vice-2.1.ebuild | 5 |
4 files changed, 27 insertions, 5 deletions
diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog index afc84431eb5c..ca9e7f6e9f59 100644 --- a/app-emulation/vice/ChangeLog +++ b/app-emulation/vice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/vice # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.64 2009/11/02 09:54:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.65 2009/11/12 07:59:49 tupone Exp $ + + 12 Nov 2009; Alfredo Tupone <tupone@gentoo.org> vice-2.1.ebuild, + +files/vice-2.1-xshm.patch: + Fix X_ShmAttach not declared. Bug #292508 by Cedric Godin 02 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> vice-1.22.ebuild, vice-2.1.ebuild: diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest index c94a70c01d90..871fda4637be 100644 --- a/app-emulation/vice/Manifest +++ b/app-emulation/vice/Manifest @@ -1,7 +1,8 @@ AUX vice-2.1-gcc44.patch 218 RMD160 3d14faf8527894b83de5a0c7cf70b811b4364d62 SHA1 9db442b6fed66c760953b0a2ca5167a1f0f44512 SHA256 1816007ac07855bed75ff40bbaead7bb83b6392c338a7a24dbef9bdff7d46b08 +AUX vice-2.1-xshm.patch 421 RMD160 f40abf65680d82814b4de19d5ee0d85897c35c4c SHA1 4e0274f77ee4558370bd46fe98951589cb550ee9 SHA256 62a993fde4dfcea206d448c46f38cb3da5dad462d9e1f250dacb2df44f0fd0c7 DIST vice-1.22.tar.gz 6088483 RMD160 ca93fc424e617e38f27e288ebcdfbab2aa3659db SHA1 55e0047824f64173539e03ddd2d5ab51cd581fbb SHA256 cd45ce3eea98ce70ae03002a4d02bb3188c982ee7fb7435ac8777bc8a780ef01 DIST vice-2.1.tar.gz 8097482 RMD160 218a3b111d9c3bfcea06cea30299f7b471a57232 SHA1 0adf7a1d13c7b3af7b8d2d21c17b6dc0f055ff67 SHA256 dc42df924bd4b4ab4af43e372d873a79ea035059f31f2f5c297c234b1c532c66 EBUILD vice-1.22.ebuild 2171 RMD160 c42fb2d1ee264c4c0a7297000a647d50314a4b9c SHA1 aa6d8fd1904f38a90faae780da7c0037bcabdf98 SHA256 b46fb1d48a91e82e9f5feb92cdcdd063e87225f210692b3d859acd2a0b6158fb -EBUILD vice-2.1.ebuild 2194 RMD160 63ad57d33eb27872d91bba17f6b362bac982a3bd SHA1 d18ba017e27b5917381df93e6b335118cd7f7719 SHA256 aa44f2cc372a71de5fc7fc5f0e2362c79c0fba77633f85907eb3a99a2d543b94 -MISC ChangeLog 8174 RMD160 bf44e58f7c0b59cf37cdef81d8e116ea89a179bb SHA1 0e5ac24e5ac259f8434520fe64292ebf8acbf7ef SHA256 208ac8160a6ea584ad4a4fe0da133da1400bfa033bb31dfd0edc2a791ce44257 +EBUILD vice-2.1.ebuild 2225 RMD160 94e536477b9a82f89f643cc244110b129ad5c045 SHA1 6363e00cda6cf9edc5f7d91138652db18428477d SHA256 4a638e51345c6242f72fa837e1cb00e8c2297237511ef54c7872392b1aba9a92 +MISC ChangeLog 8329 RMD160 d3499037862a0b451bfdda1579b112dce040eca0 SHA1 10656a389e1c2d7c5ad1cb200aed490e6884aeaa SHA256 9c35c3e4e594df606e2c89a8d1aacda8b9d576e6f70918a0499d579c85f84a8d MISC metadata.xml 321 RMD160 6709c07341536778184c86e920569d23e00f94b3 SHA1 c482881ba2599e5a49fec4f34acb13856b4eb2da SHA256 7c918d9c1645188c60a72a4e8f0dd0a7fde2b553400c79e748d0d4a24b702393 diff --git a/app-emulation/vice/files/vice-2.1-xshm.patch b/app-emulation/vice/files/vice-2.1-xshm.patch new file mode 100644 index 000000000000..1546da7b4818 --- /dev/null +++ b/app-emulation/vice/files/vice-2.1-xshm.patch @@ -0,0 +1,16 @@ +--- src/arch/unix/x11/xaw/videoarch.h.old 2009-11-12 08:50:17.000000000 +0100 ++++ src/arch/unix/x11/xaw/videoarch.h 2009-11-12 08:52:20.000000000 +0100 +@@ -44,6 +44,13 @@ + #include <X11/extensions/XShm.h> + #include <sys/ipc.h> + #include <sys/shm.h> ++# ifndef X_ShmAttach ++# ifdef BYTE ++# undef BYTE ++# endif ++# include <X11/Xmd.h> ++# include <X11/extensions/shmproto.h> ++# endif + #endif + + #include "types.h" diff --git a/app-emulation/vice/vice-2.1.ebuild b/app-emulation/vice/vice-2.1.ebuild index 7f0c79edecdf..92c40eef9107 100644 --- a/app-emulation/vice/vice-2.1.ebuild +++ b/app-emulation/vice/vice-2.1.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/app-emulation/vice/vice-2.1.ebuild,v 1.4 2009/11/02 09:54:41 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.1.ebuild,v 1.5 2009/11/12 07:59:49 tupone Exp $ EAPI=2 inherit eutils games @@ -53,7 +53,8 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_prepare() { - epatch "${FILESDIR}"/${P}-gcc44.patch + epatch "${FILESDIR}"/${P}-gcc44.patch \ + "${FILESDIR}"/${P}-xshm.patch } src_configure() { |