diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2007-10-13 21:22:15 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2007-10-13 21:22:15 +0000 |
| commit | 579512f889d0bf1737009a7939c02725868f9892 (patch) | |
| tree | e5aa09f7282a73b331a63f1f5fcd8005d3b7f197 /app-editors | |
| parent | Mask =x11-base/xorg-server-1.3.0.0-r2 because I'm still making changes to it. (diff) | |
| download | gentoo-2-579512f889d0bf1737009a7939c02725868f9892.tar.gz gentoo-2-579512f889d0bf1737009a7939c02725868f9892.tar.bz2 gentoo-2-579512f889d0bf1737009a7939c02725868f9892.zip | |
Fix compilation failure with USE=-X.
(Portage version: 2.1.3.12)
Diffstat (limited to 'app-editors')
| -rw-r--r-- | app-editors/emacs-cvs/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild | 3 | ||||
| -rw-r--r-- | app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch | 14 |
3 files changed, 21 insertions, 2 deletions
diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog index 4e61f424c6e2..0706f96cccd2 100644 --- a/app-editors/emacs-cvs/ChangeLog +++ b/app-editors/emacs-cvs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/emacs-cvs # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.163 2007/10/12 23:31:12 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.164 2007/10/13 21:22:15 ulm Exp $ + + 13 Oct 2007; Ulrich Mueller <ulm@gentoo.org> + +files/emacs-cvs-no-x-compile.patch, emacs-cvs-23.0.0_p20070920.ebuild: + Fix compilation failure with USE=-X. *emacs-cvs-23.0.60 (12 Oct 2007) diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild index 597cd214ce24..7be6aaeff1d8 100644 --- a/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild +++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.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-cvs/emacs-cvs-23.0.0_p20070920.ebuild,v 1.2 2007/10/12 16:42:03 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0_p20070920.ebuild,v 1.3 2007/10/13 21:22:15 ulm Exp $ WANT_AUTOCONF="2.5" WANT_AUTOMAKE="latest" @@ -71,6 +71,7 @@ src_unpack() { epatch "${FILESDIR}/${PN}-freebsd-sparc.patch" epatch "${FILESDIR}/${PN}-make-tramp-temp-file.patch" epatch "${FILESDIR}/${PN}-makeinfo-regexp.patch" + epatch "${FILESDIR}/${PN}-no-x-compile.patch" # ALSA is detected and used even if not requested by the USE=alsa flag. # So remove the automagic check use alsa || epatch "${FILESDIR}/${PN}-disable_alsa_detection-r1.patch" diff --git a/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch b/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch new file mode 100644 index 000000000000..941cb3e9adeb --- /dev/null +++ b/app-editors/emacs-cvs/files/emacs-cvs-no-x-compile.patch @@ -0,0 +1,14 @@ +--- emacs-orig/src/dispextern.h 2007-09-13 10:50:51.000000000 +0000 ++++ emacs/src/dispextern.h 2007-10-12 21:57:44.000000000 +0000 +@@ -853,9 +853,11 @@ + /* Continuation lines width at the start of the row. */ + int continuation_lines_width; + ++#ifdef HAVE_WINDOW_SYSTEM + /* Non-NULL means the current clipping area. This is temporarily + set while exposing a region. Coordinates are frame-relative. */ + XRectangle *clip; ++#endif + }; + + |