commit: 05205b638ad99c10c0875dcd5c99a37a71f2cdec Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Sep 1 21:53:00 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 2 12:41:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05205b63
gui-apps/xwaylandvideobridge: drop 0.3.0-r2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> gui-apps/xwaylandvideobridge/Manifest | 1 - ...xwaylandvideobridge-0.3.0-no-session-mgmt.patch | 54 ---------------------- .../xwaylandvideobridge-0.3.0-skip-switcher.patch | 29 ------------ .../xwaylandvideobridge-0.3.0-r2.ebuild | 44 ------------------ 4 files changed, 128 deletions(-) diff --git a/gui-apps/xwaylandvideobridge/Manifest b/gui-apps/xwaylandvideobridge/Manifest index 4428e599841f..03a74bd262a9 100644 --- a/gui-apps/xwaylandvideobridge/Manifest +++ b/gui-apps/xwaylandvideobridge/Manifest @@ -1,2 +1 @@ -DIST xwaylandvideobridge-0.3.0.tar.xz 35584 BLAKE2B 10d0770efc023a3c52bcc7af119d13cf2d38cd9c6d4d0e7a19a46ae455428a7b2fc03a8b61a8036a15210d699193c71784962c60ad82a65a385414b426c20e78 SHA512 9e86fac3dbed2c2cca1b899a8266c8feda3263544048c3e554e3029f065053637dda84fc0fcc10be5d4856015743b0cdcb8e0e18cd26d14739fb7481850b1392 DIST xwaylandvideobridge-0.4.0.tar.xz 35668 BLAKE2B c21857821bfc16b5df14feeea2ea188cedb00f1f3634335a359ba0938b8fb50f5ccf914011f6aca5bd527740ea62297ba9e4171604147d10d87725a0b545d96b SHA512 d0352b7ce94f1a355d8fd8f42a45436483a87d90da1904295f984012859651472eabbca39df5107793790d48474b6de1c8766e31461d1548134547cbc7dfd5a4 diff --git a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-no-session-mgmt.patch b/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-no-session-mgmt.patch deleted file mode 100644 index af7e52b98f68..000000000000 --- a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-no-session-mgmt.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0ca63bfbd8b30dfdb5807f6e4e35ca272d7cdc01 Mon Sep 17 00:00:00 2001 -From: David Redondo <[email protected]> -Date: Fri, 10 Nov 2023 09:52:33 +0100 -Subject: [PATCH] Do not start in an X11 session and opt out of session - managment - -xwaylandvideobridge runs with the Qt xcb backend, this means it -is also session managed by default. Since it is also autostarted -on every log a new instance is auotstarted and in addition the -session manager will start an instance for every one that was -running. So on second log in you will have 2 running instances, -on the third three, ... -Also exit on X11 where it is not needed. ---- - src/main.cpp | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/main.cpp b/src/main.cpp -index 8dda8a5..84e3677 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -11,12 +11,16 @@ - - #include <QApplication> - #include <QCommandLineParser> -+#include <QSessionManager> - #include <QIcon> - #include <KLocalizedString> - #include <KAboutData> - - int main(int argc, char **argv) - { -+ if (qgetenv("XDG_SESSION_TYPE") == "x11") { -+ return 0; -+ } - qputenv("QT_QPA_PLATFORM", "xcb"); - qputenv("QT_XCB_GL_INTEGRATION", "xcb_egl"); - -@@ -25,6 +29,12 @@ int main(int argc, char **argv) - QApplication app(argc, argv); // widgets are needed just for the SNI. - app.setAttribute(Qt::AA_UseHighDpiPixmaps); - -+ auto disableSessionManagement = [](QSessionManager &sm) { -+ sm.setRestartHint(QSessionManager::RestartNever); -+ }; -+ QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement); -+ QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement); -+ - KLocalizedString::setApplicationDomain("xwaylandvideobridge"); - { - KAboutData about("xwaylandvideobridge", i18n("Xwayland Video Bridge"), version, i18n("Offer XDG Desktop Portals screencast streams to X11 apps"), --- -GitLab - diff --git a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-skip-switcher.patch b/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-skip-switcher.patch deleted file mode 100644 index 6c71d238757d..000000000000 --- a/gui-apps/xwaylandvideobridge/files/xwaylandvideobridge-0.3.0-skip-switcher.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9ee3d7a21ee3069e37a205318914f48b2b597eaa Mon Sep 17 00:00:00 2001 -From: David Redondo <[email protected]> -Date: Wed, 15 Nov 2023 11:24:10 +0100 -Subject: [PATCH] Also skip the switcher - -BUG:477025 ---- - src/contentswindow.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/contentswindow.cpp b/src/contentswindow.cpp -index addae88..b6d4846 100644 ---- a/src/contentswindow.cpp -+++ b/src/contentswindow.cpp -@@ -54,9 +54,9 @@ ContentsWindow::ContentsWindow() - setFlag(Qt::WindowDoesNotAcceptFocus); - setFlag(Qt::WindowTransparentForInput); - #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) -- KX11Extras::setState(winId(), NET::SkipTaskbar | NET::SkipPager); -+ KX11Extras::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher); - #else -- KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager); -+ KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | NET::SkipSwitcher); - #endif - - // remove decoration. We can't use the Qt helper as we need our window type to remain something --- -GitLab - diff --git a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.3.0-r2.ebuild b/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.3.0-r2.ebuild deleted file mode 100644 index 2abee612761c..000000000000 --- a/gui-apps/xwaylandvideobridge/xwaylandvideobridge-0.3.0-r2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.106.0 -QTMIN=5.15.9 -KDE_ORG_CATEGORY="system" -inherit ecm kde.org - -DESCRIPTION="Screenshare Wayland windows to XWayland apps" -HOMEPAGE="https://planet.kde.org/david-edmundson-2023-03-22-fixing-wayland-xwayland-screen-casting/ -https://invent.kde.org/system/xwaylandvideobridge"; - -if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64" -fi - -LICENSE="GPL-2+" -SLOT="0" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] - >=kde-plasma/kpipewire-5.27.4:5 - media-libs/freetype - x11-libs/libxcb:= - x11-libs/xcb-util -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/${P}-no-session-mgmt.patch" - "${FILESDIR}/${P}-skip-switcher.patch" # KDE-bug 477025 -)
