Backported Emacs 22 upstream patch for proper including of Xaw3d headers.

Package-Manager: portage-2.1.2.4

4 files changed, 97 insertions, 17 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 17898d560f24..fc3e767a818a 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.136 2007/04/18 13:57:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.137 2007/04/19 05:40:28 ulm Exp $
+
+  19 Apr 2007; Ulrich Mueller <ulm@gentoo.org>
+  +files/emacs-21.4-Xaw3d-headers.patch, emacs-21.4-r12.ebuild:
+  Backported Emacs 22 upstream patch for proper including of Xaw3d headers;
+  removed build-time dependency on x11-libs/libXaw; bug #174453.
 
   18 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> emacs-21.4-r12.ebuild:
   Keyworded ~sparc wrt #174884
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index afa6c3cd6d94..15ca9fcff66e 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -25,6 +25,10 @@ AUX emacs-21.3-xorg.patch 394 RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 SH
 MD5 ef8adf470d7d95802802b3860ef8d9a9 files/emacs-21.3-xorg.patch 394
 RMD160 51d64c84aaa61cd1eb6b08c8fa7688a10bc09949 files/emacs-21.3-xorg.patch 394
 SHA256 191c93e97587a7d7b9000d2cba24ef45233aa029719865646bf8d73b26510622 files/emacs-21.3-xorg.patch 394
+AUX emacs-21.4-Xaw3d-headers.patch 2145 RMD160 0da9222f7f35d4de93470d36aba927ce3117d0d8 SHA1 309c96f228fc5c28b140cd8b9b81205e82f97a2c SHA256 52bf59a3d2e4786ab5c44f607d47fe16a965de40e5cf895ca36dc75362eee11c
+MD5 d958ceb1e8cbecb2717f9c3699a73754 files/emacs-21.4-Xaw3d-headers.patch 2145
+RMD160 0da9222f7f35d4de93470d36aba927ce3117d0d8 files/emacs-21.4-Xaw3d-headers.patch 2145
+SHA256 52bf59a3d2e4786ab5c44f607d47fe16a965de40e5cf895ca36dc75362eee11c files/emacs-21.4-Xaw3d-headers.patch 2145
 AUX emacs-21.4-autosave-tmp.patch 525 RMD160 db34685ca46b419dc1807acd0ebcc52ef622b20e SHA1 5865d14c568ed8046b3a8fc6971fa538347eb15e SHA256 18bb63c546d2496ead9544f69f8c33041fdf2da6d7b7a9bf13304b37fd54608a
 MD5 57a5ad0e9c07aa3ee8060eaff08f499b files/emacs-21.4-autosave-tmp.patch 525
 RMD160 db34685ca46b419dc1807acd0ebcc52ef622b20e files/emacs-21.4-autosave-tmp.patch 525
@@ -62,10 +66,10 @@ EBUILD emacs-18.59-r4.ebuild 2565 RMD160 48ec8327551a3c62eaef317212c38095f9bf5aa
 MD5 9d243787c2d24292323c8d5194820563 emacs-18.59-r4.ebuild 2565
 RMD160 48ec8327551a3c62eaef317212c38095f9bf5aa3 emacs-18.59-r4.ebuild 2565
 SHA256 5ef985e2208697bc13b9cb1858da6ce6d9b14169cf238f6d8995e75b673eb23f emacs-18.59-r4.ebuild 2565
-EBUILD emacs-21.4-r12.ebuild 5797 RMD160 9e87d5f878e1c24b66e9d74aeee7fbe75c906843 SHA1 10a4a775fd2563f45dcc8ccaafa6b4afdcb8f8d5 SHA256 1dd1a44d8545dc98f9e9967d94cbc77c1c4358b4b1d1d17bbf0c1c35dfd51b80
-MD5 92359cf57c57ba45b29c119fa7a3bdbd emacs-21.4-r12.ebuild 5797
-RMD160 9e87d5f878e1c24b66e9d74aeee7fbe75c906843 emacs-21.4-r12.ebuild 5797
-SHA256 1dd1a44d8545dc98f9e9967d94cbc77c1c4358b4b1d1d17bbf0c1c35dfd51b80 emacs-21.4-r12.ebuild 5797
+EBUILD emacs-21.4-r12.ebuild 5805 RMD160 bbea02eb022602d2b0e3b4fa158a6bc88d5114f7 SHA1 ff27008049fa71eb525420b1c14a24a343757e4a SHA256 c6f5118a00f9c70e7c7509a6ff463e1e05a9974ab4e99266835588ea2af82e3c
+MD5 5b8e93cb5dedc113b4d7c4c161b06eb6 emacs-21.4-r12.ebuild 5805
+RMD160 bbea02eb022602d2b0e3b4fa158a6bc88d5114f7 emacs-21.4-r12.ebuild 5805
+SHA256 c6f5118a00f9c70e7c7509a6ff463e1e05a9974ab4e99266835588ea2af82e3c emacs-21.4-r12.ebuild 5805
 EBUILD emacs-21.4-r4.ebuild 4551 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 SHA1 aae095ad8995c6dc1b76e2805032073486b13476 SHA256 57f007813695810a6df614b335de85df341fdda53a36d7c806a18e315f70afec
 MD5 d008266355b179cf5699aded70630be3 emacs-21.4-r4.ebuild 4551
 RMD160 a7b49c929b37f60e45af01038595fd6e26579609 emacs-21.4-r4.ebuild 4551
@@ -74,10 +78,10 @@ EBUILD emacs-21.4-r8.ebuild 5727 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2
 MD5 92f4d4ff1be57566edb7db155c0bbf53 emacs-21.4-r8.ebuild 5727
 RMD160 e879aeb102baa9977fee9a40d18c4a0acc001be2 emacs-21.4-r8.ebuild 5727
 SHA256 2a692ffbdc1203341a019866b2f54460a7f6faa7a048a8466cc2879545cdc3c2 emacs-21.4-r8.ebuild 5727
-MISC ChangeLog 20584 RMD160 48ab666e19c8b24384ed2fca31388da9efbf0fd7 SHA1 45915762b0bc980dad7cc4713066bf64cbf67e44 SHA256 571e688d7b7a4d24b2e583bf4814308a2e9a0d441b8b3787af1a07a75fa1f261
-MD5 0bbe958a454d9e12bc5dea7f3d84c22f ChangeLog 20584
-RMD160 48ab666e19c8b24384ed2fca31388da9efbf0fd7 ChangeLog 20584
-SHA256 571e688d7b7a4d24b2e583bf4814308a2e9a0d441b8b3787af1a07a75fa1f261 ChangeLog 20584
+MISC ChangeLog 20832 RMD160 8abc65b85b3f0a51a250ff9e2a9923c42a55d07a SHA1 e0807bf90684f5faa758bb44a1f3489152e8b1b8 SHA256 d63da599bf620d9cb70edbdd067f6fbf76bf7fdba877f231e3b4950c33068639
+MD5 0cd75405839a4d282614a1ae42d159e3 ChangeLog 20832
+RMD160 8abc65b85b3f0a51a250ff9e2a9923c42a55d07a ChangeLog 20832
+SHA256 d63da599bf620d9cb70edbdd067f6fbf76bf7fdba877f231e3b4950c33068639 ChangeLog 20832
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -98,9 +102,9 @@ MD5 6276bfdc37e540127a083cc6b979ac37 files/digest-emacs-21.4-r8 473
 RMD160 4f6aee1102af50b44f69f8de5714c901c5b6b15c files/digest-emacs-21.4-r8 473
 SHA256 8dec85daf40abb62a8c6a7232b067f0e5da524b222d2668f8db0f1df9dd7188e files/digest-emacs-21.4-r8 473
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGJiO7KRy60XGEcJIRAl1NAJ0d1kGq+U2kF4g4FvrrEavUbXB69ACfdUus
-PhQZFRbYZLrOyBwgekG6yLk=
-=4DNu
+iD8DBQFGJwFPOeoy/oIi7uwRAm9vAKDPi8wQVYo4RDzWIkkxPeZ4wmGIBACePNDl
+mz9+/xl41htthdw17wGcqJw=
+=8VP3
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-21.4-r12.ebuild b/app-editors/emacs/emacs-21.4-r12.ebuild
index 90946e286c2c..287da5f63745 100644
--- a/app-editors/emacs/emacs-21.4-r12.ebuild
+++ b/app-editors/emacs/emacs-21.4-r12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.5 2007/04/18 13:57:08 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r12.ebuild,v 1.6 2007/04/19 05:40:28 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -39,9 +39,7 @@ RDEPEND="sys-libs/ncurses
 	>=app-admin/eselect-emacs-0.7-r1"
 
 DEPEND="${RDEPEND}
-	X? ( x11-misc/xbitmaps
-		!arm? (	Xaw3d? ( x11-libs/libXaw ) )
-	)"
+	X? ( x11-misc/xbitmaps )"
 
 PROVIDE="virtual/emacs virtual/editor"
 
@@ -61,6 +59,7 @@ src_unpack() {
 	epatch "${FILESDIR}/emacs-21.4-autosave-tmp.patch"
 	epatch "${FILESDIR}/emacs-21.4-blessmail-build.patch"
 	epatch "${FILESDIR}/emacs-21.4-qa.patch"
+	epatch "${FILESDIR}/emacs-21.4-Xaw3d-headers.patch"
 
 	# install emacsclient.1 man page (#165466)
 	sed -i -e "s/for page in emacs/& emacsclient/" Makefile.in || die
diff --git a/app-editors/emacs/files/emacs-21.4-Xaw3d-headers.patch b/app-editors/emacs/files/emacs-21.4-Xaw3d-headers.patch
new file mode 100644
index 000000000000..26d7a8546ab3
--- /dev/null
+++ b/app-editors/emacs/files/emacs-21.4-Xaw3d-headers.patch
@@ -0,0 +1,72 @@
+diff -ur emacs-21.4-orig/src/xfns.c emacs-21.4/src/xfns.c
+--- emacs-21.4-orig/src/xfns.c	2002-12-06 18:05:35.000000000 +0100
++++ emacs-21.4/src/xfns.c	2007-04-19 01:56:40.000000000 +0200
+@@ -69,8 +69,13 @@
+ #include <X11/Shell.h>
+ 
+ #ifndef USE_MOTIF
++#ifdef HAVE_XAW3D
++#include <X11/Xaw3d/Paned.h>
++#include <X11/Xaw3d/Label.h>
++#else  /* !HAVE_XAW3D */
+ #include <X11/Xaw/Paned.h>
+ #include <X11/Xaw/Label.h>
++#endif /* HAVE_XAW3D */
+ #endif /* USE_MOTIF */
+ 
+ #ifdef USG
+diff -ur emacs-21.4-orig/src/xmenu.c emacs-21.4/src/xmenu.c
+--- emacs-21.4-orig/src/xmenu.c	2002-01-06 07:18:19.000000000 +0100
++++ emacs-21.4/src/xmenu.c	2007-04-19 01:56:40.000000000 +0200
+@@ -73,7 +73,11 @@
+ #include <X11/StringDefs.h>
+ #include <X11/Shell.h>
+ #ifdef USE_LUCID
++#ifdef HAVE_XAW3D
++#include <X11/Xaw3d/Paned.h>
++#else  /* !HAVE_XAW3D */
+ #include <X11/Xaw/Paned.h>
++#endif /* HAVE_XAW3D */
+ #endif /* USE_LUCID */
+ #include "../lwlib/lwlib.h"
+ #else /* not USE_X_TOOLKIT */
+diff -ur emacs-21.4-orig/lwlib/lwlib.c emacs-21.4/lwlib/lwlib.c
+--- emacs-21.4-orig/lwlib/lwlib.c	2000-09-30 19:03:27.000000000 +0200
++++ emacs-21.4/lwlib/lwlib.c	2007-04-19 01:56:40.000000000 +0200
+@@ -49,7 +49,11 @@
+ #include "lwlib-Xol.h"
+ #endif
+ #if defined (USE_XAW)
++#ifdef HAVE_XAW3D
++#include <X11/Xaw3d/Paned.h>
++#else  /* !HAVE_XAW3D */
+ #include <X11/Xaw/Paned.h>
++#endif /* HAVE_XAW3D */
+ #include "lwlib-Xaw.h"
+ #endif
+ 
+diff -ur emacs-21.4-orig/lwlib/lwlib-Xaw.c emacs-21.4/lwlib/lwlib-Xaw.c
+--- emacs-21.4-orig/lwlib/lwlib-Xaw.c	2001-02-28 15:55:17.000000000 +0100
++++ emacs-21.4/lwlib/lwlib-Xaw.c	2007-04-19 01:56:40.000000000 +0200
+@@ -31,12 +31,21 @@
+ #include <X11/CoreP.h>
+ #include <X11/Shell.h>
+ 
++#ifdef HAVE_XAW3D
++#include <X11/Xaw3d/Scrollbar.h>
++#include <X11/Xaw3d/Paned.h>
++#include <X11/Xaw3d/Dialog.h>
++#include <X11/Xaw3d/Form.h>
++#include <X11/Xaw3d/Command.h>
++#include <X11/Xaw3d/Label.h>
++#else /* !HAVE_XAW3D */
+ #include <X11/Xaw/Scrollbar.h>
+ #include <X11/Xaw/Paned.h>
+ #include <X11/Xaw/Dialog.h>
+ #include <X11/Xaw/Form.h>
+ #include <X11/Xaw/Command.h>
+ #include <X11/Xaw/Label.h>
++#endif /* HAVE_XAW3D */
+ 
+ #include <X11/Xatom.h>
+