diff --git a/cmake/libs/RP_FindQt4andKDE4.cmake b/cmake/libs/RP_FindQt4andKDE4.cmake index 9ed60f20b..ab3ef8345 100644 --- a/cmake/libs/RP_FindQt4andKDE4.cmake +++ b/cmake/libs/RP_FindQt4andKDE4.cmake @@ -2,6 +2,7 @@ MACRO(FIND_QT4_AND_KDE4) SET(ENV{QT_SELECT} qt4) SET(QT_DEFAULT_MAJOR_VERSION 4) + SET(QT_NO_CREATE_VERSIONLESS_TARGETS TRUE) SET(QT4_NO_LINK_QTMAIN 1) FIND_PACKAGE(Qt4 4.6.0 ${REQUIRE_KDE4} COMPONENTS QtCore QtGui QtDBus) diff --git a/cmake/libs/RP_FindQt5andKF5.cmake b/cmake/libs/RP_FindQt5andKF5.cmake index b2f127014..eab361871 100644 --- a/cmake/libs/RP_FindQt5andKF5.cmake +++ b/cmake/libs/RP_FindQt5andKF5.cmake @@ -8,6 +8,7 @@ MACRO(FIND_QT5_AND_KF5) SET(ENV{QT_SELECT} qt5) SET(QT_DEFAULT_MAJOR_VERSION 5) + SET(QT_NO_CREATE_VERSIONLESS_TARGETS TRUE) # FIXME: Search for Qt5 first instead of ECM? diff --git a/cmake/libs/RP_FindQt6andKF6.cmake b/cmake/libs/RP_FindQt6andKF6.cmake index ca500840c..1dff71633 100644 --- a/cmake/libs/RP_FindQt6andKF6.cmake +++ b/cmake/libs/RP_FindQt6andKF6.cmake @@ -7,6 +7,7 @@ MACRO(FIND_QT6_AND_KF6) SET(ENV{QT_SELECT} qt6) SET(QT_DEFAULT_MAJOR_VERSION 6) + SET(QT_NO_CREATE_VERSIONLESS_TARGETS TRUE) # FIXME: Search for Qt6 first instead of ECM? SET(KF6_MIN 5.248.0) @@ -73,7 +74,9 @@ MACRO(FIND_QT6_AND_KF6) SET(QT_PLUGIN_INSTALL_DIR "${KF6_PLUGIN_INSTALL_DIR}") # Find KF6. - FIND_PACKAGE(KF6 ${REQUIRE_KF6} ${KF6_MIN} COMPONENTS KIO WidgetsAddons FileMetaData Crash) + # FIXME: Specifying the minimum version here breaks on Kubuntu 24.10. + #FIND_PACKAGE(KF6 ${REQUIRE_KF6} ${KF6_MIN} COMPONENTS KIO WidgetsAddons FileMetaData Crash) + FIND_PACKAGE(KF6 ${REQUIRE_KF6} COMPONENTS KIO WidgetsAddons FileMetaData Crash) IF(NOT KF6KIO_FOUND OR NOT KF6WidgetsAddons_FOUND OR NOT KF6FileMetaData_FOUND OR NOT KF6Crash_FOUND) # KF6 not found. SET(BUILD_KF6 OFF CACHE INTERNAL "Build the KDE Frameworks 6 plugin." FORCE) diff --git a/debian/changelog b/debian/changelog index 69f39fd9c..c1c984f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,9 @@ rom-properties (2.4-1ppa6~oracular5) oracular; urgency=medium * Add statx() to syscall whitelist to fix SIGSYS in amiiboc on armhf. - -- David Korth Tue, 12 Nov 2024 19:57:50 -0500 + * Fix Qt6 CMake build system issues + + -- David Korth Tue, 12 Nov 2024 20:38:28 -0500 rom-properties (2.4-1ppa6~oracular4) oracular; urgency=medium