Apply patch for x32 support, bug #395363.

Package-Manager: portage-2.2.0_alpha109/cvs/Linux x86_64

4 files changed, 73 insertions, 12 deletions

diff --git a/x11-proto/xproto/ChangeLog b/x11-proto/xproto/ChangeLog
index 8ec767e1d10e..c5e76b8f0126 100644
--- a/x11-proto/xproto/ChangeLog
+++ b/x11-proto/xproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-proto/xproto
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/ChangeLog,v 1.135 2012/04/26 18:30:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/ChangeLog,v 1.136 2012/06/10 09:53:27 chithanh Exp $
+
+*xproto-7.0.23-r1 (10 Jun 2012)
+
+  10 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xproto-7.0.23-Xmd_h_x32.patch, +xproto-7.0.23-r1.ebuild:
+  Apply patch for x32 support, bug #395363.
 
   26 Apr 2012; Alexis Ballier <aballier@gentoo.org> xproto-7.0.23.ebuild:
   keyword ~amd64-fbsd
diff --git a/x11-proto/xproto/Manifest b/x11-proto/xproto/Manifest
index 4e153f347f4a..4ef8d9a13ddd 100644
--- a/x11-proto/xproto/Manifest
+++ b/x11-proto/xproto/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xproto-7.0.23-Xmd_h_x32.patch 1170 RMD160 6fd64442a03c3b86a5cf7d46a6f3587df0c43bc0 SHA1 4a7d758897457ea4c3872bf530a912b34e0de2fe SHA256 139ec2c7cdec4dd909ee8d3203f2d8828475aac68ec06ae14d644a626cd5453b
 DIST xproto-7.0.22.tar.bz2 281763 RMD160 0d3b840e7a584e98ea3576bd521b09d2fd483b6d SHA1 96d9b37d15591412a94dd0d3620008e20ef500ca SHA256 ad8397dd2a3de7249d2f3fb3a49444fef71483d43681285936c11911663817a8
 DIST xproto-7.0.23.tar.bz2 290114 RMD160 b4077227a012c90cbcab8b6e7a289931b2ee6efb SHA1 5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2 SHA256 ade04a0949ebe4e3ef34bb2183b1ae8e08f6f9c7571729c9db38212742ac939e
 EBUILD xproto-7.0.22.ebuild 738 RMD160 010c039d040b885926f9d397cb25949f5390165b SHA1 4ba980fe0e760ce1a27a692128f3bfba21ab7c0f SHA256 6129bcc9d39c95299f92fab880a30446163a9f21d25ca149d72a67e7cd85bd37
+EBUILD xproto-7.0.23-r1.ebuild 823 RMD160 8dab40195e915d00c5ca6c7d015038e4945374db SHA1 a4115c7f12a04368ec254845cd54f09e0544a6e5 SHA256 0bcd2c888923a9c5c15542b53a7eb8dc2127b1a564ab9f580797c865116240bd
 EBUILD xproto-7.0.23.ebuild 763 RMD160 d08e08579f2c578f5bb5d0f3250eb1fed852ec03 SHA1 4ebcbb07d57cc358b9704e72f47c9b6a4651480c SHA256 980328aa938a7e772a39dbc09c4dc5efed62600fb426c5acd7c512de709b8777
-MISC ChangeLog 15583 RMD160 de1584ff8280f6ddf96a992027931adc92e84604 SHA1 ff14de99930f1a1155d42673260011190ceff599 SHA256 132d4098aa093f14f41b970afe81abcb63fe629af5938c65c0d7cc70a94f464a
+MISC ChangeLog 15796 RMD160 b9da18fbfdc525c7dd2de1c741b155f94f4ca17b SHA1 f0bd375f66ab82ed85205c2d02894d343bfa744e SHA256 b9917a2897f115c25a148f689e78b6c2e958229b9d69724f010fb5ff3f40a3eb
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+ZlGEACgkQvFcC4BYPU0rgawCgmFjOJuMNFP6au9cdjnpjN/aa
-hssAnj3NVP0oBNJXlnGu7kNiEhauQ6YF
-=gzMA
------END PGP SIGNATURE-----
diff --git a/x11-proto/xproto/files/xproto-7.0.23-Xmd_h_x32.patch b/x11-proto/xproto/files/xproto-7.0.23-Xmd_h_x32.patch
new file mode 100644
index 000000000000..f141c79befff
--- /dev/null
+++ b/x11-proto/xproto/files/xproto-7.0.23-Xmd_h_x32.patch
@@ -0,0 +1,34 @@
+From a06fa7fc98b66652df8bbc4734b5010d43744373 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Tue, 20 Dec 2011 13:43:44 +0000
+Subject: Xmd.h: Treat __ILP32__ targets as LONG32 ones
+
+amd64-x32 ABI defines sizeof(long) == sizeof (void*) == 4
+
+Noticed on build failure of libXmu:
+  libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c: In function '_XEditresGetStringValues':
+  libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c:2198:6: error: duplicate case value
+  libXmu-1.1.0/work/libXmu-1.1.0/src/EditresCom.c:2194:6: error: previously used here
+
+More info about x32: https://sites.google.com/site/x32abi/
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+Signed-off-by: James Cloos <cloos@jhcloos.com>
+---
+diff --git a/Xmd.h b/Xmd.h
+index f3868b3..96cc08f 100644
+--- a/Xmd.h
++++ b/Xmd.h
+@@ -64,7 +64,9 @@ SOFTWARE.
+      defined(__s390x__) || \
+      defined(__amd64__) || defined(amd64) || \
+      defined(__powerpc64__)
+-#  define LONG64				/* 32/64-bit architecture */
++#  if !defined(__ILP32__) /* amd64-x32 is 32bit */
++#   define LONG64				/* 32/64-bit architecture */
++#  endif /* !__ILP32__ */
+ # endif
+ 
+ /*
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-proto/xproto/xproto-7.0.23-r1.ebuild b/x11-proto/xproto/xproto-7.0.23-r1.ebuild
new file mode 100644
index 000000000000..753276b11386
--- /dev/null
+++ b/x11-proto/xproto/xproto-7.0.23-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xproto/xproto-7.0.23-r1.ebuild,v 1.1 2012/06/10 09:53:27 chithanh Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org xproto protocol headers"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-7.0.23-Xmd_h_x32.patch
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop
+	)
+}