* [gentoo-commits] repo/gentoo:master commit in: dev-libs/jsoncpp/files/, dev-libs/jsoncpp/
@ 2015-08-10 19:56 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2015-08-10 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 6a293f55fcc2a1d9fb75d0bbd33f2d26105c58d8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 19:57:53 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> 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 <maekke <AT> gentoo.org>
Acked-by: Michał Górny <mgorny <AT> 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 <cdunn2001@gmail.com>
+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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/jsoncpp/files/, dev-libs/jsoncpp/
@ 2024-12-12 12:27 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-12-12 12:27 UTC (permalink / raw
To: gentoo-commits
commit: 898e14a66e2908724fcfcc4d4b2200d7901416f2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 12:19:15 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 12:19:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898e14a6
dev-libs/jsoncpp: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/jsoncpp/Manifest | 1 -
dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch | 21 ---------
dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild | 51 ---------------------
dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild | 51 ---------------------
dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild | 56 ------------------------
dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild | 51 ---------------------
6 files changed, 231 deletions(-)
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 44699d7bdf27..767768ca9f30 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,2 +1 @@
-DIST jsoncpp-1.9.5.tar.gz 216055 BLAKE2B 744275297647be8f1ac7bbf6c818e5106fc122591b3fb68c37cf33f5b3b7d6666e8429bb7ca2ae693202a5a83c274303804e21ebb27f05ba235568bf75a9b375 SHA512 1d06e044759b1e1a4cc4960189dd7e001a0a4389d7239a6d59295af995a553518e4e0337b4b4b817e70da5d9731a4c98655af90791b6287870b5ff8d73ad8873
DIST jsoncpp-1.9.6.tar.gz 212682 BLAKE2B efa5dea68ddc175391200077666204f7ec66cd1f96a889a2a3c53d0e22e1f96ead1a2e7a871940f60dbd4261650f133b83de428b9c8b663fa13bd7ab4b9fdffe SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
diff --git a/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch b/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch
deleted file mode 100644
index 9e24533ae9f9..000000000000
--- a/dev-libs/jsoncpp/files/jsoncpp-1.9.6-cmake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 8d9109992e34cdacd3f2750ada5c2460d346898f Mon Sep 17 00:00:00 2001
-From: Rui Chen <rui@chenrui.dev>
-Date: Thu, 19 Sep 2024 15:10:21 -0400
-Subject: [PATCH] fix(build): remove `check_required_components` for meson
- build
-
-Signed-off-by: Rui Chen <rui@chenrui.dev>
----
- jsoncppConfig.cmake.meson.in | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/jsoncppConfig.cmake.meson.in b/jsoncppConfig.cmake.meson.in
-index 0f4866d6d..be8852d0c 100644
---- a/jsoncppConfig.cmake.meson.in
-+++ b/jsoncppConfig.cmake.meson.in
-@@ -4,5 +4,3 @@
- @MESON_STATIC_TARGET@
-
- include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" )
--
--check_required_components(JsonCpp)
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild
deleted file mode 100644
index 54097e4571ac..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
-SRC_URI="
- https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz
-"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- doc? ( app-text/doxygen )
-"
-
-multilib_src_configure() {
- local emesonargs=(
- # Follow Debian, Ubuntu, Arch convention for headers location
- # bug #452234
- --includedir include/jsoncpp
- -Dtests=$(usex test true false)
- )
- meson_src_configure
-}
-
-src_compile() {
- meson-multilib_src_compile
-
- if use doc; then
- echo "${PV}" > version || die
- "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
- HTML_DOCS=( dist/doxygen/jsoncpp*/. )
- fi
-}
-
-multilib_src_test() {
- # increase test timeout due to failures on slower hardware
- meson_src_test -t 2
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
deleted file mode 100644
index 0fbc59a63899..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit meson python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
-SRC_URI="
- https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz
-"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/25"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- doc? ( app-text/doxygen )
-"
-
-src_configure() {
- local emesonargs=(
- # Follow Debian, Ubuntu, Arch convention for headers location
- # bug #452234
- --includedir include/jsoncpp
- -Dtests=$(usex test true false)
- )
- meson_src_configure
-}
-
-src_compile() {
- meson_src_compile
-
- if use doc; then
- echo "${PV}" > version || die
- "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
- HTML_DOCS=( dist/doxygen/jsoncpp*/. )
- fi
-}
-
-src_test() {
- # increase test timeout due to failures on slower hardware
- meson_src_test -t 2
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild
deleted file mode 100644
index 6f29211cc90b..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
-SRC_URI="
- https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz
-"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/26"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- doc? ( app-text/doxygen )
-"
-
-PATCHES=(
- # https://github.com/open-source-parsers/jsoncpp/pull/1570
- "${FILESDIR}/${P}-cmake.patch"
-)
-
-multilib_src_configure() {
- local emesonargs=(
- # Follow Debian, Ubuntu, Arch convention for headers location
- # bug #452234
- --includedir include/jsoncpp
- -Dtests=$(usex test true false)
- )
- meson_src_configure
-}
-
-src_compile() {
- meson-multilib_src_compile
-
- if use doc; then
- echo "${PV}" > version || die
- "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
- HTML_DOCS=( dist/doxygen/jsoncpp*/. )
- fi
-}
-
-multilib_src_test() {
- # increase test timeout due to failures on slower hardware
- meson_src_test -t 2
-}
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild
deleted file mode 100644
index b38818f791b0..000000000000
--- a/dev-libs/jsoncpp/jsoncpp-1.9.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit meson-multilib python-any-r1
-
-DESCRIPTION="C++ JSON reader and writer"
-HOMEPAGE="https://github.com/open-source-parsers/jsoncpp/"
-SRC_URI="
- https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz
- -> ${P}.tar.gz
-"
-
-LICENSE="|| ( public-domain MIT )"
-SLOT="0/26"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- doc? ( app-text/doxygen )
-"
-
-multilib_src_configure() {
- local emesonargs=(
- # Follow Debian, Ubuntu, Arch convention for headers location
- # bug #452234
- --includedir include/jsoncpp
- -Dtests=$(usex test true false)
- )
- meson_src_configure
-}
-
-src_compile() {
- meson-multilib_src_compile
-
- if use doc; then
- echo "${PV}" > version || die
- "${EPYTHON}" doxybuild.py --doxygen="${EPREFIX}"/usr/bin/doxygen || die
- HTML_DOCS=( dist/doxygen/jsoncpp*/. )
- fi
-}
-
-multilib_src_test() {
- # increase test timeout due to failures on slower hardware
- meson_src_test -t 2
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-12 12:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-12 12:27 [gentoo-commits] repo/gentoo:master commit in: dev-libs/jsoncpp/files/, dev-libs/jsoncpp/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2015-08-10 19:56 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox