Use patch to fix implicit pointer conversion which lead to compilation failures in 64bit arches

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 41 insertions, 4 deletions

diff --git a/app-editors/xemacs/ChangeLog b/app-editors/xemacs/ChangeLog
index 8bb8a6141b72..248b0b81b465 100644
--- a/app-editors/xemacs/ChangeLog
+++ b/app-editors/xemacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/xemacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.137 2010/06/17 22:40:24 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/ChangeLog,v 1.138 2010/08/24 18:02:12 hwoarang Exp $
+
+  24 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  xemacs-21.4.22-r1.ebuild,
+  +files/xemacs-21.4.22-implicit-pointer-conversion.patch:
+  Use patch to fix implicit pointer conversion which lead to compilation
+  failures in 64bit arches
 
   17 Jun 2010; Patrick Lauer <patrick@gentoo.org> xemacs-21.4.22-r1.ebuild,
   xemacs-21.5.29-r2.ebuild:
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 01d190b8a7b5..7e33e21ea3fe 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX README.Gentoo 1426 RMD160 2aee174f6eaa410ac036ad316fb860be340b17a7 SHA1 0f10e8c6907e6f4c33e284ef37ffee9f6467c84c SHA256 9fa4fa31fc4deb0742dd220c8a1cf41af2bb4f4651e4f995589389afcc9f5f92
 AUX xemacs-21.4.19-db.patch 3157 RMD160 354d4b70dce5313ecd8732336b2562f66153c351 SHA1 f83a0870a07a10ec5f177c0e0292607463ff095a SHA256 c0c0cf18ccd01ee0e34e913c4f275977f4f61aa7343fef9fdff1f3ba84096022
 AUX xemacs-21.4.19-texi.patch 1107 RMD160 2cedf0e0dfe50fdb2eb578fd7605629ea28a6f61 SHA1 4858d4297fc9c4a2db2b53b718618a23441b48c9 SHA256 9f7af4de522d03c9e78076c4801db775ce919d30b27f4f84c8b055d17f476ae5
 AUX xemacs-21.4.21-vcdiff.patch 476 RMD160 1298334c8d309f9054d98ec98bdda6dba494b653 SHA1 63bedf52451d64907f410b6a6534d82371a42e3e SHA256 adf0bb95ef289187027203f28fb0055be817c6b54211912bc33c16a9ff9cfb2c
+AUX xemacs-21.4.22-implicit-pointer-conversion.patch 719 RMD160 42de2a679944a69b20cccef57654cd4cf72c1d8e SHA1 b7d54b52bd25287819da1ca941c71adee6a02492 SHA256 36836c48150a1e1839449e60658f487f57440b02ae7b34cf4baa6d432fe32337
 AUX xemacs-21.4.22-large-images.patch 4695 RMD160 f67bc1b0900bcefce0c31ce07ab298df84e00e91 SHA1 764f25a2e2938fd9ec6f88597e7ffdc3af41cd9c SHA256 bde9b13e2e57f25564d732213fa5cb5f2bef17ce8580f8d18e81975febade3f8
 AUX xemacs-21.5.29-large-images.patch 3738 RMD160 95c508a325510cf883190fb03af8c1b84f9da51e SHA1 ac4e62cf676db315beae79ed43274659013013dd SHA256 fa842acfb13ecf8c2ba214172b825760e98e024592f26f5df9e854b5e93a895f
 AUX xemacs-21.5.29-optimization-bug.patch 371 RMD160 77a86c16783b3e6e416fb1fd0f5fa799b088034d SHA1 5c52deccf1d692afc8becf6eb15a9e8906425f4c SHA256 14c5d9ddab865a9e4a1c6d4f64ed44e4b16e0eccb9fdcef94cedfaa30948863c
@@ -10,7 +14,14 @@ AUX xemacs.desktop 1080 RMD160 9ddca2747abcc4e7a8bb305740942f62daa73ba6 SHA1 6a3
 DIST NeXT_XEmacs.tar.gz 39571 RMD160 3c2cedf75e4ece412031b20a15614a78367393f4 SHA1 619912734b1a1fae5115941b904d41beb4765b47 SHA256 35a0d988fd4ee801572639a99798571aa9fad140ddbed1455565ae9d5e0086c7
 DIST xemacs-21.4.22.tar.gz 8357931 RMD160 f7d71d3607c3301760df8f7ae5a93d1d37df56ba SHA1 24ed9b13d80c53c06bba60c7bb68387f692b7373 SHA256 87fb7633106625935105e821eb8fe65e521a3de44d45fe864109779c3a8e4bd1
 DIST xemacs-21.5.29.tar.gz 15453810 RMD160 96b951fd44915b3b73a9d69a7ab80c1237fdecc7 SHA1 0815975a2a7e9720d1a8fe0b347b0f977786e2a5 SHA256 071f84a2572eb70d4ae5cfc079f8f4c199371621f1855833a55a9577dffc0186
-EBUILD xemacs-21.4.22-r1.ebuild 6587 RMD160 7a52abb9e18f93c5d58b10c84014532494093834 SHA1 5c801af653c3ebec39f0f0666b02ffedf0cb183e SHA256 4a2444b7cb955370414c538e28b70cc6fd7e486b122f7320ff85afd73784208c
+EBUILD xemacs-21.4.22-r1.ebuild 6750 RMD160 99a1016442c32e47bd84d071a4d62713a31409ee SHA1 0b74520e1bc62e72510a3c94fdbe19a643eb9f29 SHA256 a16aef324d3cb3e4a6be7f8f011713389acc14b20aeeff4ce4c07372ed19afa0
 EBUILD xemacs-21.5.29-r2.ebuild 7077 RMD160 4d6093a515b6126651c27ef376e6a75eb4794bc1 SHA1 ed9efaac027d0d79dc1f71fba7a701cd1d589d44 SHA256 5f26479d153ff4b1b81dc2cc536f76d7f76b0450b9ec28f4fb752b7fd41eab6c
-MISC ChangeLog 23557 RMD160 3c5a320662e200c89cee1b36123beb555240e966 SHA1 5fe277fbbc39fe58ca7f54ec091bc7229d1d81fa SHA256 5267424c12b7d115f1f4e781cf712ffbec8304de452b36d2b78c6fc67ad37791
+MISC ChangeLog 23799 RMD160 3af482e369b828fcc447a244091e3b55ccdb6d67 SHA1 6f1e9afafaec75a8bbb83e2813a84c3eddcee0c1 SHA256 62df411dd6c9fb27b777faf496669c0bdc48f045632f6d4474396d9c6554c2ec
 MISC metadata.xml 711 RMD160 fc8a32ef389e34f90c14f2c26d75ac3cdc7e28a0 SHA1 b56f6ef2c44d658e3505f97c1686e52a40e4ee00 SHA256 abb7f5df5077d65ee8df0ed47e57faabe561de5bd09493912a3f06ef695f8f58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkx0CSwACgkQ9/cejkQaxBDWYgCdGy9NMO9C4lk9gvJVfD+/d5cj
+UHMAn1pBWkJ6xs4R8bKvQ+Q+23lfN9Dg
+=RfS4
+-----END PGP SIGNATURE-----
diff --git a/app-editors/xemacs/files/xemacs-21.4.22-implicit-pointer-conversion.patch b/app-editors/xemacs/files/xemacs-21.4.22-implicit-pointer-conversion.patch
new file mode 100644
index 000000000000..14fe615d0676
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.22-implicit-pointer-conversion.patch
@@ -0,0 +1,17 @@
+Index: xemacs-21.4.22/src/eldap.c
+===================================================================
+--- xemacs-21.4.22.orig/src/eldap.c
++++ xemacs-21.4.22/src/eldap.c
+@@ -57,7 +57,11 @@ static Lisp_Object Qnever, Qalways, Qfin
+ /* Modification types (Qdelete is defined in general.c) */
+ static Lisp_Object Qadd, Qreplace;
+ 
+-
++/* copied from /usr/include/ldap.h header */
++ldap_open LDAP_P((	/* deprecated, use ldap_create or ldap_initialize */
++	LDAP_CONST char *host,
++	int port ));
++
+ /************************************************************************/
+ /*                         Utility Functions                            */
+ /************************************************************************/
diff --git a/app-editors/xemacs/xemacs-21.4.22-r1.ebuild b/app-editors/xemacs/xemacs-21.4.22-r1.ebuild
index 48bef0389b39..50e1836ba2fc 100644
--- a/app-editors/xemacs/xemacs-21.4.22-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.22-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r1.ebuild,v 1.10 2010/06/27 09:58:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.4.22-r1.ebuild,v 1.11 2010/08/24 18:02:12 hwoarang Exp $
 
 # Note: xemacs currently does not work with a hardened profile. If you
 # want to use xemacs on a hardened profile then compile with the
@@ -69,6 +69,9 @@ src_unpack() {
 	# Security bug #275397
 	epatch "${FILESDIR}"/${P}-large-images.patch
 
+	# implicit pointer conversion patch to fix compilation problems
+	# on amd64 when using strict feature
+	epatch "${FILESDIR}"/${P}-implicit-pointer-conversion.patch
 	# Run autoconf. XEmacs tries to be smart by providing a stub
 	# configure.ac file for autoconf 2.59 but this throws our
 	# autotools eclass so it must be removed first.