Merge branch 'master' of https://aur.archlinux.org/afterstep

2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 616520bc52d1..bc69af34a06f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-06-18 FoolEcho <foolecho at gmail dot com>
+
+	* 2.2.12-5 :
+	Porting to gcc 5 requires CFLAGS modification (thanks to Chazza). 
+
 	* 2.2.12-4 :
 
 	Added staticlibs to options (now required).
diff --git a/PKGBUILD b/PKGBUILD
index 5483df75f299..dc77809c2e20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,6 +25,12 @@ prepare() {
   #fix some problems about the launcher (Slim)
   patch -p0 -i ${srcdir}/desktop_entry.patch
 
+  #porting to gcc 5
+  #see:
+  #	https://gcc.gnu.org/gcc-5/porting_to.html
+  #	https://gcc.gnu.org/onlinedocs/gcc/C-Dialect-Options.html
+  export CFLAGS+=" -fgnu89-inline"
+  
   ./configure --prefix=/usr --mandir=/usr/share/man
 }