From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78687158015 for ; Mon, 25 Dec 2023 11:43:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8C1D42BC013; Mon, 25 Dec 2023 11:43:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C0C32BC013 for ; Mon, 25 Dec 2023 11:43:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8194833E3A9 for ; Mon, 25 Dec 2023 11:43:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1A56AC2 for ; Mon, 25 Dec 2023 11:43:31 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1703503960.e402b0a11e8232c36426726067f2e4f3d5c21c94.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/kwayland-integration/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/kwayland-integration/files/kwayland-integration-5.91.0-kwindowsystem-no-widgets.patch X-VCS-Directories: kde-plasma/kwayland-integration/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e402b0a11e8232c36426726067f2e4f3d5c21c94 X-VCS-Branch: master Date: Mon, 25 Dec 2023 11:43:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c11b8829-339f-4e6a-acf0-ed3c27280358 X-Archives-Hash: a15769de58967070680ee98d6adf476b commit: e402b0a11e8232c36426726067f2e4f3d5c21c94 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 25 11:32:40 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 25 11:32:40 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e402b0a1 kde-plasma/kwayland-integration: Drop obsolete patch Signed-off-by: Andreas Sturmlechner gentoo.org> ...tegration-5.91.0-kwindowsystem-no-widgets.patch | 68 ---------------------- 1 file changed, 68 deletions(-) diff --git a/kde-plasma/kwayland-integration/files/kwayland-integration-5.91.0-kwindowsystem-no-widgets.patch b/kde-plasma/kwayland-integration/files/kwayland-integration-5.91.0-kwindowsystem-no-widgets.patch deleted file mode 100644 index 5fc4f00925..0000000000 --- a/kde-plasma/kwayland-integration/files/kwayland-integration-5.91.0-kwindowsystem-no-widgets.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b672d78b8fa59e0e41dab7d06816ea751f24b461 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sat, 16 Dec 2023 19:57:03 +0100 -Subject: [PATCH] Fix build against KF5WindowSystem with - -DKWINDOWSYSTEM_NO_WIDGETS=ON - -Deprecation #ifdefs got lost between 1102b5470e0573efe817ca12e649977007d3e6c0 and 4a3ae83979507598fae29d1b6d0a449779fda5eb. - -5.101 deprecation #ifdefs are still missing after this change. - -Signed-off-by: Andreas Sturmlechner ---- - src/windowsystem/windowsystem.cpp | 4 ++++ - src/windowsystem/windowsystem.h | 2 ++ - 2 files changed, 6 insertions(+) - -diff --git a/src/windowsystem/windowsystem.cpp b/src/windowsystem/windowsystem.cpp -index 9266ddd..6f67129 100644 ---- a/src/windowsystem/windowsystem.cpp -+++ b/src/windowsystem/windowsystem.cpp -@@ -192,12 +192,14 @@ QPoint WindowSystem::desktopToViewport(int desktop, bool absolute) - return QPoint(); - } - -+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0) - WId WindowSystem::groupLeader(WId window) - { - Q_UNUSED(window) - qCDebug(KWAYLAND_KWS) << "This plugin does not support group leader"; - return 0; - } -+#endif - - bool WindowSystem::icccmCompliantMappingState() - { -@@ -549,12 +551,14 @@ QList WindowSystem::stackingOrder() - return QList(); - } - -+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0) - WId WindowSystem::transientFor(WId window) - { - Q_UNUSED(window) - qCDebug(KWAYLAND_KWS) << "This plugin does not support transient for windows"; - return 0; - } -+#endif - - int WindowSystem::viewportToDesktop(const QPoint &pos) - { -diff --git a/src/windowsystem/windowsystem.h b/src/windowsystem/windowsystem.h -index 8c978e6..c59675a 100644 ---- a/src/windowsystem/windowsystem.h -+++ b/src/windowsystem/windowsystem.h -@@ -42,8 +42,10 @@ public: - void setOnAllDesktops(WId win, bool b) override; - void setOnDesktop(WId win, int desktop) override; - void setOnActivities(WId win, const QStringList &activities) override; -+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0) - WId transientFor(WId window) override; - WId groupLeader(WId window) override; -+#endif - QPixmap icon(WId win, int width, int height, bool scale, int flags) override; - void setIcons(WId win, const QPixmap &icon, const QPixmap &miniIcon) override; - void setType(WId win, NET::WindowType windowType) override; --- -GitLab -