diff --git a/pingus/PKGBUILD b/pingus/PKGBUILD index 509029092..9f7f9a2ca 100644 --- a/pingus/PKGBUILD +++ b/pingus/PKGBUILD @@ -1,8 +1,6 @@ -# Maintainer: Adrián Chaves Fernández (Gallaecio) - pkgname=pingus pkgver=0.7.6 -pkgrel=4 +pkgrel=5 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('x86_64') url="http://pingus.seul.org" @@ -10,14 +8,24 @@ license=('GPL') depends=('gcc-libs' 'sdl_image' 'sdl_mixer' 'boost-libs') makedepends=('boost' 'scons' 'glu' 'mesa') categories=('games') -source=("http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" - "$pkgname-$pkgver-gcc470-udl.patch::https://projects.archlinux.org/svntogit/community.git/plain/trunk/$pkgname-$pkgver-gcc470-udl.patch?h=packages/$pkgname") -md5sums=('561798686f34d3fa4e69135d655f47ac' - '332b280b65f63aff03b4028057b1b7d5') +source=("$pkgname-$pkgver.tgz::https://github.com/Pingus/pingus/archive/v$pkgver.tar.gz" + "$pkgname-$pkgver-gcc470-udl.patch::https://projects.archlinux.org/svntogit/community.git/plain/trunk/$pkgname-$pkgver-gcc470-udl.patch?h=packages/$pkgname" + missing-header.patch) +md5sums=('8f366e7ba76c9f3525888efe8b04b1ad' + '332b280b65f63aff03b4028057b1b7d5' + '782aa332f18c589b13e5bc0954ab5d21') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np0 -i ${srcdir}/$pkgname-$pkgver-gcc470-udl.patch + + # fedora patch to fix error due to new standards + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51282 + patch -Np0 -i ${srcdir}/pingus-0.7.6-gcc470-udl.patch + # manpage must be in man6, not man1 + sed -i "s#/man1/#/man6/#g" Makefile + # missing header + patch -Np1 -i ../missing-header.patch + scons prefix=/usr } diff --git a/pingus/missing-header.patch b/pingus/missing-header.patch new file mode 100644 index 000000000..cc1dcdbb8 --- /dev/null +++ b/pingus/missing-header.patch @@ -0,0 +1,22 @@ +From df6e2f445d3e2925a94d22faeb17be9444513e92 Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely +Date: Mon, 30 Jan 2017 15:41:53 +0000 +Subject: [PATCH] Add missing header for std::function and std::bind + +--- + src/pingus/screens/demo_session.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp +index e3ec49a2c..f887e50f0 100644 +--- a/src/pingus/screens/demo_session.cpp ++++ b/src/pingus/screens/demo_session.cpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + #include "engine/gui/gui_manager.hpp" + #include "engine/gui/surface_button.hpp" +