summaryrefslogtreecommitdiff
path: root/kde-plasma/plasma-desktop
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-01-05 14:04:26 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-01-05 14:04:26 +0000
commit8fd9d385e5bc3c01115ec2ddcb2227607eb90861 (patch)
treeaba1e6ef6b95e94172c009394cd1fcbc383e7d6e /kde-plasma/plasma-desktop
parent1ddcee0bd115d2f843f82061cb0d1741bf90151d (diff)
gentoo auto-resync : 05:01:2024 - 14:04:25
Diffstat (limited to 'kde-plasma/plasma-desktop')
-rw-r--r--kde-plasma/plasma-desktop/Manifest3
-rw-r--r--kde-plasma/plasma-desktop/files/plasma-desktop-5.27.9-foldermodel-screen-add-remove-handling.patch95
-rw-r--r--kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild180
3 files changed, 0 insertions, 278 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 89bfc33cd01b..e3fec8670149 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,10 +1,7 @@
-AUX plasma-desktop-5.27.9-foldermodel-screen-add-remove-handling.patch 4749 BLAKE2B ce2c755ddaf1afdf1e4e6dae556df76e9d34fedebde8df5c604a47693965c1d2e85dc77c4b36badf2dd251ff0b2db3ecdf73e5353a64e8d56694bccb8e328de5 SHA512 1a8b9b9321d74b898ed22072d6e8bbfe5213977dffcee147d40a62489258af7f5b5ae3da371336376a53d16105ab0cb210f986306622077ed50ab12ba0b81689
AUX plasma-desktop-5.90.0-override-include-dirs.patch 3967 BLAKE2B 53d964e0a9c71da3a9a4e208b1d8638a9838451621c88ea690c15c018632987684e1c316bd6f25c46d3cff7e3dddcaabe2220bc895ca8c38fa689667ec960363 SHA512 7ac7072772827b97af87c28f8fff3bda8aee5ce09437da81b69ffcf18f93488db48a4bfb05a4b9285151ebb53c459e431c6cceb77d33220ea93e24fd355828c2
DIST plasma-desktop-5.27.10.tar.xz 14724388 BLAKE2B 59a6bbe524a45b5331d46497fff9d83136906dc094dca571f43641cded5b8a9b9d117a1fcbccfe04c1877d52ee686a2c3949e5194fee611d798548c2d8bb501e SHA512 88d0aa3d4d57aa9286d1d45c1908c5a2fcc7005cc39105085c19cd22657b72b1ea4bfef5be59d3e68fe3851acb68d1b8ac8d4d33305e22c70877d66c266b03e9
-DIST plasma-desktop-5.27.9.tar.xz 14721128 BLAKE2B 5332887ac65df280d8eaa6d834d844a49ba8d3aba38246564e19885aaed86135b95958b7914e69008c1ff1d5b85440a9d8998ca04740c82ddc1cf46399cb9f6f SHA512 ae23ab2e8359345c5ffe3cd2ff8d3aa8e302be49f3686f5f24fd5905990fc2f05a45d69fcb9b3414eae9997b70e0d424b307bc7f02d189158cd7f9ba995c9ec9
DIST plasma-desktop-5.91.0.tar.xz 15610104 BLAKE2B acebeba90f989a6db42f47a76d7f28ed80a8b82bc5f2b2b2654be63d454db1d9ad5085aea304dd6abe52c1263dc730b7d524ec4c5935f376332265dfbd84f471 SHA512 475bd9487986d44b4782aeffd05d9fd78d43e3ac4d7b602de71a59f7da9d3a3a2e599cac1c12b61b5689d7a2417901012bfec82aa5b7b52c2b0a34c84111ef4c
DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb
EBUILD plasma-desktop-5.27.10-r1.ebuild 5300 BLAKE2B 586fdff9fb65b2dc9b97e7fc3644422475cdeebabad1fa6b4afed0fb9d4d261a8a637dc90fe882679e0a2191e8425345a4168ebdcfbbcc47e3c64194ce3fe60a SHA512 28aa99f6d0adf8cdc73a48e297318cf8912c448979a8114c91be404b560538869dd9b9d8a738c438be765f7fba30c2b13d3bf17c86f96622ecec3c6be963f132
-EBUILD plasma-desktop-5.27.9-r1.ebuild 5354 BLAKE2B 874bbf306fae896e39c48acde4a3a72c2305d1d3d174cf128969d70e36450127add035d7cef42783fcaf8227b7fab425adcf21224774854f150accd2fa3b47a9 SHA512 03a78bab0adb58858c96410aa33a5430467afadeee50de05f0dc2421644818751bb919c2da5bc519c5effb0487d576435127e069eb67683986986d96fb62d082
EBUILD plasma-desktop-5.91.0.ebuild 5035 BLAKE2B 65dece1b17ed7854700e101d45f169c981834839cfdd7fcf22595334849ae56ab4d12496c977514b49ec715a6e71b4c345f0a54241b919b35780cd28f4eb20c0 SHA512 6359e1544976374596b34090783d36ce2143c41718050cf9a906f4c1ea420b158cf7c416774f957e82cc75db75bf750fec8ccb5ab19fc022f35f5ff5efd5f5a1
MISC metadata.xml 560 BLAKE2B bf6910f40706c17989a0961c39073bd1bb00575b0bbd12c9a44c5ae8c699b33451dac36512afe8310c4bff5432864d16adb0f5b6b3f933b39705409547b05ee5 SHA512 0f34c3e91789674538cbac7f857ef57db8e1ca9b85b7e5d512b1a6af10fb218bfae01f65ae1825d26bb31103e7b95c0cf68fc3965c40952392afafcbf5877a25
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.9-foldermodel-screen-add-remove-handling.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.9-foldermodel-screen-add-remove-handling.patch
deleted file mode 100644
index 8d5ad98b40b7..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.9-foldermodel-screen-add-remove-handling.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From a6bc63103ed128ffe0fd843eb3c4416ede835fde Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter@kde.org>
-Date: Mon, 6 Nov 2023 23:24:57 +0100
-Subject: [PATCH] foldermodel: lift screen add/remove handling out of
- screenmapper
-
-screenmapper is the wrong place for it because we don't know the url
-inside the mapper. Instead handle events in the foldermodel and
-correctly delegate the add/remove actions to the mapper with both our
-screenId AND the activityId
-
-notably the previous code would incorrectly invoke addScreen with empty
-activityIds triggering fallback handling that resulted in incorrect
-m_screensPerPath management (there would be no screen associated with
-our url anymore after a screenAdded signal because our screen got
-associated with no url) and consequently firstAvailableScreen would
-return no screen for our url (remember: we are associated with no url)
-making FolderModel::filterAcceptsRow return false and filtering
-completely valid entries
-
-BUG: 467951
-
-possibly also is the root cause behind
-CCBUG: 467092
----
- containments/desktop/plugins/folder/foldermodel.cpp | 12 +++++++++++-
- containments/desktop/plugins/folder/screenmapper.cpp | 9 +--------
- containments/desktop/plugins/folder/screenmapper.h | 2 +-
- 3 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp
-index 6a9f8da607..bcab0275e3 100644
---- a/containments/desktop/plugins/folder/foldermodel.cpp
-+++ b/containments/desktop/plugins/folder/foldermodel.cpp
-@@ -2024,7 +2024,17 @@ void FolderModel::setAppletInterface(QObject *appletInterface)
- Plasma::Corona *corona = containment->corona();
-
- if (corona) {
-- m_screenMapper->setCorona(corona, m_currentActivity);
-+ connect(corona, &Plasma::Corona::screenRemoved, this, [this](int screenId) {
-+ if (m_screen == screenId) {
-+ m_screenMapper->removeScreen(screenId, m_currentActivity, resolvedUrl());
-+ }
-+ });
-+ connect(corona, &Plasma::Corona::screenAdded, this, [this](int screenId) {
-+ if (m_screen == screenId) {
-+ m_screenMapper->addScreen(screenId, m_currentActivity, resolvedUrl());
-+ }
-+ });
-+ m_screenMapper->setCorona(corona);
- }
- setScreen(containment->screen());
- connect(containment, &Plasma::Containment::screenChanged, this, &FolderModel::setScreen);
-diff --git a/containments/desktop/plugins/folder/screenmapper.cpp b/containments/desktop/plugins/folder/screenmapper.cpp
-index 83e8a75276..fccea0e3fe 100644
---- a/containments/desktop/plugins/folder/screenmapper.cpp
-+++ b/containments/desktop/plugins/folder/screenmapper.cpp
-@@ -243,20 +243,13 @@ void ScreenMapper::cleanup()
- }
- #endif
-
--void ScreenMapper::setCorona(Plasma::Corona *corona, const QString &activity)
-+void ScreenMapper::setCorona(Plasma::Corona *corona)
- {
- if (m_corona != corona) {
- Q_ASSERT(!m_corona);
-
- m_corona = corona;
- if (m_corona) {
-- connect(m_corona, &Plasma::Corona::screenRemoved, this, [this, activity](int screenId) {
-- removeScreen(screenId, activity, {});
-- });
-- connect(m_corona, &Plasma::Corona::screenAdded, this, [this, activity](int screenId) {
-- addScreen(screenId, activity, {});
-- });
--
- auto config = m_corona->config();
- KConfigGroup group(config, QStringLiteral("ScreenMapping"));
- const QStringList mapping = group.readEntry(QStringLiteral("screenMapping"), QStringList{});
-diff --git a/containments/desktop/plugins/folder/screenmapper.h b/containments/desktop/plugins/folder/screenmapper.h
-index 47b01e1c08..c22432b2e8 100644
---- a/containments/desktop/plugins/folder/screenmapper.h
-+++ b/containments/desktop/plugins/folder/screenmapper.h
-@@ -50,7 +50,7 @@ public:
- int screenForItem(const QUrl &url, const QString &activity) const;
- void addMapping(const QUrl &url, int screen, const QString &activity, MappingSignalBehavior behavior = ImmediateSignal);
- void removeFromMap(const QUrl &url, const QString &activity);
-- void setCorona(Plasma::Corona *corona, const QString &activity);
-+ void setCorona(Plasma::Corona *corona);
-
- void addScreen(int screenId, const QString &activity, const QUrl &screenUrl);
- void removeScreen(int screenId, const QString &activity, const QUrl &screenUrl);
---
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild
deleted file mode 100644
index f949cfa04260..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.27.9-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-KFMIN=5.106.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.9
-inherit ecm plasma.kde.org optfeature
-
-DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-3"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="ibus +kaccounts scim screencast +semantic-desktop"
-
-# kde-frameworks/kwindowsystem[X]: Uses KX11Extras
-COMMON_DEPEND="
- dev-libs/wayland
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${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/attica-${KFMIN}:5
- >=kde-plasma/plasma-activities-${KFMIN}:5
- >=kde-plasma/plasma-activities-stats-${KFMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kauth-${KFMIN}:5
- >=kde-frameworks/kbookmarks-${KFMIN}:5
- >=kde-frameworks/kcmutils-${KFMIN}:5
- >=kde-frameworks/kcodecs-${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/kdelibs4support-${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/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/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-plasma/libplasma-${KFMIN}:5
- >=kde-frameworks/solid-${KFMIN}:5
- >=kde-frameworks/sonnet-${KFMIN}:5
- >=kde-plasma/kwin-${PVCUT}:5
- >=kde-plasma/libksysguard-${PVCUT}:5
- >=kde-plasma/libkworkspace-${PVCUT}:5
- >=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?]
- >=media-libs/phonon-4.11.0[qt5(+)]
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxcb
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- ibus? (
- app-i18n/ibus
- dev-libs/glib:2
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libxcb
- x11-libs/xcb-util-keysyms
- )
- kaccounts? (
- kde-apps/kaccounts-integration:5
- net-libs/accounts-qt
- )
- scim? ( app-i18n/scim )
- semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-libs/wayland-protocols-1.25
- dev-libs/boost
- x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
- !<kde-plasma/kdeplasma-addons-5.25.50
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
- >=kde-plasma/oxygen-${PVCUT}:5
- media-fonts/noto-emoji
- sys-apps/util-linux
- x11-apps/setxkbmap
- x11-misc/xdg-user-dirs
- kaccounts? ( net-libs/signon-oauth2 )
- screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 )
-"
-BDEPEND="
- dev-util/wayland-scanner
- >=kde-frameworks/kcmutils-${KFMIN}:5
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${WORKDIR}/${XORGHDRS}/${P}-override-include-dirs.patch" # downstream patch
- "${FILESDIR}/${P}-foldermodel-screen-add-remove-handling.patch" # in 5.27.10
-)
-
-src_prepare() {
- ecm_src_prepare
-
- if ! use ibus; then
- sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
- -i applets/kimpanel/backend/ibus/CMakeLists.txt || die
- fi
-
- # TODO: try to get a build switch upstreamed
- if ! use scim; then
- sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
- -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
- $(cmake_use_find_package ibus GLIB2)
- $(cmake_use_find_package kaccounts AccountsQt5)
- $(cmake_use_find_package kaccounts KAccounts)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # parallel tests fail, foldermodeltest,positionertest hang, bug #646890
- # test_kio_fonts needs D-Bus, bug #634166
- # lookandfeel-kcmTest is unreliable for a long time, bug #607918
- local myctestargs=(
- -j1
- -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)"
- )
-
- ecm_src_test
-}
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- optfeature "screen reader support" app-accessibility/orca
- fi
- ecm_pkg_postinst
-}