Git commit 072eee57cabdb85cbd4f5aa7769deb5ace0a0b7a by Friedrich W. H. Kossebau. Committed on 01/10/2023 at 17:22. Pushed by kossebau into branch 'master'.
Drop support for Qt5/KF5 M +0 -2 .gitlab-ci.yml M +0 -7 .kde-ci.yml M +16 -20 CMakeLists.txt M +1 -1 debian.control M +3 -3 doc/index.docbook https://invent.kde.org/games/kajongg/-/commit/072eee57cabdb85cbd4f5aa7769deb5ace0a0b7a diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 694b5b89..e788fac9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,5 @@ # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml diff --git a/.kde-ci.yml b/.kde-ci.yml index f1971608..3bb8b0bd 100644 --- a/.kde-ci.yml +++ b/.kde-ci.yml @@ -8,10 +8,3 @@ Dependencies: 'frameworks/kdoctools': '@latest-kf6' 'frameworks/ki18n': '@latest-kf6' 'games/libkmahjongg': '@latest-kf6' - -- 'on': ['Linux/Qt5', 'FreeBSD/Qt5'] - 'require': - 'frameworks/extra-cmake-modules': '@stable' - 'frameworks/kdoctools': '@stable' - 'frameworks/ki18n': '@stable' - 'games/libkmahjongg': '@same' diff --git a/CMakeLists.txt b/CMakeLists.txt index cf6db57d..42d99918 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ set(RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_ project(kajongg VERSION ${RELEASE_SERVICE_VERSION}) set(PYTHON_MIN_VERSION "3.8.0") -set(QT_MIN_VERSION "5.2") -set(KF_MIN_VERSION "5.15.0") +set(QT_MIN_VERSION "6.5.0") +set(KF_MIN_VERSION "5.240.0") set(TWISTED_MIN_VERSION "16.6.0") find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) @@ -27,21 +27,20 @@ include(FindPythonInterp) include(KDEPython) -if (QT_MAJOR_VERSION STREQUAL "6") - set(QT_REQUIRED_VERSION "6.5.0") - set(KF_MIN_VERSION "5.240.0") - set(KF_MAJOR_VERSION "6") -else() - set(KF_MAJOR_VERSION "5") -endif() - find_package(PythonInterp ${PYTHON_MIN_VERSION} REQUIRED) find_package(Twisted ${TWISTED_MIN_VERSION} REQUIRED) -find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Gui Svg Widgets) -if (QT_MAJOR_VERSION STREQUAL "6") - find_package(Qt6SvgWidgets ${QT_MIN_VERSION} REQUIRED) -endif() -find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS DocTools I18n) +find_package(Qt6 ${QT_MIN_VERSION} REQUIRED COMPONENTS + Core + Gui + Svg + SvgWidgets + Widgets +) + +find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS + DocTools + I18n +) add_subdirectory( voices ) add_subdirectory( doc ) @@ -119,11 +118,8 @@ set(DATAFILES src/backgroundselector.ui src/kajonggui.rc) -if (QT_MAJOR_VERSION STREQUAL "6") - find_package(KMahjongglib6 5.1.0 REQUIRED) -else() - find_package(KF5KMahjongglib REQUIRED) -endif() + +find_package(KMahjongglib6 5.1.0 REQUIRED) # In KDE4, this was done with PYKDE4_INSTALL_PYTHON_FILES and PYKDE4_ADD_EXECUTABLE # because including PYKDE4 does not seem appropriate when not using PYKDE4 bindings, diff --git a/debian.control b/debian.control index 0446f010..68cb6b8c 100644 --- a/debian.control +++ b/debian.control @@ -5,7 +5,7 @@ Maintainer: Wolfgang Rohdewald <wolfg...@rohdewald.de> Package: kajongg Architecture: all -Depends: python (>= 3.8.0), python-twisted-core, python3-qtpy(>= 2.2.0), libqt5svg5, python3-pyqt5.qtsvg, python3-pyqt5.sip, libsqlite3-0, kdegames-mahjongg-data, vorbis-tools +Depends: python (>= 3.8.0), python-twisted-core, python3-qtpy(>= 2.2.0), libqt6svg6, python3-pyqt6.qtsvg, python3-pyqt6.sip, libsqlite3-0, kdegames-mahjongg-data, vorbis-tools Recommends: sox Replaces: kmj Homepage: https://apps.kde.org/kajongg diff --git a/doc/index.docbook b/doc/index.docbook index 3865e97b..ff9af0e7 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -1012,9 +1012,9 @@ If you want to download the source and install manually: <para> Kajongg depends on those packages: (debian package names in parentheses) <itemizedlist> - <listitem><para>Python 3.5 or higher (python3)</para></listitem> - <listitem><para>Qt5.7 or higher (python3-pyqt5 and python3-pyqt5.qtsvg)</para></listitem> - <listitem><para>the python bindings for Qt5 (python3-pyqt5)</para></listitem> + <listitem><para>Python 3.8 or higher (python3)</para></listitem> + <listitem><para>Qt6.5 or higher (python3-pyqt6 and python3-pyqt6.qtsvg)</para></listitem> + <listitem><para>the python bindings for Qt6 (python3-pyqt6)</para></listitem> <listitem><para>the python twisted library 16.6.0 or higher (python3-twisted)</para></listitem> <listitem><para>sqlite3 (libsqlite3-0)</para></listitem> </itemizedlist>
