From nobody Sat Nov 25 04:00:48 2023 X-Original-To: dev-commits-ports-branches@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 4ScdS04tT0z52ZkN; Sat, 25 Nov 2023 04:00:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ScdS04NZVz3db6; Sat, 25 Nov 2023 04:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700884848; 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=onDkMNYrupwR+BWL2ITfFPsWCqQ4l6YP0cTrZ4ZncAk=; b=VakSQpdqMjj+r178T+JZ5Kkt2EoJmDW84nDjsEhf9Fp7pTuyXrF8Hj/bDkSWW10BnuICZL IDsUJkKFP/u2p5jpHEA4hR8DKSIYnVgQHN0fn7+v7EC/N8jmv9H4KR+8caNnKAn9BeKTEa lt4yHpieu0mK1oBYEA9SimxEVLklngb2WswPe5/HBi5T5Na+TewkL004E3NsNLG0AvXgDv d89y658ULGTo8lSmLbFv66XKgvA2LKb71XEuxwtorOTRGXg3sQ4j85EZdHm34D3FGJElDH nIMfVi/ayUJPeO1haZTVzqRUS1mOE6t8g//paggEiFCPCMGsG9Tsu79deHipZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700884848; 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=onDkMNYrupwR+BWL2ITfFPsWCqQ4l6YP0cTrZ4ZncAk=; b=NbCmtI1NEQex/1cRCKui5IifWLvZdwZlHkD7cyIozOtHDXu5Lb0Aj9JqBxytH9UkkWLrsr xua7wXVT2Y3MkCTitk83KPGEOKCgDFpbmy6ePZcMfLSLjV+WmdCR+tVc7ncIhR8jrae/Z7 VuxEF+JF07PwNjRQH5qZF31QzMgqYz/Hu+7cxjVy6x3IU9wIgC5oVNdtirzy286KgLm5Y+ DyKOaB44GD8b1vNGj/4UmgQUOgg9F4MWLZ+AMSqbQVo+lAxD7sFpqb4gbxyFJC1YVUzZhA JxPPa1ZW+08Hs+oz4CM0jjDhL1Gw/MgfrBUFP4ZsVG+LJs5zBWEPmvjnlX+gwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700884848; a=rsa-sha256; cv=none; b=ujmvWQEzSI0rolf9vlYVEciO4nYSM2vKRTLusF2g4Q73WGGmY1sjRCWmqKS6/Lp/+YvAFm mHdymH47wQCP8xzvu0IzOCWESgk0bzjV60nSoRDHI5XpTuneri6BGfVCibKK03JyeaLXjj WrE5yJejMqz8mPeaVh5Yg386NdO7VtpEtgnXsD7uGt2SQNUzHACrUS7aLfl4qho88DA5mW z2qHS8pejCwNasnUDicK04ju4PNrVmwgARuesRQqlyXGmK6+lgovFNvVh85kXxouoatJgk EBvGzzeebunC937StfC8D/kEMLKFdXe6ZPlfh9u0xBl47wq4iHAH+tt/kwtuZA== 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 4ScdS03S1Wz1CGS; Sat, 25 Nov 2023 04:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AP40msX018524; Sat, 25 Nov 2023 04:00:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AP40mLl018510; Sat, 25 Nov 2023 04:00:48 GMT (envelope-from git) Date: Sat, 25 Nov 2023 04:00:48 GMT Message-Id: <202311250400.3AP40mLl018510@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: c3d4fda5198a - 2023Q4 - devel/dbus: Fix CMake config List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: c3d4fda5198ad0fee7a13b55f25188c90596f92e Auto-Submitted: auto-generated The branch 2023Q4 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3d4fda5198ad0fee7a13b55f25188c90596f92e commit c3d4fda5198ad0fee7a13b55f25188c90596f92e Author: Jason E. Hale AuthorDate: 2023-11-25 03:48:46 +0000 Commit: Jason E. Hale CommitDate: 2023-11-25 04:00:35 +0000 devel/dbus: Fix CMake config The CMake config was essentially searching for the dbus pkgconfig file in ${LOCALBASE}/lib/pkgconfig instead of ${LOCALBASE}/libdata/pkgconfig. Not finding it, DBus1_FOUND was being set to false. devel/qt6-base, in particular, was not finding dbus before this change. MFH: 2023Q4 (cherry picked from commit fe00c4f9a3f94b92dc13ca809a5937b7fa0230ac) --- devel/dbus/Makefile | 1 + devel/dbus/files/patch-cmake_DBus1Config.pkgconfig.in | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile index 6f526ca07aaa..d30abdb42873 100644 --- a/devel/dbus/Makefile +++ b/devel/dbus/Makefile @@ -1,5 +1,6 @@ PORTNAME= dbus DISTVERSION= 1.14.10 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel gnome MASTER_SITES= https://dbus.freedesktop.org/releases/dbus/ diff --git a/devel/dbus/files/patch-cmake_DBus1Config.pkgconfig.in b/devel/dbus/files/patch-cmake_DBus1Config.pkgconfig.in new file mode 100644 index 000000000000..cf9b0e58b41f --- /dev/null +++ b/devel/dbus/files/patch-cmake_DBus1Config.pkgconfig.in @@ -0,0 +1,13 @@ +Fix location of pkgconfig directory on FreeBSD. + +--- cmake/DBus1Config.pkgconfig.in.orig 2022-10-02 14:06:53 UTC ++++ cmake/DBus1Config.pkgconfig.in +@@ -8,7 +8,7 @@ + # [1] This variable is not required if DBus1_LIBRARIES is added + # to a target with target_link_libraries + +-get_filename_component(DBus1_PKGCONFIG_DIR "${CMAKE_CURRENT_LIST_DIR}/../../pkgconfig" ABSOLUTE) ++get_filename_component(DBus1_PKGCONFIG_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../libdata/pkgconfig" ABSOLUTE) + get_filename_component(DBus1_NEARBY_ARCH_INCLUDE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../dbus-1.0/include" ABSOLUTE) + find_package(PkgConfig) + if(DEFINED ENV{PKG_CONFIG_DIR})