From nobody Sat Nov 25 03:59:52 2023 X-Original-To: dev-commits-ports-main@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 4ScdQw3L6Zz52ZV6; Sat, 25 Nov 2023 03:59:52 +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 4ScdQw2ZWqz3dTQ; Sat, 25 Nov 2023 03:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700884792; 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=uK7KFxSJL++xJCOTqOZVn8r7n/zrpFbFPMJDs37FoIs=; b=ZmAokyTYD+8A0ctJvPhh5FqVhp5gto3R8PbD/IsSdwqhSHSXfuM9V/5jlipTOvFu3cIxXy +BPUGsRMVaaZkKRsNQmBMEkMP1Toj9qFN5Svb1U6RWVumiJ/0oTi8SBz6/uIaey+uKstn+ d4uiuDc44Fjc3nPvbo30appmSm5uNfLlN8iT7cln9qHvXmPSB3HO24zXLOoI2pSGwoSYFB grjIYtFGdGntMYU5Dh5FF65RNuIndVus/fL/0PlC5do+20aZWPn1/aQ2U7NJi0QG9H2Rgx NUrYrBq9Pg0k5N2uDdP/uaT/0ecySPInOPrk29Mvz9rb3aMVo2N6pZNeOtWc7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700884792; 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=uK7KFxSJL++xJCOTqOZVn8r7n/zrpFbFPMJDs37FoIs=; b=hEeZoPDpRyXWrepWnH+u3MrDcY36tU5Fw3C/+kRRNq6zoK6kuZqIVIefEh+G2HtAGqsbQo J1B/V5dKPaiiUuq8QzSN7vS9oId6XpPQyHAyeletyDKivi82qBgotpaYLKB1nD44OKJuVi 8Bb89rzhM9piuaUFkBGhBl1/W+/3lx80lNDQKkSsbRBTzOzgRswb4rez17mQSyGice/5L2 rvMC18znfAPTg07/OaPyMmQr2rl0mRgL/Kkah8gFVFQHqtoX17iXtULMipSj920W4vhs+H 4PHuBCUv/GCZv1F1QijcTyhnknDN8+Wyfk1IS8ydOpWNgAU1MkEhe324Hu9DOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700884792; a=rsa-sha256; cv=none; b=ovEFttD4/xC0OFhLVzfQsdBquHJZ11jrFBJZ5pmP0Pbq2Mk6DmJ8hzXnpMaY/3TmeSgSAV 1CTTAZO0TK/T8NJmFmMrt9k++pAfRekn9dVeVXuEqlRuAv1zI+nkfssyxtrDQ0qSsTbFQ1 FwQ0sxVcKVuSYFXZ/5rtg1CS17zdV+YVt2hEESRLaEsiQppN0CcG1a6moQQerKaEsSnPnT ci8W8mOkqWpCUkcNHe7gOd1s7ZM2jP9gOUkblAAaIy1lYUbp6F4ssn+2UDyzadQZkLReIl 7ywlmvBcx2jBxJUNpK0rhYcM6uJjHKz4ewm9c9ZlzbUXf5Fo7+YzKPYL1Gs/hQ== 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 4ScdQw1NJJz1Cbb; Sat, 25 Nov 2023 03:59:52 +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 3AP3xqq1004164; Sat, 25 Nov 2023 03:59:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AP3xqUJ004161; Sat, 25 Nov 2023 03:59:52 GMT (envelope-from git) Date: Sat, 25 Nov 2023 03:59:52 GMT Message-Id: <202311250359.3AP3xqUJ004161@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: fe00c4f9a3f9 - main - devel/dbus: Fix CMake config List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: fe00c4f9a3f94b92dc13ca809a5937b7fa0230ac Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe00c4f9a3f94b92dc13ca809a5937b7fa0230ac commit fe00c4f9a3f94b92dc13ca809a5937b7fa0230ac Author: Jason E. Hale AuthorDate: 2023-11-25 03:48:46 +0000 Commit: Jason E. Hale CommitDate: 2023-11-25 03:59:44 +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 --- 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})