[arch-commits] Commit in oolite/repos (10 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Mon Aug 8 15:51:12 UTC 2016
Date: Monday, August 8, 2016 @ 15:51:12
Author: svenstaro
Revision: 186054
archrelease: copy trunk to community-i686, community-x86_64
Added:
oolite/repos/community-i686/PKGBUILD
(from rev 186053, oolite/trunk/PKGBUILD)
oolite/repos/community-i686/oolite
(from rev 186053, oolite/trunk/oolite)
oolite/repos/community-i686/spidermonkey185ff4-GCC6.patch
(from rev 186053, oolite/trunk/spidermonkey185ff4-GCC6.patch)
oolite/repos/community-x86_64/PKGBUILD
(from rev 186053, oolite/trunk/PKGBUILD)
oolite/repos/community-x86_64/oolite
(from rev 186053, oolite/trunk/oolite)
oolite/repos/community-x86_64/spidermonkey185ff4-GCC6.patch
(from rev 186053, oolite/trunk/spidermonkey185ff4-GCC6.patch)
Deleted:
oolite/repos/community-i686/PKGBUILD
oolite/repos/community-i686/oolite
oolite/repos/community-x86_64/PKGBUILD
oolite/repos/community-x86_64/oolite
------------------------------------------------+
/PKGBUILD | 96 +++++++++++++++++++++++
/oolite | 18 ++++
community-i686/PKGBUILD | 40 ---------
community-i686/oolite | 9 --
community-i686/spidermonkey185ff4-GCC6.patch | 11 ++
community-x86_64/PKGBUILD | 40 ---------
community-x86_64/oolite | 9 --
community-x86_64/spidermonkey185ff4-GCC6.patch | 11 ++
8 files changed, 136 insertions(+), 98 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-08-08 15:51:05 UTC (rev 186053)
+++ community-i686/PKGBUILD 2016-08-08 15:51:12 UTC (rev 186054)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Lone_Wolf <lonewolf at xs4all.nl>
-pkgname=oolite
-pkgver=1.82
-pkgrel=2
-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')
-#options=(makeflags)
-source=(oolite
- "https://github.com/OoliteProject/oolite/releases/download/1.82/oolite-source-${pkgver}.tar.bz2")
-md5sums=('ade14e17fe9d52d16b35f2e97046362c'
- '8cac3638a887efc7715b8a8982bc4f55')
-
-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
-}
-
-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 186053, oolite/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-08-08 15:51:12 UTC (rev 186054)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Lone_Wolf <lonewolf at xs4all.nl>
+pkgname=oolite
+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=('gnustep-make' 'curl' 'zip' 'mesa' 'gcc5')
+#options=(makeflags)
+source=(oolite
+ spidermonkey185ff4-GCC6.patch
+ "https://github.com/OoliteProject/oolite/releases/download/${pkgver}/oolite-source-${pkgver}.tar.bz2")
+md5sums=('ade14e17fe9d52d16b35f2e97046362c'
+ '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
+ CC=gcc-5 make -f Makefile release-deployment
+ # 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/oolite
===================================================================
--- community-i686/oolite 2016-08-08 15:51:05 UTC (rev 186053)
+++ community-i686/oolite 2016-08-08 15:51:12 UTC (rev 186054)
@@ -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 186053, oolite/trunk/oolite)
===================================================================
--- community-i686/oolite (rev 0)
+++ community-i686/oolite 2016-08-08 15:51:12 UTC (rev 186054)
@@ -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 "$@"
Copied: oolite/repos/community-i686/spidermonkey185ff4-GCC6.patch (from rev 186053, oolite/trunk/spidermonkey185ff4-GCC6.patch)
===================================================================
--- community-i686/spidermonkey185ff4-GCC6.patch (rev 0)
+++ community-i686/spidermonkey185ff4-GCC6.patch 2016-08-08 15:51:12 UTC (rev 186054)
@@ -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
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-08-08 15:51:05 UTC (rev 186053)
+++ community-x86_64/PKGBUILD 2016-08-08 15:51:12 UTC (rev 186054)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Lone_Wolf <lonewolf at xs4all.nl>
-pkgname=oolite
-pkgver=1.82
-pkgrel=2
-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')
-#options=(makeflags)
-source=(oolite
- "https://github.com/OoliteProject/oolite/releases/download/1.82/oolite-source-${pkgver}.tar.bz2")
-md5sums=('ade14e17fe9d52d16b35f2e97046362c'
- '8cac3638a887efc7715b8a8982bc4f55')
-
-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
-}
-
-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 186053, oolite/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-08-08 15:51:12 UTC (rev 186054)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Lone_Wolf <lonewolf at xs4all.nl>
+pkgname=oolite
+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=('gnustep-make' 'curl' 'zip' 'mesa' 'gcc5')
+#options=(makeflags)
+source=(oolite
+ spidermonkey185ff4-GCC6.patch
+ "https://github.com/OoliteProject/oolite/releases/download/${pkgver}/oolite-source-${pkgver}.tar.bz2")
+md5sums=('ade14e17fe9d52d16b35f2e97046362c'
+ '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
+ CC=gcc-5 make -f Makefile release-deployment
+ # 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/oolite
===================================================================
--- community-x86_64/oolite 2016-08-08 15:51:05 UTC (rev 186053)
+++ community-x86_64/oolite 2016-08-08 15:51:12 UTC (rev 186054)
@@ -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 186053, oolite/trunk/oolite)
===================================================================
--- community-x86_64/oolite (rev 0)
+++ community-x86_64/oolite 2016-08-08 15:51:12 UTC (rev 186054)
@@ -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 "$@"
Copied: oolite/repos/community-x86_64/spidermonkey185ff4-GCC6.patch (from rev 186053, oolite/trunk/spidermonkey185ff4-GCC6.patch)
===================================================================
--- community-x86_64/spidermonkey185ff4-GCC6.patch (rev 0)
+++ community-x86_64/spidermonkey185ff4-GCC6.patch 2016-08-08 15:51:12 UTC (rev 186054)
@@ -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
+
More information about the arch-commits
mailing list