commit: 18baa1d69c9ec20537212c3136c00d32e9114031 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Feb 8 21:41:42 2026 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Feb 8 21:41:42 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18baa1d6
net-im/spectrum2: update jsoncpp cmake file Closes: https://bugs.gentoo.org/939604 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../files/spectrum2-2.2.1-findjsoncpp.patch | 42 ++++++++++++++++++++++ net-im/spectrum2/spectrum2-2.2.1-r1.ebuild | 1 + 2 files changed, 43 insertions(+) diff --git a/net-im/spectrum2/files/spectrum2-2.2.1-findjsoncpp.patch b/net-im/spectrum2/files/spectrum2-2.2.1-findjsoncpp.patch new file mode 100644 index 000000000000..18a0b0bf90e8 --- /dev/null +++ b/net-im/spectrum2/files/spectrum2-2.2.1-findjsoncpp.patch @@ -0,0 +1,42 @@ +From: Bill Prendergast <[email protected]> + +* enable import of meson compiled jsoncpp cmake module + +--- a/cmake_modules/FindJsonCpp.cmake ++++ b/cmake_modules/FindJsonCpp.cmake +@@ -35,6 +35,11 @@ + # (See accompanying file LICENSE_1_0.txt or copy at + # http://www.boost.org/LICENSE_1_0.txt) + ++# fail if IMPORTED_LOCATION not set, rather than setting to jsoncpp-NOTFOUND ++if(POLICY CMP0111) ++ cmake_policy(SET CMP0111 NEW) ++endif() ++ + set(__jsoncpp_have_namespaced_targets OFF) + set(__jsoncpp_have_interface_support OFF) + if(NOT ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 3.0)) +@@ -169,6 +174,10 @@ if(jsoncpp_FOUND AND NOT __jsoncpp_info_string STREQUAL "${JSONCPP_CACHED_JSONCP + if(__jsoncpp_interface_include_dirs) + set(JSONCPP_IMPORTED_INCLUDE_DIRS "${__jsoncpp_interface_include_dirs}" CACHE INTERNAL "" FORCE) + endif() ++ get_property(__jsoncpp_imported_location TARGET jsoncpp_lib PROPERTY IMPORTED_LOCATION) ++ if(__jsoncpp_imported_location) ++ set(JSONCPP_IMPORTED_LOCATION "${__jsoncpp_imported_location}" CACHE INTERNAL "" FORCE) ++ endif() + endif() + if(TARGET jsoncpp_lib_static AND NOT JSONCPP_IMPORTED_INCLUDE_DIRS) + get_property(__jsoncpp_interface_include_dirs TARGET jsoncpp_lib_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +@@ -255,6 +264,12 @@ if(JSONCPP_FOUND) + endif() + + set(JSONCPP_LIBRARY ${JSONCPP_IMPORTED_LIBRARY}) ++ set_target_properties(jsoncpp_lib PROPERTIES ++ IMPORTED_LOCATION_RELEASE "${JSONCPP_IMPORTED_LOCATION}" ++ IMPORTED_LOCATION_RELWITHDEBINFO "${JSONCPP_IMPORTED_LOCATION}" ++ IMPORTED_LOCATION_MINSIZEREL "${JSONCPP_IMPORTED_LOCATION}" ++ IMPORTED_LOCATION_NONE "${JSONCPP_IMPORTED_LOCATION}" ++ IMPORTED_LOCATION_DEBUG "${JSONCPP_IMPORTED_LOCATION}") + set(JSONCPP_INCLUDE_DIRS ${JSONCPP_IMPORTED_INCLUDE_DIRS}) + if(DEFINED JSONCPP_IMPORTED_LIBRARY_IS_SHARED) + set(JSONCPP_LIBRARY_IS_SHARED ${JSONCPP_IMPORTED_LIBRARY_IS_SHARED}) diff --git a/net-im/spectrum2/spectrum2-2.2.1-r1.ebuild b/net-im/spectrum2/spectrum2-2.2.1-r1.ebuild index 13fc3d69f269..786de9226e4e 100644 --- a/net-im/spectrum2/spectrum2-2.2.1-r1.ebuild +++ b/net-im/spectrum2/spectrum2-2.2.1-r1.ebuild @@ -66,6 +66,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.1-cmake-ld-typo.patch "${FILESDIR}"/${PN}-2.2.1-libcommuni-qt6.patch "${FILESDIR}"/${PN}-2.2.1-frotz-C23.patch + "${FILESDIR}"/${PN}-2.2.1-findjsoncpp.patch ) src_prepare() {
