diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-09-10 19:02:27 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-09-10 19:58:08 +0200 |
commit | 6694455981d6614be9fd667b27cb7a2a482bd5a0 (patch) | |
tree | 4126359243ed20f7caa65c659863b8cd6033d8fe /kde-plasma/plasma-workspace | |
parent | dev-vcs/hg-git-1.1.3: version bump (diff) | |
download | gentoo-6694455981d6614be9fd667b27cb7a2a482bd5a0.tar.gz gentoo-6694455981d6614be9fd667b27cb7a2a482bd5a0.tar.bz2 gentoo-6694455981d6614be9fd667b27cb7a2a482bd5a0.zip |
kde-plasma/plasma-workspace: drop 6.1.4-r2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/plasma-workspace')
3 files changed, 0 insertions, 307 deletions
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch deleted file mode 100644 index 310015c7d70f..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-klipper-fix-copying-cells.patch +++ /dev/null @@ -1,36 +0,0 @@ -From fead4fa8174aeb6e61354390e9ddee4627b31166 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Fri, 23 Aug 2024 17:03:52 +0000 -Subject: [PATCH] klipper: fix copying cells when images are ignored - -When copying a cell to the clipboard, both the image and the plain text -will be copied, and the plain text should be saved to the history when -images are ignored. - -BUG: 491488 -FIXED-IN: 6.1.5 - - -(cherry picked from commit b83bc9a076fc0ae091f0df1eddce84d0d1dea5fd) - -Co-authored-by: Fushan Wen <qydwhotmail@gmail.com> ---- - klipper/klipper.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp -index b41129d2e1b..24446e216ef 100644 ---- a/klipper/klipper.cpp -+++ b/klipper/klipper.cpp -@@ -640,7 +640,7 @@ void Klipper::checkClipData(QClipboard::Mode mode, const QMimeData *data) - if (selectionMode && m_bSelectionTextOnly && !data->hasText()) - return; - -- if (m_bIgnoreImages && data->hasImage() && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) { -+ if (m_bIgnoreImages && data->hasImage() && !data->hasText() /*BUG 491488*/ && !data->hasFormat(QStringLiteral("x-kde-force-image-copy"))) { - return; - } - --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch deleted file mode 100644 index 58a367a386ae..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-6.1.4-xembedsniproxy-crash.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dec0608369e1fe50685ce94113681ec9ed1bc43c Mon Sep 17 00:00:00 2001 -From: David Redondo <kde@david-redondo.de> -Date: Tue, 13 Aug 2024 09:09:06 +0000 -Subject: [PATCH] xembedsniproxy: Guard against crash when xcb_query_tree_reply - is null - -BUG:491509 -FIXED-IN:6.1.5 - - -(cherry picked from commit 85eb56e174bf887ccb8311e8f1a871e1ec453e04) - -Co-authored-by: David Redondo <kde@david-redondo.de> ---- - xembed-sni-proxy/sniproxy.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/xembed-sni-proxy/sniproxy.cpp b/xembed-sni-proxy/sniproxy.cpp -index 41e1fb0550c..21d74c566d5 100644 ---- a/xembed-sni-proxy/sniproxy.cpp -+++ b/xembed-sni-proxy/sniproxy.cpp -@@ -76,6 +76,9 @@ static bool checkWindowOrDescendantWantButtonEvents(xcb_window_t window) - } - auto treeCookie = xcb_query_tree(connection, window); - UniqueCPointer<xcb_query_tree_reply_t> tree(xcb_query_tree_reply(connection, treeCookie, nullptr)); -+ if (!tree) { -+ return false; -+ } - std::span<xcb_window_t> children(xcb_query_tree_children(tree.get()), xcb_query_tree_children_length(tree.get())); - return std::ranges::any_of(children, &checkWindowOrDescendantWantButtonEvents); - } --- -GitLab - diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild deleted file mode 100644 index 6fdc40a5dfdb..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.1.4-r2.ebuild +++ /dev/null @@ -1,237 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="forceoptional" -KFMIN=6.5.0 -PVCUT=$(ver_cut 1-3) -QTMIN=6.7.2 -inherit ecm plasma.kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="appstream +calendar +fontconfig geolocation gps +policykit -screencast +semantic-desktop systemd telemetry +wallpaper-metadata" - -REQUIRED_USE="gps? ( geolocation )" -RESTRICT="test" - -# kde-frameworks/kwindowsystem[X]: Uses KX11Extras -# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h -# slot op: various private QtWaylandClient headers -COMMON_DEPEND=" - dev-libs/icu:= - >=dev-libs/wayland-1.15 - >=dev-qt/qt5compat-${QTMIN}:6[qml] - >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - >=dev-qt/qtshadertools-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - >=dev-qt/qtwayland-${QTMIN}:6= - >=kde-frameworks/karchive-${KFMIN}:6 - >=kde-frameworks/kauth-${KFMIN}:6 - >=kde-frameworks/kbookmarks-${KFMIN}:6 - >=kde-frameworks/kcmutils-${KFMIN}:6 - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kdeclarative-${KFMIN}:6 - >=kde-frameworks/kded-${KFMIN}:6 - >=kde-frameworks/kglobalaccel-${KFMIN}:6 - >=kde-frameworks/kguiaddons-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=kde-frameworks/kidletime-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kitemmodels-${KFMIN}:6 - >=kde-frameworks/kitemviews-${KFMIN}:6 - >=kde-frameworks/kjobwidgets-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 - >=kde-frameworks/knotifications-${KFMIN}:6 - >=kde-frameworks/knotifyconfig-${KFMIN}:6 - >=kde-frameworks/kpackage-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/krunner-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 - >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-frameworks/ktexteditor-${KFMIN}:6 - >=kde-frameworks/ktextwidgets-${KFMIN}:6 - >=kde-frameworks/kunitconversion-${KFMIN}:6 - >=kde-frameworks/kwallet-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-frameworks/prison-${KFMIN}:6[qml] - >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/breeze-${PVCUT}:6 - >=kde-plasma/kscreenlocker-${PVCUT}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/kwin-${PVCUT}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 - media-libs/libcanberra - >=media-libs/phonon-4.12.0[qt6] - sci-libs/libqalculate:= - sys-libs/zlib - virtual/libudev:= - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - appstream? ( >=dev-libs/appstream-1[qt6] ) - calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 ) - fontconfig? ( - media-libs/fontconfig - x11-libs/libXft - x11-libs/xcb-util-image - ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) - gps? ( sci-geosciences/gpsd ) - policykit? ( - >=sys-auth/polkit-qt-0.175[qt6] - virtual/libcrypt:= - ) - screencast? ( - >=dev-qt/qtbase-${QTMIN}:6=[opengl] - >=kde-plasma/kpipewire-${PVCUT}:6 - media-libs/libglvnd - >=media-video/pipewire-0.3:= - x11-libs/libdrm - ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) - systemd? ( sys-apps/systemd:= ) - telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) - wallpaper-metadata? ( kde-apps/libkexiv2:6 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.13.0 - dev-libs/qcoro[dbus] - >=dev-qt/qtbase-${QTMIN}:6[concurrent] - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) -" -RDEPEND="${COMMON_DEPEND} - !kde-plasma/libkworkspace:5 - !<kde-plasma/plasma-desktop-5.27.0:5 - !kde-plasma/xembed-sni-proxy:* - app-text/iso-codes - dev-libs/kirigami-addons:6 - >=dev-qt/qttools-${QTMIN}:*[qdbus] - kde-apps/kio-extras:6 - >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/kquickcharts-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${PVCUT}:6 - >=kde-plasma/kde-cli-tools-${PVCUT}:*[kdesu] - >=kde-plasma/milou-${PVCUT}:6 - >=kde-plasma/plasma-integration-${PVCUT}:6 - sys-apps/dbus - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - policykit? ( sys-apps/accountsservice ) -" -BDEPEND=" - >=dev-qt/qtwayland-${QTMIN}:6 - >=dev-util/wayland-scanner-1.19.0 - >=kde-frameworks/kcmutils-${KFMIN}:6 - virtual/pkgconfig - test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] ) -" - -PATCHES=( - # TODO upstream: KDE-bug 432975, bug 767478 - "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" - # upstream Plasma/6.1 branch (fixed in 6.1.5) - "${FILESDIR}/${P}-restart-unhide-timer-on-dnd.patch" # KDE-bug 450579 - "${FILESDIR}"/${P}-fix-mediacontroller-{1,2}.patch # KDE-bug 490569 - "${FILESDIR}/${P}-fix-svg-images.patch" # KDE-bug 491369 - "${FILESDIR}/${P}-xembedsniproxy-crash.patch" # KDE-bug 491509 - "${FILESDIR}/${P}-klipper-fix-copying-cells.patch" # KDE-bug 491488 -) - -src_prepare() { - ecm_src_prepare - - # TODO: try to get a build switch upstreamed - if ! use screencast; then - ecm_punt_bogus_dep KPipeWire - sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die - fi - - # TODO: try to get a build switch upstreamed - if use geolocation; then - use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ - -i dataengines/geolocation/CMakeLists.txt || die - fi - - if ! use policykit; then - cmake_run_in kcms cmake_comment_add_subdirectory users - fi - - if ! use fontconfig; then - ecm_punt_bogus_dep XCB IMAGE - sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die - fi - - # TODO: try to get a build switch upstreamed - if ! use systemd; then - sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DWITH_X11=ON # TODO: broken upstream, fix it if you can - -DGLIBC_LOCALE_GEN=$(usex policykit) - $(cmake_use_find_package appstream AppStreamQt) - $(cmake_use_find_package calendar KF6Holidays) - $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package geolocation KF6NetworkManagerQt) - $(cmake_use_find_package semantic-desktop KF6Baloo) - $(cmake_use_find_package telemetry KF6UserFeedback) - $(cmake_use_find_package wallpaper-metadata KExiv2Qt6) - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - - # default startup and shutdown scripts - insinto /etc/xdg/plasma-workspace/env - doins "${FILESDIR}"/10-agent-startup.sh - - insinto /etc/xdg/plasma-workspace/shutdown - doins "${FILESDIR}"/10-agent-shutdown.sh - fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh -} - -pkg_postinst () { - ecm_pkg_postinst - - elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," - elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" - elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" -} |