Date: Tuesday, January 22, 2013 @ 18:45:15
Author: arodseth
Revision: 82666
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
glob2/repos/community-staging-i686/
glob2/repos/community-staging-i686/PKGBUILD
(from rev 82665, glob2/trunk/PKGBUILD)
glob2/repos/community-staging-i686/glob2-0.9.4.1-gcc44.patch
(from rev 82665, glob2/trunk/glob2-0.9.4.1-gcc44.patch)
glob2/repos/community-staging-i686/glob2.install
(from rev 82665, glob2/trunk/glob2.install)
glob2/repos/community-staging-x86_64/
glob2/repos/community-staging-x86_64/PKGBUILD
(from rev 82665, glob2/trunk/PKGBUILD)
glob2/repos/community-staging-x86_64/glob2-0.9.4.1-gcc44.patch
(from rev 82665, glob2/trunk/glob2-0.9.4.1-gcc44.patch)
glob2/repos/community-staging-x86_64/glob2.install
(from rev 82665, glob2/trunk/glob2.install)
----------------------------------------------------+
community-staging-i686/PKGBUILD | 34 +++++++
community-staging-i686/glob2-0.9.4.1-gcc44.patch | 87 +++++++++++++++++++
community-staging-i686/glob2.install | 13 ++
community-staging-x86_64/PKGBUILD | 34 +++++++
community-staging-x86_64/glob2-0.9.4.1-gcc44.patch | 87 +++++++++++++++++++
community-staging-x86_64/glob2.install | 13 ++
6 files changed, 268 insertions(+)
Copied: glob2/repos/community-staging-i686/PKGBUILD (from rev 82665,
glob2/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-01-22 17:45:15 UTC (rev 82666)
@@ -0,0 +1,34 @@
+# $Id$
+# Contributor: Jaroslaw Swierczynski <[email protected]>
+# Contributor: Roman Kyrylych <[email protected]>
+
+pkgname=glob2
+pkgver=0.9.4.4
+pkgrel=13
+pkgdesc="RTS game which minimizes micro-management by automatically assigning
tasks to units"
+arch=('i686' 'x86_64')
+url="http://www.globulation2.org/";
+license=('GPL3')
+depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
+ 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('scons' 'boost' 'mesa')
+install=glob2.install
+source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz
+ glob2-0.9.4.1-gcc44.patch)
+sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad'
+ '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
+ scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share"
LINKFLAGS="-lboost_system"
+}
+
+package () {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ scons install
+ find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
+ install -Dm644 data/icons/glob2-icon-48x48.png
"${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
+}
Copied: glob2/repos/community-staging-i686/glob2-0.9.4.1-gcc44.patch (from rev
82665, 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 2013-01-22 17:45:15 UTC
(rev 82666)
@@ -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-i686/glob2.install (from rev 82665,
glob2/trunk/glob2.install)
===================================================================
--- community-staging-i686/glob2.install (rev 0)
+++ community-staging-i686/glob2.install 2013-01-22 17:45:15 UTC (rev
82666)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
Copied: glob2/repos/community-staging-x86_64/PKGBUILD (from rev 82665,
glob2/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2013-01-22 17:45:15 UTC (rev 82666)
@@ -0,0 +1,34 @@
+# $Id$
+# Contributor: Jaroslaw Swierczynski <[email protected]>
+# Contributor: Roman Kyrylych <[email protected]>
+
+pkgname=glob2
+pkgver=0.9.4.4
+pkgrel=13
+pkgdesc="RTS game which minimizes micro-management by automatically assigning
tasks to units"
+arch=('i686' 'x86_64')
+url="http://www.globulation2.org/";
+license=('GPL3')
+depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
+ 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('scons' 'boost' 'mesa')
+install=glob2.install
+source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz
+ glob2-0.9.4.1-gcc44.patch)
+sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad'
+ '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
+ scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share"
LINKFLAGS="-lboost_system"
+}
+
+package () {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ scons install
+ find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
+ install -Dm644 data/icons/glob2-icon-48x48.png
"${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
+}
Copied: glob2/repos/community-staging-x86_64/glob2-0.9.4.1-gcc44.patch (from
rev 82665, 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 2013-01-22 17:45:15 UTC
(rev 82666)
@@ -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/glob2.install (from rev 82665,
glob2/trunk/glob2.install)
===================================================================
--- community-staging-x86_64/glob2.install (rev 0)
+++ community-staging-x86_64/glob2.install 2013-01-22 17:45:15 UTC (rev
82666)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
