From 4bbcd26e7cb1908fb98bb318bfaa13ea9e32d860 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Apr 2023 05:36:05 +0100 Subject: gentoo auto-resync : 10:04:2023 - 05:36:05 --- kde-plasma/xdg-desktop-portal-kde/Manifest | 3 +- ...e-5.27.4.1-dont-try-to-screencast-nullptr.patch | 36 +++++++++++++ .../xdg-desktop-portal-kde-5.27.4.1-r1.ebuild | 61 ++++++++++++++++++++++ .../xdg-desktop-portal-kde-5.27.4.1.ebuild | 59 --------------------- 4 files changed, 99 insertions(+), 60 deletions(-) create mode 100644 kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.27.4.1-dont-try-to-screencast-nullptr.patch create mode 100644 kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1-r1.ebuild delete mode 100644 kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1.ebuild (limited to 'kde-plasma/xdg-desktop-portal-kde') diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest index 572c08cc522a..b4aa6bbc65cd 100644 --- a/kde-plasma/xdg-desktop-portal-kde/Manifest +++ b/kde-plasma/xdg-desktop-portal-kde/Manifest @@ -1,7 +1,8 @@ +AUX xdg-desktop-portal-kde-5.27.4.1-dont-try-to-screencast-nullptr.patch 1592 BLAKE2B a6a573b74f92947dff113c5d56dcd0506c8f01c526d3a50f7bb623acc13015d238eca76adbb3fc0aba2f4610734f8aa528e2d3573382b1aaa36829f3ff6b68ff SHA512 ed22d416ac7d1a35146568dcb6b97e0878c4ebafaaa9d166afea388b3aed581c59e741a3a5a117d0f5cdfed964c682305179e569200c9fac1925659c8f195c75 DIST xdg-desktop-portal-kde-5.26.5.tar.xz 110164 BLAKE2B 0eff7ac5fadce31831b9479fc812aede2f540917b186da0c71f9e85a4277923fd39e68ff4acb488772905cc296644b7a5e2f8c0fa12ef7e5cd7d5f7ccaf843d8 SHA512 d79ea70b476e08e0ff554e7a9b261abca21b07a177a576cf4c6e8d36b08dc8f48f5ccebf25d72b293439fafce53ae29e77b6289fce1ccccfabe69a5d21f6389c DIST xdg-desktop-portal-kde-5.27.3.tar.xz 138812 BLAKE2B fad396d4be8ac474642c9c845dad9f884cf80105871c458682fe2d9b4f0c6faba71b995b5a354b85ce0fdc5fbb2c0d8aedff630f955d73724b7ff40919b670b6 SHA512 1bf8f291f0ac8b85eefa845b67cece63df42f715d81b1d84fd5f63e2559854147db37396583d21672acaef2ebfa0f63696cc55b4d8944e45edac3dd85a8379c3 DIST xdg-desktop-portal-kde-5.27.4.1.tar.xz 139188 BLAKE2B 93b4b6d39cae50a96e5bbc8422071da8cc53bdb21de2f709957656b75f5e538f52b86ddb47c653ff7beb27ff4e2f96cfe700de4d179ebddaf616c4a460d24a5c SHA512 c5fa02bc3c4df8a06ba8c91f236e8542f65daa8e68db08cc13a8c0e814e585f043571744db6b56b963eca3c939d8efed5f4cb085d046101df29536433d1ca001 EBUILD xdg-desktop-portal-kde-5.26.5.ebuild 1283 BLAKE2B fb22c8574aab6b61568dd856203f88dd0508c741aab63651b5a5e73476c12466a1b578798a4b496538c207d8dc96cafe2bb841d4c20440a3008729bd0811904c SHA512 796fa58b213376814e65b8a5b8c8cf3fa4f3c4425d477f28579d53b222cdd75c317a121e382e7737a8c27353a592a4874035c036ac9620abd43558510c8f4c80 EBUILD xdg-desktop-portal-kde-5.27.3.ebuild 1632 BLAKE2B ea2011fca269a723c307b19e6a30cdab1fbead54827f53017d5504dd8a319d20a8430e14812df6a20af8124a16ab8f0bd2f8b7d534ea0dcd944f2e0ffda3c66d SHA512 aadd4705940396d3907fb8e752259af1ba2eef3485bd33e2d93bec8c60d9d301d98ac66046012d57feda685d7f57ce8fdd62f832e23f8c4471e4b0255637c5be -EBUILD xdg-desktop-portal-kde-5.27.4.1.ebuild 1632 BLAKE2B ea2011fca269a723c307b19e6a30cdab1fbead54827f53017d5504dd8a319d20a8430e14812df6a20af8124a16ab8f0bd2f8b7d534ea0dcd944f2e0ffda3c66d SHA512 aadd4705940396d3907fb8e752259af1ba2eef3485bd33e2d93bec8c60d9d301d98ac66046012d57feda685d7f57ce8fdd62f832e23f8c4471e4b0255637c5be +EBUILD xdg-desktop-portal-kde-5.27.4.1-r1.ebuild 1718 BLAKE2B 9a6e9b316ea5bab244b43f481e5233cb5a9981dfffb8e6ad50e0384bfa8900f0f8680217700faacd9e27b02443e2510a8647483b90f56d671e7c26bca762484b SHA512 e02ca4a1de4fcb447528951745305a153f3ff95778e32841bd89795ae12132595dd8fcc86686d916673636d1b4507e6ec8ddda77ce0dc4456a950cc0f61c12d6 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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 new file mode 100644 index 000000000000..85d71e3951dc --- /dev/null +++ b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.27.4.1-dont-try-to-screencast-nullptr.patch @@ -0,0 +1,36 @@ +From 58313fac8188163c9445bb9a212405412258ef5e Mon Sep 17 00:00:00 2001 +From: Aleix Pol Gonzalez +Date: Wed, 5 Apr 2023 16:36:48 +0000 +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 new file mode 100644 index 000000000000..425bf1a628cd --- /dev/null +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1-r1.ebuild @@ -0,0 +1,61 @@ +# 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 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${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 + x11-libs/libxkbcommon +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.7.0 + >=dev-libs/wayland-protocols-1.25 + >=dev-qt/qtconcurrent-${QTMIN}:5 +" +RDEPEND="${COMMON_DEPEND} + kde-misc/kio-fuse:5 + sys-apps/xdg-desktop-portal +" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}-dont-try-to-screencast-nullptr.patch" ) # KDE-bug 467622 diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1.ebuild deleted file mode 100644 index 73acc3e14c3d..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.4.1.ebuild +++ /dev/null @@ -1,59 +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 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${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 - x11-libs/libxkbcommon -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.7.0 - >=dev-libs/wayland-protocols-1.25 - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - kde-misc/kio-fuse:5 - sys-apps/xdg-desktop-portal -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - virtual/pkgconfig -" -- cgit v1.2.3