[gentoo-commits] repo/gentoo:master commit in: kde-plasma/xdg-desktop-portal-kde/files/, kde-plasma/xdg-desktop-portal-kde/
commit: 668dab41462115a17f318bb2d1c87bc81a2e85e3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 22 09:06:17 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 22 12:53:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668dab41
kde-plasma/xdg-desktop-portal-kde: drop 5.27.4.1-r1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-plasma/xdg-desktop-portal-kde/Manifest | 1 -
...e-5.27.4.1-dont-try-to-screencast-nullptr.patch | 36 -
.../xdg-desktop-portal-kde-5.27.4.1-r1.ebuild | 61 --
3 files changed, 98 deletions(-)
diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest
b/kde-plasma/xdg-desktop-portal-kde/Manifest
index fc32e026a846..90d5fad8a4d1 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-5.27.4.1.tar.xz 139188 BLAKE2B
93b4b6d39cae50a96e5bbc8422071da8cc53bdb21de2f709957656b75f5e538f52b86ddb47c653ff7beb27ff4e2f96cfe700de4d179ebddaf616c4a460d24a5c
SHA512
c5fa02bc3c4df8a06ba8c91f236e8542f65daa8e68db08cc13a8c0e814e585f043571744db6b56b963eca3c939d8efed5f4cb085d046101df29536433d1ca001
DIST xdg-desktop-portal-kde-5.27.5.tar.xz 140720 BLAKE2B
8f55edc2c8416f51f04c6585db31d4b26fceacfefbfd1eeccf97809b20f58766b6a102d48bf12822e6dd25d7ce9b8c4b901b2d75d1b3706d7cb426aec15154d2
SHA512
98dd88559b294922122bd8ed9d6d5a451f9649b946fdb0023349eae204ce6ea2328572975382e05283b177da0d44ca1e99f7576dc14a4c095d8a88b163acffa0
diff --git
a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.27.4.1-dont-try-to-screencast-nullptr.patch
b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.27.4.1-dont-try-to-screencast-nullptr.patch
deleted file mode 100644
index 85d71e3951dc..
---
a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.27.4.1-dont-try-to-screencast-nullptr.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 58313fac8188163c9445bb9a212405412258ef5e Mon Sep 17 00:00:00 2001
-From: Aleix Pol Gonzalez
-Date: Wed, 5 Apr 2023 16:36:48 +
-Subject: [PATCH] screencast: Don't try to screencast nullptr
-
-For some reason we were received an output that was null. Account for it
-by notifying and outputing some more information in hopes of fixing it
-soon.
-
-CCBUG: 467622
- src/waylandintegration.cpp | 8
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
-index c929b030..be6e19f7 100644
a/src/waylandintegration.cpp
-+++ b/src/waylandintegration.cpp
-@@ -282,6 +282,14 @@ WaylandIntegration::Stream
WaylandIntegration::WaylandIntegrationPrivate::startS
- WaylandIntegration::Stream
WaylandIntegration::WaylandIntegrationPrivate::startStreamingOutput(quint32
outputName, Screencasting::CursorMode mode)
- {
- auto output = m_outputMap.value(outputName).output();
-+if (!output) {
-+qCWarning(XdgDesktopPortalKdeWaylandIntegration) << "Cannot stream,
output not found" << outputName << m_outputMap.keys();
-+auto notification = new
KNotification(QStringLiteral("screencastfailure"),
KNotification::CloseOnTimeout);
-+notification->setTitle(i18n("Failed to start screencasting"));
-+notification->setIconName(QStringLiteral("dialog-error"));
-+notification->sendEvent();
-+return {};
-+}
- m_streamedScreenPosition = output->globalPosition();
- return startStreaming(m_screencasting->createOutputStream(output.data(),
mode),
- {
---
-GitLab
-
diff --git
a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1-r1.ebuild
b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1-r1.ebuild
deleted file mode 100644
index 292270a6c1b8..
---
a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-inherit ecm plasma.kde.org
-
-DESCRIPTION="Backend implementation for xdg-desktop-portal that is using
Qt/KDE Frameworks"
-
-LICENSE="LGPL-2+"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE=""
-
-# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
-COMMON_DEPEND="
- >=dev-libs/wayland-1.15
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- || (
- >=dev-qt/qtgui-${QTMIN}:5[libinput]
- >=dev-qt/qtgui-${QTMIN}:5[X]
- )
- >=dev-qt/qtprintsupport-${QTMIN}:5[cups]
- >=dev-qt/qtwayland-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5[dbus]
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kdeclarative-${KFMIN}:5
-
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/xdg-desktop-portal-kde/files/, kde-plasma/xdg-desktop-portal-kde/
commit: 7437df3200a260f6c048ca2455793e6cc0fbc461
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 30 15:45:53 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 30 16:09:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7437df32
kde-plasma/xdg-desktop-portal-kde: Backport 5.24.6 screencast fixes
See also:
https://invent.kde.org/plasma/xdg-desktop-portal-kde/-/merge_requests/102
https://invent.kde.org/plasma/xdg-desktop-portal-kde/-/merge_requests/103
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
...ast-close-only-streams-of-closing-session.patch | 107 ++
...eencast-dont-provide-every-running-stream.patch | 358 +
...de-5.24.5-screencast-stop-stream-actively.patch | 28 ++
.../xdg-desktop-portal-kde-5.24.5-r2.ebuild| 51 +++
4 files changed, 544 insertions(+)
diff --git
a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch
b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch
new file mode 100644
index ..134f55c900b5
--- /dev/null
+++
b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch
@@ -0,0 +1,107 @@
+From cd8275c722aa25dd22353121131c914d3ab3b438 Mon Sep 17 00:00:00 2001
+From: Aleix Pol
+Date: Sat, 28 May 2022 03:36:14 +0200
+Subject: [PATCH] screencast: When closing a session, only close the streams
+ from that session
+
+---
+ src/screencast.cpp | 11 ---
+ src/session.h | 12
+ src/waylandintegration.cpp | 5 +
+ src/waylandintegration.h | 1 +
+ 4 files changed, 26 insertions(+), 3 deletions(-)
+
+diff --git a/src/screencast.cpp b/src/screencast.cpp
+index 5be6210..84cc4bd 100644
+--- a/src/screencast.cpp
b/src/screencast.cpp
+@@ -68,8 +68,12 @@ uint ScreenCastPortal::CreateSession(const QDBusObjectPath
,
+ return 2;
+ }
+
+-connect(session, ::closed, []() {
+-WaylandIntegration::stopAllStreaming();
++connect(session, ::closed, [session] {
++auto screencastSession = qobject_cast(session);
++const auto streams = screencastSession->streams();
++for (const WaylandIntegration::Stream : streams) {
++WaylandIntegration::stopStreaming(stream.nodeId);
++}
+ });
+
+ connect(WaylandIntegration::waylandIntegration(),
::WaylandIntegration::streamingStopped, session,
::close);
+@@ -169,7 +173,8 @@ uint ScreenCastPortal::Start(const QDBusObjectPath ,
+ return 2;
+ }
+
+-results.insert(QStringLiteral("streams"),
QVariant::fromValue(streams));
++session->setStreams(streams);
++results.insert(QStringLiteral("streams"),
QVariant::fromValue(streams));
+
+ if (inhibitionsEnabled()) {
+ new NotificationInhibition(app_id, i18nc("Do not disturb mode is
enabled because...", "Screen sharing in progress"), session);
+diff --git a/src/session.h b/src/session.h
+index a4e..dd05680 100644
+--- a/src/session.h
b/src/session.h
+@@ -14,6 +14,7 @@
+
+ #include "remotedesktop.h"
+ #include "screencast.h"
++#include "waylandintegration.h"
+
+ class Session : public QDBusVirtualObject
+ {
+@@ -62,10 +63,21 @@ public:
+ return SessionType::ScreenCast;
+ }
+
++WaylandIntegration::Streams streams() const
++{
++return m_streams;
++}
++void setStreams(const WaylandIntegration::Streams )
++{
++m_streams = streams;
++}
++
+ private:
+ bool m_multipleSources;
+ ScreenCastPortal::CursorModes m_cursorMode;
+ ScreenCastPortal::SourceType m_types;
++
++WaylandIntegration::Streams m_streams;
+ };
+
+ class RemoteDesktopSession : public ScreenCastSession
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index 9f5a177..e05f73a 100644
+--- a/src/waylandintegration.cpp
b/src/waylandintegration.cpp
+@@ -89,6 +89,11 @@ void WaylandIntegration::stopAllStreaming()
+ globalWaylandIntegration->stopAllStreaming();
+ }
+
++void WaylandIntegration::stopStreaming(uint node)
++{
++globalWaylandIntegration->stopStreaming(node);
++}
++
+ void WaylandIntegration::requestPointerButtonPress(quint32 linuxButton)
+ {
+ globalWaylandIntegration->requestPointerButtonPress(linuxButton);
+diff --git a/src/waylandintegration.h b/src/waylandintegration.h
+index b8e6a00..784ee12 100644
+--- a/src/waylandintegration.h
b/src/waylandintegration.h
+@@ -131,6 +131,7 @@ void startStreamingInput();
+ Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode
mode);
+ Stream startStreamingWindow(const QMap );
+ void stopAllStreaming();
++void stopStreaming(uint node);
+
+ void requestPointerButtonPress(quint32 linuxButton);
+ void
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/xdg-desktop-portal-kde/files/, kde-plasma/xdg-desktop-portal-kde/
commit: 53b24cf50996d78646160aeaa3bcb02dcc81a3bc
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue May 17 18:53:59 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue May 17 19:01:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b24cf5
kde-plasma/xdg-desktop-portal-kde: Show screensharing notifier
...more prominently
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
...how-screenshare-notifier-more-prominently.patch | 32 +++
.../xdg-desktop-portal-kde-5.24.5-r1.ebuild| 48 ++
2 files changed, 80 insertions(+)
diff --git
a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch
b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch
new file mode 100644
index ..6b771bfede1e
--- /dev/null
+++
b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch
@@ -0,0 +1,32 @@
+From bbff465e6a005c737ee2e53eb5e072da006d9b4b Mon Sep 17 00:00:00 2001
+From: Aleix Pol
+Date: Fri, 13 May 2022 16:47:36 +0200
+Subject: [PATCH] screenshare: Show the screen sharing notifier more
+ prominently
+
+Sets it as active, otherwise it got buried in the extended view of the
+system tray.
+
+BUG: 452980
+
+
+(cherry picked from commit 3d61dae1fa334a9f3dadc505a038f75aa5846588)
+---
+ src/waylandintegration.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp
+index e125578..b1b2d4d 100644
+--- a/src/waylandintegration.cpp
b/src/waylandintegration.cpp
+@@ -292,6 +292,7 @@ bool
WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting
+ }
+ item->setOverlayIconByName("media-record");
+ item->setToolTip(item->iconName(), item->title(), i18n("Press to
cancel"));
++item->setStatus(KStatusNotifierItem::Active);
+ connect(item, ::activateRequested, stream, [=] {
+ stopStreaming(nodeid);
+ stream->deleteLater();
+--
+GitLab
+
diff --git
a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
new file mode 100644
index ..302a1ac2c35e
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=5.90.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using
Qt/KDE Frameworks"
+
+LICENSE="LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ >=dev-libs/wayland-1.15
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5[cups]
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kdeclarative-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kirigami-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kwayland-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.1.1
+ >=dev-qt/qtconcurrent-${QTMIN}:5
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/xdg-desktop-portal
+"
+BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-show-screenshare-notifier-more-prominently.patch #
KDE-bug 452980
+)
[gentoo-commits] repo/gentoo:master commit in: kde-plasma/xdg-desktop-portal-kde/files/, kde-plasma/xdg-desktop-portal-kde/
commit: 1886f66ac346be66b20ecd48c6de914a8de6ec0b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 18 12:21:11 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 18 16:34:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1886f66a
kde-plasma/xdg-desktop-portal-kde: Use QScrollArea for AppChooser
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=407559
Upstream commit 83773f6682154723d2a68e731c0e87c1f1a06893
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../xdg-desktop-portal-kde-5.15.5-appchooser.patch | 73 ++
.../xdg-desktop-portal-kde-5.15.5-r1.ebuild| 38 +++
2 files changed, 111 insertions(+)
diff --git
a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.15.5-appchooser.patch
b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.15.5-appchooser.patch
new file mode 100644
index 000..3a95c0272e8
--- /dev/null
+++
b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.15.5-appchooser.patch
@@ -0,0 +1,73 @@
+From 83773f6682154723d2a68e731c0e87c1f1a06893 Mon Sep 17 00:00:00 2001
+From: Jan Grulich
+Date: Thu, 16 May 2019 13:05:19 +0200
+Subject: AppChooser: put list of applications into a scrollarea
+
+BUG:407559
+FIXED-IN: 5.15.6
+---
+ src/appchooserdialog.cpp | 18 --
+ src/appchooserdialogitem.cpp | 1 +
+ 2 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/src/appchooserdialog.cpp b/src/appchooserdialog.cpp
+index 8fc888f..b14a5f9 100644
+--- a/src/appchooserdialog.cpp
b/src/appchooserdialog.cpp
+@@ -30,6 +30,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+
+ #include
+@@ -42,6 +43,7 @@ AppChooserDialog::AppChooserDialog(const QStringList
, const QString
+ , m_defaultApp(defaultApp)
+ {
+ setMinimumWidth(640);
++setMaximumHeight(480);
+
+ QVBoxLayout *vboxLayout = new QVBoxLayout(this);
+ vboxLayout->setSpacing(20);
+@@ -60,11 +62,23 @@ AppChooserDialog::AppChooserDialog(const QStringList
, const QString
+
+ vboxLayout->addWidget(label);
+
+-m_gridLayout = new QGridLayout();
++QWidget *appsWidget = new QWidget(this);
++QScrollArea *scrollArea = new QScrollArea(this);
++scrollArea->setFrameShape(QFrame::NoFrame);
++scrollArea->setWidget(appsWidget);
++scrollArea->setWidgetResizable(true);
++
++// FIXME: workaround scrollarea sizing, set minimum height to make sure
at least two rows are visible
++if (choices.count() > 3) {
++scrollArea->setMinimumHeight(200);
++}
++
++m_gridLayout = new QGridLayout;
++appsWidget->setLayout(m_gridLayout);
+
+ QTimer::singleShot(0, this, ::addDialogItems);
+
+-vboxLayout->addLayout(m_gridLayout);
++vboxLayout->addWidget(scrollArea);
+
+ setLayout(vboxLayout);
+ setWindowTitle(i18n("Open with"));
+diff --git a/src/appchooserdialogitem.cpp b/src/appchooserdialogitem.cpp
+index d01327f..1ce3249 100644
+--- a/src/appchooserdialogitem.cpp
b/src/appchooserdialogitem.cpp
+@@ -36,6 +36,7 @@ AppChooserDialogItem::AppChooserDialogItem(const QString
, const
+ setIcon(QIcon::fromTheme(icon));
+ setIconSize(QSize(64, 64));
+ setCheckable(true);
++setFixedHeight(100);
+ setFixedWidth(150);
+ setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+
+--
+cgit v1.1
+
diff --git
a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild
b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild
new file mode 100644
index 000..2bede4d8f54
--- /dev/null
+++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Backend implementation for xdg-desktop-portal that is using
Qt/KDE Frameworks"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# TODO: Needed for screencast portal
+# dev-libs/glib:2
+# media-libs/libepoxy
+# media-libs/mesa[gbm]
+# not packaged: PipeWire
+COMMON_DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport 'cups')
+ $(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kwayland)
+ $(add_qt_dep qtconcurrent)
+"
+RDEPEND="${COMMON_DEPEND}
+ sys-apps/xdg-desktop-portal
+"
+
+PATCHES=( "${FILESDIR}/${P}-appchooser.patch" )
