From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05CED158086 for ; Fri, 10 Dec 2021 14:58:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67C52E07D0; Fri, 10 Dec 2021 14:58:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E47FAE07D0 for ; Fri, 10 Dec 2021 14:58:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5314A343185 for ; Fri, 10 Dec 2021 14:58:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DB1F22B for ; Fri, 10 Dec 2021 14:58:36 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1639148301.772507bcfc6fe0a19f039491f52f9e028cfbb776.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/files/ kde-plasma/plasma-workspace/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 772507bcfc6fe0a19f039491f52f9e028cfbb776 X-VCS-Branch: master Date: Fri, 10 Dec 2021 14:58:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea3cfa15-32d3-4deb-84c3-8d04d10543a8 X-Archives-Hash: 3c8164145cda8a353971e69fbb76e0e5 commit: 772507bcfc6fe0a19f039491f52f9e028cfbb776 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Dec 10 14:26:33 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 10 14:58:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=772507bc kde-plasma/plasma-workspace: Fix klipper bugs, systemsettings crash Upstream commit c8b8c8dd389ae381831fdd23f354617f48f3edd4 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=446441 Upstream commit beb34e3d9781c7728260d486a835c52be21a6d83 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=444365 Upstream commit a8b613505e326dd047707e0a0e4d6f5ecc4a9baa KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439797 Package-Manager: Portage-3.0.29, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> ....4-fix-klipper-actions-content-truncation.patch | 33 ++++ ...orkspace-5.23.4-fix-klipper-use-full-text.patch | 34 ++++ ...workspace-5.23.4-fix-systemsettings-crash.patch | 31 +++ .../plasma-workspace-5.23.4-r1.ebuild | 213 +++++++++++++++++++++ 4 files changed, 311 insertions(+) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch new file mode 100644 index 000000000000..1153c9f006f1 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-actions-content-truncation.patch @@ -0,0 +1,33 @@ +From beb34e3d9781c7728260d486a835c52be21a6d83 Mon Sep 17 00:00:00 2001 +From: ValdikSS ValdikSS +Date: Sun, 5 Dec 2021 15:46:00 +0300 +Subject: [PATCH] Fix Klipper Actions content truncation + +Commit f9669af2 introduced a regression with Klipper Actions: it used +truncated text as a source for the action, which resulted in truncated +output. + +BUG: 444365 + + +(cherry picked from commit 49365857623f7e986013bee7d3160594d2272fe2) +--- + klipper/urlgrabber.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp +index fb7c0d0a2..185a6a5d6 100644 +--- a/klipper/urlgrabber.cpp ++++ b/klipper/urlgrabber.cpp +@@ -245,7 +245,7 @@ void URLGrabber::execute(const ClipAction *action, int cmdIdx) const + ClipCommand command = action->command(cmdIdx); + + if (command.isEnabled) { +- QString text(m_myClipItem->text()); ++ QString text(m_myClipItem->mimeData()->text()); + if (m_stripWhiteSpace) { + text = text.trimmed(); + } +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch new file mode 100644 index 000000000000..29640f8262e6 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-klipper-use-full-text.patch @@ -0,0 +1,34 @@ +From c8b8c8dd389ae381831fdd23f354617f48f3edd4 Mon Sep 17 00:00:00 2001 +From: David Edmundson +Date: Sun, 5 Dec 2021 08:26:45 +0000 +Subject: [PATCH] [klipper] Use full text for DBus return values + +In a recent commit HistoryItem::text() became the visual representation +of the mimedata; often a truncated string. + +mimeData()->text() always returns the full value. + +BUG: 446441 + + +(cherry picked from commit 2db375f6a71cb730e1e099f9ff17ef7092850d9d) +--- + klipper/klipper.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/klipper/klipper.cpp b/klipper/klipper.cpp +index b090a2409..3b12d1f95 100644 +--- a/klipper/klipper.cpp ++++ b/klipper/klipper.cpp +@@ -838,7 +838,7 @@ QString Klipper::getClipboardHistoryItem(int i) + if (item) { + do { + if (i-- == 0) { +- return item->text(); ++ return item->mimeData()->text(); + } + item = history()->find(item->next_uuid()); + } while (item != history()->first()); +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch new file mode 100644 index 000000000000..d46f33486785 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.23.4-fix-systemsettings-crash.patch @@ -0,0 +1,31 @@ +From a8b613505e326dd047707e0a0e4d6f5ecc4a9baa Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau +Date: Wed, 8 Dec 2021 18:25:36 +0100 +Subject: [PATCH] lookandfeel: Add missing check if list of files is empty + +BUG: 439797 + + +(cherry picked from commit d168d2a50366c528dab65415cd4f6e82afdfb645) +--- + kcms/lookandfeel/kcm.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp +index 75ce19197..349761aad 100644 +--- a/kcms/lookandfeel/kcm.cpp ++++ b/kcms/lookandfeel/kcm.cpp +@@ -123,7 +123,9 @@ void KCMLookandFeel::knsEntryChanged(KNSCore::EntryWrapper *wrapper) + if (entry.status() == KNS3::Entry::Deleted && !entry.uninstalledFiles().isEmpty()) { + removeItemFromModel(); + } else if (entry.status() == KNS3::Entry::Installed && !entry.installedFiles().isEmpty()) { +- removeItemFromModel(); // In case we updated it we don't want to have it in twice ++ if (!entry.uninstalledFiles().isEmpty()) { ++ removeItemFromModel(); // In case we updated it we don't want to have it in twice ++ } + KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel")); + pkg.setPath(entry.installedFiles().constFirst()); + addKPackageToModel(pkg); +-- +GitLab + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild new file mode 100644 index 000000000000..d53818417079 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.23.4-r1.ebuild @@ -0,0 +1,213 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=5.86.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="KDE Plasma workspace" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast ++semantic-desktop telemetry" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# slot op: various private QtWaylandClient headers +COMMON_DEPEND=" + >=dev-libs/wayland-1.15 + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput] + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5= + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 + >=kde-frameworks/kactivities-${KFMIN}:5 + >=kde-frameworks/kactivities-stats-${KFMIN}:5 + >=kde-frameworks/karchive-${KFMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kded-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kinit-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kitemviews-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kpeople-${KFMIN}:5 + >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kunitconversion-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/prison-${KFMIN}:5[qml] + >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwin-${PVCUT}:5 + >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 + >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libkworkspace-${PVCUT}:5 + >=media-libs/phonon-4.11.0 + sys-libs/zlib + 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 + x11-libs/xcb-util-image + appstream? ( dev-libs/appstream[qt5] ) + calculator? ( sci-libs/libqalculate:= ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) + fontconfig? ( + >=dev-qt/qtprintsupport-${QTMIN}:5 + media-libs/fontconfig + x11-libs/libXft + x11-libs/xcb-util-image + ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) + gps? ( sci-geosciences/gpsd ) + screencast? ( + >=dev-qt/qtgui-${QTMIN}:5=[egl] + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) + telemetry? ( dev-libs/kuserfeedback:5 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.1.1 + >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-util/wayland-scanner-1.19.0 + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + app-text/iso-codes + >=dev-qt/qdbus-${QTMIN}:5 + >=dev-qt/qtgraphicaleffects-${QTMIN}:5 + >=dev-qt/qtpaths-${QTMIN}:5 + >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + kde-apps/kio-extras:5 + >=kde-frameworks/kdesu-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/milou-${PVCUT}:5 + >=kde-plasma/plasma-integration-${PVCUT}:5 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + !