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

[Laurent Carlier]

    Date: Tuesday, January 7, 2014 @ 10:25:45
  Author: lcarlier
Revision: 103531

upgpkg: scorched3d 43.3.d-6

wxgtk 3.0 rebuild

Modified:
  scorched3d/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-07 09:17:54 UTC (rev 103530)
+++ PKGBUILD	2014-01-07 09:25:45 UTC (rev 103531)
@@ -5,12 +5,12 @@
 pkgname=scorched3d
 pkgver=43.3.d
 _pkgver=43.3d
-pkgrel=5
+pkgrel=6
 pkgdesc="3D artillery combat game"
 arch=('i686' 'x86_64')
 url="http://www.scorched3d.co.uk/"
 license=('GPL')
-depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils')
+depends=('sdl_net' 'wxgtk2.8' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils')
 makedepends=('gendesk' 'mesa')
 install=scorched3d.install
 source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz"
@@ -20,12 +20,16 @@
         'scorched3d-libpng1.5.patch'
         'libpng14.patch')
 md5sums=('9c3043282a9e7451468ff325bef3b04c'
-         '0f7e570f586c227873e909ebbc17c84d'
+         'cc3217f5b3baa6950a4619aac72d8a75'
          '053769f77a38c252eef1d967b18e93e6'
          'dfde556559d95bca07c4a390c60790b4'
          'ec6958191751b5a2c44aa15abfc75269'
          'c8c03855fd3693122fd39427fa3638c1')
 
+prepare() {
+  gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Scorched3d"
+}
+
 build() {
   cd "$srcdir/scorched"
 
@@ -35,13 +39,14 @@
 #  patch -Np0 -i ${srcdir}/libpng14.patch
 
   WANT_WXGTK=gtk2
-  sh autogen.sh \
+  ./configure \
     --prefix=/usr \
     --datadir=/usr/share/scorched3d \
     --disable-openaltest \
-    --with-wx-config=wx-config
+    --with-wx-config=wx-config-2.8
 
   sed -i '1 i #include <unistd.h>' src/client/client/SecureID.cpp
+  sed -i 's|freetype/||g' src/launcher/wxdialogs/TrueTypeFont.h src/client/GLEXT/GLFont2dFreeType.h
   #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1
   #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1
 
@@ -49,10 +54,8 @@
 }
 
 package() {
-  cd "$srcdir"
-  gendesk
+  cd scorched
 
-  cd scorched
   make DESTDIR=${pkgdir} install
   cd ..