[arch-commits] Commit in performous/trunk (PKGBUILD cast-basic_istream-to-bool.patch)
Laurent Carlier
lcarlier at archlinux.org
Sat May 30 22:07:46 UTC 2015
Date: Sunday, May 31, 2015 @ 00:07:44
Author: lcarlier
Revision: 134389
upgpkg: performous 1.0-4
fix building with gcc 5.1.0
Added:
performous/trunk/cast-basic_istream-to-bool.patch
Modified:
performous/trunk/PKGBUILD
----------------------------------+
PKGBUILD | 14 +++++++++++---
cast-basic_istream-to-bool.patch | 26 ++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-30 20:00:32 UTC (rev 134388)
+++ PKGBUILD 2015-05-30 22:07:44 UTC (rev 134389)
@@ -4,7 +4,7 @@
pkgname=performous
pkgver=1.0
-pkgrel=3
+pkgrel=4
pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
arch=('i686' 'x86_64')
url="http://performous.org/"
@@ -12,9 +12,17 @@
depends=('boost-libs' 'glew' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg' 'opencv' 'sdl2')
makedepends=('cmake' 'pkgconfig' 'help2man' 'boost' 'mesa')
optdepends=('performous-freesongs: free songs for performous')
-source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz)
-md5sums=('cbeec2f0c0114cc499746c1e33f56055')
+source=($pkgname-$pkgver.tar.gz::https://github.com/performous/${pkgname}/archive/${pkgver}.tar.gz
+ cast-basic_istream-to-bool.patch)
+md5sums=('cbeec2f0c0114cc499746c1e33f56055'
+ 'c883cce82d0359c6b40ce38bd4ccf4bf')
+prepare() {
+ cd performous-${pkgver}
+
+ patch -Np1 -i ../cast-basic_istream-to-bool.patch
+}
+
build() {
cd performous-${pkgver}
Added: cast-basic_istream-to-bool.patch
===================================================================
--- cast-basic_istream-to-bool.patch (rev 0)
+++ cast-basic_istream-to-bool.patch 2015-05-30 22:07:44 UTC (rev 134389)
@@ -0,0 +1,26 @@
+From 3b6ee0162ac22e569cb00a8aee5c026c86147956 Mon Sep 17 00:00:00 2001
+From: Tobias Gruetzmacher <tobias-git at 23.gs>
+Date: Sun, 22 Mar 2015 18:43:11 +0100
+Subject: [PATCH] Cast basic_istream to bool.
+
+This shouldn't be necessary as far as I understand it (istream has an
+operator bool()), but clang 3.4 with libc++ insists that it can't cast
+basic_istream to bool. This may be a bug in libc++ or my bad
+understanding of C++ cast rules, but changing it doesn't hurt.
+---
+ game/songparser.hh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/game/songparser.hh b/game/songparser.hh
+index 5196c8e..21d7e16 100644
+--- a/game/songparser.hh
++++ b/game/songparser.hh
+@@ -33,7 +33,7 @@ class SongParser {
+ Song& m_song;
+ std::stringstream m_ss;
+ unsigned int m_linenum;
+- bool getline(std::string& line) { ++m_linenum; return std::getline(m_ss, line);}
++ bool getline(std::string& line) { ++m_linenum; return (bool) std::getline(m_ss, line);}
+ bool m_relative;
+ double m_gap;
+ double m_bpm;
More information about the arch-commits
mailing list