From dec68552e0977381b047f05a0f711fde7276a1c0550d6e3f1a86057f6dd2b1e5 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 19 Jun 2015 15:17:07 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/M17N/xemacs?expand=0&rev=79 --- xemacs-21.5.34-gcc5.patch | 15 +++++++++++++++ xemacs.changes | 5 +++++ xemacs.spec | 2 ++ 3 files changed, 22 insertions(+) create mode 100644 xemacs-21.5.34-gcc5.patch diff --git a/xemacs-21.5.34-gcc5.patch b/xemacs-21.5.34-gcc5.patch new file mode 100644 index 0000000..ba7cb28 --- /dev/null +++ b/xemacs-21.5.34-gcc5.patch @@ -0,0 +1,15 @@ +--- + src/lisp.h | 2 ++ + 1 file changed, 2 insertions(+) + +--- src/lisp.h ++++ src/lisp.h 2015-06-19 15:07:05.294018565 +0000 +@@ -1154,6 +1154,8 @@ typedef int Boolint; + + /* ------------------------ alignment definitions ------------------- */ + ++#undef lisp_max_align_t ++#define max_align_t lisp_max_align_t + /* No type has a greater alignment requirement than max_align_t. + (except perhaps for types we don't use, like long double) */ + typedef union diff --git a/xemacs.changes b/xemacs.changes index c23b12a..7ef5342 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 19 15:16:09 UTC 2015 - werner@suse.de + +- Gcc 5 use type type max_align_t instead of _max_align_t + ------------------------------------------------------------------- Fri Jun 19 14:31:38 UTC 2015 - werner@suse.de diff --git a/xemacs.spec b/xemacs.spec index 93d3a1c..89bd87c 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -85,6 +85,7 @@ Patch50: menus-always-utf8.patch Patch51: bnc502716-fontmenu.patch Patch52: bnc502716-xft.patch Patch53: xemacs-21.5.31-array.patch +Patch54: xemacs-21.5.34-gcc5.patch Patch56: xemacs-libpng15.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch @@ -175,6 +176,7 @@ echo Use xfs, that is XFontSet support for internationalized menubar. %patch52 -p0 %endif %patch53 -p0 +%patch54 -p0 %patch56 -p1 %patch292811 -p1 %patch301352 -p1