Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=700ccbe988209d71c6da53312572c75197268d8f

commit 700ccbe988209d71c6da53312572c75197268d8f
Author: Priyank <[EMAIL PROTECTED]>
Date:   Tue Apr 8 21:44:48 2008 +0530

glest-3.1.2-1-i686
* Version bump
* Completely reworked the build()
* Added wxgtk-u8 to depends (needed for glest map editor)
* Added a patch to fix gcc43 compilation issues

diff --git a/source/games-extra/glest/FrugalBuild 
b/source/games-extra/glest/FrugalBuild
index 186d135..9ccdc51 100644
--- a/source/games-extra/glest/FrugalBuild
+++ b/source/games-extra/glest/FrugalBuild
@@ -2,47 +2,44 @@
# Maintainer: Priyank Gosalia <[EMAIL PROTECTED]>

pkgname=glest
-pkgver=2.0.1
-pkgrel=2
+pkgver=3.1.2
+pkgrel=1
pkgdesc="Cross-platform 3D realtime strategy game."
-_F_sourceforge_ext=".zip"
+_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
url="http://www.glest.org/";
makedepends=('jam' 'hd2u')
rodepends=('glest-data')
-depends=('sdl' 'libogg' 'libvorbis' 'openal' 'xerces-c>=2.8.0' 'libxt' 
'libx11' 'mesa' 'corefonts')
+depends=('sdl' 'libogg' 'libvorbis' 'openal' 'xerces-c>=2.8.0' 'libxt' 
'libx11' 'mesa' 'corefonts' 'wxgtk-u8')
groups=('games-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
+_F_desktop_name="Glest"
+_F_desktop_icon="glest.png"
+_F_desktop_categories="Game;StrategyGame"
up2date="lynx -dump $url/en/downloads.html | grep -m1 glest | sed 
's/.*t_\(.*\).ex.*/\1/'"
-source=(${source/glest-/glest_source_} $pkgname $pkgname.png)
-Fprefix="/usr/share"
-sha1sums=('20625eb567de3de9e3f2c5ec91e6c5da0dd6dca8' \
+source=(${source/glest-/glest-source-} $pkgname $pkgname.png 
$pkgname-$pkgver-gcc43fixes.patch)
+sha1sums=('62be30fb94044b55efcdd1ec2bd7d0149c594645' \
'8a0b4eb824a4ecd48cda3b836f60570188bdd096' \
-          'ebc17786df24dd19c375f112a02ed6f35ab77ce1')
+          'ebc17786df24dd19c375f112a02ed6f35ab77ce1' \
+          'c970bc1e3229786d2bd26180ed4ed32e688eeb51')
+_F_cd_path="$pkgname-source-$pkgver"

build()
{
-       for i in `find $Fsrcdir/{source,mk} -type f`; do dos2unix $i; done
-       cd $Fsrcdir || Fdie
-       cd mk/linux || Fdie
-       chmod a+x *.sh || return 1
+       Fcd
+       Fpatchall
Fmkdir usr/{share/glest,bin}
-       if [[ ! -e configure ]] ; then
-       ./autogen.sh || die "autogen failed"
-       fi
-
-       # Lets build glest
-       Fconf
-       jam || return 1
+       ./configure || Fdie
+       jam || Fdie

# Install glest
-       Finstallrel 755 glest usr/share/glest/
-       Fsed 'utopia' 'arial' glest.ini
+       Fexerel glest usr/share/glest/
+       Fexerel glest_editor /usr/share/glest/
Ffilerel glest.ini usr/share/glest/
-       Finstall 0755 glest usr/bin/glest
-       Fexe /usr/share/pixmaps/$pkgname.png
-       Fdesktop "/usr/bin/$pkgname" "/usr/share/pixmaps/$pkgname.png" 
"Qt;Gtk;Game;StrategyGame;"
+       Ficon $pkgname.png
+       Fexe glest usr/bin/glest
+       Fdesktop2
}

# optimization OK
diff --git a/source/games-extra/glest/glest-3.1.2-gcc43fixes.patch 
b/source/games-extra/glest/glest-3.1.2-gcc43fixes.patch
new file mode 100644
index 0000000..f90d635
--- /dev/null
+++ b/source/games-extra/glest/glest-3.1.2-gcc43fixes.patch
@@ -0,0 +1,47 @@
+diff -Naur glest-source-3.1.2/shared_lib/sources/platform/posix/socket.cpp 
glest-source-3.1.2.new/shared_lib/sources/platform/posix/socket.cpp
+--- glest-source-3.1.2/shared_lib/sources/platform/posix/socket.cpp    
2008-02-16 19:04:09.000000000 +0530
++++ glest-source-3.1.2.new/shared_lib/sources/platform/posix/socket.cpp        
2008-04-08 19:35:15.000000000 +0530
+@@ -10,6 +10,8 @@
+
+ #include <stdexcept>
+ #include <sstream>
++#include <cstdlib>
++#include <cstring>
+ #if defined(HAVE_SYS_IOCTL_H)
+ #define BSD_COMP /* needed for FIONREAD on Solaris2 */
+ #include <sys/ioctl.h>
+diff -Naur glest-source-3.1.2/shared_lib/sources/util/conversion.cpp 
glest-source-3.1.2.new/shared_lib/sources/util/conversion.cpp
+--- glest-source-3.1.2/shared_lib/sources/util/conversion.cpp  2008-01-23 
01:40:59.000000000 +0530
++++ glest-source-3.1.2.new/shared_lib/sources/util/conversion.cpp      
2008-04-08 19:34:48.000000000 +0530
+@@ -13,6 +13,8 @@
+
+ #include <stdexcept>
+ #include <cstdio>
++#include <cstdlib>
++#include <cstring>
+
+ #include "leak_dumper.h"
+
+diff -Naur glest-source-3.1.2/shared_lib/sources/util/properties.cpp 
glest-source-3.1.2.new/shared_lib/sources/util/properties.cpp
+--- glest-source-3.1.2/shared_lib/sources/util/properties.cpp  2008-02-08 
16:13:47.000000000 +0530
++++ glest-source-3.1.2.new/shared_lib/sources/util/properties.cpp      
2008-04-08 19:33:54.000000000 +0530
+@@ -13,7 +13,7 @@
+
+ #include <fstream>
+ #include <stdexcept>
+-
++#include <cstring>
+ #include "conversion.h"
+ #include "leak_dumper.h"
+
+diff -Naur glest-source-3.1.2/shared_lib/sources/util/util.cpp 
glest-source-3.1.2.new/shared_lib/sources/util/util.cpp
+--- glest-source-3.1.2/shared_lib/sources/util/util.cpp        2008-01-23 
01:40:59.000000000 +0530
++++ glest-source-3.1.2.new/shared_lib/sources/util/util.cpp    2008-04-08 
19:34:37.000000000 +0530
+@@ -13,6 +13,7 @@
+
+ #include <ctime>
+ #include <cassert>
++#include <cstring>
+ #include <stdexcept>
+
+ #include "leak_dumper.h"
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to