Make grantlee-1.8 build on arm, where qreal!=double...

Package-Manager: portage-2.1.10.1/cvs/Linux x86_64

4 files changed, 38 insertions, 9 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/Manifest b/dev-libs/grantlee/Manifest
index e32012d33e37..62eed4922e51 100644
--- a/dev-libs/grantlee/Manifest
+++ b/dev-libs/grantlee/Manifest
@@ -1,16 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX grantlee-0.1.8-arm.patch 704 RMD160 b3e9feb1dd07c7bc63797a345dac81dec0c67f7b SHA1 6fa68d534915b824e86d12c65d157b0bfe181d70 SHA256 4d2f67b6bfa6049e1103436da8ad86a22711444702730a017038482814b558c9
 DIST grantlee-0.1.7.tar.gz 636992 RMD160 36d38a3f7e5cb09980d1fff37dc29d726c295f7b SHA1 02362a6cfeb2865e28397d8a626e95072a3ea247 SHA256 e2a86c272533d713d9d37e7f66b0c4c939795d3a7b1924349e20a8f26874663f
 DIST grantlee-0.1.8.tar.gz 669703 RMD160 b8e700726aa4764f267919df2ac06bd549e1615b SHA1 322a98e10ff7be2096274f510f262b038fe63387 SHA256 d7d530419960e90c6253358c5a951ca344c2174752a431b4d81d1fd378927a7c
 EBUILD grantlee-0.1.7.ebuild 1052 RMD160 6b1550157d884fe7722be1ac7525db20e027cdbd SHA1 d48665172d4c28c6c8a9beb2081f39e5ce3ef81a SHA256 657c720a94427442f189e6c935119795de4b41d0a29bfc6785fe9e53e423b9c6
-EBUILD grantlee-0.1.8.ebuild 1070 RMD160 3ca366b48e79c8aed3e46901c4dd4327d126e1d7 SHA1 80888596eacbe4ce1c4615305824b264a6251150 SHA256 2b166ec46ce65c4f70f6eaccd4ddcd249f3c2ed67076865b78a8d04b13b076e3
-MISC ChangeLog 493 RMD160 1f82a5fdf03020f0e9320e06c7c5f47e2c950d46 SHA1 efce2e1aef3ddadf4d15673d8db4d1f65e3767de SHA256 88eb54d2941b746527c011bad8300cd53746acb2737014e43d85da9814110b42
+EBUILD grantlee-0.1.8.ebuild 1117 RMD160 8eba4cb9da208c37d4af8546abe80f511fb9d16b SHA1 64c4bdb3595016500d8d0a09cd1c54be5343eca1 SHA256 623a8aa694a010fd69bdd3412084b164159bf10f6044c33c3dbd5034aa6d2514
+MISC ChangeLog 666 RMD160 c7e8ed58a21a4321d4d2fbbd031a2f89e6012d0a SHA1 05097b22c9d277a90683496dc18676bedb0ab8f7 SHA256 a226a82658c9ebe96c71b363a73818555aa0ba18268002ef3fa2bbc0c4cfe2eb
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk24SDEACgkQHB6c3gNBRYdj5wCfZuz1H4s1RiJZg+Zc/sFCLTZI
-RgUAn0lrnudxi7lxH76LetTNviA28ErS
-=GKi8
+iQIcBAEBCgAGBQJN/NPpAAoJENwGBM22xffeor4P/jVcPgN/zJk4nWDOn5/O1Zk2
+ug1ZPH0VzkDrdi8Ccf10kAhhn9F0hLuYXmQHK0O4gPTx5RlDxkvZsXCzQyvpnvoa
+XJgCHdJjcdaH6EZD2B8pXDq/AP8fwf+L4VeGqwkJF70rmr4XFEgam5u3YLDDvv9X
+Y4S9ByLIGc8id4brWe7U+RqTIS0aP+hUPbTyR4Zv0UdLcW/grjF77Uh0eh/j7274
+T52Mz/6XOwj5fRZkFQ6FGWGz5bm0bZXyVz+FeTHxwhamT9DoprmLIwJ5177UVgfi
+7BQpg6eURaZL+s4w+oiecobmkjG8C/iyplXgtcaMCSkisI2PwaOCuEYVinJbyzNi
+kvmaC4Fk/XHIgiV/+M433ah/V2s/ME0uRX+WnKgAFCnaqs050ot+JyaRjXJFhiD+
+/KdWyrIvEjlUF5bXc5wqh4attJP+Da18y2fwWlgJie7w7eGlVbu4cINtT+Rl0Ijc
+28OgpWpcS1HgGEGt2cjZmmhsTtWVGmbbzQOIIlEGI2Y2xPdq29MfIGcXaBXIzV8+
+LZLCDtCVV0WJcLIz7DZmXSDK6Q/qTHTrMLHMbRXbdzMgbpX4QqwHfwV5F3oEdgRQ
+e3lODQJgr31Kej4Rs2lQ8W4P4Dxu9KjI/dwI77Se3QGu9QWq7jszzqKO7AF+hoDD
+m5ypmgsnQi432LZvStEh
+=zOZY
 -----END PGP SIGNATURE-----
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)