[arch-commits] Commit in glob2/trunk (PKGBUILD)

2020-12-12 Thread Felix Yan via arch-commits
Date: Saturday, December 12, 2020 @ 16:03:54
  Author: felixonmars
Revision: 773383

upgpkg: glob2 0.9.4.4-41: boost 1.75.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-12 16:03:36 UTC (rev 773382)
+++ PKGBUILD2020-12-12 16:03:54 UTC (rev 773383)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=40
+pkgrel=41
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='https://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2020-12-06 Thread Felix Yan via arch-commits
Date: Sunday, December 6, 2020 @ 22:30:53
  Author: felixonmars
Revision: 771294

upgpkg: glob2 0.9.4.4-40: boost 1.74.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-06 22:30:26 UTC (rev 771293)
+++ PKGBUILD2020-12-06 22:30:53 UTC (rev 771294)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=39
+pkgrel=40
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='https://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD glob2-gcc6.patch)

2020-12-06 Thread Evangelos Foutras via arch-commits
Date: Sunday, December 6, 2020 @ 21:51:32
  Author: foutrelis
Revision: 771217

Add glob2-gcc6.patch to svn; bitbucket is 404

Added:
  glob2/trunk/glob2-gcc6.patch
Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 glob2-gcc6.patch |   28 
 2 files changed, 30 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-12-06 21:51:17 UTC (rev 771216)
+++ PKGBUILD2020-12-06 21:51:32 UTC (rev 771217)
@@ -15,7 +15,7 @@
 makedepends=('scons' 'boost' 'mesa' 'patch')
 
source=(https://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/;
+glob2-gcc6.patch
 glob2-scons3.patch
 glob2-bool.patch
 scons-python3.patch)
@@ -22,7 +22,7 @@
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
 '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba'
-'40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20'
+'a371eb801407a75021c1a0105ffa1e713358d7def3eba8a9bd861f528e051d9b'
 '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc'
 '81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591'
 '6daec0ee916f6bbc4e9696a0a713e2b06e4951381d508af814e67e980bd28664')

Added: glob2-gcc6.patch
===
--- glob2-gcc6.patch(rev 0)
+++ glob2-gcc6.patch2020-12-06 21:51:32 UTC (rev 771217)
@@ -0,0 +1,28 @@
+Description: Fix some compiler warnings
+ This fixes a FTBFS with GCC 6 where the warnings are now errors.
+Bug-Debian: https://bugs.debian.org/812167
+Origin: upstream, 
https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247
+Author: Leo Wandersleb 
+Last-Update: 2011-11-03
+--- a/src/ChooseMapScreen.cpp
 b/src/ChooseMapScreen.cpp
