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) 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/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 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 diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 7e1040a28..c21f7817d 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -30,20 +30,25 @@ 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(). */ 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 + return QDBusMessage::createMethodCall( + QStringLiteral( "org.kde.kded6" ), QStringLiteral( "/kded" ), QStringLiteral( "org.kde.kded6" ), method ); +#endif } /** @brief Log a response from call() 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: 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 )