diff options
Diffstat (limited to 'kde-plasma/plasma-welcome')
| -rw-r--r-- | kde-plasma/plasma-welcome/Manifest | 11 | ||||
| -rw-r--r-- | kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch | 99 | ||||
| -rw-r--r-- | kde-plasma/plasma-welcome/metadata.xml | 4 | ||||
| -rw-r--r-- | kde-plasma/plasma-welcome/plasma-welcome-5.27.11.ebuild | 60 | ||||
| -rw-r--r-- | kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/plasma-welcome/plasma-welcome-6.2.2.ebuild (renamed from kde-plasma/plasma-welcome/plasma-welcome-6.1.4.ebuild) | 7 |
6 files changed, 9 insertions, 174 deletions
diff --git a/kde-plasma/plasma-welcome/Manifest b/kde-plasma/plasma-welcome/Manifest index 5b9782879d0c..b19b4251726f 100644 --- a/kde-plasma/plasma-welcome/Manifest +++ b/kde-plasma/plasma-welcome/Manifest @@ -1,8 +1,5 @@ -AUX plasma-welcome-5.27.4.1-kaccounts-optional.patch 3455 BLAKE2B 47f4294b6ac94ce005d0079981fa31d33991ac01ec73adb768b4feb12ef169a70a7a13519efce88b5bb3d79bc7faa24054ecc10a79272a758e7ab64e39fa5b59 SHA512 a7533802112b34eb8a3d547ee5925f6123ce12a61423433f9a2014f3f37ae5d02da48748e535b3bd2eb5ae6d61ff4458af7960bfab2065e06d78047d26123a60 -DIST plasma-welcome-5.27.11.tar.xz 839880 BLAKE2B 68d9192fa244c51aa50ca9746221444d879e0e031ca0fdbafdd641786ae3528fd7bde0ea2c76fabc7aed617248184a88e5c6658e85654fe162cf34bb47bd4a84 SHA512 b6e263d6fae310500743bb2ab6407ad5162b36aa91be9c932cd45ed56a2087ce47bde0be1a15be05397ccda9399f7b168266b6b10550ab3f337330af5b246aeb -DIST plasma-welcome-6.1.4.tar.xz 665592 BLAKE2B 550e9cbaa26d0f250bf96b420e2c6b4ff1df4e85d07f707ef39fd0a9be82f154dea20aece30817b4b6dd2410d9cab4f384c546d4315591cd8ceee50cd2ba6d12 SHA512 9c011ea4d9fb1062f0b05790d5fc7406264fe62273bb9dfeb1908bb85dd045fdf6a760610c313bca20b1b0927da63734ac023b2100aa67d73c833f4fe4057ea7 DIST plasma-welcome-6.1.5.tar.xz 672448 BLAKE2B f7abe5740df64972b4c91183b2cded1070f016498f13bc15feaba59e625096b109f4dc5573f899523d899911b6903ce178afd8df5e1618c9ec9d9659bc6f863b SHA512 09fdad9a554607f89538139252ff2c1b59544ddcddb75a3548366647f3347b28df8d7c238b18f50535a22747451c96e029ef66989f3ad60ad7a06a4b8c3c92c6 -EBUILD plasma-welcome-5.27.11.ebuild 1578 BLAKE2B 1619763048f46d3576546c14baca2baa07463c6555a81f396377542f36e74bc7e7cd50e9dbf3dafd4f2e81e7a2951a0f3ab6edd50336d37fe8e2b8051334c998 SHA512 7128f5c6b8373baf3085e1903fb127d1ad076f7ce2de7666725e188b606ec3d49690e95e06c72cc118bcd991ed11c4e7314c74117cdd38ea8c241979158b0f1c -EBUILD plasma-welcome-6.1.4.ebuild 966 BLAKE2B ec47bcfd90bc332aea16f1cb993e1c73b99bc125f2f1706cb50ef5e453293dcbe6d1f220e0eaeeb0a0b47073b9604bf8a99c6f5f11bc5e662be159d9e4937bea SHA512 076a0222f7a466da820c9ba8bb93b7ed65c63f65ec71fecc1af8c2e272b11515e0b42b87d28cac0038d8856fa5415a86857233be2d3cef288c6c5144703eeb23 -EBUILD plasma-welcome-6.1.5.ebuild 968 BLAKE2B cbad545e5ff8f717f185945f1b127e20c004f1d306f0ded79ba44f2a2d634bee2ce9e5ffa074e50e40028a454e8586e1ffc4645960a0ce0052c1fa7535a3c059 SHA512 10a2426b62d4495684c350f566aa181b860f75d6b0213809940e1ff82339cb908d7f997a2226c08160bd5bc7a5bed3dd72c0b28eea7afd1c976b7240580b9b4b -MISC metadata.xml 550 BLAKE2B 78839fba571ddb92926c13ff6e8747b2d14af746f5e0f29483996df70a51801838c016de81ed9125fa79f701ff0aefe22f9bc95e71d068f3cc95bd210164fe5d SHA512 8d79e582ddf141e9e97e5de8036e4878f7a4c2acbb06669491da9e0d1ae64316d49d6a330b8c7268c411a42170d37152f8d7c1580ef3ad75454097780e92b24f +DIST plasma-welcome-6.2.2.tar.xz 691168 BLAKE2B 07d529049a82caf08cf641db7143e42039885f2708e5da6bea567ff6feb529824c4e9fca75cccf52c273afb34447e1d729963e18333b36079bbb3af69521468a SHA512 43e404e97ee291a5f1badf9a51c133a3ebd8991a54290669101964f5443c53b970de332107a3ee9c068e0f2a76814e7bc3b78d1a72a71a43d68ed29d51fec201 +EBUILD plasma-welcome-6.1.5.ebuild 966 BLAKE2B 6ea2f74855893d3b633d4e7b22beaf794c610aebef7a5b0cc1f53166feccdc5aa6cabcda428701b55433be31525842c052e537fc27bcc640472570fd59afad0e SHA512 d3eaf3070e1873ded5847dffad07bab3eee1e220088675dd61b19b484902a175ea26a4359eb757c4290f874badb03eed2c04b29ccfc8558cd52363cf60a9e3a7 +EBUILD plasma-welcome-6.2.2.ebuild 1002 BLAKE2B 0e53e847d4fdb2ecfc43095a6b368682e07997e2460005a89d3edcba10b492f4615043302c5bb618dcf3dc46f2c9a482c1e8ed6effa6bfbe87e87735b6f9a9b4 SHA512 4dd7c9d9bc56a3e99db39e84d6aaf75e20d2ee1241b4a0e0158fbd0f8267b3d5f3d0d59fea9313e685fc67f575b03d5986035633c18c38ca6159a06f8d77f2d2 +MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 diff --git a/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch b/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch deleted file mode 100644 index fc4eaa684a63..000000000000 --- a/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 24092946ed95b4ddf7e7f4c0f5bd9000e45fecad Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 19 Apr 2023 21:16:59 +0200 -Subject: [PATCH] Make KAccounts optional - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 2 +- - src/CMakeLists.txt | 1 + - src/contents/ui/main.qml | 4 +++- - src/controller.cpp | 9 +++++++++ - src/controller.h | 1 + - src/kuserfeedbacksettings.h.cmake | 1 + - 6 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 772d79e..86db439 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,7 +41,7 @@ ecm_setup_version(${PROJECT_VERSION} - find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Network Qml QuickControls2 Svg) - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 CoreAddons ConfigWidgets DBusAddons Declarative I18n KIO NewStuff Notifications Plasma Service WindowSystem) - find_package(KUserFeedback) --find_package(KAccounts REQUIRED) -+find_package(KAccounts) - - ecm_set_disabled_deprecation_versions(QT 5.15.2 - KF 5.101 -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 4eab33d..e0cc179 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -3,6 +3,7 @@ - # SPDX-FileCopyrightText: 2022 Nate Graham <nate@kde.org> - - set(HAVE_KUSERFEEDBACK ${KUserFeedback_FOUND}) -+set(HAVE_KACCOUNTS ${KAccounts_FOUND}) - configure_file(kuserfeedbacksettings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kuserfeedbacksettings.h) - - add_executable(plasma-welcome main.cpp controller.cpp resources.qrc module.cpp) -diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml -index 380c074..86da39b 100644 ---- a/src/contents/ui/main.qml -+++ b/src/contents/ui/main.qml -@@ -124,7 +124,9 @@ Kirigami.ApplicationWindow { - pageStack.push(kcm_feedback); - } - -- pageStack.push(kcm_kaccounts); -+ if (Controller.kAccountsAvailable()) { -+ pageStack.push(kcm_kaccounts); -+ } - - // Append any distro-specific pages that were found - let distroPages = Controller.distroPages() -diff --git a/src/controller.cpp b/src/controller.cpp -index 7586c23..de8fa85 100644 ---- a/src/controller.cpp -+++ b/src/controller.cpp -@@ -50,6 +50,15 @@ bool Controller::networkAlreadyConnected() - return false; - } - -+bool Controller::kAccountsAvailable() -+{ -+#if HAVE_KACCOUNTS -+ return true; -+#else -+ return false; -+#endif -+} -+ - bool Controller::userFeedbackAvailable() - { - #if HAVE_KUSERFEEDBACK -diff --git a/src/controller.h b/src/controller.h -index 20ba44c..97a9d1c 100644 ---- a/src/controller.h -+++ b/src/controller.h -@@ -15,6 +15,7 @@ public: - Q_INVOKABLE static void runCommand(const QString &command, const QString &desktopFilename); - Q_INVOKABLE bool networkAlreadyConnected(); - Q_INVOKABLE bool userFeedbackAvailable(); -+ Q_INVOKABLE bool kAccountsAvailable(); - Q_INVOKABLE QStringList distroPages(); - - Q_PROPERTY(QString newPlasmaVersion MEMBER m_newPlasmaVersion NOTIFY newPlasmaVersionChanged) -diff --git a/src/kuserfeedbacksettings.h.cmake b/src/kuserfeedbacksettings.h.cmake -index f30924f..a76aedf 100644 ---- a/src/kuserfeedbacksettings.h.cmake -+++ b/src/kuserfeedbacksettings.h.cmake -@@ -5,3 +5,4 @@ - */ - - #cmakedefine01 HAVE_KUSERFEEDBACK -+#cmakedefine01 HAVE_KACCOUNTS --- -2.40.0 - diff --git a/kde-plasma/plasma-welcome/metadata.xml b/kde-plasma/plasma-welcome/metadata.xml index 7499be9e7e7d..d925f2439758 100644 --- a/kde-plasma/plasma-welcome/metadata.xml +++ b/kde-plasma/plasma-welcome/metadata.xml @@ -8,8 +8,4 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> - <use> - <flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag> - <flag name="kaccounts">Build the OpenDesktop integration plugin</flag> - </use> </pkgmetadata> diff --git a/kde-plasma/plasma-welcome/plasma-welcome-5.27.11.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-5.27.11.ebuild deleted file mode 100644 index e9f2c0fdc96a..000000000000 --- a/kde-plasma/plasma-welcome/plasma-welcome-5.27.11.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm plasma.kde.org - -DESCRIPTION="A friendly onboarding wizard for Plasma" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" -IUSE="discover kaccounts telemetry" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/libplasma-${KFMIN}:5 - kaccounts? ( kde-apps/kaccounts-integration:5 ) - telemetry? ( kde-frameworks/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - discover? ( kde-plasma/discover:5 ) -" - -PATCHES=( "${FILESDIR}/${PN}-5.27.4.1-kaccounts-optional.patch" ) - -src_prepare() { - ecm_src_prepare - - if ! use discover; then - sed -e "s:pageStack.push(discover);:// & disabled by IUSE=discover:" \ - -i src/contents/ui/main.qml || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kaccounts KAccounts) - $(cmake_use_find_package telemetry KUserFeedback) - ) - ecm_src_configure -} diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild index 2536d95eb199..044eec5d243b 100644 --- a/kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild +++ b/kde-plasma/plasma-welcome/plasma-welcome-6.1.5.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Friendly onboarding wizard for Plasma" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" IUSE="" DEPEND=" diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.1.4.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.2.2.ebuild index c50d4dfea323..8a6d8a8f6655 100644 --- a/kde-plasma/plasma-welcome/plasma-welcome-6.1.4.ebuild +++ b/kde-plasma/plasma-welcome/plasma-welcome-6.2.2.ebuild @@ -3,19 +3,20 @@ EAPI=8 -KFMIN=6.3.0 +KFMIN=6.6.0 PVCUT=$(ver_cut 1-3) -QTMIN=6.7.1 +QTMIN=6.7.2 inherit ecm plasma.kde.org DESCRIPTION="Friendly onboarding wizard for Plasma" LICENSE="GPL-2+" SLOT="6" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" DEPEND=" + >=dev-libs/kirigami-addons-1.2.0 >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] >=dev-qt/qtsvg-${QTMIN}:6 |