From nobody Fri Sep 13 17:57:11 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X527q5PzDz5VvHc; Fri, 13 Sep 2024 17:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X527q3nLgz56XL; Fri, 13 Sep 2024 17:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726250231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnkYmWIT/NHq99g2FmjwZFADOn+hrpQev0AeesHwLig=; b=CM6kabO5Jmh5V5D3ptBF1jojJ7o2pf45OHZlBCPvvavS1m2H2hvZOxZI8irzHgH9s31WTi GKN1to1kyIT1dH/9oIjswnFNgpcqNXffH/PGJlJtZdbMd8savbsh9rRr2LLRVZ4sF1uyKb gWqgcEp/SmdvuwBMHWR0Sbv0Hyo1SrjUfk+RAhDWpcpt38cXrl9Y25lf4aEQCJMAIMYToM huTbH8ycBpW6EzCDrmaJsTFKndttpRIBDdmFealHj5EHI2l1CXUjQjCLpa1L1AdFJI97i/ 2dq7Yil/R6rJ0NGfFX/N7VdfktM6PH39yRs1cFcs7gECkMu+BYFmSG45zRcI0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726250231; a=rsa-sha256; cv=none; b=rktKcpI/ySbor2tjfzQ+EsnXWv1xGlSyGktq5WYZmi3x1bo8X9wec2heUiM6YyvB+H2HZc hGwIypneI5yJS4nDDTS1hjGKtaHqMdr/e4Xsz0z/3ibpIPOCxZGpwq3s5l7KC/l1bJ/1Mr CDNARXjiv/6tIhETfebj7CFqVeO3gSL3L0mw409V8plxcS6UaOvZ6JRX8O4AXfQAdCM7Mq GCMrz/346LCD/tsqfh7lFjlpRa0H/ZMllAedLycvstWDPiBkI2xF/EW6ETP741aajYIYUe hoLt3qZ+u3pOHxZuqdw1uJKTvxTzA7+VyZqVuzXlo1TS/R+CzM/mpchWAyMS/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726250231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OnkYmWIT/NHq99g2FmjwZFADOn+hrpQev0AeesHwLig=; b=PAwdFqD70/ocOnBPQ9/59AUueBpYHqtc0wDTCvsX7/jMal3J8jdNVczz+6k7tLw+CjRNvt issZ0o9oJj694j2SnAk2kMnGezqCJ8VDhA5pmEhMS3aQ3JwK3P5IAXXLAm3y2uNAIJ8uHt 91ur1Rm989mP8lEW+w4PBmsqaEpPj4zJWVKChWI71i6WLYmIHwm35WPoukOa3IU/HMIQ8V Vk8bGx+v/Eb0z8vl6HW7LsSxp4LjWLIxLFIGDLnBkgy0ZF8sA/KOg/RXTzPcQJrx6yD+/D 2SjI4UlfP7MNkyKozOce5abNLrnEqoZ1XvBKYtK0XP37cjhekeIZkGkog2oEfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X527q3FymzsyK; Fri, 13 Sep 2024 17:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48DHvB0s042833; Fri, 13 Sep 2024 17:57:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48DHvBbi042830; Fri, 13 Sep 2024 17:57:11 GMT (envelope-from git) Date: Fri, 13 Sep 2024 17:57:11 GMT Message-Id: <202409131757.48DHvBbi042830@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 9295e1f45704 - main - devel/jsoncpp: Fix regression in 'find_package(jsoncpp)' List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9295e1f45704eac6d89bb2e18ab3eb12565ce56c Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=9295e1f45704eac6d89bb2e18ab3eb12565ce56c commit 9295e1f45704eac6d89bb2e18ab3eb12565ce56c Author: Yuri Victorovich AuthorDate: 2024-09-13 17:54:39 +0000 Commit: Yuri Victorovich CommitDate: 2024-09-13 17:57:09 +0000 devel/jsoncpp: Fix regression in 'find_package(jsoncpp)' 1.9.6 introduced a regression that find_package is failing: Unknown CMake command "check_required_components" Reported by: Vladimir Druzenko --- devel/jsoncpp/Makefile | 1 + .../files/patch-jsoncppConfig.cmake.meson.in | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile index a05c1bc14a4e..c694b53a7bb1 100644 --- a/devel/jsoncpp/Makefile +++ b/devel/jsoncpp/Makefile @@ -1,5 +1,6 @@ PORTNAME= jsoncpp DISTVERSION= 1.9.6 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org diff --git a/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in b/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in new file mode 100644 index 000000000000..ea15d52a7708 --- /dev/null +++ b/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in @@ -0,0 +1,23 @@ +- workaround for https://github.com/open-source-parsers/jsoncpp/issues/1568 +- [1.9.6 regression] 'find_package(jsoncpp REQUIRED)' fails: Unknown CMake command "check_required_components" + +--- jsoncppConfig.cmake.meson.in.orig 2024-09-13 17:50:33 UTC ++++ jsoncppConfig.cmake.meson.in +@@ -3,6 +3,17 @@ + @MESON_SHARED_TARGET@ + @MESON_STATIC_TARGET@ + ++macro(check_required_components _NAME) ++ foreach(comp ${${_NAME}_FIND_COMPONENTS}) ++ if(NOT ${_NAME}_${comp}_FOUND) ++ if(${_NAME}_FIND_REQUIRED_${comp}) ++ set(${_NAME}_FOUND FALSE) ++ endif() ++ endif() ++ endforeach() ++endmacro() ++ ++ + include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" ) + + check_required_components(JsonCpp)