Date: Sat, 25 Nov 2023 03:59:52 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fe00c4f9a3f9 - main - devel/dbus: Fix CMake config Message-ID: <202311250359.3AP3xqUJ004161@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe00c4f9a3f94b92dc13ca809a5937b7fa0230ac commit fe00c4f9a3f94b92dc13ca809a5937b7fa0230ac Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2023-11-25 03:48:46 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> 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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311250359.3AP3xqUJ004161>