Date: Monday, August 8, 2016 @ 15:51:05
Author: svenstaro
Revision: 186053
upgpkg: oolite 1.84-1
upstream release 1.84
Added:
oolite/trunk/spidermonkey185ff4-GCC6.patch
Modified:
oolite/trunk/PKGBUILD
-------------------------------+
PKGBUILD | 20 ++++++++++++++------
spidermonkey185ff4-GCC6.patch | 11 +++++++++++
2 files changed, 25 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-08 15:47:03 UTC (rev 186052)
+++ PKGBUILD 2016-08-08 15:51:05 UTC (rev 186053)
@@ -2,26 +2,34 @@
# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
# Contributor: Lone_Wolf <lonew...@xs4all.nl>
pkgname=oolite
-pkgver=1.82
-pkgrel=2
+pkgver=1.84
+pkgrel=1
pkgdesc="A space-sim based on the classic Elite"
arch=('i686' 'x86_64')
url="http://www.oolite.org/";
license=('GPL2')
depends=('gnustep-gui' 'sdl_mixer' 'glu' 'espeak' 'nspr' 'python2' 'icu'
'gnustep-base' 'openal')
-makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip' 'mesa')
+makedepends=('gnustep-make' 'curl' 'zip' 'mesa' 'gcc5')
#options=(makeflags)
source=(oolite
-
"https://github.com/OoliteProject/oolite/releases/download/1.82/oolite-source-${pkgver}.tar.bz2";)
+ spidermonkey185ff4-GCC6.patch
+
"https://github.com/OoliteProject/oolite/releases/download/${pkgver}/oolite-source-${pkgver}.tar.bz2";)
md5sums=('ade14e17fe9d52d16b35f2e97046362c'
- '8cac3638a887efc7715b8a8982bc4f55')
+ '9e3ffab5a49afeebe7ba501161c8d4dc'
+ '538e4249dbf4d3418216e0bdb7cbf408')
+prepare() {
+ cd oolite-source-${pkgver}/deps/mozilla
+ patch -Np0 -i ${srcdir}/spidermonkey185ff4-GCC6.patch
+}
+
build() {
cd oolite-source-${pkgver}
unset CPPFLAGS
#sed -i '/void png_error/d' src/Core/Materials/OOPNGTextureLoader.m
sed -i "/ADDITIONAL_OBJCFLAGS/s/=/= -fobjc-exceptions/" GNUmakefile
- make -f Makefile release-deployment
+ CC=gcc-5 make -f Makefile release-deployment
+ # make -f Makefile release-deployment
}
package() {
Added: spidermonkey185ff4-GCC6.patch
===================================================================
--- spidermonkey185ff4-GCC6.patch (rev 0)
+++ spidermonkey185ff4-GCC6.patch 2016-08-08 15:51:05 UTC (rev 186053)
@@ -0,0 +1,11 @@
+--- js/src/Makefile.in 2013-11-10 21:58:00.000000000 +0200
++++ js/src/Makefile.GCC6.in 2016-08-04 17:53:00.000000000 +0300
+@@ -914,7 +914,7 @@
+ # Needed to "configure" it correctly. Unfortunately these
+ # flags wind up being applied to all code in js/src, not just
+ # the code in js/src/assembler.
+-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
-std=gnu++98
+
+ INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr
+
