From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 52E8E1386F2 for ; Mon, 10 Aug 2015 19:56:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A16909578F; Mon, 10 Aug 2015 19:56:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4EAA19578F for ; Mon, 10 Aug 2015 19:56:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A8D834084A for ; Mon, 10 Aug 2015 19:56:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E68E211B for ; Mon, 10 Aug 2015 19:56:29 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1439236715.6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/jsoncpp/files/, dev-libs/jsoncpp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild X-VCS-Directories: dev-libs/jsoncpp/files/ dev-libs/jsoncpp/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8 X-VCS-Branch: master Date: Mon, 10 Aug 2015 19:56:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 438cc5c3-a495-475a-8ca9-3c80e8bac90d X-Archives-Hash: a8b86fdcfba9d0133d7d84fd6b4255f0 commit: 6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8 Author: Johannes Huber gentoo org> AuthorDate: Mon Aug 10 19:57:53 2015 +0000 Commit: Johannes Huber gentoo org> CommitDate: Mon Aug 10 19:58:35 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a293f55 dev-libs/jsoncpp: Fix build on arm, bug #552572 Adds upstream patch commit: 96412d2964775fd6fb9bf359936743dd508af8ba Gentoo-bug: 552572 Acked-by: Markus Meier gentoo.org> Acked-by: Michał Górny gentoo.org> Package-Manager: portage-2.2.20 dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch | 25 +++++++++++++++++++++++++ dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild | 1 + 2 files changed, 26 insertions(+) diff --git a/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch b/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch new file mode 100644 index 0000000..838ef84 --- /dev/null +++ b/dev-libs/jsoncpp/files/jsoncpp-0.10.2-arm.patch @@ -0,0 +1,25 @@ +From 96412d2964775fd6fb9bf359936743dd508af8ba Mon Sep 17 00:00:00 2001 +From: Christopher Dunn +Date: Wed, 10 Jun 2015 21:22:24 -0500 +Subject: [PATCH] fix #290 + +(cherry picked from commit 2760c7902a5cc7173aabe4e1f31dcf93e79377d5) +--- + src/test_lib_json/main.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp +index 85110ad..080ba6e 100644 +--- a/src/test_lib_json/main.cpp ++++ b/src/test_lib_json/main.cpp +@@ -296,7 +296,10 @@ JSONTEST_FIXTURE(ValueTest, null) { + JSONTEST_ASSERT_EQUAL(0.0, null_.asFloat()); + JSONTEST_ASSERT_STRING_EQUAL("", null_.asString()); + ++#if !defined(__ARMEL__) ++ // See line #165 of include/json/value.h + JSONTEST_ASSERT_EQUAL(Json::Value::null, null_); ++#endif + } + + JSONTEST_FIXTURE(ValueTest, strings) { diff --git a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild index 08d7734..e6c618b 100644 --- a/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild +++ b/dev-libs/jsoncpp/jsoncpp-0.10.2-r1.ebuild @@ -29,6 +29,7 @@ RDEPEND="" PATCHES=( # fix broken path subst in .pc file "${FILESDIR}"/jsoncpp-1.6.2-fix-pkgconfig.patch + "${FILESDIR}/${P}-arm.patch" ) pkg_setup() {