[neon/kde/ksudoku/Neon/release] /: general modernisation

[Carlos De Maine]

Git commit e8306df5176527bd14f5b708fff4bfe25b9fd5cf by Carlos De Maine.
Committed on 25/11/2025 at 13:18.
Pushed by carlosdem into branch 'Neon/release'.

general modernisation

M  +4    -5    debian/control
D  +0    -23   debian/patches/require_both_opengl_andqt5opengl_for_gl_support.patch
D  +0    -1    debian/patches/series
M  +2    -2    debian/rules
D  +0    -24   patches/qtglobal.diff

https://invent.kde.org/neon/kde/ksudoku/-/commit/e8306df5176527bd14f5b708fff4bfe25b9fd5cf

diff --git a/debian/control b/debian/control
index c28f1af..d35985c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Uploaders: Daniel Schepler <schepler at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
-               debhelper-compat (= 12),
+               debhelper-compat (= 13),
                libgl1-mesa-dev [!armhf !arm64] | libgl-dev [!armhf !arm64],
                libglu1-mesa-dev [!armhf !arm64],
                kf6-extra-cmake-modules,
@@ -25,16 +25,15 @@ Build-Depends: cmake,
                kf6-ki18n-dev,
                kf6-kiconthemes-dev,
                kf6-kjobwidgets-dev,
-               libkdegames6-dev,
                kf6-kio-dev,
                kf6-kwidgetsaddons-dev,
                kf6-kxmlgui-dev,
-               libqt6opengl6-dev [!armhf !arm64],
-               qt6-svg-dev,
+               libkdegames6-dev,
                pkg-kde-tools-neon,
                qt6-base-dev,
                qt6-declarative-dev,
-Standards-Version: 4.1.4
+               qt6-svg-dev,
+Standards-Version: 4.6.2
 Homepage: http://games.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/ksudoku
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/ksudoku.git
diff --git a/debian/patches/require_both_opengl_andqt5opengl_for_gl_support.patch b/debian/patches/require_both_opengl_andqt5opengl_for_gl_support.patch
deleted file mode 100644
index 6eb1817..0000000
--- a/debian/patches/require_both_opengl_andqt5opengl_for_gl_support.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: ksudoku/CMakeLists.txt
-===================================================================
---- ksudoku.orig/CMakeLists.txt
-+++ ksudoku/CMakeLists.txt
-@@ -14,7 +14,8 @@ set (KF5_MIN_VERSION "5.46.0")
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
- 
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets PrintSupport Svg Test OpenGL)
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets PrintSupport Svg Test)
-+find_package(Qt5 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS OpenGL)
- find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     Archive
-     Config
-@@ -45,7 +46,7 @@ include(KDEInstallDirs)
- include(KDECompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- 
--if (OPENGL_FOUND AND OPENGL_GLU_FOUND)
-+if (OPENGL_FOUND AND QT5OPENGL_FOUND AND OPENGL_GLU_FOUND)
-      set(OPENGL_SUPPORT true)
- endif()
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6d43da7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-#require_both_opengl_andqt5opengl_for_gl_support.patch
diff --git a/debian/rules b/debian/rules
index 773c786..58bfd2a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 # SPDX-License-Identifier: LGPL-2.0-or-later
-# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
 	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBIN_INSTALL_DIR=/usr/games
+	dh_auto_configure -- -DKDE_INSTALL_BINDIR=/usr/games/
diff --git a/patches/qtglobal.diff b/patches/qtglobal.diff
deleted file mode 100644
index 29b2228..0000000
--- a/patches/qtglobal.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 24852f2cfc8606046f38d94c5fcba9fa90ddef33
-Author: Johnny Jazeix <jazeix at gmail.com>
-Date:   Sun Nov 29 21:32:50 2020 +0100
-
-    fix Windows nightly. Q_WS_WIN does not exist anymore and we need to include QtGlobal first to know about the macros
-
-diff --git a/src/gui/views/ArcBall.h b/src/gui/views/ArcBall.h
-index 58c1593..d1112b2 100644
---- a/src/gui/views/ArcBall.h
-+++ b/src/gui/views/ArcBall.h
-@@ -20,10 +20,12 @@
- #ifndef _ArcBall_h
- #define _ArcBall_h
- 
-+#include <QtGlobal>
-+
- #ifdef Q_OS_MAC
- #include <OpenGL/gl.h>
- #include <OpenGL/glu.h>
--#elif defined(Q_WS_WIN)
-+#elif defined(Q_OS_WIN)
- #include <windows.h>
- #include <GL/gl.h>                                                                                             // Header File For The OpenGL32 Library
- #include <GL/glu.h>                                                                                            // Header File For The GLu32 Library