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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4116138359 for ; Tue, 28 Jul 2020 15:38:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D9D40E0955; Tue, 28 Jul 2020 15:38:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B5491E0955 for ; Tue, 28 Jul 2020 15:38:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A5D1734F338 for ; Tue, 28 Jul 2020 15:38:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B2D3304 for ; Tue, 28 Jul 2020 15:37:58 +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: <1595950655.4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7.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/Manifest kde-plasma/plasma-workspace/files/plasma-workspace-5.19.3-revert-fix-broken-env-vars-for-detailed-settings.patch kde-plasma/plasma-workspace/plasma-workspace-5.19.3-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: 4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7 X-VCS-Branch: master Date: Tue, 28 Jul 2020 15:37:58 +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: 34a1ea46-8570-444b-aaa8-23e5c57b9c89 X-Archives-Hash: 541735cdfe24abdaf764b4176e236ba3 commit: 4aafa6d0e1b8ae09efdfa7a93129e3ce668948d7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 28 15:30:14 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jul 28 15:37:35 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aafa6d0 kde-plasma/plasma-workspace: drop 5.19.3* Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/plasma-workspace/Manifest | 1 - ...fix-broken-env-vars-for-detailed-settings.patch | 62 ------ .../plasma-workspace-5.19.3-r1.ebuild | 222 --------------------- 3 files changed, 285 deletions(-) diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 0331710b8bd..514c4868ea7 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 44c29a2f091..00000000000 --- 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 -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 ca003e21c46..00000000000 --- 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 ) - !