From nobody Fri Sep 8 20:06:19 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 4Rj6Z41YkXz4sMZb; Fri, 8 Sep 2023 20:06:20 +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 4Rj6Z413ngz4TcZ; Fri, 8 Sep 2023 20:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694203580; 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=R6Vtl3P/P7mwUTU/b3PIutPoUkqxfq/F1EfOjvyul3g=; b=Nj4vpCIIibxpVtt02wfPU1cjTQ3633WeeZZg/xVDI0+5FzOTw3OzkAofALMGaUnx5PCZ2X FnQn+lOM1an1OC/xDero//3wxG9ykpkzPIjOldxBMr8lfyujSVM1VJX4dWbpa4ZTll8BXw l/CDjZJfTW0zYyiibHFxBPHMbZowr6CLM3tQ+aBiiHRYeoyu3OBKz7wYB4KGHmA2SbzIXl /5IlQNBFSVta8J29nRCnUssA2fhKAJHQn+xinr+EN5NNAytSCP5l311hNTggimFiPTVkWm ng+6kmH83T1evjT19imuK3wUoEMCbMyD+h6USyHiKf5PiI8HwFcOWJFcKhs8TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694203580; a=rsa-sha256; cv=none; b=kPfrgEBiCo+3G2lvgH3MBpBsJxuG4ClScx32DTwrKu8PVAe9XPb9PwrR3W8zWR9fu8/Ipd iKRCyTC5imyJxORHpeTiNNhx4ce3Ft9uFcdtjMtGSB/qvZBCATpnQ47+74+qxLapqbNDoX Wgdbb0Nj95+faN3RMVdnZGC6SJOj3L4A+Ae7nRcnFPCjuuMcru6dQb/7Gr9zuUR5/Dgly0 +QFwjaSMxfU5OzW614LIA6ctIDzxxNgJRZV09S41crMohv6N/HMdBdLOHrmKDuwVNsP/CE HYSIOEc5uvl9stgBkonQb9rEmPaQO0UjFxpszJyhzMDwdHU64itwZAXC86/tWg== 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=1694203580; 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=R6Vtl3P/P7mwUTU/b3PIutPoUkqxfq/F1EfOjvyul3g=; b=dwEKxKH6fNmkF/BQXhxBx7rYAQZ46tbqjkSGSCeVTkMf2K9fKKDqcDKDstgv1YJPDDiBj7 iX8789+Rs7EwK2zzQNOuRK+vmvidg52eNSldjp/x+bgyPTaWXgoMTcivU9pDwji1oJeipN nxeBC5hKCNQCT9FXTDW5XK4ECrOE+1RuPvBvrBeUkiN5nOde1diGRMtzAEhGZ4ULhGbkOw iUVGKLvlBZELQ3sKYgVjXUEwouBPuU69V5uQwTYvVtlVrVX/oMUbpQxjzL6CplCMYPhs6A I8ytXa0KB5b1aKABbFkFqgmaaNB+X2z89AVCScIFzQAT0637qU+txgbbbQgftw== 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 4Rj6Z4019Hzvyh; Fri, 8 Sep 2023 20:06:19 +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 388K6JrT024522; Fri, 8 Sep 2023 20:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388K6J0a024520; Fri, 8 Sep 2023 20:06:19 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:06:19 GMT Message-Id: <202309082006.388K6J0a024520@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: b80e4a374020 - main - devel/sdbus-cpp: switch to upstreamable patches 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b80e4a374020da30c567ed84918767f02f835109 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b80e4a374020da30c567ed84918767f02f835109 commit b80e4a374020da30c567ed84918767f02f835109 Author: Jan Beich AuthorDate: 2023-09-08 19:57:26 +0000 Commit: Jan Beich CommitDate: 2023-09-08 20:05:26 +0000 devel/sdbus-cpp: switch to upstreamable patches --- devel/sdbus-cpp/Makefile | 5 + devel/sdbus-cpp/distinfo | 6 + devel/sdbus-cpp/files/patch-basu | 288 --------------------------------------- 3 files changed, 11 insertions(+), 288 deletions(-) diff --git a/devel/sdbus-cpp/Makefile b/devel/sdbus-cpp/Makefile index cb594b5ae465..2ae17ff5550c 100644 --- a/devel/sdbus-cpp/Makefile +++ b/devel/sdbus-cpp/Makefile @@ -4,6 +4,11 @@ DISTVERSION= 1.3.0 PORTREVISION= 2 CATEGORIES= devel +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 33bc728d3a67.patch:-p1 # https://github.com/Kistler-Group/sdbus-cpp/pull/358 +PATCHFILES+= 600d3f2e5d8a.patch:-p1 # https://github.com/Kistler-Group/sdbus-cpp/pull/358 +PATCHFILES+= 4a89f970e6be.patch:-p1 # https://github.com/Kistler-Group/sdbus-cpp/pull/358 + MAINTAINER= jbeich@FreeBSD.org COMMENT= High-level C++ D-Bus library WWW= https://github.com/Kistler-Group/sdbus-cpp diff --git a/devel/sdbus-cpp/distinfo b/devel/sdbus-cpp/distinfo index 5d09bebdfaf8..2ffa218d0ecb 100644 --- a/devel/sdbus-cpp/distinfo +++ b/devel/sdbus-cpp/distinfo @@ -1,3 +1,9 @@ TIMESTAMP = 1692524744 SHA256 (Kistler-Group-sdbus-cpp-v1.3.0_GH0.tar.gz) = d44f59abdd64d8f1ca3af7db58bc6518cb081fc9ff16285c3d75a68f5c073d10 SIZE (Kistler-Group-sdbus-cpp-v1.3.0_GH0.tar.gz) = 217150 +SHA256 (33bc728d3a67.patch) = cd2bee5d93375711d7fd42138abd1f6dfcae46e471dec26253c49047c257841c +SIZE (33bc728d3a67.patch) = 8296 +SHA256 (600d3f2e5d8a.patch) = 2819b5b9020e6ce819d225d1a59f7774120bfb37b3d46bfc6a75da9ae8d5fc22 +SIZE (600d3f2e5d8a.patch) = 1967 +SHA256 (4a89f970e6be.patch) = eacc1fb7f884a95ce481f442af0d8ea194d0485d0dae40e6e01d61e5945acaf7 +SIZE (4a89f970e6be.patch) = 1652 diff --git a/devel/sdbus-cpp/files/patch-basu b/devel/sdbus-cpp/files/patch-basu deleted file mode 100644 index 79391ccc797b..000000000000 --- a/devel/sdbus-cpp/files/patch-basu +++ /dev/null @@ -1,288 +0,0 @@ -libsystemd is Linux-only, so replace with basu - ---- CMakeLists.txt.orig 2023-08-20 09:45:44 UTC -+++ CMakeLists.txt -@@ -26,6 +26,11 @@ if(NOT BUILD_LIBSYSTEMD) - set(LIBSYSTEMD "libelogind") - string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION}) - list(GET VERSION_LIST 0 Systemd_VERSION) -+ else() -+ pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu) -+ set(LIBSYSTEMD "basu") -+ # https://git.sr.ht/~emersion/basu/commit/d4d185d29a26 -+ set(Systemd_VERSION "240") - endif() - endif() - if(NOT TARGET PkgConfig::Systemd) ---- src/Connection.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/Connection.cpp -@@ -31,7 +31,13 @@ - #include - #include - #include "ScopeGuard.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - #include - #include ---- src/Connection.h.orig 2023-08-20 09:45:44 UTC -+++ src/Connection.h -@@ -32,7 +32,13 @@ - #include "IConnection.h" - #include "ScopeGuard.h" - #include "ISdBus.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - #include - #include ---- src/Error.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/Error.cpp -@@ -25,7 +25,13 @@ - */ - - #include -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include "ScopeGuard.h" - - namespace sdbus ---- src/Flags.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/Flags.cpp -@@ -25,7 +25,13 @@ - */ - - #include -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - - namespace sdbus - { ---- src/IConnection.h.orig 2023-08-20 09:45:44 UTC -+++ src/IConnection.h -@@ -28,7 +28,13 @@ - #define SDBUS_CXX_INTERNAL_ICONNECTION_H_ - - #include -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - #include - #include ---- src/ISdBus.h.orig 2023-08-20 09:45:44 UTC -+++ src/ISdBus.h -@@ -28,7 +28,13 @@ - #ifndef SDBUS_CXX_ISDBUS_H - #define SDBUS_CXX_ISDBUS_H - -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - - namespace sdbus::internal { - ---- src/Message.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/Message.cpp -@@ -31,7 +31,13 @@ - #include "ISdBus.h" - #include "IConnection.h" - #include "ScopeGuard.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - - namespace sdbus { ---- src/Object.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/Object.cpp -@@ -35,7 +35,13 @@ - #include "IConnection.h" - #include "Utils.h" - #include "VTableUtils.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - #include - ---- src/Object.h.orig 2023-08-20 09:45:44 UTC -+++ src/Object.h -@@ -29,7 +29,13 @@ - - #include - #include "IConnection.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - #include - #include ---- src/Proxy.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/Proxy.cpp -@@ -32,7 +32,13 @@ - #include "sdbus-c++/IConnection.h" - #include "sdbus-c++/Error.h" - #include "ScopeGuard.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - #include - #include ---- src/Proxy.h.orig 2023-08-20 09:45:44 UTC -+++ src/Proxy.h -@@ -29,7 +29,13 @@ - - #include - #include "IConnection.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - #include - #include ---- src/SdBus.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/SdBus.cpp -@@ -224,7 +224,12 @@ int SdBus::sd_bus_open_system_remote(sd_bus **ret, con - - int SdBus::sd_bus_open_system_remote(sd_bus **ret, const char *host) - { -+#if __has_include() || __has_include() - return ::sd_bus_open_system_remote(ret, host); -+#else -+ // Removed in https://git.sr.ht/~emersion/basu/commit/01d33b244eb6 -+ return -EOPNOTSUPP; -+#endif - } - - int SdBus::sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags) ---- src/Types.cpp.orig 2023-08-20 09:45:44 UTC -+++ src/Types.cpp -@@ -27,7 +27,13 @@ - #include - #include - #include "MessageUtils.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - - namespace sdbus { ---- src/Utils.h.orig 2023-08-20 09:45:44 UTC -+++ src/Utils.h -@@ -28,7 +28,13 @@ - #define SDBUS_CXX_INTERNAL_UTILS_H_ - - #include -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - - #if LIBSYSTEMD_VERSION>=246 - #define SDBUS_CHECK_OBJECT_PATH(_PATH) \ ---- src/VTableUtils.c.orig 2023-08-20 09:45:44 UTC -+++ src/VTableUtils.c -@@ -25,7 +25,13 @@ - */ - - #include "VTableUtils.h" -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - - sd_bus_vtable createVTableStartItem(uint64_t flags) - { ---- src/VTableUtils.h.orig 2023-08-20 09:45:44 UTC -+++ src/VTableUtils.h -@@ -27,7 +27,13 @@ - #ifndef SDBUS_CXX_INTERNAL_VTABLEUTILS_H_ - #define SDBUS_CXX_INTERNAL_VTABLEUTILS_H_ - -+#if __has_include() - #include -+#elif __has_include() -+#include -+#else -+#include -+#endif - #include - - #ifdef __cplusplus ---- tests/integrationtests/DBusStandardInterfacesTests.cpp.orig 2023-08-20 09:45:44 UTC -+++ tests/integrationtests/DBusStandardInterfacesTests.cpp -@@ -65,8 +65,14 @@ 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 __has_include() - if (::access("/etc/machine-id", F_OK) == -1) - GTEST_SKIP() << "/etc/machine-id file does not exist, GetMachineId() will not work"; -+#else -+ if (::access("/etc/machine-id", F_OK) == -1 && -+ ::access("/var/lib/dbus/machine-id", F_OK) == -1) -+ GTEST_SKIP() << "/etc/machine-id and /var/lib/dbus/machine-id file do not exist, GetMachineId() will not work"; -+#endif - - ASSERT_NO_THROW(m_proxy->GetMachineId()); - }