[arch-commits] Commit in xmoto/repos (3 files)
Ronald van Haren
ronald at archlinux.org
Thu Sep 10 21:17:51 UTC 2009
Date: Thursday, September 10, 2009 @ 17:17:51
Author: ronald
Revision: 51756
Merged revisions 51753,51755 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xmoto/trunk
........
r51753 | ronald | 2009-09-10 23:09:29 +0200 (Thu, 10 Sep 2009) | 2 lines
upgpkg: xmoto 0.5.2-1
update to latest version; add upstream build fix
........
r51755 | ronald | 2009-09-10 23:10:43 +0200 (Thu, 10 Sep 2009) | 1 line
remove old patch
........
Modified:
xmoto/repos/extra-i686/ (properties)
xmoto/repos/extra-i686/PKGBUILD
Deleted:
xmoto/repos/extra-i686/xmoto_gcc44.patch
-------------------+
PKGBUILD | 14 ++++++--------
xmoto_gcc44.patch | 33 ---------------------------------
2 files changed, 6 insertions(+), 41 deletions(-)
Property changes on: xmoto/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xmoto/trunk:1-45121
+ /xmoto/trunk:1-51755
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-09-10 21:10:43 UTC (rev 51755)
+++ extra-i686/PKGBUILD 2009-09-10 21:17:51 UTC (rev 51756)
@@ -4,8 +4,8 @@
# Contributor: Denis (dtonator at gmail.com)
pkgname=xmoto
-pkgver=0.5.1
-pkgrel=3
+pkgver=0.5.2
+pkgrel=1
pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
arch=('i686' 'x86_64')
url="http://xmoto.tuxfamily.org"
@@ -13,16 +13,14 @@
depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode=0.11' 'curl>=7.16.2'
'mesa' 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net')
install=xmoto.install
-source=(http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz
- xmoto_gcc44.patch)
-md5sums=('10cb822ec8c2c7e9466806633e69be1f'
- '40bba4510c0188dc6e722d44de5471ef')
+source=(http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz)
+md5sums=('1e3678ebceca21d61844efb53c140227')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- # fix gcc4.4 building
- patch -Np0 -i ${srcdir}/xmoto_gcc44.patch || return 1
+ # upstream fix compilation issue
+ sed -i 's|v_replay << m_Chunks.size();|v_replay << (unsigned int) m_Chunks.size();|' src/Replay.cpp || return 1
# build and install
./configure --prefix=/usr --disable-sdltest
Deleted: extra-i686/xmoto_gcc44.patch
===================================================================
--- extra-i686/xmoto_gcc44.patch 2009-09-10 21:10:43 UTC (rev 51755)
+++ extra-i686/xmoto_gcc44.patch 2009-09-10 21:17:51 UTC (rev 51756)
@@ -1,33 +0,0 @@
-diff -Naur src.old/XMArgs.cpp src/XMArgs.cpp
---- src.old/XMArgs.cpp 2009-05-14 14:20:54.603960980 +0200
-+++ src/XMArgs.cpp 2009-05-14 14:21:07.584007699 +0200
-@@ -24,6 +24,7 @@
- #include "VFileIO.h"
- #include <sstream>
- #include <stdlib.h>
-+#include <cstdio>
-
- XMArguments::XMArguments() {
- m_opt_pack = false;
-diff -Naur src.old/helpers/Log.cpp src/helpers/Log.cpp
---- src.old/helpers/Log.cpp 2009-05-14 14:20:54.613925407 +0200
-+++ src/helpers/Log.cpp 2009-05-14 14:23:14.092429804 +0200
-@@ -23,6 +23,7 @@
- #include "../VFileIO.h"
- #include "assert.h"
- #include <stdarg.h>
-+#include <cstdio>
-
- bool Logger::m_isInitialized = false;
- bool Logger::m_activ = true;
-diff -Naur src.old/helpers/Text.cpp src/helpers/Text.cpp
---- src.old/helpers/Text.cpp 2009-05-14 14:20:54.613925407 +0200
-+++ src/helpers/Text.cpp 2009-05-14 14:21:31.804817862 +0200
-@@ -19,6 +19,7 @@
- =============================================================================*/
-
- #include "Text.h"
-+#include <cstdio>
-
- std::string txtToLower(const std::string& i_str) {
- std::string v_res;
More information about the arch-commits
mailing list