[arch-commits] Commit in oolite/trunk (3 files)

[Sven-Hendrik Haase]

    Date: Sunday, October 29, 2017 @ 21:54:38
  Author: svenstaro
Revision: 264707

upgpkg: oolite 1.86-1

Modified:
  oolite/trunk/PKGBUILD
Deleted:
  oolite/trunk/lightdot-issue202-NSDate.patch
  oolite/trunk/spidermonkey185ff4-GCC6.patch

--------------------------------+
 PKGBUILD                       |   10 +++++-----
 lightdot-issue202-NSDate.patch |   24 ------------------------
 spidermonkey185ff4-GCC6.patch  |   11 -----------
 3 files changed, 5 insertions(+), 40 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-29 21:47:49 UTC (rev 264706)
+++ PKGBUILD	2017-10-29 21:54:38 UTC (rev 264707)
@@ -2,8 +2,8 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 # Contributor: Lone_Wolf <lonewolf at xs4all.nl>
 pkgname=oolite
-pkgver=1.84
-pkgrel=5
+pkgver=1.86
+pkgrel=1
 pkgdesc="A space-sim based on the classic Elite"
 arch=('i686' 'x86_64')
 url="http://www.oolite.org/"
@@ -18,13 +18,13 @@
 md5sums=('ade14e17fe9d52d16b35f2e97046362c'
          '9e3ffab5a49afeebe7ba501161c8d4dc'
          '09e27cd86792feef0125d47627df1e26'
-         '538e4249dbf4d3418216e0bdb7cbf408')
+         '2f6f565f3db65c102a5923ded659af8e')
 
 prepare() {
   cd ${srcdir}/oolite-source-${pkgver}
-  patch -Np1 -i ${srcdir}/lightdot-issue202-NSDate.patch
+  # patch -Np1 -i ${srcdir}/lightdot-issue202-NSDate.patch
   cd ${srcdir}/oolite-source-${pkgver}/deps/mozilla
-  patch -Np0 -i ${srcdir}/spidermonkey185ff4-GCC6.patch
+  # patch -Np0 -i ${srcdir}/spidermonkey185ff4-GCC6.patch
 }
 
 build() {

Deleted: lightdot-issue202-NSDate.patch
===================================================================
--- lightdot-issue202-NSDate.patch	2017-10-29 21:47:49 UTC (rev 264706)
+++ lightdot-issue202-NSDate.patch	2017-10-29 21:54:38 UTC (rev 264707)
@@ -1,24 +0,0 @@
-diff -aur oolite-source-1.84.pristine/src/SDL/main.m oolite-source-1.84.new/src/SDL/main.m
---- oolite-source-1.84.pristine/src/SDL/main.m	2015-09-07 05:52:51.000000000 +0200
-+++ oolite-source-1.84.new/src/SDL/main.m	2016-08-22 17:30:28.997554264 +0200
-@@ -25,6 +25,9 @@
- 
- #ifdef GNUSTEP
- #import <Foundation/NSAutoreleasePool.h>
-+#if (GNUSTEP_BASE_MAJOR_VERSION == 1 && (GNUSTEP_BASE_MINOR_VERSION == 24 && GNUSTEP_BASE_SUBMINOR_VERSION >= 9) || (GNUSTEP_BASE_MINOR_VERSION > 24)) || (GNUSTEP_BASE_MAJOR_VERSION > 1)
-+#import <Foundation/NSDate.h>
-+#endif
- #import <Foundation/NSString.h>
- 
- #import "GameController.h"
-@@ -47,6 +50,10 @@
- {
- #ifdef GNUSTEP
- 	int i;
-+
-+#if (GNUSTEP_BASE_MAJOR_VERSION == 1 && (GNUSTEP_BASE_MINOR_VERSION == 24 && GNUSTEP_BASE_SUBMINOR_VERSION >= 9) || (GNUSTEP_BASE_MINOR_VERSION > 24)) || (GNUSTEP_BASE_MAJOR_VERSION > 1)
-+	[NSDate class]; // See github issue #202
-+#endif
- 	
- #if OOLITE_WINDOWS
- 

Deleted: spidermonkey185ff4-GCC6.patch
===================================================================
--- spidermonkey185ff4-GCC6.patch	2017-10-29 21:47:49 UTC (rev 264706)
+++ spidermonkey185ff4-GCC6.patch	2017-10-29 21:54:38 UTC (rev 264707)
@@ -1,11 +0,0 @@
---- 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
-