Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=16bb89978500a897c660827368862cad1e6acc4c
commit 16bb89978500a897c660827368862cad1e6acc4c Author: crazy <[EMAIL PROTECTED]> Date: Sun Dec 9 08:27:18 2007 +0100 glob2-0.9.1-2-i686 * release bump * rebuild with boost * fixed icon location , CXXFLAGS , depends() * make use of MAKEFLAGS diff --git a/source/games-extra/glob2/FrugalBuild b/source/games-extra/glob2/FrugalBuild index f42b186..fa036d7 100644 --- a/source/games-extra/glob2/FrugalBuild +++ b/source/games-extra/glob2/FrugalBuild @@ -4,11 +4,11 @@ pkgname=glob2 pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="Innovative Real-Time Strategy (RTS) game which reduces micro-management by automatically assigning tasks to units." url="http://globulation2.org/"; -depends=('sdl_net' 'sdl_ttf' 'sdlimage' 'libvorbis' 'libgl' 'speex') -makedepends=('boost>=1.34.0' 'scons') +depends=('sdl_net' 'sdl_ttf' 'sdlimage' 'libvorbis' 'libgl' 'speex' 'fribidi' 'libboost-mt>=1.34.1') +makedepends=('boost>=1.34.1' 'scons') license="GPL2" groups=('games-extra') archs=('i686' 'x86_64') @@ -18,11 +18,13 @@ source=("http://dl.sv.nongnu.org/releases/$pkgname/$pkgver/$pkgname-$pkgver.tar. build() { Fpatchall cp $Fsrcdir/glob2.desktop data/ || return 1 - scons || return 1 + [ -n "$MAKEFLAGS" ] && JOBS="$MAKEFLAGS" + scons $JOBS CXXFLAGS="$CXXFLAGS" || return 1 scons BINDIR="$Fdestdir/usr/bin" INSTALLDIR="$Fdestdir/usr/share" install || return 1 + } -sha1sums=('18136ff058e2b7bd313cefdc45bcbfe25e12a5e0' \ - '14373039ae35116b9bec89604240aab0202d1d99' \ - 'f65660dafea34ca84a53cb8033f856baac65fd84') +sha1sums=('edfc49f3b06933783518afeeb670c5119694267a' \ + '74ab16b4267a8b39d707b94873a34143f8a4d508' \ + 'b090d2baf0943f66611f9b73f66d883d8aad3e33') # optimization OK diff --git a/source/games-extra/glob2/glob2-0.9.1-boostmt.diff b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff index 8476984..12b0c0d 100644 --- a/source/games-extra/glob2/glob2-0.9.1-boostmt.diff +++ b/source/games-extra/glob2/glob2-0.9.1-boostmt.diff @@ -6,8 +6,8 @@ Exit(1) - if not conf.CheckLib('boost_thread') or not conf.CheckCXXHeader('boost/thread/thread.hpp'): - print "Could not find libboost_thread or boost/thread/thread.hpp" -+ if not conf.CheckLib('boost_thread-gcc42-mt') or not conf.CheckCXXHeader('boost/thread/thread.hpp'): -+ print "Could not find libboost_thread-gcc42-mt or boost/thread/thread.hpp" ++ if not conf.CheckLib('boost_thread-mt') or not conf.CheckCXXHeader('boost/thread/thread.hpp'): ++ print "Could not find libboost_thread-mt or boost/thread/thread.hpp" Exit(1) if not conf.CheckCXXHeader('boost/shared_ptr.hpp'): print "Could not find boost/shared_ptr.hpp" @@ -16,7 +16,7 @@ if env['osx']: env.Append(CXXFLAGS="-framework OpenGL") - env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread']) -+ env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread-gcc42-mt']) ++ env.Append(LIBS=['vorbisfile', 'SDL_ttf', 'SDL_image', 'SDL_net', 'speex', 'boost_thread-mt']) env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz" env["TARFLAGS"] = "-c -z" diff --git a/source/games-extra/glob2/glob2.desktop b/source/games-extra/glob2/glob2.desktop index bb87b9c..a0017b7 100644 --- a/source/games-extra/glob2/glob2.desktop +++ b/source/games-extra/glob2/glob2.desktop @@ -4,7 +4,7 @@ Encoding=UTF-8 Name=Globulation 2 Comment=An innovative new strategy game Exec=glob2 -Icon=glob2-icon-48x48 +Icon=/usr/share/glob2/data/icons/glob2-icon-48x48.png Terminal=false X-MultipleArgs=false Type=Application _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
