[arch-commits] Commit in glob2/repos/community-i686 (7 files)
Eric Bélanger
eric at archlinux.org
Mon Aug 11 05:20:28 UTC 2014
Date: Monday, August 11, 2014 @ 07:20:28
Author: eric
Revision: 117125
archrelease: copy trunk to community-i686
Added:
glob2/repos/community-i686/PKGBUILD
(from rev 117124, glob2/trunk/PKGBUILD)
glob2/repos/community-i686/fix-ftbfs-gcc49.diff
(from rev 117124, glob2/trunk/fix-ftbfs-gcc49.diff)
glob2/repos/community-i686/glob2-0.9.4.1-gcc44.patch
(from rev 117124, glob2/trunk/glob2-0.9.4.1-gcc44.patch)
glob2/repos/community-i686/glob2.install
(from rev 117124, glob2/trunk/glob2.install)
Deleted:
glob2/repos/community-i686/PKGBUILD
glob2/repos/community-i686/glob2-0.9.4.1-gcc44.patch
glob2/repos/community-i686/glob2.install
---------------------------+
PKGBUILD | 88 +++++++++++-----------
fix-ftbfs-gcc49.diff | 14 +++
glob2-0.9.4.1-gcc44.patch | 174 ++++++++++++++++++++++----------------------
glob2.install | 26 +++---
4 files changed, 159 insertions(+), 143 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-08-11 05:18:00 UTC (rev 117124)
+++ PKGBUILD 2014-08-11 05:20:28 UTC (rev 117125)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
-
-pkgname=glob2
-pkgver=0.9.4.4
-pkgrel=21
-pkgdesc='RTS game which minimizes micro-management'
-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')
-install="$pkgname.install"
-source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz"
- "$pkgname-${pkgver%.*}.1-gcc44.patch")
-sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
- '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.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"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: glob2/repos/community-i686/PKGBUILD (from rev 117124, glob2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-08-11 05:20:28 UTC (rev 117125)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+
+pkgname=glob2
+pkgver=0.9.4.4
+pkgrel=21
+pkgdesc='RTS game which minimizes micro-management'
+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')
+install=glob2.install
+source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz"
+ "glob2-0.9.4.1-gcc44.patch" fix-ftbfs-gcc49.diff)
+sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
+ '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
+ '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -p0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
+ patch -p1 -i "$srcdir/fix-ftbfs-gcc49.diff"
+}
+
+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"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: glob2/repos/community-i686/fix-ftbfs-gcc49.diff (from rev 117124, glob2/trunk/fix-ftbfs-gcc49.diff)
===================================================================
--- fix-ftbfs-gcc49.diff (rev 0)
+++ fix-ftbfs-gcc49.diff 2014-08-11 05:20:28 UTC (rev 117125)
@@ -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;
Deleted: glob2-0.9.4.1-gcc44.patch
===================================================================
--- glob2-0.9.4.1-gcc44.patch 2014-08-11 05:18:00 UTC (rev 117124)
+++ glob2-0.9.4.1-gcc44.patch 2014-08-11 05:20:28 UTC (rev 117125)
@@ -1,87 +0,0 @@
-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-i686/glob2-0.9.4.1-gcc44.patch (from rev 117124, glob2/trunk/glob2-0.9.4.1-gcc44.patch)
===================================================================
--- glob2-0.9.4.1-gcc44.patch (rev 0)
+++ glob2-0.9.4.1-gcc44.patch 2014-08-11 05:20:28 UTC (rev 117125)
@@ -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;
Deleted: glob2.install
===================================================================
--- glob2.install 2014-08-11 05:18:00 UTC (rev 117124)
+++ glob2.install 2014-08-11 05:20:28 UTC (rev 117125)
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- xdg-icon-resource forceupdate
-}
-
-post_remove() {
- xdg-icon-resource forceupdate
-}
-
-# vim:set ts=2 sw=2 et:
Copied: glob2/repos/community-i686/glob2.install (from rev 117124, glob2/trunk/glob2.install)
===================================================================
--- glob2.install (rev 0)
+++ glob2.install 2014-08-11 05:20:28 UTC (rev 117125)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate
+}
+
+post_upgrade() {
+ xdg-icon-resource forceupdate
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list