+@@ -31,7 +31,7 @@
+ 
+ #include "Game.h"
+ 
+-ChooseMapScreen::ChooseMapScreen(const char *directory, const char 
*extension, bool recurse, const char* alternateDirectory, const char* 
alternateExtension, const char* alternateRecurse)
++ChooseMapScreen::ChooseMapScreen(const char *directory, const char 
*extension, bool recurse, const char* alternateDirectory, const char* 
alternateExtension, const bool alternateRecurse)
+ {
+   ok = new TextButton(440, 360, 180, 40, ALIGN_SCREEN_CENTERED, 
ALIGN_SCREEN_CENTERED, "menu", Toolkit::getStringTable()->getString("[ok]"), 
OK, 13);
+   addWidget(ok);
+--- a/src/ChooseMapScreen.h
 b/src/ChooseMapScreen.h
+@@ -43,7 +43,7 @@
+   /// Constructor. Directory is the source of the listed files.
+   /// extension is the file extension to show. If recurse is true,
+   /// subdirectoried are shown and can be opened.
+-  ChooseMapScreen(const char *directory, const char *extension, bool 
recurse, const char* alternateDirectory=NULL, const char* 
alternateExtension=NULL, const char* alternateRecurse=NULL);
++  ChooseMapScreen(const char *directory, const char *extension, bool 
recurse, const char* alternateDirectory=NULL, const char* 
alternateExtension=NULL, const bool alternateRecurse=NULL);
+   //! Destructor
+   virtual ~ChooseMapScreen();
+   virtual void onAction(Widget *source, Action action, int par1, int 
par2);


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2020-01-27 Thread Evangelos Foutras via arch-commits
Date: Tuesday, January 28, 2020 @ 04:29:01
  Author: foutrelis
Revision: 557245

boost 1.72.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-28 04:28:19 UTC (rev 557244)
+++ PKGBUILD2020-01-28 04:29:01 UTC (rev 557245)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=38
+pkgrel=39
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='https://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2019-09-13 Thread Evangelos Foutras via arch-commits
Date: Friday, September 13, 2019 @ 11:01:17
  Author: foutrelis
Revision: 510286

boost 1.71.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-13 10:56:59 UTC (rev 510285)
+++ PKGBUILD2019-09-13 11:01:17 UTC (rev 510286)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=37
+pkgrel=38
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='https://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2019-09-13 Thread Levente Polyak via arch-commits
Date: Friday, September 13, 2019 @ 10:04:49
  Author: anthraxx
Revision: 510130

fix checksums after patch was adjusted

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-13 10:04:33 UTC (rev 510129)
+++ PKGBUILD2019-09-13 10:04:49 UTC (rev 510130)
@@ -25,7 +25,7 @@
 '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20'
 '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc'
 '81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591'
-'a44d7498dee4924e971c2ed4f5fa4346ad638819bf2bbed6b107dffa0e05c772')
+'6daec0ee916f6bbc4e9696a0a713e2b06e4951381d508af814e67e980bd28664')
 
 prepare() {
   cd "$pkgname-$pkgver"


[arch-commits] Commit in glob2/trunk (PKGBUILD scons-python3.patch)

2019-07-26 Thread Antonio Rojas via arch-commits
Date: Friday, July 26, 2019 @ 18:36:43
  Author: arojas
Revision: 492961

Fix build with python3 scons

Added:
  glob2/trunk/scons-python3.patch
Modified:
  glob2/trunk/PKGBUILD

-+
 PKGBUILD|7 +
 scons-python3.patch |  243 ++
 2 files changed, 248 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-26 18:33:05 UTC (rev 492960)
+++ PKGBUILD2019-07-26 18:36:43 UTC (rev 492961)
@@ -17,13 +17,15 @@
 glob2-0.9.4.1-gcc44.patch fix-ftbfs-gcc49.diff
 
glob2-gcc6.patch::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/;
 glob2-scons3.patch
-glob2-bool.patch)
+glob2-bool.patch
+scons-python3.patch)
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
 '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba'
 '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20'
 '4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc'
-'81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591')
+'81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591'
+'a44d7498dee4924e971c2ed4f5fa4346ad638819bf2bbed6b107dffa0e05c772')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -33,6 +35,7 @@
   patch -p1 -i "$srcdir/glob2-gcc6.patch"
   patch -p1 -i "$srcdir/glob2-scons3.patch"
   patch -p1 -i "$srcdir/glob2-bool.patch"
