Date: Thursday, August 4, 2016 @ 17:49:23 Author: arojas Revision: 185078
GLEW 2.0 rebuild Added: scorched3d/trunk/scorched3d-gcc6.patch Modified: scorched3d/trunk/PKGBUILD Deleted: scorched3d/trunk/scorched3d.install -----------------------+ PKGBUILD | 13 +++++++++---- scorched3d-gcc6.patch | 11 +++++++++++ scorched3d.install | 11 ----------- 3 files changed, 20 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-08-04 17:33:11 UTC (rev 185077) +++ PKGBUILD 2016-08-04 17:49:23 UTC (rev 185078) @@ -5,7 +5,7 @@ pkgname=scorched3d pkgver=44 _pkgver=44 -pkgrel=9 +pkgrel=10 pkgdesc="3D artillery combat game" arch=('i686' 'x86_64') url="http://www.scorched3d.co.uk/" @@ -12,22 +12,27 @@ license=('GPL') 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" 'scorched3d.png::http://cdn.portableapps.com/Scorched3DPortable_128.png' 'scorched3d-42.1-gcc43.patch' 'scorched3d-42.1-fixups.patch' 'scorched3d-libpng1.5.patch' - 'libpng14.patch') + 'libpng14.patch' + 'scorched3d-gcc6.patch') md5sums=('c395d54a7a43cf91166d2cc0f7dec83e' 'cc3217f5b3baa6950a4619aac72d8a75' '053769f77a38c252eef1d967b18e93e6' 'dfde556559d95bca07c4a390c60790b4' 'ec6958191751b5a2c44aa15abfc75269' - 'c8c03855fd3693122fd39427fa3638c1') + 'c8c03855fd3693122fd39427fa3638c1' + 'a23e840ff6af304f675bdea25fd94cac') prepare() { gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Scorched3d" + + cd scorched + # Fix build with GCC 6 + patch -p0 -i ../scorched3d-gcc6.patch } build() { Added: scorched3d-gcc6.patch =================================================================== --- scorched3d-gcc6.patch (rev 0) +++ scorched3d-gcc6.patch 2016-08-04 17:49:23 UTC (rev 185078) @@ -0,0 +1,11 @@ +--- src/common/weapons/AccessoryStore.cpp.orig 2016-02-13 22:16:08.997822186 -0600 ++++ src/common/weapons/AccessoryStore.cpp 2016-02-13 22:16:47.949819533 -0600 +@@ -156,7 +156,7 @@ + Accessory *parent, XMLNode *currentNode) + { + XMLNode *typeNode = 0; +- if (!currentNode->getNamedParameter("type", typeNode)) return false; ++ if (!currentNode->getNamedParameter("type", typeNode)) return 0; + + AccessoryPart *accessoryPart = + AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this); Deleted: scorched3d.install =================================================================== --- scorched3d.install 2016-08-04 17:33:11 UTC (rev 185077) +++ scorched3d.install 2016-08-04 17:49:23 UTC (rev 185078) @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -}