From 0e2fa42b60ae0f14e4ca2607fd686eaa5b6f06f6 Mon Sep 17 00:00:00 2001 From: demmm Date: Sun, 19 Nov 2023 15:40:29 +0100 Subject: [PATCH 1/7] [CMake] use KPMCore version to select Qt6 with https://invent.kde.org/system/kpmcore/-/commit/2588d1e796442409a8f95f1777b4f1d89086028a KPMCore is Qt6 only, so any version from 24.01.75 on is Qt6, no need to check for Qt version this way add missing NO_CONFIG to summaryq --- CMakeModules/KPMcoreHelper.cmake | 21 +++++++++++---------- src/modules/summaryq/CMakeLists.txt | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CMakeModules/KPMcoreHelper.cmake b/CMakeModules/KPMcoreHelper.cmake index ce1071160..36172e85b 100644 --- a/CMakeModules/KPMcoreHelper.cmake +++ b/CMakeModules/KPMcoreHelper.cmake @@ -15,18 +15,19 @@ if(NOT TARGET calapmcore) find_package(${kfname}I18n CONFIG) find_package(${kfname}WidgetsAddons CONFIG) - if(NOT WITH_QT6) - # TODO: Qt6 how to detect the version of Qt that KPMCore needs? + if( WITH_QT6) + find_package(KPMcore 24.01.75) + else() find_package(KPMcore 20.04.0) - set_package_properties( - KPMcore - PROPERTIES - URL "https://invent.kde.org/kde/kpmcore" - DESCRIPTION "KDE Partitioning library" - TYPE RECOMMENDED - PURPOSE "For disk partitioning support" - ) endif() + set_package_properties( + KPMcore + PROPERTIES + URL "https://invent.kde.org/kde/kpmcore" + DESCRIPTION "KDE Partitioning library" + TYPE RECOMMENDED + PURPOSE "For disk partitioning support" + ) # Create an internal Calamares interface to KPMcore # and give it a nice alias name. If kpmcore is not found, diff --git a/src/modules/summaryq/CMakeLists.txt b/src/modules/summaryq/CMakeLists.txt index 9ec8327fa..e63640597 100644 --- a/src/modules/summaryq/CMakeLists.txt +++ b/src/modules/summaryq/CMakeLists.txt @@ -23,4 +23,5 @@ calamares_add_plugin(summaryq LINK_PRIVATE_LIBRARIES calamaresui SHARED_LIB + NO_CONFIG ) From 8748a52c6821641f05cd8b1b204398ea44236807 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 20 Nov 2023 20:31:58 +0100 Subject: [PATCH 2/7] [keyboard] Add explanatory translation comment --- src/modules/keyboard/KeyboardPage.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/keyboard/KeyboardPage.ui b/src/modules/keyboard/KeyboardPage.ui index f57040a65..e131e5c9a 100644 --- a/src/modules/keyboard/KeyboardPage.ui +++ b/src/modules/keyboard/KeyboardPage.ui @@ -150,7 +150,7 @@ SPDX-License-Identifier: GPL-3.0-or-later - Keyboard switch: + Switch Keyboard: From 5809b32c98c968bb519e0cda76e16c4bb8251480 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Nov 2023 15:11:59 +0100 Subject: [PATCH 3/7] CI: expand fedora dependencies --- ci/deps-fedora-qt6.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/deps-fedora-qt6.sh b/ci/deps-fedora-qt6.sh index 4bb7bb095..2d2e83ce5 100755 --- a/ci/deps-fedora-qt6.sh +++ b/ci/deps-fedora-qt6.sh @@ -8,7 +8,8 @@ yum install -y yaml-cpp-devel libpwquality-devel parted-devel python-devel gette yum install -y libicu-devel libatasmart-devel # Qt6/KF6 dependencies yum install -y qt6-qtbase-devel qt6-linguist qt6-qtbase-private-devel qt6-qtdeclarative-devel qt6-qtsvg-devel qt6-qttools-devel -yum install -y kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel +yum install -y extra-cmake-modules kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel +yum install -y kf6-kconfig-devel kf6-ki18n-devel kf6-kwidgetsaddons-devel kf6-kservice-devel yum install -y polkit-qt6-1-devel appstream-qt-devel # Runtime dependencies for QML modules yum install -y kf6-kirigami2-devel || true From 01e7cf44c221a0d215e30ad27ba47f5058260961 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Nov 2023 15:22:09 +0100 Subject: [PATCH 4/7] [libcalamares] Placeholder for KF6 automount DBus calls --- src/libcalamares/partition/AutoMount.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 7e1040a28..1f17e3173 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -42,8 +42,15 @@ struct AutoMountInfo static inline QDBusMessage kdedCall( const QString& method ) { +#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) return QDBusMessage::createMethodCall( QStringLiteral( "org.kde.kded5" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded5" ), method ); +#else +#warning KF6 Automount-handling is untested + // This is definitely wrong until Plasma6 is released, and somebody tests it + return QDBusMessage::createMethodCall( + QStringLiteral( "org.kde.kded6" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded6" ), method ); +#endif } /** @brief Log a response from call() From b37afd4269ee27c59bc81c92642b2a807da9089f Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Wed, 22 Nov 2023 18:27:16 +0100 Subject: [PATCH 5/7] Update openSUSE repositories Also make sure refresh is enabled. --- ci/deps-opensuse-qt6.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps-opensuse-qt6.sh b/ci/deps-opensuse-qt6.sh index f4f709508..6838dfa90 100755 --- a/ci/deps-opensuse-qt6.sh +++ b/ci/deps-opensuse-qt6.sh @@ -3,8 +3,8 @@ # Install dependencies for the nightly-opensuse-qt6 build # # Add a Qt6/KF6 repo -zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:krop:kf6/openSUSE_Tumbleweed/home:krop:kf6.repo -zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/KDE:/Qt6/openSUSE_Tumbleweed/KDE:Qt6.repo +zypper --non-interactive addrepo -f -G https://download.opensuse.org/repositories/KDE:/Unstable:/Frameworks/openSUSE_Factory/KDE:Unstable:Frameworks.repo +zypper --non-interactive addrepo -f -G https://download.opensuse.org/repositories/KDE:/Qt6/openSUSE_Tumbleweed/KDE:Qt6.repo zypper --non-interactive refresh zypper --non-interactive up From 26236fe63a33648aff37f03c4fbd7844f2e2e632 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 23 Nov 2023 21:08:05 +0100 Subject: [PATCH 6/7] Changes: post-release, add some credits --- CHANGES-3.3 | 3 ++- CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES-3.3 b/CHANGES-3.3 index 815ef893f..f035ea4cc 100644 --- a/CHANGES-3.3 +++ b/CHANGES-3.3 @@ -11,7 +11,8 @@ the history of the 3.2 series (2018-05 - 2022-08). # 3.3.0 (unreleased) This release contains contributions from (alphabetically by first name): - - Nobody, yet + - Adriaan de Groot + - Christophe Marin ## Core ## diff --git a/CMakeLists.txt b/CMakeLists.txt index b7af98fed..589b134a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,8 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(CALAMARES_VERSION 3.3.0-alpha6) -set(CALAMARES_RELEASE_MODE ON) # Set to ON during a release +set(CALAMARES_VERSION 3.3.0) +set(CALAMARES_RELEASE_MODE OFF) # Set to ON during a release if(CMAKE_SCRIPT_MODE_FILE) include(${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake) From 7a9a50d7023e564f0e0211c0aefedd48b0dd9eac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 26 Nov 2023 21:53:04 +0100 Subject: [PATCH 7/7] [libcalamares] AutoMount / kded6 has been tested by KaOS --- src/libcalamares/partition/AutoMount.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 1f17e3173..c21f7817d 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -30,12 +30,12 @@ struct AutoMountInfo * * KDE Solid automount management. * - * Solid can be influenced through DBus calls to kded5. The following code - * handles Solid: if Solid exists (e.g. we're in a KDE Plasma desktop) + * Solid can be influenced through DBus calls to kded (both kded5 and kded6). The + * following code handles Solid: if Solid exists (e.g. we're in a KDE Plasma desktop) * then try to turn off automount that way. */ -/** @brief Boilerplate for a call to kded5 +/** @brief Boilerplate for a call to kded * * Returns a method-call message, ready for arguments and call(). */ @@ -46,8 +46,6 @@ kdedCall( const QString& method ) return QDBusMessage::createMethodCall( QStringLiteral( "org.kde.kded5" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded5" ), method ); #else -#warning KF6 Automount-handling is untested - // This is definitely wrong until Plasma6 is released, and somebody tests it return QDBusMessage::createMethodCall( QStringLiteral( "org.kde.kded6" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded6" ), method ); #endif