diff options
| author |   Dominik Kapusta <ayoy@gentoo.org> | 2009-11-08 15:10:44 +0000 |
|---|---|---|
| committer | Dominik Kapusta <ayoy@gentoo.org> | 2009-11-08 15:10:44 +0000 |
| commit | 996045a66bcf06f6ddb1f0649f41babf6efaeffa (patch) | |
| tree | 8d9183033a9898369c1b22c95db5e977572d6017 /dev-libs | |
| parent | Fixing SRC_URI (diff) | |
| download | gentoo-2-996045a66bcf06f6ddb1f0649f41babf6efaeffa.tar.gz gentoo-2-996045a66bcf06f6ddb1f0649f41babf6efaeffa.tar.bz2 gentoo-2-996045a66bcf06f6ddb1f0649f41babf6efaeffa.zip | |
Fix for bug #292387
(Portage version: 2.2_rc49/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/qjson/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/qjson/files/qjson-quint64.patch | 13 | ||||
| -rw-r--r-- | dev-libs/qjson/qjson-0.6.2.ebuild | 5 |
3 files changed, 22 insertions, 2 deletions
diff --git a/dev-libs/qjson/ChangeLog b/dev-libs/qjson/ChangeLog index 0382f7cae4a5..7350173131fb 100644 --- a/dev-libs/qjson/ChangeLog +++ b/dev-libs/qjson/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/qjson # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/ChangeLog,v 1.3 2009/09/16 21:34:41 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/ChangeLog,v 1.4 2009/11/08 15:10:43 ayoy Exp $ + + 08 Nov 2009; Dominik Kapusta <ayoy@gentoo.org> +files/qjson-quint64.patch, + qjson-0.6.2.ebuild: + Fix for bug #292387 *qjson-0.6.2 (16 Sep 2009) diff --git a/dev-libs/qjson/files/qjson-quint64.patch b/dev-libs/qjson/files/qjson-quint64.patch new file mode 100644 index 000000000000..b5f9d4b9cf3d --- /dev/null +++ b/dev-libs/qjson/files/qjson-quint64.patch @@ -0,0 +1,13 @@ +diff --git a/tests/testparser.cpp b/tests/testparser.cpp +index bc84d9d..406423a 100644 +--- a/tests/testparser.cpp ++++ b/tests/testparser.cpp +@@ -267,7 +267,7 @@ void TestParser::testNumbers_data() { + // big number + input = QByteArray("128708157440"); + output = QVariant(QVariant::ULongLong); +- output.setValue(128708157440); ++ output.setValue(Q_UINT64_C(128708157440)); + + QTest::newRow("big number") << input << output << QVariant::ULongLong; + diff --git a/dev-libs/qjson/qjson-0.6.2.ebuild b/dev-libs/qjson/qjson-0.6.2.ebuild index cb8d58ae483c..48b989bba7b9 100644 --- a/dev-libs/qjson/qjson-0.6.2.ebuild +++ b/dev-libs/qjson/qjson-0.6.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.6.2.ebuild,v 1.1 2009/09/16 21:34:41 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/qjson/qjson-0.6.2.ebuild,v 1.2 2009/11/08 15:10:43 ayoy Exp $ EAPI="2" @@ -23,6 +23,9 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${PN}" DOCS=( "${S}/README" ) +# bug 292387 +PATCHES=( "${FILESDIR}/${PN}-quint64.patch" ) + src_configure() { mycmakeargs="${mycmakeargs} $(cmake-utils_use test QJSON_BUILD_TESTS)" |