Date: Friday, October 7, 2016 @ 21:16:11 Author: jlichtblau Revision: 191614
archrelease: copy trunk to community-staging-x86_64, community-staging-i686 Added: glob2/repos/community-staging-i686/ glob2/repos/community-staging-i686/PKGBUILD (from rev 191613, glob2/trunk/PKGBUILD) glob2/repos/community-staging-i686/fix-ftbfs-gcc49.diff (from rev 191613, glob2/trunk/fix-ftbfs-gcc49.diff) glob2/repos/community-staging-i686/glob2-0.9.4.1-gcc44.patch (from rev 191613, glob2/trunk/glob2-0.9.4.1-gcc44.patch) glob2/repos/community-staging-x86_64/ glob2/repos/community-staging-x86_64/PKGBUILD (from rev 191613, glob2/trunk/PKGBUILD) glob2/repos/community-staging-x86_64/fix-ftbfs-gcc49.diff (from rev 191613, glob2/trunk/fix-ftbfs-gcc49.diff) glob2/repos/community-staging-x86_64/glob2-0.9.4.1-gcc44.patch (from rev 191613, glob2/trunk/glob2-0.9.4.1-gcc44.patch) ----------------------------------------------------+ community-staging-i686/PKGBUILD | 46 ++++++++++ community-staging-i686/fix-ftbfs-gcc49.diff | 14 +++ community-staging-i686/glob2-0.9.4.1-gcc44.patch | 87 +++++++++++++++++++ community-staging-x86_64/PKGBUILD | 46 ++++++++++ community-staging-x86_64/fix-ftbfs-gcc49.diff | 14 +++ community-staging-x86_64/glob2-0.9.4.1-gcc44.patch | 87 +++++++++++++++++++ 6 files changed, 294 insertions(+) Copied: glob2/repos/community-staging-i686/PKGBUILD (from rev 191613, glob2/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2016-10-07 21:16:11 UTC (rev 191614) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> +# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> +# Contributor: Jaroslav Lichtblau <svetlemo...@archlinux.org> + +pkgname=glob2 +pkgver=0.9.4.4 +pkgrel=30 +pkgdesc='An innovative Real-Time Strategy game which reduces micro-management by automatically assigning tasks to units' +arch=('x86_64' 'i686') +url='http://www.globulation2.org/' +license=('GPL3') +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu' + 'fribidi' 'xdg-utils' 'libgl' 'hicolor-icon-theme') +makedepends=('scons' 'boost' 'mesa' 'patch') +source=(http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz + glob2-0.9.4.1-gcc44.patch fix-ftbfs-gcc49.diff + glob2-gcc6.patch::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/") +sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' + '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a' + '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba' + '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20') + +prepare() { + cd "$pkgname-$pkgver" + + patch -p0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" + patch -p1 -i "$srcdir/fix-ftbfs-gcc49.diff" + patch -p1 -i "$srcdir/glob2-gcc6.patch" +} + +build() { + cd "$pkgname-$pkgver" + + scons LINKFLAGS="-lboost_system" +} + +package () { + cd "$pkgname-$pkgver" + + scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share" + find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \; + install -Dm644 "data/icons/$pkgname-icon-48x48.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png" +} Copied: glob2/repos/community-staging-i686/fix-ftbfs-gcc49.diff (from rev 191613, glob2/trunk/fix-ftbfs-gcc49.diff) =================================================================== --- community-staging-i686/fix-ftbfs-gcc49.diff (rev 0) +++ community-staging-i686/fix-ftbfs-gcc49.diff 2016-10-07 21:16:11 UTC (rev 191614) @@ -0,0 +1,14 @@ +Index: glob2-0.9.4.4/src/Game.h +=================================================================== +--- glob2-0.9.4.4.orig/src/Game.h 2014-07-14 10:36:36.705074927 +0800 ++++ glob2-0.9.4.4/src/Game.h 2014-07-14 10:38:28.733077827 +0800 +@@ -148,7 +148,8 @@ + TOP_TO_BOTTOM, + BOTTOM_TO_TOP + }; +- ++ ++public: + struct BuildProject + { + int posX; Copied: glob2/repos/community-staging-i686/glob2-0.9.4.1-gcc44.patch (from rev 191613, glob2/trunk/glob2-0.9.4.1-gcc44.patch) =================================================================== --- community-staging-i686/glob2-0.9.4.1-gcc44.patch (rev 0) +++ community-staging-i686/glob2-0.9.4.1-gcc44.patch 2016-10-07 21:16:11 UTC (rev 191614) @@ -0,0 +1,87 @@ +diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h +--- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 +@@ -43,7 +43,7 @@ namespace GAGCore + virtual void flush(void) = 0; + virtual void read(void *data, size_t size) = 0; + virtual void putc(int c) = 0; +- virtual int getc(void) = 0; ++ virtual int get_c(void) = 0; + virtual void seekFromStart(int displacement) = 0; + virtual void seekFromEnd(int displacement) = 0; + virtual void seekRelative(int displacement) = 0; +@@ -67,7 +67,7 @@ namespace GAGCore + virtual void flush(void) { assert(fp); fflush(fp); } + virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } + virtual void putc(int c) { assert(fp); fputc(c, fp); } +- virtual int getc(void) { assert(fp); return fgetc(fp); } ++ virtual int get_c(void) { assert(fp); return fgetc(fp); } + virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } + virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } + virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } +@@ -92,7 +92,7 @@ namespace GAGCore + virtual void flush(void); + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +@@ -117,7 +117,7 @@ namespace GAGCore + virtual void flush(void) { } + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp +--- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 +@@ -75,9 +75,9 @@ namespace GAGCore + buffer->putc(c); + } + +- int ZLibStreamBackend::getc(void) ++ int ZLibStreamBackend::get_c(void) + { +- return buffer->getc(); ++ return buffer->get_c(); + } + + void ZLibStreamBackend::seekFromStart(int displacement) +@@ -147,7 +147,7 @@ namespace GAGCore + write(&ch, 1); + } + +- int MemoryStreamBackend::getc(void) ++ int MemoryStreamBackend::get_c(void) + { + Uint8 ch; + read(&ch, 1); +diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp +--- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 +@@ -60,7 +60,7 @@ namespace GAGCore + std::string s; + while (1) + { +- int c = backend->getc(); ++ int c = backend->get_c(); + if(c=='\r') + continue; + if ((c >= 0) && (c != '\n')) +diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp +--- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 +@@ -150,7 +150,7 @@ namespace GAGCore + + int nextChar(void) + { +- next = stream->getc(); ++ next = stream->get_c(); + if (next == '\n') + { + column = 0; Copied: glob2/repos/community-staging-x86_64/PKGBUILD (from rev 191613, glob2/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2016-10-07 21:16:11 UTC (rev 191614) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rods...@gmail.com> +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> +# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> +# Contributor: Jaroslav Lichtblau <svetlemo...@archlinux.org> + +pkgname=glob2 +pkgver=0.9.4.4 +pkgrel=30 +pkgdesc='An innovative Real-Time Strategy game which reduces micro-management by automatically assigning tasks to units' +arch=('x86_64' 'i686') +url='http://www.globulation2.org/' +license=('GPL3') +depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu' + 'fribidi' 'xdg-utils' 'libgl' 'hicolor-icon-theme') +makedepends=('scons' 'boost' 'mesa' 'patch') +source=(http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz + glob2-0.9.4.1-gcc44.patch fix-ftbfs-gcc49.diff + glob2-gcc6.patch::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/") +sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8' + '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a' + '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba' + '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20') + +prepare() { + cd "$pkgname-$pkgver" + + patch -p0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch" + patch -p1 -i "$srcdir/fix-ftbfs-gcc49.diff" + patch -p1 -i "$srcdir/glob2-gcc6.patch" +} + +build() { + cd "$pkgname-$pkgver" + + scons LINKFLAGS="-lboost_system" +} + +package () { + cd "$pkgname-$pkgver" + + scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share" + find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \; + install -Dm644 "data/icons/$pkgname-icon-48x48.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png" +} Copied: glob2/repos/community-staging-x86_64/fix-ftbfs-gcc49.diff (from rev 191613, glob2/trunk/fix-ftbfs-gcc49.diff) =================================================================== --- community-staging-x86_64/fix-ftbfs-gcc49.diff (rev 0) +++ community-staging-x86_64/fix-ftbfs-gcc49.diff 2016-10-07 21:16:11 UTC (rev 191614) @@ -0,0 +1,14 @@ +Index: glob2-0.9.4.4/src/Game.h +=================================================================== +--- glob2-0.9.4.4.orig/src/Game.h 2014-07-14 10:36:36.705074927 +0800 ++++ glob2-0.9.4.4/src/Game.h 2014-07-14 10:38:28.733077827 +0800 +@@ -148,7 +148,8 @@ + TOP_TO_BOTTOM, + BOTTOM_TO_TOP + }; +- ++ ++public: + struct BuildProject + { + int posX; Copied: glob2/repos/community-staging-x86_64/glob2-0.9.4.1-gcc44.patch (from rev 191613, glob2/trunk/glob2-0.9.4.1-gcc44.patch) =================================================================== --- community-staging-x86_64/glob2-0.9.4.1-gcc44.patch (rev 0) +++ community-staging-x86_64/glob2-0.9.4.1-gcc44.patch 2016-10-07 21:16:11 UTC (rev 191614) @@ -0,0 +1,87 @@ +diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h +--- libgag/include/StreamBackend.h.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/include/StreamBackend.h 2009-06-20 14:21:10.000000000 +0200 +@@ -43,7 +43,7 @@ namespace GAGCore + virtual void flush(void) = 0; + virtual void read(void *data, size_t size) = 0; + virtual void putc(int c) = 0; +- virtual int getc(void) = 0; ++ virtual int get_c(void) = 0; + virtual void seekFromStart(int displacement) = 0; + virtual void seekFromEnd(int displacement) = 0; + virtual void seekRelative(int displacement) = 0; +@@ -67,7 +67,7 @@ namespace GAGCore + virtual void flush(void) { assert(fp); fflush(fp); } + virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); } + virtual void putc(int c) { assert(fp); fputc(c, fp); } +- virtual int getc(void) { assert(fp); return fgetc(fp); } ++ virtual int get_c(void) { assert(fp); return fgetc(fp); } + virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); } + virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); } + virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); } +@@ -92,7 +92,7 @@ namespace GAGCore + virtual void flush(void); + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +@@ -117,7 +117,7 @@ namespace GAGCore + virtual void flush(void) { } + virtual void read(void *data, size_t size); + virtual void putc(int c); +- virtual int getc(void); ++ virtual int get_c(void); + virtual void seekFromStart(int displacement); + virtual void seekFromEnd(int displacement); + virtual void seekRelative(int displacement); +diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp +--- libgag/src/StreamBackend.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/StreamBackend.cpp 2009-06-20 14:21:53.000000000 +0200 +@@ -75,9 +75,9 @@ namespace GAGCore + buffer->putc(c); + } + +- int ZLibStreamBackend::getc(void) ++ int ZLibStreamBackend::get_c(void) + { +- return buffer->getc(); ++ return buffer->get_c(); + } + + void ZLibStreamBackend::seekFromStart(int displacement) +@@ -147,7 +147,7 @@ namespace GAGCore + write(&ch, 1); + } + +- int MemoryStreamBackend::getc(void) ++ int MemoryStreamBackend::get_c(void) + { + Uint8 ch; + read(&ch, 1); +diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp +--- libgag/src/Stream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/Stream.cpp 2009-06-20 14:21:35.000000000 +0200 +@@ -60,7 +60,7 @@ namespace GAGCore + std::string s; + while (1) + { +- int c = backend->getc(); ++ int c = backend->get_c(); + if(c=='\r') + continue; + if ((c >= 0) && (c != '\n')) +diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp +--- libgag/src/TextStream.cpp.orig 2009-03-18 03:46:47.000000000 +0100 ++++ libgag/src/TextStream.cpp 2009-06-20 14:21:22.000000000 +0200 +@@ -150,7 +150,7 @@ namespace GAGCore + + int nextChar(void) + { +- next = stream->getc(); ++ next = stream->get_c(); + if (next == '\n') + { + column = 0;