Merge pull request #31 from Undef-a/wip/undef/fix-ftbfs

Fix failure to configure/build with newer CMake and Calamares 3.3.0
calamares · Jan 9, 2024 · 85f05e8 · 85f05e8
2 parents 6bd7557 + c28c9b8
commit 85f05e8
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,28 @@ project(calamares-extensions
 set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 
+if(WITH_QT6)
+    set(kfname "KF6")
+    set(KF_VERSION 5.240) # KDE Neon weirdness
+else()
+    message(STATUS "Building Calamares with Qt5")
+    set(kfname "KF5")
+    set(KF_VERSION 5.78)
+    # API that was deprecated before Qt 5.15 causes a compile error
+    add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050f00)
+endif()
+
+include( FeatureSummary )
+find_package(${kfname}CoreAddons ${KF_VERSION} QUIET)
+set_package_properties(
+    ${kfname}CoreAddons
+    PROPERTIES
+    TYPE REQUIRED
+    DESCRIPTION "KDE Framework CoreAddons"
+    URL "https://api.kde.org/frameworks/"
+    PURPOSE "Essential Framework for AboutData and Macros"
+)
+
 # On developer's machine, the user package registry breaks
 # consumers by loading the developer's config from a build
 # directory (which doesn't have the rest of the config

diff --git a/modules/mobile/Config.cpp b/modules/mobile/Config.cpp
@@ -18,7 +18,7 @@ Config::Config( QObject* parent )
 void
 Config::setConfigurationMap( const QVariantMap& cfgMap )
 {
-    using namespace CalamaresUtils;
+    using namespace Calamares;
 
     if ( getBool( cfgMap, "bogus", false ) )
     {

diff --git a/modules/mobile/PartitionJob.cpp b/modules/mobile/PartitionJob.cpp
@@ -5,7 +5,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>
@@ -75,7 +75,7 @@ Calamares::JobResult
 PartitionJob::exec()
 {
     using namespace Calamares;
-    using namespace CalamaresUtils;
+    using namespace Calamares;
     using namespace std;
 
     const QString pathMount = "/mnt/install";

diff --git a/modules/mobile/UsersJob.cpp b/modules/mobile/UsersJob.cpp
@@ -5,7 +5,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>
@@ -47,7 +47,7 @@ Calamares::JobResult
 UsersJob::exec()
 {
     using namespace Calamares;
-    using namespace CalamaresUtils;
+    using namespace Calamares;
     using namespace std;
 
     QList< QPair< QStringList, QString > > commands = {

diff --git a/modules/unpackfsc/FSArchiverRunner.cpp b/modules/unpackfsc/FSArchiverRunner.cpp
@@ -62,7 +62,7 @@ FSArchiverRunner::checkPrerequisites( QString& fsarchiverExecutable ) const
 Calamares::JobResult
 FSArchiverRunner::checkDestination( QString& destinationPath ) const
 {
-    destinationPath = CalamaresUtils::System::instance()->targetPath( m_destination );
+    destinationPath = Calamares::System::instance()->targetPath( m_destination );
     if ( destinationPath.isEmpty() )
     {
         return Calamares::JobResult::internalError(

diff --git a/modules/unpackfsc/Runners.cpp b/modules/unpackfsc/Runners.cpp
@@ -9,7 +9,7 @@
 
 #include "Runners.h"
 
-#include <utils/CalamaresUtilsSystem.h>
+#include <utils/System.h>
 #include <utils/Logger.h>
 
 #include <QFileInfo>

diff --git a/modules/unpackfsc/TarballRunner.cpp b/modules/unpackfsc/TarballRunner.cpp
@@ -38,7 +38,7 @@ TarballRunner::run()
             Calamares::JobResult::MissingRequirements );
     }
 
-    const QString destinationPath = CalamaresUtils::System::instance()->targetPath( m_destination );
+    const QString destinationPath = Calamares::System::instance()->targetPath( m_destination );
     if ( destinationPath.isEmpty() )
     {
         return Calamares::JobResult::internalError(

diff --git a/modules/unpackfsc/UnpackFSCJob.cpp b/modules/unpackfsc/UnpackFSCJob.cpp
@@ -101,8 +101,8 @@ UnpackFSCJob::exec()
 void
 UnpackFSCJob::setConfigurationMap( const QVariantMap& map )
 {
-    QString source = CalamaresUtils::getString( map, "source" );
-    QString sourceTypeName = CalamaresUtils::getString( map, "sourcefs" );
+    QString source = Calamares::getString( map, "source" );
+    QString sourceTypeName = Calamares::getString( map, "sourcefs" );
     if ( source.isEmpty() || sourceTypeName.isEmpty() )
     {
         cWarning() << "Skipping item with bad source data:" << map;
@@ -115,7 +115,7 @@ UnpackFSCJob::setConfigurationMap( const QVariantMap& map )
         cWarning() << "Skipping item with source type None";
         return;
     }
-    QString destination = CalamaresUtils::getString( map, "destination" );
+    QString destination = Calamares::getString( map, "destination" );
     if ( destination.isEmpty() )
     {
         cWarning() << "Skipping item with empty destination";

diff --git a/modules/unpackfsc/UnsquashRunner.cpp b/modules/unpackfsc/UnsquashRunner.cpp
@@ -38,7 +38,7 @@ UnsquashRunner::run()
             Calamares::JobResult::MissingRequirements );
     }
 
-    const QString destinationPath = CalamaresUtils::System::instance()->targetPath( m_destination );
+    const QString destinationPath = Calamares::System::instance()->targetPath( m_destination );
     if ( destinationPath.isEmpty() )
     {
         return Calamares::JobResult::internalError(