From 527a6eb48135eeb6304cfe2d01a4fd134aa4501d Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 21 May 2020 17:44:37 +0200 Subject: kde-plasma: Drop KDE Plasma 5.17.5 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner --- kde-plasma/plasma-workspace/Manifest | 1 - ...sma-workspace-5.17.2-waylandsessionrename.patch | 91 --------- ...ace-5.17.5-disable-autoscaling-on-qt-5.14.patch | 47 ----- .../plasma-workspace-5.17.5-r1.ebuild | 220 --------------------- 4 files changed, 359 deletions(-) delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch delete mode 100644 kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch delete mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild (limited to 'kde-plasma/plasma-workspace') diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index fec5b1041e8d..8859ce07956d 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.17.5.tar.xz 4962336 BLAKE2B d7c91130d303b612cae09627947547919d44ce91f31340bea4b8987ecc688728e0d937364c76710e0989554282688765bba58308cbb36c889e6729a6fbb7043a SHA512 b8a3f3a1a79d7254deecfb5228749abf15bc6f58ab17eb6d19e9010c74930491439aefa6589980dc0ae53858e4bef6be7edb66a15d3f227c5dfff458c1ca5d1a DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch deleted file mode 100644 index 71d1ce4abb87..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.2-waylandsessionrename.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 36bc9bfd9661f88039a8945688e07b0626b48610 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 15 Oct 2019 18:33:45 +0200 -Subject: [PATCH 1/2] Fix Name conflict between plasma.desktop and - plasmawayland.desktop - -Summary: -SDDM until 0.18.1 appends " (Wayland)" to the name of any session file it -finds in wayland-sessions dir, and Plasma is relying on that behaviour to -distinguish between its X11 and Wayland sessions. This leads to duplicate -"Plasma" entries on any other DM not applying the same hack, e.g. lightdm, -and users are lost without downstream patching. - -SDDM in 0.19 only appends " (Wayland)" in case the session name does -not already end with this, to avoid duplicating it. - -CCBUG: https://bugs.kde.org/show_bug.cgi?id=368409 -See also: https://github.com/sddm/sddm/pull/997 - -Reviewers: #plasma, davidedmundson, fvogt, ngraham - -Reviewed By: #plasma, davidedmundson, fvogt, ngraham - -Subscribers: ngraham, pino, rdieter, fvogt, davidedmundson, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D22210 ---- - login-sessions/plasmawayland.desktop.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/login-sessions/plasmawayland.desktop.cmake b/login-sessions/plasmawayland.desktop.cmake -index 64f997ea4..3e9b46bc9 100644 ---- a/login-sessions/plasmawayland.desktop.cmake -+++ b/login-sessions/plasmawayland.desktop.cmake -@@ -2,51 +2,7 @@ - Exec=dbus-run-session ${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland - TryExec=${CMAKE_INSTALL_FULL_BINDIR}/startplasma-wayland - DesktopNames=KDE --Name=Plasma --Name[ar]=بلازما --Name[bs]=Plazma --Name[ca]=Plasma --Name[ca@valencia]=Plasma --Name[cs]=Plasma --Name[da]=Plasma --Name[de]=Plasma --Name[el]=Plasma --Name[en_GB]=Plasma --Name[es]=Plasma --Name[et]=Plasma --Name[eu]=Plasma --Name[fi]=Plasma --Name[fr]=Plasma --Name[gl]=Plasma --Name[he]=פלזמה --Name[hu]=Plasma --Name[id]=Plasma --Name[is]=Plasma --Name[it]=Plasma --Name[ja]=プラズマ --Name[ko]=Plasma --Name[lt]=Plasma --Name[nb]=Plasma --Name[nds]=Plasma --Name[nl]=Plasma --Name[nn]=Plasma --Name[pa]=ਪਲਾਜ਼ਮਾ --Name[pl]=Plazma --Name[pt]=Plasma --Name[pt_BR]=Plasma --Name[ru]=Plasma --Name[sk]=Plasma --Name[sl]=Plasma --Name[sr]=Плазма --Name[sr@ijekavian]=Плазма --Name[sr@ijekavianlatin]=Plasma --Name[sr@latin]=Plasma --Name[sv]=Plasma --Name[tr]=Plama --Name[uk]=Плазма --Name[x-test]=xxPlasmaxx --Name[zh_CN]=Plasma --Name[zh_TW]=Plasma -+Name=Plasma (Wayland) - Comment=Plasma by KDE - Comment[ar]=بلازما كدي - Comment[bs]=Plazma od strane KDe --- -2.23.0 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch deleted file mode 100644 index 114e653df8e1..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.17.5-disable-autoscaling-on-qt-5.14.patch +++ /dev/null @@ -1,47 +0,0 @@ -From ea66bff2af8466f2bb5acafcc43ac8f79b1f447f Mon Sep 17 00:00:00 2001 -From: Fabian Vogt -Date: Tue, 21 Jan 2020 11:55:49 +0100 -Subject: Also disable automatic scaling on Qt >= 5.14 - -Summary: -Applications which set `Qt::AA_EnableHighDpiScaling` use the DPI of the monitor the window is on to calculate an additional scaling factor. -Plasma sets `QT_SCREEN_SCALE_FACTORS` in the environment for manual specification of per-monitor scale, which combined with the automatic scaling may result in double scaling. -To disable the automatic scaling, `QT_AUTO_SCREEN_SCALE_FACTOR=0` has to be set, even on Qt 5.14. - -As a side effect, this works around QTBUG-80967 as well. - -BUG: 415421 - -Test Plan: On X11, with a >144dpi monitor and a scaling factor of 2 set manually, scaling was doubled previously. Now it works as expected. - -Reviewers: #plasma, apol, davidedmundson, fvogt - -Reviewed By: #plasma, davidedmundson, fvogt - -Subscribers: acooligan, fvogt, asturmlechner, dfaure, davidedmundson, anthonyfieroni, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D26185 ---- - startkde/startplasma.cpp | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index 8d88587..4a89878 100644 ---- a/startkde/startplasma.cpp -+++ b/startkde/startplasma.cpp -@@ -222,11 +222,9 @@ void runEnvironmentScripts() - - void setupPlasmaEnvironment() - { --#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - //Manually disable auto scaling because we are scaling above - //otherwise apps that manually opt in for high DPI get auto scaled by the developer AND manually scaled by us - qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "0"); --#endif - - qputenv("KDE_FULL_SESSION", "true"); - qputenv("KDE_SESSION_VERSION", "5"); --- -cgit v1.1 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild deleted file mode 100644 index 41f1e2d666a5..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.17.5-r1.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.64.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.12.3 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="appstream +calendar geolocation gps qalculate qrcode +semantic-desktop systemd" - -REQUIRED_USE="gps? ( geolocation )" - -# drop qtgui subslot operator when QT_MINIMAL >= 5.14.0 -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5=[jpeg] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${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/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/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/kidletime-${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/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/solid-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - media-libs/phonon[qt5(+)] - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - qalculate? ( sci-libs/libqalculate:= ) - qrcode? ( >=kde-frameworks/prison-${KFMIN}:5 ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 - x11-base/xorg-proto -" -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-19.04.3:5 - >=kde-frameworks/kdesu-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/ksysguard-${PVCUT}:5 - >=kde-plasma/milou-${PVCUT}:5 - >=kde-plasma/plasma-integration-${PVCUT}:5 - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !