Date: Sunday, October 29, 2017 @ 21:54:51
Author: svenstaro
Revision: 264708
archrelease: copy trunk to community-i686, community-x86_64
Added:
oolite/repos/community-i686/PKGBUILD
(from rev 264707, oolite/trunk/PKGBUILD)
oolite/repos/community-i686/oolite
(from rev 264707, oolite/trunk/oolite)
oolite/repos/community-x86_64/PKGBUILD
(from rev 264707, oolite/trunk/PKGBUILD)
oolite/repos/community-x86_64/oolite
(from rev 264707, oolite/trunk/oolite)
Deleted:
oolite/repos/community-i686/PKGBUILD
oolite/repos/community-i686/lightdot-issue202-NSDate.patch
oolite/repos/community-i686/oolite
oolite/repos/community-i686/spidermonkey185ff4-GCC6.patch
oolite/repos/community-x86_64/PKGBUILD
oolite/repos/community-x86_64/lightdot-issue202-NSDate.patch
oolite/repos/community-x86_64/oolite
oolite/repos/community-x86_64/spidermonkey185ff4-GCC6.patch
-------------------------------------------------+
/PKGBUILD | 104 ++++++++++++++++++++++
/oolite | 18 +++
community-i686/PKGBUILD | 52 -----------
community-i686/lightdot-issue202-NSDate.patch | 24 -----
community-i686/oolite | 9 -
community-i686/spidermonkey185ff4-GCC6.patch | 11 --
community-x86_64/PKGBUILD | 52 -----------
community-x86_64/lightdot-issue202-NSDate.patch | 24 -----
community-x86_64/oolite | 9 -
community-x86_64/spidermonkey185ff4-GCC6.patch | 11 --
10 files changed, 122 insertions(+), 192 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-10-29 21:54:38 UTC (rev 264707)
+++ community-i686/PKGBUILD 2017-10-29 21:54:51 UTC (rev 264708)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Contributor: Lone_Wolf <lonew...@xs4all.nl>
-pkgname=oolite
-pkgver=1.84
-pkgrel=5
-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=('gnustep-make' 'curl' 'zip' 'mesa' 'gcc-objc')
-#options=(makeflags)
-source=(oolite
- spidermonkey185ff4-GCC6.patch
- lightdot-issue202-NSDate.patch
-
"https://github.com/OoliteProject/oolite/releases/download/${pkgver}/oolite-source-${pkgver}.tar.bz2";)
-md5sums=('ade14e17fe9d52d16b35f2e97046362c'
- '9e3ffab5a49afeebe7ba501161c8d4dc'
- '09e27cd86792feef0125d47627df1e26'
- '538e4249dbf4d3418216e0bdb7cbf408')
-
-prepare() {
- cd ${srcdir}/oolite-source-${pkgver}
- patch -Np1 -i ${srcdir}/lightdot-issue202-NSDate.patch
- cd ${srcdir}/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
- source /usr/share/GNUstep/Makefiles/GNUstep.sh
- make -f Makefile release-deployment
-}
-
-package() {
- cd oolite-source-${pkgver}
-
- mkdir -p ${pkgdir}/usr/bin
- mkdir -p ${pkgdir}/usr/share/{oolite,applications,pixmaps,doc/oolite}
-
- cp -r oolite.app/* ${pkgdir}/usr/share/oolite/
-
- install -D -m755 ../oolite ${pkgdir}/usr/bin/oolite
- install -D -m644 installers/FreeDesktop/oolite-icon.png
${pkgdir}/usr/share/pixmaps/oolite-icon.png
- install -D -m644 installers/FreeDesktop/oolite.desktop
${pkgdir}/usr/share/applications/oolite.desktop
- install -D -m644 Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf
Doc/OoliteRS.pdf ${pkgdir}/usr/share/doc/oolite/
- }
-# vim:set ts=2 sw=2 et:
Copied: oolite/repos/community-i686/PKGBUILD (from rev 264707,
oolite/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-10-29 21:54:51 UTC (rev 264708)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Lone_Wolf <lonew...@xs4all.nl>
+pkgname=oolite
+pkgver=1.86
+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=('gnustep-make' 'curl' 'zip' 'mesa' 'gcc-objc')
+#options=(makeflags)
+source=(oolite
+ spidermonkey185ff4-GCC6.patch
+ lightdot-issue202-NSDate.patch
+
"https://github.com/OoliteProject/oolite/releases/download/${pkgver}/oolite-source-${pkgver}.tar.bz2";)
+md5sums=('ade14e17fe9d52d16b35f2e97046362c'
+ '9e3ffab5a49afeebe7ba501161c8d4dc'
+ '09e27cd86792feef0125d47627df1e26'
+ '2f6f565f3db65c102a5923ded659af8e')
+
+prepare() {
+ cd ${srcdir}/oolite-source-${pkgver}
+ # patch -Np1 -i ${srcdir}/lightdot-issue202-NSDate.patch
+ cd ${srcdir}/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
+ source /usr/share/GNUstep/Makefiles/GNUstep.sh
+ make -f Makefile release-deployment
+}
+
+package() {
+ cd oolite-source-${pkgver}
+
+ mkdir -p ${pkgdir}/usr/bin
+ mkdir -p ${pkgdir}/usr/share/{oolite,applications,pixmaps,doc/oolite}
+
+ cp -r oolite.app/* ${pkgdir}/usr/share/oolite/
+
+ install -D -m755 ../oolite ${pkgdir}/usr/bin/oolite
+ install -D -m644 installers/FreeDesktop/oolite-icon.png
${pkgdir}/usr/share/pixmaps/oolite-icon.png
+ install -D -m644 installers/FreeDesktop/oolite.desktop
${pkgdir}/usr/share/applications/oolite.desktop
+ install -D -m644 Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf
Doc/OoliteRS.pdf ${pkgdir}/usr/share/doc/oolite/
+ }
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/lightdot-issue202-NSDate.patch
===================================================================
--- community-i686/lightdot-issue202-NSDate.patch 2017-10-29 21:54:38 UTC
(rev 264707)
+++ community-i686/lightdot-issue202-NSDate.patch 2017-10-29 21:54:51 UTC
(rev 264708)
@@ -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: community-i686/oolite
===================================================================
--- community-i686/oolite 2017-10-29 21:54:38 UTC (rev 264707)
+++ community-i686/oolite 2017-10-29 21:54:51 UTC (rev 264708)
@@ -1,9 +0,0 @@
-#!/bin/bash
-source /usr/share/GNUstep/Makefiles/GNUstep.sh
-if [ ! -d ~/.Oolite/AddOns ]; then
- mkdir -p ~/.Oolite/AddOns
-fi
-if [ ! -d ~/~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns ]; then
- mkdir -p ~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns
-fi
-/usr/share/oolite/oolite "$@"
Copied: oolite/repos/community-i686/oolite (from rev 264707,
oolite/trunk/oolite)
===================================================================
--- community-i686/oolite (rev 0)
+++ community-i686/oolite 2017-10-29 21:54:51 UTC (rev 264708)
@@ -0,0 +1,9 @@
+#!/bin/bash
+source /usr/share/GNUstep/Makefiles/GNUstep.sh
+if [ ! -d ~/.Oolite/AddOns ]; then
+ mkdir -p ~/.Oolite/AddOns
+fi
+if [ ! -d ~/~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns ]; then
+ mkdir -p ~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns
+fi
+/usr/share/oolite/oolite "$@"
Deleted: community-i686/spidermonkey185ff4-GCC6.patch
===================================================================
--- community-i686/spidermonkey185ff4-GCC6.patch 2017-10-29 21:54:38 UTC
(rev 264707)
+++ community-i686/spidermonkey185ff4-GCC6.patch 2017-10-29 21:54:51 UTC
(rev 264708)
@@ -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
-
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-10-29 21:54:38 UTC (rev 264707)
+++ community-x86_64/PKGBUILD 2017-10-29 21:54:51 UTC (rev 264708)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
-# Contributor: Lone_Wolf <lonew...@xs4all.nl>
-pkgname=oolite
-pkgver=1.84
-pkgrel=5
-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=('gnustep-make' 'curl' 'zip' 'mesa' 'gcc-objc')
-#options=(makeflags)
-source=(oolite
- spidermonkey185ff4-GCC6.patch
- lightdot-issue202-NSDate.patch
-
"https://github.com/OoliteProject/oolite/releases/download/${pkgver}/oolite-source-${pkgver}.tar.bz2";)
-md5sums=('ade14e17fe9d52d16b35f2e97046362c'
- '9e3ffab5a49afeebe7ba501161c8d4dc'
- '09e27cd86792feef0125d47627df1e26'
- '538e4249dbf4d3418216e0bdb7cbf408')
-
-prepare() {
- cd ${srcdir}/oolite-source-${pkgver}
- patch -Np1 -i ${srcdir}/lightdot-issue202-NSDate.patch
- cd ${srcdir}/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
- source /usr/share/GNUstep/Makefiles/GNUstep.sh
- make -f Makefile release-deployment
-}
-
-package() {
- cd oolite-source-${pkgver}
-
- mkdir -p ${pkgdir}/usr/bin
- mkdir -p ${pkgdir}/usr/share/{oolite,applications,pixmaps,doc/oolite}
-
- cp -r oolite.app/* ${pkgdir}/usr/share/oolite/
-
- install -D -m755 ../oolite ${pkgdir}/usr/bin/oolite
- install -D -m644 installers/FreeDesktop/oolite-icon.png
${pkgdir}/usr/share/pixmaps/oolite-icon.png
- install -D -m644 installers/FreeDesktop/oolite.desktop
${pkgdir}/usr/share/applications/oolite.desktop
- install -D -m644 Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf
Doc/OoliteRS.pdf ${pkgdir}/usr/share/doc/oolite/
- }
-# vim:set ts=2 sw=2 et:
Copied: oolite/repos/community-x86_64/PKGBUILD (from rev 264707,
oolite/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-10-29 21:54:51 UTC (rev 264708)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com>
+# Contributor: Lone_Wolf <lonew...@xs4all.nl>
+pkgname=oolite
+pkgver=1.86
+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=('gnustep-make' 'curl' 'zip' 'mesa' 'gcc-objc')
+#options=(makeflags)
+source=(oolite
+ spidermonkey185ff4-GCC6.patch
+ lightdot-issue202-NSDate.patch
+
"https://github.com/OoliteProject/oolite/releases/download/${pkgver}/oolite-source-${pkgver}.tar.bz2";)
+md5sums=('ade14e17fe9d52d16b35f2e97046362c'
+ '9e3ffab5a49afeebe7ba501161c8d4dc'
+ '09e27cd86792feef0125d47627df1e26'
+ '2f6f565f3db65c102a5923ded659af8e')
+
+prepare() {
+ cd ${srcdir}/oolite-source-${pkgver}
+ # patch -Np1 -i ${srcdir}/lightdot-issue202-NSDate.patch
+ cd ${srcdir}/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
+ source /usr/share/GNUstep/Makefiles/GNUstep.sh
+ make -f Makefile release-deployment
+}
+
+package() {
+ cd oolite-source-${pkgver}
+
+ mkdir -p ${pkgdir}/usr/bin
+ mkdir -p ${pkgdir}/usr/share/{oolite,applications,pixmaps,doc/oolite}
+
+ cp -r oolite.app/* ${pkgdir}/usr/share/oolite/
+
+ install -D -m755 ../oolite ${pkgdir}/usr/bin/oolite
+ install -D -m644 installers/FreeDesktop/oolite-icon.png
${pkgdir}/usr/share/pixmaps/oolite-icon.png
+ install -D -m644 installers/FreeDesktop/oolite.desktop
${pkgdir}/usr/share/applications/oolite.desktop
+ install -D -m644 Doc/AdviceForNewCommanders.pdf Doc/OoliteReadMe.pdf
Doc/OoliteRS.pdf ${pkgdir}/usr/share/doc/oolite/
+ }
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/lightdot-issue202-NSDate.patch
===================================================================
--- community-x86_64/lightdot-issue202-NSDate.patch 2017-10-29 21:54:38 UTC
(rev 264707)
+++ community-x86_64/lightdot-issue202-NSDate.patch 2017-10-29 21:54:51 UTC
(rev 264708)
@@ -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: community-x86_64/oolite
===================================================================
--- community-x86_64/oolite 2017-10-29 21:54:38 UTC (rev 264707)
+++ community-x86_64/oolite 2017-10-29 21:54:51 UTC (rev 264708)
@@ -1,9 +0,0 @@
-#!/bin/bash
-source /usr/share/GNUstep/Makefiles/GNUstep.sh
-if [ ! -d ~/.Oolite/AddOns ]; then
- mkdir -p ~/.Oolite/AddOns
-fi
-if [ ! -d ~/~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns ]; then
- mkdir -p ~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns
-fi
-/usr/share/oolite/oolite "$@"
Copied: oolite/repos/community-x86_64/oolite (from rev 264707,
oolite/trunk/oolite)
===================================================================
--- community-x86_64/oolite (rev 0)
+++ community-x86_64/oolite 2017-10-29 21:54:51 UTC (rev 264708)
@@ -0,0 +1,9 @@
+#!/bin/bash
+source /usr/share/GNUstep/Makefiles/GNUstep.sh
+if [ ! -d ~/.Oolite/AddOns ]; then
+ mkdir -p ~/.Oolite/AddOns
+fi
+if [ ! -d ~/~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns ]; then
+ mkdir -p ~/GNUstep/Library/ApplicationSupport/Oolite/ManagedAddOns
+fi
+/usr/share/oolite/oolite "$@"
Deleted: community-x86_64/spidermonkey185ff4-GCC6.patch
===================================================================
--- community-x86_64/spidermonkey185ff4-GCC6.patch 2017-10-29 21:54:38 UTC
(rev 264707)
+++ community-x86_64/spidermonkey185ff4-GCC6.patch 2017-10-29 21:54:51 UTC
(rev 264708)
@@ -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
-
