From nobody Wed Feb 22 05:40:19 2023 X-Original-To: dev-commits-ports-branches@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 4PM4kD0qB9z3sKNs; Wed, 22 Feb 2023 05:40: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 4PM4kD0HLzz42d7; Wed, 22 Feb 2023 05:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677044420; 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=z76pvKVdY1WOSWIB93aePa7Pi+zSbbwpVOKzSAZFnLg=; b=P7um8e9JL3TBHTabuT8f3jdO6NgYQuJu3o1XmuXMxTZa2K57aE32b0N7ZXH7BhVuEzjTTX xbHZ4JyXjGtLp7xGoEGtMtWf5huTUr0+P5hlK3GwlydjU68qPcQs8cadhll1KROwFG9w9/ /8I0o+/EI7CvhtR+XlWypSV3HGVg8cFOo6u3lQ9QFH4YiX3uYUS1cVo6d+a8gWpT/R9zHu 0GSqZNrMmOgJ/RhFw1YUKiXs4R8CixPKpM+fvBDCyls8Cfe7KFyPUNUuO0nrCzUiVYpw3i P/CAkUYx1Acjwyt5tgsF+ZLCfD4eiCOh3BOsRxa0/rnmMEaPxlWgWlXg+R94QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677044420; 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=z76pvKVdY1WOSWIB93aePa7Pi+zSbbwpVOKzSAZFnLg=; b=qC1Ja7YsHQyKAd5J5APbqRHl5tDZKdf8m2tLtR1NZ034AaF5sbrFUzcOqL5oL/uM1zN/2a E0lFNz0LXpDtW6cCVgCVwtf0HSY+zneW7ROxGfltssShicMBSysq8Ih3EDToVF7YqKkJMB eGaA1wVy5HZXMQxTQUHKshI2XqBVmgOyR4PkF/9/OhP6q8Bt0zFNBklLAva/oB9pj2vLqk 6NYLeL1tl5XXd6T4oOnG54jOriIkph59wNMvhtpgUOuzD06cCu7YpFWvGIg8b+Vhl5OLdD LIy9box/PGk43nk8oC03lR5mgItSFOxMyDJrKPX/Vc+7nqzcNWPTQv2srSay2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677044420; a=rsa-sha256; cv=none; b=lwVmAyBFgApOztfJOKk06dcJJgCKMMZxOSvH202R23gwqin3MvoC+MHkD8ZSOxOS1B7PzZ tu9+8GpVgFSWufm3clMa/Olgz6hVi9KWQ98X618EMDE5ArDKrXFLGax5wjSRV3O7Hmnmiq +nhljFTQgJh8dgi7G65ToLYX+e624y5E69g6Amm1FjffPVenRT5ZuRFK2yEolQ5v9AboLs QHYYUqXtwP3JOISqs/euh9U+uwf39icpERNpALRmI4AI0mWndI9iisGlHzW5mmO006i6rj QD6la8sAkY5lZ0+S89xMCbA2ZWNee6k56lAJYYtvRya3R5uvW/5vbnIgpV+ARg== 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 4PM4kC6Sr4zpfl; Wed, 22 Feb 2023 05:40:19 +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 31M5eJSm065745; Wed, 22 Feb 2023 05:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31M5eJaq065744; Wed, 22 Feb 2023 05:40:19 GMT (envelope-from git) Date: Wed, 22 Feb 2023 05:40:19 GMT Message-Id: <202302220540.31M5eJaq065744@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Tobias C. Berner" Subject: git: b17cebc8f9f6 - 2023Q1 - devel/libdbusmenu-qt: fix build on 12.x List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q1 X-Git-Reftype: branch X-Git-Commit: b17cebc8f9f69ae493dfbe9ff66da397d115d0b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=b17cebc8f9f69ae493dfbe9ff66da397d115d0b9 commit b17cebc8f9f69ae493dfbe9ff66da397d115d0b9 Author: Tobias C. Berner AuthorDate: 2023-02-18 12:03:35 +0000 Commit: Tobias C. Berner CommitDate: 2023-02-22 05:40:11 +0000 devel/libdbusmenu-qt: fix build on 12.x Backported from https://github.com/desktop-app/libdbusmenu-qt/commit/af9fa001dac49eedc76e15613b67abfd097105f3 (cherry picked from commit b2ddacb08617a635f0110e9312b7011c8cca8c81) --- 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 */