From nobody Sat Feb 18 12:37:30 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 4PJp9R1zCPz3sB1g; Sat, 18 Feb 2023 12:37:31 +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 4PJp9R13h4z3KRR; Sat, 18 Feb 2023 12:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676723851; 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=yJy+uSTrynw/TnIszXRMc3JyGryocwc+BOtCHqHUz+A=; b=R7pKzcAApQS5kNe2bgILmyo6vlGwmK9HgXevrnkw6ybajgzIH3n+20G01TTEKdhgTNwO/O DsoD5/DBs+x7/zm4jpAKV1Cr4QwGrMrrG3/EUXPbjs4sGjyBTWRSHJGUXdY9uxCCPY7ac2 /sqda2pBnrM4DKp2zmaznx59NC6pXCgCJOB6jYL5O87Wv3VAaOVhusBZaiyf8CayFfNRH8 /+DsSDeprT+ow8nb2PcvOJOC+BxXMqQM7+sFjHg+38FIcGs6FdksPCLVWu65yx1yvR2pz4 dLrTqCDEUkeur8YKlljE0lKRWBznOBuxoJGLAjOIPL5ep6rxVBgpMgsW9D2dlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676723851; 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=yJy+uSTrynw/TnIszXRMc3JyGryocwc+BOtCHqHUz+A=; b=rEPc7AlLo1DTI5rNIwcf4BguUBFlCvnHs/Nxrrz30P3ku27pMza/ikHfbvyXtlmG2Ntf1z zMAqGt+Be5+oST6i7t3Pu5SB1QgsRG4gclxPeIrWA2m/fSCnZTaLHZ5DntmabtZuFKfBfz 6L5AiZVGPplSEpvN0nS6DPZK7CMd4BlSN8LWFwZbTBt/ILgXkJkUTVxKc8Sj3SC6e0zx7j AlVxkFuuLGvX72GhpVpNYc8LYAC2YX3ysMsIT+zZL4Sne+NFOBWKVV4FWhc++Huz1T8wCu K0zJuihPnz1+e6VhNL7cnJ7VblxNI62PKIC2qCbAvPdsPpqDOdPlrUY5owPcQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676723851; a=rsa-sha256; cv=none; b=mYp49KskyZCm9dTHRZwRMHKvOJbivOgdKBtEokLWEhPQTzfdj9G75//c1TBOUNrBwURoZL jeF2GLdL1Mqkutqu2OaPdSuDmRpq7Im9nRvBpFfinyXChMjibcxlBI3b5Qf9WW3gBa3GEf SgGMzdpatCWBW5z8LeT3uH+UwiqwdFZGzWu/2aoxVeVlUsFtx5YOlSsIPTm9XOgdnAkdEm xCRyh+8f8jWw3irP6KJbCyLyVni17ZiJHYY2xfNyhoxj1Oe0Btsrz8a4lK69DhIqkxmzPs DE56OO0mNyOyEvbEPcQi9oGmFlW2HkZ8DXPMDYErY+yrE4YBAXGL40Jvy4+oQA== 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 4PJp9R06bpzNKW; Sat, 18 Feb 2023 12:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31ICbUou027836; Sat, 18 Feb 2023 12:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31ICbUNR027835; Sat, 18 Feb 2023 12:37:30 GMT (envelope-from git) Date: Sat, 18 Feb 2023 12:37:30 GMT Message-Id: <202302181237.31ICbUNR027835@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: b2ddacb08617 - main - devel/libdbusmenu-qt: fix build on 12.x 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: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2ddacb08617a635f0110e9312b7011c8cca8c81 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2ddacb08617a635f0110e9312b7011c8cca8c81 commit b2ddacb08617a635f0110e9312b7011c8cca8c81 Author: Tobias C. Berner AuthorDate: 2023-02-18 12:03:35 +0000 Commit: Tobias C. Berner CommitDate: 2023-02-18 12:37:21 +0000 devel/libdbusmenu-qt: fix build on 12.x Backported from https://github.com/desktop-app/libdbusmenu-qt/commit/af9fa001dac49eedc76e15613b67abfd097105f3 --- devel/libdbusmenu-qt/files/patch-qt6-support | 108 +++++++++++++++++++++------ 1 file changed, 84 insertions(+), 24 deletions(-) diff --git a/devel/libdbusmenu-qt/files/patch-qt6-support b/devel/libdbusmenu-qt/files/patch-qt6-support index 5765550a40f9..43a9d37b69d9 100644 --- a/devel/libdbusmenu-qt/files/patch-qt6-support +++ b/devel/libdbusmenu-qt/files/patch-qt6-support @@ -140,6 +140,35 @@ ) endif() +--- src/dbusmenuexporter.cpp.orig 2016-02-18 10:13:53 UTC ++++ src/dbusmenuexporter.cpp +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + // Local + #include "dbusmenu_config.h" +@@ -484,7 +485,7 @@ void DBusMenuExporter::activateAction(QAction *action) + { + int id = d->idForAction(action); + DMRETURN_IF_FAIL(id >= 0); +- uint timeStamp = QDateTime::currentDateTime().toTime_t(); ++ uint timeStamp = QDateTime::currentDateTime().toSecsSinceEpoch(); + d->m_dbusObject->ItemActivationRequested(id, timeStamp); + } + +--- src/dbusmenuimporter.cpp.orig 2016-02-18 10:13:53 UTC ++++ src/dbusmenuimporter.cpp +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + // Local + #include "dbusmenutypes_p.h" --- tests/CMakeLists.txt.orig 2016-02-18 10:13:58 UTC +++ tests/CMakeLists.txt @@ -1,9 +1,9 @@ @@ -222,32 +251,63 @@ qt4_automoc(${dbusmenushortcuttest_SRCS}) endif() ---- src/dbusmenuexporter.cpp.orig 2022-08-23 07:04:07 UTC -+++ src/dbusmenuexporter.cpp -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include +--- src/dbusmenushortcut_p.cpp.orig 2023-02-18 11:49:10 UTC ++++ src/dbusmenushortcut_p.cpp +@@ -22,6 +22,7 @@ + + // Qt + #include ++#include // Local - #include "dbusmenu_config.h" -@@ -484,7 +485,7 @@ void DBusMenuExporter::activateAction(QAction *action) - { - int id = d->idForAction(action); - DMRETURN_IF_FAIL(id >= 0); -- uint timeStamp = QDateTime::currentDateTime().toTime_t(); -+ uint timeStamp = QDateTime::currentDateTime().toSecsSinceEpoch(); - d->m_dbusObject->ItemActivationRequested(id, timeStamp); + #include "debug_p.h" +@@ -82,4 +83,30 @@ QKeySequence DBusMenuShortcut::toKeySequence() const + } + QString string = tmp.join(QLatin1String(", ")); + return QKeySequence::fromString(string); ++} ++ ++QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &obj) ++{ ++ int id = qMetaTypeId(); ++ argument.beginArray(id); ++ typename DBusMenuShortcut::ConstIterator it = obj.constBegin(); ++ typename DBusMenuShortcut::ConstIterator end = obj.constEnd(); ++ for ( ; it != end; ++it) ++ argument << *it; ++ argument.endArray(); ++ return argument; ++} ++ ++const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &obj) ++{ ++ argument.beginArray(); ++ obj.clear(); ++ while (!argument.atEnd()) { ++ QStringList item; ++ argument >> item; ++ obj.push_back(item); ++ } ++ argument.endArray(); ++ ++ return argument; } +--- src/dbusmenushortcut_p.h.orig 2023-02-18 11:49:59 UTC ++++ src/dbusmenushortcut_p.h +@@ -30,6 +30,7 @@ class QKeySequence; ---- src/dbusmenuimporter.cpp.orig 2022-08-23 07:00:03 UTC -+++ src/dbusmenuimporter.cpp -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - // Local - #include "dbusmenutypes_p.h" + class QKeySequence; ++class QDBusArgument; + + class DBUSMENU_EXPORT DBusMenuShortcut : public QList + { +@@ -39,5 +40,8 @@ Q_DECLARE_METATYPE(DBusMenuShortcut) + }; + + Q_DECLARE_METATYPE(DBusMenuShortcut) ++ ++DBUSMENU_EXPORT QDBusArgument &operator<<(QDBusArgument &argument, const DBusMenuShortcut &); ++DBUSMENU_EXPORT const QDBusArgument &operator>>(const QDBusArgument &argument, DBusMenuShortcut &); + + #endif /* DBUSMENUSHORTCUT_H */