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

[Sven-Hendrik Haase]

    Date: Saturday, October 24, 2015 @ 19:46:32
  Author: svenstaro
Revision: 144925

upgpkg: scorched3d 44-8

Fix FS#46846

Modified:
  scorched3d/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-24 17:03:42 UTC (rev 144924)
+++ PKGBUILD	2015-10-24 17:46:32 UTC (rev 144925)
@@ -5,12 +5,12 @@
 pkgname=scorched3d
 pkgver=44
 _pkgver=44
-pkgrel=7
+pkgrel=8
 pkgdesc="3D artillery combat game"
 arch=('i686' 'x86_64')
 url="http://www.scorched3d.co.uk/"
 license=('GPL')
-depends=('sdl_net' 'wxgtk2.8' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils' 'glew')
+depends=('sdl_net' 'wxgtk2.8' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils' 'glew' 'freetype2')
 makedepends=('gendesk' 'mesa')
 install=scorched3d.install
 source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz"
@@ -33,11 +33,6 @@
 build() {
   cd "$srcdir/scorched"
 
-#  patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch
-#  patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch
-   #patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch
-#  patch -Np0 -i ${srcdir}/libpng14.patch
-
   WANT_WXGTK=gtk2
   ./configure \
     --prefix=/usr \
@@ -45,10 +40,8 @@
     --disable-openaltest \
     --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
+  # 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
 
   make
 }
@@ -59,7 +52,7 @@
   make DESTDIR=${pkgdir} install
   cd ..
 
-  install -D -m644 scorched3d.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png"
+  install -D -m644 scorched3d.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
   install -D -m644 scorched3d.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -D -m644 scorched3d.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
 }