| 1 |
commit: 30283933db509646ea0696c9af807a206275da42 |
| 2 |
Author: Mats Lidell <matsl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 11 13:34:29 2015 +0000 |
| 4 |
Commit: Mats Lidell <matsl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 13:34:29 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/emacs.git/commit/?id=30283933 |
| 7 |
|
| 8 |
app-editors/xemacs: Sync with main tree getting gcc5 patch. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch | 35 ++++++++++++++++++++++ |
| 13 |
...-21.5.34-r4.ebuild => xemacs-21.5.34-r5.ebuild} | 20 +++++++------ |
| 14 |
2 files changed, 46 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..025a390 |
| 19 |
--- /dev/null |
| 20 |
+++ b/app-editors/xemacs/files/xemacs-21.5.34-gcc5.patch |
| 21 |
@@ -0,0 +1,35 @@ |
| 22 |
+diff --git a/src/lisp.h b/src/lisp.h |
| 23 |
+--- a/src/lisp.h |
| 24 |
++++ b/src/lisp.h |
| 25 |
+@@ -1154,6 +1154,8 @@ |
| 26 |
+ |
| 27 |
+ /* ------------------------ alignment definitions ------------------- */ |
| 28 |
+ |
| 29 |
++#if (!defined (__STDC_VERSION__) || __STDC_VERSION__ < 201112L) && \ |
| 30 |
++ (!defined (__cplusplus) || __cplusplus < 201103L) |
| 31 |
+ /* No type has a greater alignment requirement than max_align_t. |
| 32 |
+ (except perhaps for types we don't use, like long double) */ |
| 33 |
+ typedef union |
| 34 |
+@@ -1163,6 +1165,7 @@ |
| 35 |
+ struct { void (*f)(void); } f; |
| 36 |
+ struct { double d; } d; |
| 37 |
+ } max_align_t; |
| 38 |
++#endif |
| 39 |
+ |
| 40 |
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such |
| 41 |
+ that data of this type must begin at a memory address which is a |
| 42 |
+@@ -1170,7 +1173,11 @@ |
| 43 |
+ as the type itself. */ |
| 44 |
+ |
| 45 |
+ #ifndef ALIGNOF |
| 46 |
+-# if defined (__GNUC__) && (__GNUC__ >= 2) |
| 47 |
++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L |
| 48 |
++# define ALIGNOF(type) _Alignof(type) |
| 49 |
++# elif defined (__cplusplus) && __cplusplus >= 201103L |
| 50 |
++# define ALIGNOF(type) alignof(type) |
| 51 |
++# elif defined (__GNUC__) && (__GNUC__ >= 2) |
| 52 |
+ /* gcc has an extension that gives us exactly what we want. */ |
| 53 |
+ # define ALIGNOF(type) __alignof__ (type) |
| 54 |
+ # elif ! defined (__cplusplus) |
| 55 |
+ |
| 56 |
+ |
| 57 |
|
| 58 |
diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild |
| 59 |
similarity index 93% |
| 60 |
rename from app-editors/xemacs/xemacs-21.5.34-r4.ebuild |
| 61 |
rename to app-editors/xemacs/xemacs-21.5.34-r5.ebuild |
| 62 |
index 1e48191..486bc7c 100644 |
| 63 |
--- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild |
| 64 |
+++ b/app-editors/xemacs/xemacs-21.5.34-r5.ebuild |
| 65 |
@@ -1,6 +1,6 @@ |
| 66 |
# Copyright 1999-2015 Gentoo Foundation |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/xemacs/xemacs-21.5.34-r2.ebuild,v 1.1 2014/02/17 21:37:43 ulm Exp $ |
| 69 |
+# $Id$ |
| 70 |
|
| 71 |
# Note: xemacs currently does not work with a hardened profile. If you |
| 72 |
# want to use xemacs on a hardened profile then compile with the |
| 73 |
@@ -19,18 +19,19 @@ SRC_URI="http://ftp.xemacs.org/xemacs-21.5/${P}.tar.gz |
| 74 |
LICENSE="GPL-3+" |
| 75 |
SLOT="0" |
| 76 |
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" |
| 77 |
-IUSE="alsa debug eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" |
| 78 |
+IUSE="alsa debug eolconv gif gpm pop postgres ldap libressl xface nas dnd X jpeg tiff png mule motif freewnn canna xft xim athena neXt Xaw3d gdbm berkdb" |
| 79 |
|
| 80 |
X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps" |
| 81 |
|
| 82 |
RDEPEND=" |
| 83 |
- berkdb? ( >=sys-libs/db-4 !!<sys-libs/db-4 ) |
| 84 |
+ berkdb? ( >=sys-libs/db-4:= !!<sys-libs/db-4 ) |
| 85 |
gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb(+)] ) |
| 86 |
>=sys-libs/zlib-1.1.4 |
| 87 |
- >=dev-libs/openssl-0.9.6 |
| 88 |
+ !libressl? ( >=dev-libs/openssl-0.9.6:0 ) |
| 89 |
+ libressl? ( dev-libs/libressl ) |
| 90 |
>=media-libs/audiofile-0.2.3 |
| 91 |
gpm? ( >=sys-libs/gpm-1.19.6 ) |
| 92 |
- postgres? ( dev-db/postgresql ) |
| 93 |
+ postgres? ( dev-db/postgresql:= ) |
| 94 |
ldap? ( net-nds/openldap ) |
| 95 |
alsa? ( media-libs/alsa-lib ) |
| 96 |
nas? ( media-libs/nas ) |
| 97 |
@@ -42,12 +43,12 @@ RDEPEND=" |
| 98 |
xft? ( media-libs/freetype:2 x11-libs/libXft x11-libs/libXrender >=media-libs/fontconfig-2.5.0 ) |
| 99 |
neXt? ( x11-libs/neXtaw ) |
| 100 |
xface? ( media-libs/compface ) |
| 101 |
- tiff? ( media-libs/tiff ) |
| 102 |
- png? ( >=media-libs/libpng-1.2 ) |
| 103 |
- jpeg? ( virtual/jpeg ) |
| 104 |
+ tiff? ( media-libs/tiff:0 ) |
| 105 |
+ png? ( >=media-libs/libpng-1.2:0 ) |
| 106 |
+ jpeg? ( virtual/jpeg:0 ) |
| 107 |
canna? ( app-i18n/canna ) |
| 108 |
freewnn? ( app-i18n/freewnn ) |
| 109 |
- >=sys-libs/ncurses-5.2 |
| 110 |
+ >=sys-libs/ncurses-5.2:= |
| 111 |
>=app-eselect/eselect-emacs-1.15" |
| 112 |
|
| 113 |
DEPEND="${RDEPEND} |
| 114 |
@@ -66,6 +67,7 @@ src_prepare() { |
| 115 |
use neXt && cp "${WORKDIR}"/NeXT.XEmacs/xemacs-icons/* "${S}"/etc/toolbar/ |
| 116 |
find "${S}"/lisp -name '*.elc' -exec rm {} \; || die |
| 117 |
epatch "${FILESDIR}/${P}-ncurses-tinfo.patch" |
| 118 |
+ epatch "${FILESDIR}/${P}-gcc5.patch" |
| 119 |
epatch "${FILESDIR}/${P}-destdir.patch" |
| 120 |
|
| 121 |
# Some binaries and man pages are installed under suffixed names |
Archives