Date: Thursday, November 16, 2017 @ 22:12:40 Author: arodseth Revision: 267021
upgpkg: dangerdeep 0.3.0-10 Modified: dangerdeep/trunk/PKGBUILD Deleted: dangerdeep/trunk/build-fix.patch -----------------+ PKGBUILD | 49 ++++++++++++++++++------- build-fix.patch | 102 ------------------------------------------------------ 2 files changed, 34 insertions(+), 117 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-11-16 20:42:13 UTC (rev 267020) +++ PKGBUILD 2017-11-16 22:12:40 UTC (rev 267021) @@ -1,27 +1,46 @@ # $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> pkgname=dangerdeep pkgver=0.3.0 -pkgrel=9 -pkgdesc="submarine simulator" -arch=(x86_64) -url="http://dangerdeep.sourceforge.net"; +pkgrel=10 +pkgdesc='Submarine simulator' +arch=('x86_64') +url='https://dangerdeep.sourceforge.net' license=('GPL') -depends=('libgl' 'sdl_net' 'fftw' 'sdl_image' 'sdl_mixer' 'dangerdeep-data' 'glu') -makedepends=('scons' 'mesa') -source=("http://downloads.sourceforge.net/sourceforge/dangerdeep/dangerdeep-$pkgver.tar.gz"; - "build-fix.patch") -md5sums=('8a1d19326a9a0bd8bb91a652bfa51bd9' - 'a4487f079e844ec6b093ef97c151dcd7') +depends=('dangerdeep-data' 'fftw' 'glu' 'libgl' 'sdl_image' 'sdl_mixer' 'sdl_net') +makedepends=('addinclude>=1.0' 'mesa' 'scons' 'setconf') +source=("https://downloads.sourceforge.net/sourceforge/dangerdeep/dangerdeep-$pkgver.tar.gz";) +sha256sums=('bdab6b9b1c2b5f8e618f5c346965ec1f48c9edc9bff1d4f5ff7c8d235464283f') +prepare() { + cd "$pkgname-$pkgver" + + addinclude src/bspline_test.cpp cstdlib + addinclude -+ src/convoy.h memory + addinclude src/date.cpp stdio.h + addinclude src/date.cpp stdlib.h + addinclude -t src/faulthandler.h unistd + addinclude src/filehelper.cpp stdio.h + addinclude src/ocean_wave_generator.h stdlib + addinclude -+ src/ptrlist.h memory + addinclude -+ src/ptrvector.h memory + addinclude src/widget.cpp algorithm + + setconf SConstruct ccflags=\'"$(pkg-config --cflags sdl x11) -w"\' +} + build() { - cd "$srcdir"/$pkgname-$pkgver - patch -p1 <"$srcdir"/build-fix.patch + cd "$pkgname-$pkgver" + scons datadir=/usr/share/dangerdeep } package() { - cd "$srcdir"/$pkgname-$pkgver - scons installbindir="$pkgdir"/usr/bin datadir=/usr/share/dangerdeep install + cd "$pkgname-$pkgver" + + scons installbindir="$pkgdir/usr/bin" datadir=/usr/share/dangerdeep install } + +# vim: ts=2 sw=2 et: Deleted: build-fix.patch =================================================================== --- build-fix.patch 2017-11-16 20:42:13 UTC (rev 267020) +++ build-fix.patch 2017-11-16 22:12:40 UTC (rev 267021) @@ -1,102 +0,0 @@ -diff -wbBur dangerdeep-0.3.0/src/bspline_test.cpp dangerdeep-0.3.0.my/src/bspline_test.cpp ---- dangerdeep-0.3.0/src/bspline_test.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/bspline_test.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -1,6 +1,8 @@ - // some test code for the 2d bsplines! - #include "bspline.h" - #include <fstream> -+#include <cstdlib> -+ - using namespace std; - - double rnd() { return double(rand())/RAND_MAX; } -diff -wbBur dangerdeep-0.3.0/src/convoy.h dangerdeep-0.3.0.my/src/convoy.h ---- dangerdeep-0.3.0/src/convoy.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/convoy.h 2012-10-08 17:33:01.034909571 +0400 -@@ -26,6 +26,7 @@ - #include "ai.h" - #include "vector2.h" - #include <new> -+#include <memory> - #include <list> - class ship; - -diff -wbBur dangerdeep-0.3.0/src/date.cpp dangerdeep-0.3.0.my/src/date.cpp ---- dangerdeep-0.3.0/src/date.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/date.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -20,6 +20,8 @@ - // date - // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE - -+#include <stdio.h> -+#include <stdlib.h> - #include <iomanip> - #include "date.h" - #include "texts.h" -diff -wbBur dangerdeep-0.3.0/src/faulthandler.h dangerdeep-0.3.0.my/src/faulthandler.h ---- dangerdeep-0.3.0/src/faulthandler.h 2007-06-11 22:29:30.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/faulthandler.h 2012-10-08 17:33:23.264909316 +0400 -@@ -50,6 +50,7 @@ - #include <signal.h> - #include <string> - #include <sstream> -+#include <unistd.h> - - // Note: use --export-dynamic as linker option or you won't get function names here. - -diff -wbBur dangerdeep-0.3.0/src/filehelper.cpp dangerdeep-0.3.0.my/src/filehelper.cpp ---- dangerdeep-0.3.0/src/filehelper.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/filehelper.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -23,6 +23,7 @@ - #include "filehelper.h" - #include "error.h" - #include <vector> -+#include <stdio.h> - using namespace std; - - #ifdef WIN32 -diff -wbBur dangerdeep-0.3.0/src/ocean_wave_generator.h dangerdeep-0.3.0.my/src/ocean_wave_generator.h ---- dangerdeep-0.3.0/src/ocean_wave_generator.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/ocean_wave_generator.h 2012-10-08 17:33:01.034909571 +0400 -@@ -29,6 +29,7 @@ - #include "environment.h" - #include <complex> - #include <vector> -+#include <cstdlib> - - // use float fftw (faster) or double (default) ? - #ifdef WITH_FLOAT_FFTW -diff -wbBur dangerdeep-0.3.0/src/ptrlist.h dangerdeep-0.3.0.my/src/ptrlist.h ---- dangerdeep-0.3.0/src/ptrlist.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/ptrlist.h 2012-10-08 17:33:01.034909571 +0400 -@@ -25,6 +25,7 @@ - - #include <list> - #include <stdexcept> -+#include <memory> - - // same as std::list regarding the interface (partly), but handles pointers. - template <class T> -diff -wbBur dangerdeep-0.3.0/src/ptrvector.h dangerdeep-0.3.0.my/src/ptrvector.h ---- dangerdeep-0.3.0/src/ptrvector.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/ptrvector.h 2012-10-08 17:33:01.034909571 +0400 -@@ -25,6 +25,7 @@ - - #include <vector> - #include <stdexcept> -+#include <memory> - - // same as std::vector regarding the interface, but handles pointers. - template <class T> -diff -wbBur dangerdeep-0.3.0/src/widget.cpp dangerdeep-0.3.0.my/src/widget.cpp ---- dangerdeep-0.3.0/src/widget.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/widget.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -32,6 +32,8 @@ - #include "datadirs.h" - #include <set> - #include <sstream> -+#include <algorithm> -+ - using std::vector; - using std::list; - using std::string;
