Date: Monday, January 18, 2016 @ 15:00:16 Author: foutrelis Revision: 157535
upgpkg: xmoto 0.5.11-4 - Fix missing text (FS#47770). - Remove unneeded patches. Modified: xmoto/trunk/PKGBUILD Deleted: xmoto/trunk/system.cpp.patch xmoto/trunk/xmoto-0.5.10-libpng15.patch -----------------------------+ PKGBUILD | 18 ++++++++---------- system.cpp.patch | 10 ---------- xmoto-0.5.10-libpng15.patch | 10 ---------- 3 files changed, 8 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-18 12:06:59 UTC (rev 157534) +++ PKGBUILD 2016-01-18 14:00:16 UTC (rev 157535) @@ -5,7 +5,7 @@ pkgname=xmoto pkgver=0.5.11 -pkgrel=3 +pkgrel=4 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64') url="http://xmoto.tuxfamily.org" @@ -15,20 +15,15 @@ makedepends=('mesa') install=xmoto.install source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" - 'xmoto-0.5.10-libpng15.patch' - 'lua52_compat.patch' - 'system.cpp.patch') + 'lua52_compat.patch') sha1sums=('a795616fb359e60be343e339f7acf5e95e0f1ce2' - '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d' - '104542546fbbd24172ddaa179f87e1b26df8b761' - 'e741f769d1fc5779a6688970ee97e2a61a50c7ae') + '104542546fbbd24172ddaa179f87e1b26df8b761') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch" - patch -Np1 -i "${srcdir}/system.cpp.patch" patch -Np1 -i "${srcdir}/lua52_compat.patch" + ./bootstrap # Remove bundled ode library because its headers get picked up during build rm -r src/ode @@ -37,7 +32,10 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./bootstrap # regenrate confif file because the lua patch modifies configure.in + # Build using the old C++ ABI to fix issue with missing text; the issue + # should be fixed in the next stable release (if that ever does happen) + CPPFLAGS+=' -D_GLIBCXX_USE_CXX11_ABI=0' + ./configure --prefix=/usr --disable-sdltest make } Deleted: system.cpp.patch =================================================================== --- system.cpp.patch 2016-01-18 12:06:59 UTC (rev 157534) +++ system.cpp.patch 2016-01-18 14:00:16 UTC (rev 157535) @@ -1,10 +0,0 @@ ---- a/src/helpers/System.cpp 2011-10-11 22:18:14.000000000 +0200 -+++ b/src/helpers/System.cpp 2012-07-21 21:28:40.000000000 +0200 -@@ -24,6 +24,7 @@ - #include "Log.h" - #include "VExcept.h" - #include <sstream> -+#include <unistd.h> - - std::vector<std::string>* System::getDisplayModes(int windowed) { - std::vector<std::string>* modes = new std::vector<std::string>; Deleted: xmoto-0.5.10-libpng15.patch =================================================================== --- xmoto-0.5.10-libpng15.patch 2016-01-18 12:06:59 UTC (rev 157534) +++ xmoto-0.5.10-libpng15.patch 2016-01-18 14:00:16 UTC (rev 157535) @@ -1,10 +0,0 @@ ---- a/src/image/tim_png.cpp 2011-12-29 22:13:37.000000000 +0100 -+++ b/src/image/tim_png.cpp 2012-07-21 21:36:34.000000000 +0200 -@@ -24,6 +24,7 @@ - */ - #include <stdio.h> - #include <string.h> -+#include <zlib.h> - #include "tim.h" - #include <png.h> - #include <zlib.h>