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

(Portage version: 2.1.2.4)

3 files changed, 81 insertions, 5 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/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>
+