+  patch -p1 -i ../scons-python3.patch
 }
 
 build() {

Added: scons-python3.patch
===
--- scons-python3.patch (rev 0)
+++ scons-python3.patch 2019-07-26 18:36:43 UTC (rev 492961)
@@ -0,0 +1,243 @@
+--- glob2-0.9.4.4/SConstruct.orig  2019-07-26 18:18:48.365048391 +
 glob2-0.9.4.4/SConstruct   2019-07-26 18:23:10.541667260 +
+@@ -75,31 +75,31 @@
+ env.Append(CPPDEFINES=["HAVE_CONFIG_H"])
+ #Simple checks for required libraries
+ if not conf.CheckLib("SDL") and not server_only:
+-print "Could not find libSDL"
++print ("Could not find libSDL")
+ missing.append("SDL")
+ if not conf.CheckLib("SDL_ttf") and not server_only:
+-print "Could not find libSDL_ttf"
++print ("Could not find libSDL_ttf")
+ missing.append("SDL_ttf")
+ if not conf.CheckLib("SDL_image") and not server_only:
+-print "Could not find libSDL_image"
++print ("Could not find libSDL_image")
+ missing.append("SDL_image")
+ if not conf.CheckLib("SDL_net") and not server_only:
+-print "Could not find libSDL_net"
++print ("Could not find libSDL_net")
+ missing.append("SDL_net")
+ if not conf.CheckLib("speex") or not conf.CheckCXXHeader("speex/speex.h") 
and not server_only:
+-print "Could not find libspeex or could not find 'speex/speex.h'"
++print ("Could not find libspeex or could not find 'speex/speex.h'")
+ missing.append("speex")
+ if not conf.CheckLib("vorbisfile") and not server_only:
+-print "Could not find libvorbisfile"
++print ("Could not find libvorbisfile")
+ missing.append("vorbisfile")
+ if not conf.CheckLib("vorbis") and not server_only:
+-print "Could not find libvorbis"
++print ("Could not find libvorbis")
+ missing.append("vorbis")
+ if not conf.CheckLib("ogg") and not server_only:
+-print "Could not find libogg"
++print ("Could not find libogg")
+ missing.append("ogg")
+ if not conf.CheckCXXHeader("zlib.h"):
+-print "Could not find zlib.h"
++print ("Could not find zlib.h")
+ missing.append("zlib")
+ else:
+ if conf.CheckLib("z"):
+@@ -107,7 +107,7 @@
+ elif conf.CheckLib("zlib1"):
+ env.Append(LIBS="zlib1")
+ else:
+-print "Could not find libz or zlib1.dll"
++print ("Could not find libz or zlib1.dll")
+ missing.append("zlib")
+ 
+ boost_thread = ''
+@@ -116,7 +116,7 @@
+ elif conf.CheckLib("boost_thread-mt") and 
conf.CheckCXXHeader("boost/thread/thread.hpp"):
+ boost_thread="boost_thread-mt"
+ else:
+-print "Could not find libboost_thread or libboost_thread-mt or 
boost/thread/thread.hpp"
++print ("Could not find libboost_thread or libboost_thread-mt or 
boost/thread/thread.hpp")
+ missing.append("libboost_thread")
+ env.Append(LIBS=[boost_thread])
+ 
+@@ -126,31 +126,31 @@
+ elif conf.CheckLib("boost_date_time-mt") and 
conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"):
+ boost_thread="boost_thread-mt"
+ else:
+-print "Could not find 

[arch-commits] Commit in glob2/trunk (PKGBUILD)

2019-06-03 Thread Antonio Rojas via arch-commits
Date: Monday, June 3, 2019 @ 20:52:30
  Author: arojas
Revision: 476760

https

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-03 20:51:37 UTC (rev 476759)
+++ PKGBUILD2019-06-03 20:52:30 UTC (rev 476760)
@@ -8,12 +8,12 @@
 pkgrel=37
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
-url='http://www.globulation2.org/'
+url='https://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
+source=(https://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/;
 glob2-scons3.patch


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2019-01-15 Thread Felix Yan via arch-commits
Date: Tuesday, January 15, 2019 @ 16:59:48
  Author: felixonmars
Revision: 423354

boost 1.69.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 16:53:20 UTC (rev 423353)
+++ PKGBUILD2019-01-15 16:59:48 UTC (rev 423354)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=36
+pkgrel=37
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD glob2-bool.patch)

2019-01-15 Thread Christian Hesse via arch-commits
Date: Tuesday, January 15, 2019 @ 16:53:20
  Author: eworm
Revision: 423353

fix bool for boost 1.69.0

Added:
  glob2/trunk/glob2-bool.patch
Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 glob2-bool.patch |   13 +
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 16:24:34 UTC (rev 423352)
+++ PKGBUILD2019-01-15 16:53:20 UTC (rev 423353)
@@ -16,12 +16,14 @@
 
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/;
-glob2-scons3.patch)
+glob2-scons3.patch
+glob2-bool.patch)
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
 '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba'
 '40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20'
-'4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc')
+'4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc'
+'81d28fde429be01ae2398ca33537daf9203bafb45182d51f04b2d00dd173b591')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -30,6 +32,7 @@
   patch -p1 -i "$srcdir/fix-ftbfs-gcc49.diff"
   patch -p1 -i "$srcdir/glob2-gcc6.patch"
   patch -p1 -i "$srcdir/glob2-scons3.patch"
