diff --git a/devel/sdbus-cpp/Makefile b/devel/sdbus-cpp/Makefile index 614f0323d95a..2f337d65450f 100644 --- a/devel/sdbus-cpp/Makefile +++ b/devel/sdbus-cpp/Makefile @@ -1,32 +1,32 @@ PORTNAME= sdbus-cpp DISTVERSIONPREFIX= v -DISTVERSION= 1.1.0 +DISTVERSION= 1.2.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= High-level C++ D-Bus library LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libbasu.so:devel/basu \ libexpat.so:textproc/expat2 TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++17-lang pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= Kistler-Group CMAKE_ON= BUILD_CODE_GEN CMAKE_OFF= BUILD_DOC CMAKE_TESTING_ON= BUILD_TESTS .include .if ${OPSYS} != FreeBSD || ${OSVERSION} < 1300134 LIB_DEPENDS+= libepoll-shim.so:devel/libepoll-shim CFLAGS+= `pkg-config --cflags epoll-shim` LDFLAGS+= `pkg-config --libs epoll-shim` .endif .include diff --git a/devel/sdbus-cpp/distinfo b/devel/sdbus-cpp/distinfo index 9336a3d49d28..418db13cc303 100644 --- a/devel/sdbus-cpp/distinfo +++ b/devel/sdbus-cpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640175451 -SHA256 (Kistler-Group-sdbus-cpp-v1.1.0_GH0.tar.gz) = 35e939fdd9c796522702c9c8762dd59b5c47f3440c01ba9feb9921c042780b55 -SIZE (Kistler-Group-sdbus-cpp-v1.1.0_GH0.tar.gz) = 201532 +TIMESTAMP = 1660031433 +SHA256 (Kistler-Group-sdbus-cpp-v1.2.0_GH0.tar.gz) = 7f7231904abb6a996b8c18ddc5fb50078ef5dff5191649abf9f127aff41d24e9 +SIZE (Kistler-Group-sdbus-cpp-v1.2.0_GH0.tar.gz) = 205798 diff --git a/devel/sdbus-cpp/files/patch-basu b/devel/sdbus-cpp/files/patch-basu index beb0e0c696cd..b31aa3a37623 100644 --- a/devel/sdbus-cpp/files/patch-basu +++ b/devel/sdbus-cpp/files/patch-basu @@ -1,202 +1,213 @@ libsystemd is Linux-only, so replace with basu --- CMakeLists.txt.orig 2021-12-22 12:17:31 UTC +++ CMakeLists.txt @@ -16,7 +16,7 @@ option(BUILD_LIBSYSTEMD "Build libsystemd static libra if(NOT BUILD_LIBSYSTEMD) find_package(PkgConfig REQUIRED) - pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libsystemd>=236) + pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu) if(NOT TARGET PkgConfig::Systemd) message(FATAL_ERROR "libsystemd of version at least 236 is required, but was not found " "(if you have systemd in your OS, you may want to install package containing pkgconfig " @@ -25,8 +25,7 @@ if(NOT BUILD_LIBSYSTEMD) "and incorporate libsystemd as embedded library within sdbus-c++)") endif() add_library(Systemd::Libsystemd ALIAS PkgConfig::Systemd) - string(REGEX MATCHALL "([0-9]+)" SYSTEMD_VERSION_LIST "${Systemd_VERSION}") - list(GET SYSTEMD_VERSION_LIST 0 LIBSYSTEMD_VERSION) + set(LIBSYSTEMD_VERSION "239") message(STATUS "Building with libsystemd v${LIBSYSTEMD_VERSION}") else() # Build static libsystemd library as an external project --- src/Connection.cpp.orig 2021-10-25 07:02:37 UTC +++ src/Connection.cpp @@ -30,7 +30,7 @@ #include #include #include "ScopeGuard.h" -#include +#include #include #include #include --- src/Connection.h.orig 2021-10-25 07:02:37 UTC +++ src/Connection.h @@ -32,7 +32,7 @@ #include "IConnection.h" #include "ScopeGuard.h" #include "ISdBus.h" -#include +#include #include #include #include --- src/Error.cpp.orig 2021-10-25 07:02:37 UTC +++ src/Error.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include #include "ScopeGuard.h" namespace sdbus --- src/Flags.cpp.orig 2021-10-25 07:02:37 UTC +++ src/Flags.cpp @@ -25,7 +25,7 @@ */ #include -#include +#include namespace sdbus { ---- src/IConnection.h.orig 2021-10-25 07:02:37 UTC +--- src/IConnection.h.orig 2022-08-09 07:50:33 UTC +++ src/IConnection.h -@@ -27,7 +27,7 @@ - #ifndef SDBUS_CXX_INTERNAL_ICONNECTION_H_ +@@ -28,7 +28,7 @@ #define SDBUS_CXX_INTERNAL_ICONNECTION_H_ + #include -#include +#include #include #include #include --- src/ISdBus.h.orig 2021-10-25 07:02:37 UTC +++ src/ISdBus.h @@ -28,7 +28,7 @@ #ifndef SDBUS_CXX_ISDBUS_H #define SDBUS_CXX_ISDBUS_H -#include +#include namespace sdbus::internal { --- src/Message.cpp.orig 2021-10-25 07:02:37 UTC +++ src/Message.cpp @@ -31,7 +31,7 @@ #include "ISdBus.h" #include "IConnection.h" #include "ScopeGuard.h" -#include +#include #include namespace sdbus { --- src/Object.cpp.orig 2021-10-25 07:02:37 UTC +++ src/Object.cpp @@ -34,7 +34,7 @@ #include "ScopeGuard.h" #include "IConnection.h" #include "VTableUtils.h" -#include +#include #include #include --- src/Object.h.orig 2021-10-25 07:02:37 UTC +++ src/Object.h @@ -29,7 +29,7 @@ #include #include "IConnection.h" -#include +#include #include #include #include --- src/Proxy.cpp.orig 2021-10-25 07:02:37 UTC +++ src/Proxy.cpp @@ -31,7 +31,7 @@ #include "sdbus-c++/IConnection.h" #include "sdbus-c++/Error.h" #include "ScopeGuard.h" -#include +#include #include #include #include --- src/Proxy.h.orig 2021-10-25 07:02:37 UTC +++ src/Proxy.h @@ -29,7 +29,7 @@ #include #include "IConnection.h" -#include +#include #include #include #include --- src/SdBus.cpp.orig 2021-10-25 07:02:37 UTC +++ src/SdBus.cpp @@ -178,7 +178,8 @@ int SdBus::sd_bus_open_system(sd_bus **ret) int SdBus::sd_bus_open_system_remote(sd_bus **ret, const char *host) { - return ::sd_bus_open_system_remote(ret, host); + // Removed in https://git.sr.ht/~emersion/basu/commit/01d33b244eb6 + return -EOPNOTSUPP; } int SdBus::sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags) --- src/Types.cpp.orig 2021-10-25 07:02:37 UTC +++ src/Types.cpp @@ -27,7 +27,7 @@ #include #include #include "MessageUtils.h" -#include +#include #include namespace sdbus { +--- src/Utils.h.orig 2022-08-09 07:50:33 UTC ++++ src/Utils.h +@@ -28,7 +28,7 @@ + #define SDBUS_CXX_INTERNAL_UTILS_H_ + + #include +-#include ++#include + + #if LIBSYSTEMD_VERSION>=246 + #define SDBUS_CHECK_OBJECT_PATH(_PATH) \ --- src/VTableUtils.c.orig 2021-10-25 07:02:37 UTC +++ src/VTableUtils.c @@ -25,7 +25,7 @@ */ #include "VTableUtils.h" -#include +#include sd_bus_vtable createVTableStartItem(uint64_t flags) { --- src/VTableUtils.h.orig 2021-10-25 07:02:37 UTC +++ src/VTableUtils.h @@ -27,7 +27,7 @@ #ifndef SDBUS_CXX_INTERNAL_VTABLEUTILS_H_ #define SDBUS_CXX_INTERNAL_VTABLEUTILS_H_ -#include +#include #include #ifdef __cplusplus --- tests/integrationtests/DBusStandardInterfacesTests.cpp.orig 2021-10-25 07:02:37 UTC +++ tests/integrationtests/DBusStandardInterfacesTests.cpp @@ -65,8 +65,8 @@ TEST_F(SdbusTestObject, AnswersMachineUuidViaPeerInter // a non-systemd Linux), org.freedesktop.DBus.Peer.GetMachineId() will not work. To solve // this, you can create /etc/machine-id yourself as symlink to /var/lib/dbus/machine-id, // and then org.freedesktop.DBus.Peer.GetMachineId() will start to work. - if (::access("/etc/machine-id", F_OK) == -1) - GTEST_SKIP() << "/etc/machine-id file does not exist, GetMachineId() will not work"; + if (::access("/var/lib/dbus/machine-id", F_OK) == -1) + GTEST_SKIP() << "/var/lib/dbus/machine-id file does not exist, GetMachineId() will not work"; ASSERT_NO_THROW(m_proxy->GetMachineId()); } diff --git a/devel/sdbus-cpp/pkg-plist b/devel/sdbus-cpp/pkg-plist index 63bed691297b..cb7f0b4ae083 100644 --- a/devel/sdbus-cpp/pkg-plist +++ b/devel/sdbus-cpp/pkg-plist @@ -1,29 +1,29 @@ bin/sdbus-c++-xml2cpp include/sdbus-c++/AdaptorInterfaces.h include/sdbus-c++/ConvenienceApiClasses.h include/sdbus-c++/ConvenienceApiClasses.inl include/sdbus-c++/Error.h include/sdbus-c++/Flags.h include/sdbus-c++/IConnection.h include/sdbus-c++/IObject.h include/sdbus-c++/IProxy.h include/sdbus-c++/Message.h include/sdbus-c++/MethodResult.h include/sdbus-c++/ProxyInterfaces.h include/sdbus-c++/StandardInterfaces.h include/sdbus-c++/TypeTraits.h include/sdbus-c++/Types.h include/sdbus-c++/sdbus-c++.h lib/cmake/sdbus-c++-tools/sdbus-c++-tools-config-version.cmake lib/cmake/sdbus-c++-tools/sdbus-c++-tools-config.cmake lib/cmake/sdbus-c++-tools/sdbus-c++-tools-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/sdbus-c++-tools/sdbus-c++-tools-targets.cmake lib/cmake/sdbus-c++/sdbus-c++-config-version.cmake lib/cmake/sdbus-c++/sdbus-c++-config.cmake lib/cmake/sdbus-c++/sdbus-c++-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/sdbus-c++/sdbus-c++-targets.cmake lib/libsdbus-c++.so lib/libsdbus-c++.so.1 -lib/libsdbus-c++.so.1.1.0 +lib/libsdbus-c++.so.1.2.0 libdata/pkgconfig/sdbus-c++-tools.pc libdata/pkgconfig/sdbus-c++.pc