summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-06-18 16:35:41 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-06-18 16:35:41 +0000
commitb641b129c700b187ad271997e437d36a9c919fba (patch)
tree44c9a78c67b5a53135ce3f38854e8bd948efb125 /dev-libs/grantlee
parentFix underlink. Bug #369301 (diff)
downloadgentoo-2-b641b129c700b187ad271997e437d36a9c919fba.tar.gz
gentoo-2-b641b129c700b187ad271997e437d36a9c919fba.tar.bz2
gentoo-2-b641b129c700b187ad271997e437d36a9c919fba.zip
Make grantlee-1.8 build on arm, where qreal!=double...
(Portage version: 2.1.10.1/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/grantlee')
-rw-r--r--dev-libs/grantlee/ChangeLog6
-rw-r--r--dev-libs/grantlee/files/grantlee-0.1.8-arm.patch12
-rw-r--r--dev-libs/grantlee/grantlee-0.1.8.ebuild6
3 files changed, 21 insertions, 3 deletions
diff --git a/dev-libs/grantlee/ChangeLog b/dev-libs/grantlee/ChangeLog
index f19a0b304e33..0410cab5f7a0 100644
--- a/dev-libs/grantlee/ChangeLog
+++ b/dev-libs/grantlee/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/grantlee
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.2 2011/04/27 16:45:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/ChangeLog,v 1.3 2011/06/18 16:35:41 dilfridge Exp $
+
+ 18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> grantlee-0.1.8.ebuild,
+ +files/grantlee-0.1.8-arm.patch:
+ Make grantlee-1.8 build on arm, where qreal!=double...
*grantlee-0.1.8 (27 Apr 2011)
diff --git a/dev-libs/grantlee/files/grantlee-0.1.8-arm.patch b/dev-libs/grantlee/files/grantlee-0.1.8-arm.patch
new file mode 100644
index 000000000000..f8bc1ee3249a
--- /dev/null
+++ b/dev-libs/grantlee/files/grantlee-0.1.8-arm.patch
@@ -0,0 +1,12 @@
+diff -ruN grantlee-0.1.8.orig/templates/lib/abstractlocalizer.cpp grantlee-0.1.8/templates/lib/abstractlocalizer.cpp
+--- grantlee-0.1.8.orig/templates/lib/abstractlocalizer.cpp 2011-01-24 09:32:38.000000000 +0100
++++ grantlee-0.1.8/templates/lib/abstractlocalizer.cpp 2011-06-18 18:07:49.000000000 +0200
+@@ -47,7 +47,7 @@
+ else if ( isSafeString( variant ) )
+ return localizeString( getSafeString( variant ).get() );
+ else if ( variant.type() == QVariant::Double )
+- return localizeNumber( variant.toDouble() );
++ return localizeNumber( qreal(variant.toDouble()) );
+ else if ( variant.canConvert( QVariant::LongLong ) )
+ return localizeNumber( variant.toInt() );
+ return QString();
diff --git a/dev-libs/grantlee/grantlee-0.1.8.ebuild b/dev-libs/grantlee/grantlee-0.1.8.ebuild
index b291a408470f..5afd4d01067a 100644
--- a/dev-libs/grantlee/grantlee-0.1.8.ebuild
+++ b/dev-libs/grantlee/grantlee-0.1.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.8.ebuild,v 1.1 2011/04/27 16:45:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/grantlee/grantlee-0.1.8.ebuild,v 1.2 2011/06/18 16:35:41 dilfridge Exp $
EAPI=4
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gitorious.org/grantlee/pages/Home"
SRC_URI="http://www.loegria.net/grantlee/${P}.tar.gz"
LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
SLOT="0"
IUSE="debug doc test"
@@ -30,6 +30,8 @@ DOCS=(AUTHORS CHANGELOG GOALS README)
# Some tests fail
RESTRICT="test"
+PATCHES=( "${FILESDIR}/${P}-arm.patch" )
+
src_configure() {
mycmakeargs=(
$(cmake-utils_use_build test TESTS)