summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-28 17:30:14 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-07-28 17:37:35 +0200
commit4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7 (patch)
tree37f83cadae800bc22c9db2d60e2964dba9b9953c
parentkde-plasma/plasma-thunderbolt: drop 5.19.3* (diff)
downloadgentoo-4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7.tar.gz
gentoo-4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7.tar.bz2
gentoo-4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7.zip
kde-plasma/plasma-workspace: drop 5.19.3*
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/plasma-workspace/Manifest1
-rw-r--r--kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch62
-rw-r--r--kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild222
3 files changed, 0 insertions, 285 deletions
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 0331710b8bd7..514c4868ea76 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
DIST plasma-workspace-5.18.5.tar.xz 5696256 BLAKE2B 7aaf19ff75eb796bbd687e6c63b9703431ecc567bc52c2c173718d45b3946b22572b3a097f7fb7e9726cedcb98cfbb2f20c580efefa4d9cb9d4f2473abeac636 SHA512 870cf89649d9498831f4ef9b21d3c07504b7fc7b09b95dd7e0a1d356b41fbfceed1c4f27aa258bcf1e23cfe915d31701c155325fcd4944f9cc957a287ebc1ee2
-DIST plasma-workspace-5.19.3.tar.xz 5676896 BLAKE2B 1ccd0f5be74056ed04eb368958847e9fa4bed92a295db62f6d48f2c0d0750fb3ced1f71c27be0052c0732e8aada7e6a2212cce20da500d5de8a4e8df78c9442a SHA512 c29d3c674d197b25644200c11c602ac5b3ec2289d12e09139a404225c224a4da039db645b42ba0692588bd03c85fa7b11c2ff3c3cd4a07485cdac19a4dca0754
DIST plasma-workspace-5.19.4.tar.xz 5677192 BLAKE2B 5a336a85aaacc63965de4e63ad827363ba7f6aa1ec0ca84fa4cc1ed225ff577b9806c69ed683d05f4d1d10b890ddd45ea9692568aab4be5cfe93706d0a4a3428 SHA512 ee17e3fe80a643cbfecea9b0d261cc8dcdf263f87c4d4926703f20089ae9e937f9fe54fe1e9d6a5fe19bc1d564aa00090296c87be3dae68ee3edd5f0e75a3d0a
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch
deleted file mode 100644
index 44c29a2f0913..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 76028ecdbd9a060b375c1cc53c6ae9ab9276cb28 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 9 Jul 2020 19:46:02 +0200
-Subject: [PATCH] Revert "Fix broken ENV variables for detailed settings"
-
-This reverts commit edc64d04a1e569d7032c41e6ee0ebf59833c26f2.
----
- startkde/startplasma.cpp | 31 ++++++++++---------------------
- 1 file changed, 10 insertions(+), 21 deletions(-)
-
-diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index b2dba900d..a055d5635 100644
---- a/startkde/startplasma.cpp
-+++ b/startkde/startplasma.cpp
-@@ -128,27 +128,11 @@ void runStartupConfig()
- KConfig config(QStringLiteral("plasma-localerc"));
- KConfigGroup formatsConfig = KConfigGroup(&config, "Formats");
-
-- // In case we don't have a value in the config file, but in the ENV variables, write it
-- if (!formatsConfig.hasKey("LANG") && !qEnvironmentVariableIsEmpty("LANG")) {
-- formatsConfig.writeEntry("LANG", qgetenv("LANG"));
-- formatsConfig.sync();
-- }
--
-- const auto explicitLCValues = { "LANG", "LC_COLLATE", "LC_CTYPE" };
-- const auto detailedLCValues = { "LC_NUMERIC", "LC_TIME", "LC_MONETARY", "LC_MEASUREMENT" };
-- const QString lcLang = formatsConfig.readEntry("LANG");
-- const bool useDetailed = formatsConfig.readEntry("useDetailed", false);
--
-- // These values have to explicitly set
-- for (auto lc : explicitLCValues) {
-- const QString value = formatsConfig.readEntry(lc);
-- if (!value.isEmpty()) {
-- qputenv(lc, value.toUtf8());
-- }
-- }
-- // If we have the "Detailed Settings" checkbox unchecked we want to use the value from the LANG entry
-- for (auto lc : detailedLCValues) {
-- const QString value = useDetailed ? formatsConfig.readEntry(lc) : lcLang;
-+ const auto lcValues = {
-+ "LANG", "LC_NUMERIC", "LC_TIME", "LC_MONETARY", "LC_MEASUREMENT", "LC_COLLATE", "LC_CTYPE"
-+ };
-+ for (auto lc : lcValues) {
-+ const QString value = formatsConfig.readEntry(lc, QString());
- if (!value.isEmpty()) {
- qputenv(lc, value.toUtf8());
- }
-@@ -159,6 +143,11 @@ void runStartupConfig()
- if (!value.isEmpty()) {
- qputenv("LANGUAGE", value.toUtf8());
- }
-+
-+ if (!formatsConfig.hasKey("LANG") && !qEnvironmentVariableIsEmpty("LANG")) {
-+ formatsConfig.writeEntry("LANG", qgetenv("LANG"));
-+ formatsConfig.sync();
-+ }
- }
-
- void setupCursor(bool wayland)
---
-2.27.0
-
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild
deleted file mode 100644
index ca003e21c462..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.19.3-r1.ebuild
+++ /dev/null
@@ -1,222 +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.71.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.14.2
-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 telemetry"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-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 )
- telemetry? ( dev-libs/kuserfeedback: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/kquickcharts-${KFMIN}: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 )
- !<kde-plasma/plasma-desktop-5.16.80:5
-"
-PDEPEND="
- >=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
- "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
- "${FILESDIR}/${P}-revert-fix-broken-env-vars-for-detailed-settings.patch" # KDE-Bug #423995
-)
-
-RESTRICT+=" test"
-
-pkg_setup() {
- ecm_pkg_setup
-
- local md5
- local srcfile=/etc/plasma/XX/10-agent-XX.sh
- local newdir="${EPREFIX}"/etc/xdg/plasma-workspace
-
- if [[ -f "${EROOT}"${srcfile//XX/startup} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/startup})
- if [[ ${md5%% *} != 90caaabb40b56bfbe65388841a6dd6ca ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/startup} detected."
- elog "Copying to ${newdir}/env/10-agent-startup.sh..."
- cp -v "${EROOT}"${srcfile//XX/startup} "${T}"/ || die
- fi
- fi
-
- if [[ -f "${EROOT}"${srcfile//XX/shutdown} ]]; then
- md5=$(md5sum "${EROOT}"${srcfile//XX/shutdown})
- if [[ ${md5%% *} != d7bffa0273f92abd999c7c3c43dbc23d ]]; then
- elog "Existing modified ${EPREFIX}${srcfile//XX/shutdown} detected."
- elog "Copying to ${newdir}/shutdown/10-agent-shutdown.sh..."
- cp -v "${EROOT}"${srcfile//XX/shutdown} "${T}"/ || die
- fi
- fi
-}
-
-src_prepare() {
- ecm_src_prepare
-
- if [[ ! -f "${T}"/10-agent-startup.sh ]]; then
- cp "${FILESDIR}"/10-agent-startup.sh "${T}"/ || die
- fi
- if [[ ! -f "${T}"/10-agent-shutdown.sh ]]; then
- cp "${FILESDIR}"/10-agent-shutdown.sh "${T}"/ || die
- fi
-
- cmake_comment_add_subdirectory libkworkspace
- # delete colliding libkworkspace translations
- if [[ ${KDE_BUILD_TYPE} = release ]]; then
- find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_xembed-sni-proxy=OFF
- $(cmake_use_find_package appstream AppStreamQt)
- $(cmake_use_find_package calendar KF5Holidays)
- $(cmake_use_find_package geolocation KF5NetworkManagerQt)
- $(cmake_use_find_package qalculate Qalculate)
- $(cmake_use_find_package qrcode KF5Prison)
- $(cmake_use_find_package semantic-desktop KF5Baloo)
- $(cmake_use_find_package telemetry KUserFeedback)
- )
-
- use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) )
-
- ecm_src_configure
-}
-
-src_install() {
- ecm_src_install
-
- # default startup and shutdown scripts
- insinto /etc/xdg/plasma-workspace/env
- doins "${T}"/10-agent-startup.sh
-
- insinto /etc/xdg/plasma-workspace/shutdown
- doins "${T}"/10-agent-shutdown.sh
- fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh
-}
-
-pkg_postinst () {
- ecm_pkg_postinst
-
- # Clean up pre-5.17.4 scripts
- if [[ -e "${EROOT}"/etc/plasma/startup/10-agent-startup.sh ]]; then
- rm "${EROOT}"/etc/plasma/startup/10-agent-startup.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh"
- fi
- if [[ -e "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh ]]; then
- rm "${EROOT}"/etc/plasma/shutdown/10-agent-shutdown.sh || die
- elog "Removed obsolete ${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
- fi
-
- 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"
-}