+  patch -p1 -i "$srcdir/glob2-bool.patch"
 }
 
 build() {

Added: glob2-bool.patch
===
--- glob2-bool.patch(rev 0)
+++ glob2-bool.patch2019-01-15 16:53:20 UTC (rev 423353)
@@ -0,0 +1,13 @@
+diff --git a/src/AIEcho.cpp b/src/AIEcho.cpp
+index 77d9f63..0e5f59e 100644
+--- a/src/AIEcho.cpp
 b/src/AIEcho.cpp
+@@ -4387,7 +4387,7 @@ bool enemy_building_iterator::operator!=(const 
enemy_building_iterator& rhs) con
+ {
+   if(is_end && rhs.is_end)
+   return false;
+-  return is_end!=rhs.is_end || team!=rhs.team || 
building_type!=rhs.building_type || level!=rhs.level || 
construction_site!=rhs.construction_site;
++  return bool {is_end!=rhs.is_end || team!=rhs.team || 
building_type!=rhs.building_type || level!=rhs.level || 
construction_site!=rhs.construction_site};
+ }
+ 
+ 


[arch-commits] Commit in glob2/trunk (PKGBUILD glob2-scons3.patch)

2019-01-15 Thread Levente Polyak via arch-commits
Date: Tuesday, January 15, 2019 @ 14:08:08
  Author: anthraxx
Revision: 423340

adding scons3 support (convert Options to Variables)

Added:
  glob2/trunk/glob2-scons3.patch
Modified:
  glob2/trunk/PKGBUILD

+
 PKGBUILD   |7 +--
 glob2-scons3.patch |   26 ++
 2 files changed, 31 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 13:51:03 UTC (rev 423339)
+++ PKGBUILD2019-01-15 14:08:08 UTC (rev 423340)
@@ -15,11 +15,13 @@
 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/;)
+
glob2-gcc6.patch::"https://bitbucket.org/giszmo/glob2/commits/a9a16d8631db0176267b4f4aefd8e93767f8d247/raw/;
+glob2-scons3.patch)
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
 '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba'
-'40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20')
+'40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20'
+'4b7833d58d62abb8c737cb60e959fe3bb27cc4a19917e4fd5fca7a7debada5cc')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -27,6 +29,7 @@
   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"
+  patch -p1 -i "$srcdir/glob2-scons3.patch"
 }
 
 build() {

Added: glob2-scons3.patch
===
--- glob2-scons3.patch  (rev 0)
+++ glob2-scons3.patch  2019-01-15 14:08:08 UTC (rev 423340)
@@ -0,0 +1,26 @@
+--- glob2-0.9.4.4/SConstruct.orig  2019-01-15 14:58:36.130370433 +0100
 glob2-0.9.4.4/SConstruct   2019-01-15 15:03:13.040240416 +0100
+@@ -13,7 +13,7 @@
+ 
+ 
+ def establish_options(env):
+-opts = Options('options_cache.py')
++opts = Variables('options_cache.py')
+ opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g")
+ opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g")
+ if isDarwinPlatform:
+@@ -22,10 +22,10 @@
+   opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/share")
+ opts.Add("BINDIR", "Binary Installation Directory", "/usr/local/bin")
+ opts.Add("DATADIR", "Directory where data will be put, set to the same as 
INSTALLDIR", "/usr/local/share")
+-opts.Add(BoolOption("release", "Build for release", 0))
+-opts.Add(BoolOption("profile", "Build with profiling on", 0))
+-opts.Add(BoolOption("mingw", "Build with mingw enabled if not 
auto-detected", 0))
+-opts.Add(BoolOption("server", "Build only the YOG server, excluding the 
game and any GUI/sound components", 0))
++opts.Add(BoolVariable("release", "Build for release", 0))
++opts.Add(BoolVariable("profile", "Build with profiling on", 0))
++opts.Add(BoolVariable("mingw", "Build with mingw enabled if not 
auto-detected", 0))
++opts.Add(BoolVariable("server", "Build only the YOG server, excluding the 
game and any GUI/sound components", 0))
+ opts.Add("font", "Build the game using an alternative font placed in the 
data/font folder", "sans.ttf")
+ Help(opts.GenerateHelpText(env))
+ opts.Update(env)


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2018-09-18 Thread Evangelos Foutras via arch-commits
Date: Tuesday, September 18, 2018 @ 07:22:32
  Author: foutrelis
Revision: 382948

boost 1.68.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-18 07:17:46 UTC (rev 382947)
+++ PKGBUILD2018-09-18 07:22:32 UTC (rev 382948)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=35
+pkgrel=36
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2018-05-30 Thread Evangelos Foutras via arch-commits
Date: Thursday, May 31, 2018 @ 03:01:18
  Author: foutrelis
Revision: 333968

boost 1.67.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-05-31 03:01:07 UTC (rev 333967)
+++ PKGBUILD2018-05-31 03:01:18 UTC (rev 333968)
@@ -6,7 +6,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=34
+pkgrel=35
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2017-12-27 Thread Jaroslav Lichtblau via arch-commits
Date: Wednesday, December 27, 2017 @ 18:23:02
  Author: jlichtblau
Revision: 276260

upgpkg: glob2 0.9.4.4-34 - boost 1.66.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-27 17:41:37 UTC (rev 276259)
+++ PKGBUILD2017-12-27 18:23:02 UTC (rev 276260)
@@ -6,7 +6,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=33
+pkgrel=34
 pkgdesc='An innovative Real-Time Strategy game which reduces micro-management 
by automatically assigning tasks to units'
 arch=('x86_64')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2017-09-10 Thread Jaroslav Lichtblau
Date: Sunday, September 10, 2017 @ 16:50:54
  Author: jlichtblau
Revision: 256784

upgpkg: glob2 0.9.4.4-33 - boost 1.65.1 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-09-10 16:39:54 UTC (rev 256783)
+++ PKGBUILD2017-09-10 16:50:54 UTC (rev 256784)
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer: Alexander Rødseth 
+# Maintainer: Jaroslav Lichtblau 
+# Contributor: Alexander Rødseth 
 # Contributor: Jaroslaw Swierczynski 
 # Contributor: Roman Kyrylych 
-# Contributor: Jaroslav Lichtblau 
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=32
+pkgrel=33
 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/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2017-05-19 Thread Jaroslav Lichtblau
Date: Friday, May 19, 2017 @ 22:32:03
  Author: jlichtblau
Revision: 228652

upgpkg: glob2 0.9.4.4-32 - boost 1.64.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-19 22:15:24 UTC (rev 228651)
+++ PKGBUILD2017-05-19 22:32:03 UTC (rev 228652)
@@ -6,7 +6,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=31
+pkgrel=32
 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/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2017-01-01 Thread Bartłomiej Piotrowski
Date: Monday, January 2, 2017 @ 07:57:25
  Author: bpiotrowski
Revision: 204169

upgpkg: glob2 0.9.4.4-31

rebuild against boost 1.63.0

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-01-02 07:47:46 UTC (rev 204168)
+++ PKGBUILD2017-01-02 07:57:25 UTC (rev 204169)
@@ -6,7 +6,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=30
+pkgrel=31
 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/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2016-10-07 Thread Jaroslav Lichtblau
Date: Friday, October 7, 2016 @ 21:15:32
  Author: jlichtblau
Revision: 191613

upgpkg: glob2 0.9.4.4-30 - boost 1.62 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-07 20:50:58 UTC (rev 191612)
+++ PKGBUILD2016-10-07 21:15:32 UTC (rev 191613)
@@ -6,7 +6,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=29
+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/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2016-08-31 Thread Antonio Rojas
Date: Wednesday, August 31, 2016 @ 15:42:36
  Author: arojas
Revision: 188143

Boost 1.61 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-31 15:39:48 UTC (rev 188142)
+++ PKGBUILD2016-08-31 15:42:36 UTC (rev 188143)
@@ -6,7 +6,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=28
+pkgrel=29
 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/'
@@ -15,10 +15,12 @@
  '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-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')
+'2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba'
+'40013ef6805694f3d96407ca5df46c4083f0d13677c75c8f05c53efbe3d33e20')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -25,6 +27,7 @@
 
   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() {


[arch-commits] Commit in glob2/trunk (PKGBUILD glob2.install)

2016-04-30 Thread Jaroslav Lichtblau
Date: Saturday, April 30, 2016 @ 11:19:27
  Author: jlichtblau
Revision: 173093

upgpkg: glob2 0.9.4.4-28 pacman hooks part 1 rebuild

Modified:
  glob2/trunk/PKGBUILD
Deleted:
  glob2/trunk/glob2.install

---+
 PKGBUILD  |   14 ++
 glob2.install |   13 -
 2 files changed, 6 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-30 09:06:16 UTC (rev 173092)
+++ PKGBUILD2016-04-30 09:19:27 UTC (rev 173093)
@@ -2,20 +2,20 @@
 # Maintainer: Alexander Rødseth 
 # Contributor: Jaroslaw Swierczynski 
 # Contributor: Roman Kyrylych 
+# Contributor: Jaroslav Lichtblau 
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=27
-pkgdesc='Globulation 2 is an innovative Real-Time Strategy (RTS) game which 
reduces micro-management by automatically assigning tasks to units'
+pkgrel=28
+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')
-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)
+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)
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
 '2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba')
@@ -41,5 +41,3 @@
   install -Dm644 "data/icons/$pkgname-icon-48x48.png" \
 "$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png"
 }
-
-# vim:set ts=2 sw=2 et:

Deleted: glob2.install
===
--- glob2.install   2016-04-30 09:06:16 UTC (rev 173092)
+++ glob2.install   2016-04-30 09:19:27 UTC (rev 173093)
@@ -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:


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2015-12-21 Thread Evangelos Foutras
Date: Monday, December 21, 2015 @ 18:37:42
  Author: foutrelis
Revision: 153969

boost 1.60.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-21 17:32:36 UTC (rev 153968)
+++ PKGBUILD2015-12-21 17:37:42 UTC (rev 153969)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=26
+pkgrel=27
 pkgdesc='Globulation 2 is an innovative Real-Time Strategy (RTS) game which 
reduces micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2015-12-06 Thread Bartłomiej Piotrowski
Date: Sunday, December 6, 2015 @ 21:06:44
  Author: bpiotrowski
Revision: 149149

C++11 ABI rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 20:06:20 UTC (rev 149148)
+++ PKGBUILD2015-12-06 20:06:44 UTC (rev 149149)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=25
+pkgrel=26
 pkgdesc='Globulation 2 is an innovative Real-Time Strategy (RTS) game which 
reduces micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2015-10-15 Thread Evangelos Foutras
Date: Thursday, October 15, 2015 @ 14:07:50
  Author: foutrelis
Revision: 144126

boost 1.59.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-15 12:07:22 UTC (rev 144125)
+++ PKGBUILD2015-10-15 12:07:50 UTC (rev 144126)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=24
+pkgrel=25
 pkgdesc='Globulation 2 is an innovative Real-Time Strategy (RTS) game which 
reduces micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2015-04-21 Thread Bartłomiej Piotrowski
Date: Tuesday, April 21, 2015 @ 09:05:47
  Author: bpiotrowski
Revision: 131791

upgpkg: glob2 0.9.4.4-24

rebuild against boost 1.58.0

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-21 06:57:53 UTC (rev 131790)
+++ PKGBUILD2015-04-21 07:05:47 UTC (rev 131791)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=23
+pkgrel=24
 pkgdesc='Globulation 2 is an innovative Real-Time Strategy (RTS) game which 
reduces micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2014-11-04 Thread Evangelos Foutras
Date: Tuesday, November 4, 2014 @ 15:14:13
  Author: foutrelis
Revision: 121814

upgpkg: glob2 0.9.4.4-23

boost 1.57.0 rebuild.

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-11-04 13:39:33 UTC (rev 121813)
+++ PKGBUILD2014-11-04 14:14:13 UTC (rev 121814)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=22
+pkgrel=23
 pkgdesc='Globulation 2 is an innovative Real-Time Strategy (RTS) game which 
reduces micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2014-10-30 Thread Eric Bélanger
Date: Friday, October 31, 2014 @ 04:16:34
  Author: eric
Revision: 121616

Improve description (close FS#42627)

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-10-31 02:55:33 UTC (rev 121615)
+++ PKGBUILD2014-10-31 03:16:34 UTC (rev 121616)
@@ -6,7 +6,7 @@
 pkgname=glob2
 pkgver=0.9.4.4
 pkgrel=22
-pkgdesc='RTS game which minimizes micro-management'
+pkgdesc='Globulation 2 is an innovative Real-Time Strategy (RTS) game which 
reduces micro-management by automatically assigning tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'
 license=('GPL3')


[arch-commits] Commit in glob2/trunk (PKGBUILD)

2014-08-11 Thread Felix Yan
Date: Monday, August 11, 2014 @ 17:25:02
  Author: fyan
Revision: 117182

upgpkg: glob2 0.9.4.4-22

boost 1.56.0 rebuild

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-11 14:00:01 UTC (rev 117181)
+++ PKGBUILD2014-08-11 15:25:02 UTC (rev 117182)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=21
+pkgrel=22
 pkgdesc='RTS game which minimizes micro-management'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'



[arch-commits] Commit in glob2/trunk (PKGBUILD fix-ftbfs-gcc49.diff)

2014-08-10 Thread Eric Bélanger
Date: Monday, August 11, 2014 @ 07:18:00
  Author: eric
Revision: 117124

Fix build issue (close FS#40334)

Added:
  glob2/trunk/fix-ftbfs-gcc49.diff
Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 fix-ftbfs-gcc49.diff |   14 ++
 2 files changed, 20 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-11 01:32:25 UTC (rev 117123)
+++ PKGBUILD2014-08-11 05:18:00 UTC (rev 117124)
@@ -13,16 +13,18 @@
 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
+install=glob2.install
 
source=(http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz;
-$pkgname-${pkgver%.*}.1-gcc44.patch)
+glob2-0.9.4.1-gcc44.patch fix-ftbfs-gcc49.diff)
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
-'3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
+'3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a'
+'2bf0e51ca5de8c6f4910b68522a0265e07bb32beefe13b9912b59e5954c5bfba')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  patch -Np0 -i $srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch
+  patch -p0 -i $srcdir/glob2-0.9.4.1-gcc44.patch
+  patch -p1 -i $srcdir/fix-ftbfs-gcc49.diff
 }
 
 build() {

Added: fix-ftbfs-gcc49.diff
===
--- fix-ftbfs-gcc49.diff(rev 0)
+++ fix-ftbfs-gcc49.diff2014-08-11 05:18:00 UTC (rev 117124)
@@ -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;



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-11-28 Thread Eric Bélanger
Date: Friday, November 29, 2013 @ 04:27:00
  Author: eric
Revision: 101603

upgpkg: glob2 0.9.4.4-21

Rebuild against boost 1.55.0, Add hicolor-icon-theme depends, Change mesa-libgl 
makedepends to mesa

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-28 22:21:11 UTC (rev 101602)
+++ PKGBUILD2013-11-29 03:27:00 UTC (rev 101603)
@@ -5,14 +5,14 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=20
+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')
-makedepends=('scons' 'boost' 'mesa-libgl')
+ '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)



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-11-25 Thread Alexander Rødseth
Date: Monday, November 25, 2013 @ 16:06:54
  Author: arodseth
Revision: 101431

Boos rebuild. Minor changes.

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-25 14:11:45 UTC (rev 101430)
+++ PKGBUILD2013-11-25 15:06:54 UTC (rev 101431)
@@ -5,8 +5,8 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=19
-pkgdesc='RTS game which minimizes micro-management by automatically assigning 
tasks to units'
+pkgrel=20
+pkgdesc='RTS game which minimizes micro-management'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'
 license=('GPL3')
@@ -20,19 +20,19 @@
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   patch -Np0 -i $srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   scons LINKFLAGS=-lboost_system
 }
 
 package () {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   scons install BINDIR=$pkgdir/usr/bin INSTALLDIR=$pkgdir/usr/share
   find $pkgdir/usr/share -type f -exec chmod 644 '{}' \;



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-07-09 Thread Alexander Rødseth
Date: Tuesday, July 9, 2013 @ 17:15:42
  Author: arodseth
Revision: 93745

upgpkg: glob2 0.9.4.4-19

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-09 14:13:22 UTC (rev 93744)
+++ PKGBUILD2013-07-09 15:15:42 UTC (rev 93745)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=18
+pkgrel=19
 pkgdesc='RTS game which minimizes micro-management by automatically assigning 
tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'
@@ -19,10 +19,15 @@
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+
+  patch -Np0 -i $srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  patch -Np0 -i $srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch
   scons LINKFLAGS=-lboost_system
 }
 



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-03-28 Thread Evangelos Foutras
Date: Thursday, March 28, 2013 @ 14:06:40
  Author: foutrelis
Revision: 87171

upgpkg: glob2 0.9.4.4-17

Boost 1.53 rebuild.

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-28 12:39:29 UTC (rev 87170)
+++ PKGBUILD2013-03-28 13:06:40 UTC (rev 87171)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=16
+pkgrel=17
 pkgdesc='RTS game which minimizes micro-management by automatically assigning 
tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'



[arch-commits] Commit in glob2/trunk (PKGBUILD glob2.install glob2.install)

2013-03-28 Thread Alexander Rødseth
Date: Thursday, March 28, 2013 @ 15:15:16
  Author: arodseth
Revision: 87196

Pixmap handling

Added:
  glob2/trunk/glob2.install
Modified:
  glob2/trunk/PKGBUILD
Deleted:
  glob2/trunk/glob2.install

---+
 PKGBUILD  |4 ++--
 glob2.install |   26 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-28 14:09:05 UTC (rev 87195)
+++ PKGBUILD2013-03-28 14:15:16 UTC (rev 87196)
@@ -5,13 +5,13 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=17
+pkgrel=18
 pkgdesc='RTS game which minimizes 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' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 
'libgl')
+ 'fribidi' 'xdg-utils' 'libgl')
 makedepends=('scons' 'boost' 'mesa-libgl')
 install=$pkgname.install
 
source=(http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz;

Deleted: glob2.install
===
--- glob2.install   2013-03-28 14:09:05 UTC (rev 87195)
+++ glob2.install   2013-03-28 14:15:16 UTC (rev 87196)
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor  /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-

Added: glob2.install
===
--- glob2.install   (rev 0)
+++ glob2.install   2013-03-28 14:15:16 UTC (rev 87196)
@@ -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:



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-02-28 Thread Alexander Rødseth
Date: Thursday, February 28, 2013 @ 13:06:06
  Author: arodseth
Revision: 85279

upgpkg: glob2 0.9.4.4-16

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |   25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-28 11:55:43 UTC (rev 85278)
+++ PKGBUILD2013-02-28 12:06:06 UTC (rev 85279)
@@ -5,37 +5,34 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=15
+pkgrel=16
 pkgdesc='RTS game which minimizes 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' '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')
+ 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 
'libgl')
+makedepends=('scons' 'boost' 'mesa-libgl')
+install=$pkgname.install
+source=(http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz;
+$pkgname-${pkgver%.*}.1-gcc44.patch)
 sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
 '3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 
-  patch -Np0 -i $srcdir/glob2-0.9.4.1-gcc44.patch
-  scons \
-LINKFLAGS=-lboost_system
+  patch -Np0 -i $srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch
+  scons LINKFLAGS=-lboost_system
 }
 
 package () {
   cd $srcdir/$pkgname-$pkgver
 
-  scons install \
-BINDIR=$pkgdir/usr/bin \
-INSTALLDIR=$pkgdir/usr/share
+  scons install BINDIR=$pkgdir/usr/bin INSTALLDIR=$pkgdir/usr/share
   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
+  install -Dm644 data/icons/$pkgname-icon-48x48.png \
+$pkgdir/usr/share/pixmaps/$pkgname-icon-48x48.png
 }
 
 # vim:set ts=2 sw=2 et:



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-02-04 Thread Alexander Rødseth
Date: Monday, February 4, 2013 @ 23:09:03
  Author: arodseth
Revision: 83747

upgpkg: glob2 0.9.4.4-14, pkgdir todo

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-04 21:45:01 UTC (rev 83746)
+++ PKGBUILD2013-02-04 22:09:03 UTC (rev 83747)
@@ -1,4 +1,5 @@
 # $Id$
+# Maintainer: Alexander Rødseth rods...@gmail.com
 # Contributor: Jaroslaw Swierczynski swier...@aur.archlinux.org
 # Contributor: Roman Kyrylych roman.kyryl...@gmail.com
 
@@ -23,15 +24,15 @@
 
   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
+  scons install \
+BINDIR=$pkgdir/usr/bin \
+INSTALLDIR=$pkgdir/usr/share
   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



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-02-04 Thread Alexander Rødseth
Date: Tuesday, February 5, 2013 @ 08:28:38
  Author: arodseth
Revision: 83779

upgpkg: glob2 0.9.4.4-15, pkgdir TODO

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-05 07:07:02 UTC (rev 83778)
+++ PKGBUILD2013-02-05 07:28:38 UTC (rev 83779)
@@ -5,7 +5,7 @@
 
 pkgname=glob2
 pkgver=0.9.4.4
-pkgrel=14
+pkgrel=15
 pkgdesc='RTS game which minimizes micro-management by automatically assigning 
tasks to units'
 arch=('x86_64' 'i686')
 url='http://www.globulation2.org/'



[arch-commits] Commit in glob2/trunk (PKGBUILD)

2013-01-23 Thread arodseth
Date: Wednesday, January 23, 2013 @ 10:00:06
  Author: arodseth
Revision: 82702

upgpkg: glob2 0.9.4.4-14

Modified:
  glob2/trunk/PKGBUILD

--+
 PKGBUILD |   32 +++-
 1 file changed, 19 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-23 08:54:24 UTC (rev 82701)
+++ PKGBUILD2013-01-23 09:00:06 UTC (rev 82702)
@@ -4,31 +4,37 @@
 
 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/;
+pkgrel=14
+pkgdesc='RTS game which minimizes 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' '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')
+source=(http://dl.sv.nongnu.org/releases/$pkgname/0.9.4/$pkgname-$pkgver.tar.gz;
+   'glob2-0.9.4.1-gcc44.patch')
+sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
+'3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  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
+  scons \
+BINDIR=$pkgdir/usr/bin \
+INSTALLDIR=$pkgdir/usr/share \
+LINKFLAGS=-lboost_system
 }
 
 package () {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  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
+  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
 }
+
+# vim:set ts=2 sw=2 et: