[arch-commits] Commit in xemacs/trunk (PKGBUILD xemacs-c11.patch)

[Evangelos Foutras]

    Date: Tuesday, September 8, 2015 @ 13:56:40
  Author: foutrelis
Revision: 139596

Add patch from Fedora to fix build failure with GCC 5

Added:
  xemacs/trunk/xemacs-c11.patch
Modified:
  xemacs/trunk/PKGBUILD

------------------+
 PKGBUILD         |   11 +++++++++--
 xemacs-c11.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-08 10:34:44 UTC (rev 139595)
+++ PKGBUILD	2015-09-08 11:56:40 UTC (rev 139596)
@@ -16,10 +16,17 @@
 makedepends=('xbitmaps')
 install=$pkgname.install
 source=(http://ftp.xemacs.org/pub/xemacs/beta/${pkgname}-${pkgver}.tar.gz
-        xemacs.desktop)
+        xemacs.desktop
+        xemacs-c11.patch)
 sha256sums=('448c76aa32cd5c84257027846f01b75a5e4f1e9db3278f95e68ff23d59fb8f94'
-            'd6dc802cf07519584aa28f3b5f4ae84d5e18b619ddd7e89a04da2f6783125f34')
+            'd6dc802cf07519584aa28f3b5f4ae84d5e18b619ddd7e89a04da2f6783125f34'
+            'ea948edf003a2fb5a8f922fea20474e1ca79cd6168fc217d07b780e4a331fe85')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np0 -i ../xemacs-c11.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Added: xemacs-c11.patch
===================================================================
--- xemacs-c11.patch	                        (rev 0)
+++ xemacs-c11.patch	2015-09-08 11:56:40 UTC (rev 139596)
@@ -0,0 +1,33 @@
+--- src/lisp.h.orig	2014-06-05 09:02:17.000000000 -0600
++++ src/lisp.h	2015-02-09 12:30:00.000000000 -0700
+@@ -1154,6 +1154,9 @@
+ 
+ /* ------------------------ alignment definitions ------------------- */
+ 
++#if (defined (__STDC_VERSION__) && __STDC_VERSION__ < 201112L) || \
++    (defined (__cplusplus) && __cplusplus < 201103L) || \
++    (! defined (__STDC_VERSION__) && ! defined (__cplusplus))
+ /* No type has a greater alignment requirement than max_align_t.
+    (except perhaps for types we don't use, like long double) */
+ typedef union
+@@ -1163,6 +1166,7 @@
+   struct { void (*f)(void); } f;
+   struct { double d; } d;
+ } max_align_t;
++#endif
+ 
+ /* ALIGNOF returns the required alignment of a type -- i.e. a value such
+    that data of this type must begin at a memory address which is a
+@@ -1170,7 +1174,11 @@
+    as the type itself. */
+ 
+ #ifndef ALIGNOF
+-# if defined (__GNUC__) && (__GNUC__ >= 2)
++# if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
++#  define ALIGNOF(type) _Alignof(type)
++# elif defined (__cplusplus) && __cplusplus >= 201103L
++#  define ALIGNOF(type) alignof(type)
++# elif defined (__GNUC__) && (__GNUC__ >= 2)
+ /* gcc has an extension that gives us exactly what we want. */
+ #  define ALIGNOF(type) __alignof__ (type)
+ # elif ! defined (__cplusplus)