commit: dea9da206f63decb6c414b5c6c9cb5068db99640 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 25 19:16:18 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Sep 26 10:17:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dea9da20
kde-plasma/xdg-desktop-portal-kde: drop 6.3.6-r1 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/xdg-desktop-portal-kde/Manifest | 1 - ...desktop-portal-kde-6.3.5-screencast-crash.patch | 47 --------------- .../xdg-desktop-portal-kde-6.3.6-r1.ebuild | 68 ---------------------- 3 files changed, 116 deletions(-) diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest index 2f87b50b98d4..488fde857265 100644 --- a/kde-plasma/xdg-desktop-portal-kde/Manifest +++ b/kde-plasma/xdg-desktop-portal-kde/Manifest @@ -1,2 +1 @@ -DIST xdg-desktop-portal-kde-6.3.6.tar.xz 190288 BLAKE2B 576a015b58f3e2b0f7def445d4221212bbd14a6a6d863f36b2bab2929ad4e8338ac46d5cec9c2223917c25e9d65ee4a5c57991f681f8ce41c418a1619b8313b7 SHA512 e76edf238fb08de8e5a7b870a1285b583cae4de7629e5540b136d66d49c29bde7dce7fdc6974c21f2d00cbdfd5cc8b71a3c6d887e9c9825bacde270d6ddf29dd DIST xdg-desktop-portal-kde-6.4.5.tar.xz 204948 BLAKE2B 518db0c5b15297f886d7cbf070d0691c4dfa1ac0f83dbc44543435a8e97fa8f763eef32ce001f7336bc1f8431d828103720bafe2edfdf316e472dc26c8cf9469 SHA512 0623b79706ade775a5f5457aa877397da1b2bbabc3769601dc0f0fea2e995d6816d20b200a743d9065bcae1ffbe5f7b9765f25b04cf1a621e54616e2914a6774 diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-6.3.5-screencast-crash.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-6.3.5-screencast-crash.patch deleted file mode 100644 index 34fa7039b157..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-6.3.5-screencast-crash.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/957100 -https://bugs.kde.org/show_bug.cgi?id=500577 -https://invent.kde.org/plasma/xdg-desktop-portal-kde/-/commit/011d08c340bab468eec6aa347ae138e40c6332cf - -From 011d08c340bab468eec6aa347ae138e40c6332cf Mon Sep 17 00:00:00 2001 -From: David Redondo <[email protected]> -Date: Tue, 3 Jun 2025 12:10:34 +0200 -Subject: [PATCH] screencast: Guard against session closing while creating - stream - -Starting a stream runs an event loop during which the session can -be closed. For now use a QPointer to guard against that until -we make it not use an event loop anymore. -BUG:500577 -FIXED-IN:6.4 - - -(cherry picked from commit 13a19d1db5562d45477c6fa2cb53c3f40d7c60ed) - -Co-authored-by: David Redondo <[email protected]> ---- - src/screencast.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/screencast.cpp b/src/screencast.cpp -index d0841a96..510f5242 100644 ---- a/src/screencast.cpp -+++ b/src/screencast.cpp -@@ -282,6 +282,7 @@ - QVariantList outputs; - QList<WindowRestoreInfo> windows; - WaylandIntegration::Streams streams; -+ QPointer<ScreenCastSession> guardedSession(session); - Screencasting::CursorMode cursorMode = Screencasting::CursorMode(session->cursorMode()); - for (const auto &output : std::as_const(selectedOutputs)) { - WaylandIntegration::Stream stream; -@@ -332,6 +333,10 @@ - return 2; - } - -+ if (!guardedSession) { -+ return 2; -+ } -+ - session->setStreams(streams); - results.insert(QStringLiteral("streams"), QVariant::fromValue<WaylandIntegration::Streams>(streams)); - if (allowRestore) { diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.3.6-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.3.6-r1.ebuild deleted file mode 100644 index c8e2b4a721c9..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.3.6-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=6.10.0 -QTMIN=6.8.1 -inherit ecm plasma.kde.org xdg - -DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks" - -LICENSE="LGPL-2+" -SLOT="6" -KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -# dev-qt/qtbase:= slot op: Uses Qt::GuiPrivate for qtx11extras_p.h -# dev-qt/qtbase:=[cups]: includes specifically the cups private header -# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X -COMMON_DEPEND=" - >=dev-libs/wayland-1.15 - >=dev-qt/qtbase-${QTMIN}:6=[cups,dbus,gui,wayland,widgets] - >=dev-qt/qtdeclarative-${QTMIN}:6 - || ( - >=dev-qt/qtbase-${QTMIN}:6[libinput] - >=dev-qt/qtbase-${QTMIN}:6[X] - ) - >=kde-frameworks/kcoreaddons-${KFMIN}:6[dbus] - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/kguiaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kwayland-${KDE_CATV}:6 - >=kde-plasma/plasma-workspace-${KDE_CATV}:6 - x11-libs/libxkbcommon -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.16.0 - >=dev-libs/wayland-protocols-1.25 - >=dev-qt/qtbase-${QTMIN}:6[concurrent] -" -RDEPEND="${COMMON_DEPEND} - kde-misc/kio-fuse:6 - sys-apps/xdg-desktop-portal -" -RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" -BDEPEND=" - >=dev-qt/qtbase-${QTMIN}:6[wayland] - virtual/pkgconfig -" -BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )" - -CMAKE_SKIP_TESTS=( - # bugs: 926483, wants dbus/X11 - colorschemetest -) - -PATCHES=( "${FILESDIR}"/${PN}-6.3.5-screencast-crash.patch ) # bug 957100
