feat: update libkomparediff2 to 4:25.04.0-1

.gitignore

@@ -1 +1,2 @@
-.pc/
+/build*
+CMakeLists.txt.user

.gitlab-ci.yml

@@ -0,0 +1,10 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+include:
+  - project: sysadmin/ci-utilities
+    file:
+      - /gitlab-templates/linux-qt6.yml
+      - /gitlab-templates/linux-qt6-next.yml
+      - /gitlab-templates/freebsd-qt6.yml
+      - /gitlab-templates/windows-qt6.yml

.kde-ci.yml

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: None
+# SPDX-License-Identifier: CC0-1.0
+
+Dependencies:
+- 'on': ['@all']
+  'require':
+    'frameworks/extra-cmake-modules': '@latest-kf6'
+    'frameworks/kcoreaddons': '@latest-kf6'
+    'frameworks/kconfig': '@latest-kf6'
+    'frameworks/kxmlgui': '@latest-kf6'
+    'frameworks/ki18n': '@latest-kf6'
+    'frameworks/kio': '@latest-kf6'
+
+Options:
+  require-passing-tests-on: [ '@all' ]

CMakeLists.txt

@@ -1,9 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(LibKompareDiff2 VERSION "5.2")
+project(LibKompareDiff2 VERSION "6.0.0")
 
-set(QT_MIN_VERSION "5.15.0")
-set(KF_MIN_VERSION "5.80.0")
+set(QT_MIN_VERSION "6.5.0")
+set(KF_MIN_VERSION "6.0.0")
 
 find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
@@ -12,48 +12,40 @@ include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
+include(ECMSetupVersion)
+include(ECMGenerateExportHeader)
+include(ECMGenerateHeaders)
+include(ECMDeprecationSettings)
 
 include(CMakePackageConfigHelpers)
 include(FeatureSummary)
-include(GenerateExportHeader)
+
+set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].")
 
 set(ADDITIONAL_REQUIRED_QT_COMPONENTS)
 if(BUILD_TESTING)
     list(APPEND ADDITIONAL_REQUIRED_QT_COMPONENTS Test)
 endif()
 
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
+find_package(Qt6 ${QT_MIN_VERSION} CONFIG REQUIRED
     COMPONENTS
         Core
         Widgets
         ${ADDITIONAL_REQUIRED_QT_COMPONENTS}
 )
 
-find_package(KF5 ${KF_MIN_VERSION} REQUIRED
+find_package(KF6 ${KF_MIN_VERSION} REQUIRED
     COMPONENTS
         CoreAddons
-        Codecs
         Config
         XmlGui
         I18n
         KIO
 )
 
-add_definitions(
-    -DQT_DEPRECATED_WARNINGS
-    -DQT_DISABLE_DEPRECATED_BEFORE=0x050F00
-    -DQT_DEPRECATED_WARNINGS_SINCE=0x060000
-    -DQT_USE_QSTRINGBUILDER
-    -DQT_NO_CAST_TO_ASCII
-    -DQT_NO_CAST_FROM_ASCII
-    -DQT_NO_CAST_FROM_BYTEARRAY
-    -DQT_NO_URL_CAST_FROM_STRING
-    -DQT_NO_KEYWORDS
-    -DQT_STRICT_ITERATORS
-    -DQT_NO_FOREACH
-    -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT
-    -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000
-    -DKF_DEPRECATED_WARNINGS_SINCE=0x060000
+ecm_set_disabled_deprecation_versions(
+    QT 6.5
+    KF 6.0
 )
 
 add_subdirectory(src)

debian/changelog

@@ -1,8 +1,99 @@
-libkomparediff2 (4:21.08.0-1deepin0) unstable; urgency=medium
+libkomparediff2 (4:25.04.0-1) unstable; urgency=medium
 
-  * No source change upload against GCC 12.
+  [ Aurélien COUDERC ]
+  * New upstream release (25.04.0).
+  * Bump Standards-Version to 4.7.2, no change required.
 
- -- Tianyu Chen <sweetyfish@deepin.org>  Fri, 20 Sep 2024 14:12:40 +0800
+ -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Apr 2025 22:02:24 +0200
+
+libkomparediff2 (4:24.12.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Team upload
+
+ -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Fri, 07 Mar 2025 15:58:23 +0100
+
+libkomparediff2 (4:24.12.2-1) unstable; urgency=medium
+
+  * New upstream release
+  * Team upload
+
+ -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Sun, 02 Mar 2025 19:02:10 +0100
+
+libkomparediff2 (4:24.12.1-1) unstable; urgency=medium
+
+  * New upstream release
+  * Team upload
+
+ -- Salvo 'LtWorf' Tomaselli <ltworf@debian.org>  Tue, 21 Jan 2025 08:30:42 +0100
+
+libkomparediff2 (4:24.12.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (24.12.0).
+  * Update build-deps and deps with the info from cmake.
+  * Fix 'acc' autopkgtest:
+    - fix location of library headers
+    - set -std=c++17, needed when using Qt 6
+  * Release to unstable.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sun, 22 Dec 2024 09:22:07 +0100
+
+libkomparediff2 (4:24.08.2-1) experimental; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (24.08.2).
+  * Update build-deps and deps with the info from cmake.
+  * Package new libkomparediff2-6 library package following upstream
+    soname bump.
+  * Split architecture-independent data files into a separate package
+    to ease future transitions.
+  * Bump Standards-Version to 4.7.0, no change required.
+  * Review copyright information.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Thu, 17 Oct 2024 00:10:56 +0200
+
+libkomparediff2 (4:22.12.3-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (22.12.3).
+  * Update build-deps and deps with the info from cmake.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Wed, 01 Mar 2023 11:58:04 +0100
+
+libkomparediff2 (4:22.12.1-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (22.12.1).
+  * Bump Standards-Version to 4.6.2, no change required.
+  * Add Albert Astals Cid’s master key to upstream signing keys.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Fri, 06 Jan 2023 23:40:32 +0100
+
+libkomparediff2 (4:22.12.0-2) unstable; urgency=medium
+
+  * Upload with a correctly released changelog.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sat, 10 Dec 2022 16:05:00 +0100
+
+libkomparediff2 (4:22.12.0-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (22.08.3).
+  * Update build-deps and deps with the info from cmake.
+  * Bump Standards-Version to 4.6.1, no change required.
+  * New upstream release (22.11.90).
+  * New upstream release (22.12.0).
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Sat, 10 Dec 2022 00:13:08 +0100
+
+libkomparediff2 (4:21.12.3-1) unstable; urgency=medium
+
+  [ Aurélien COUDERC ]
+  * New upstream release (21.12.3).
+  * Bump Standards-Version to 4.6.0, no change required.
+
+ -- Aurélien COUDERC <coucouf@debian.org>  Wed, 06 Apr 2022 23:00:16 +0200
 
 libkomparediff2 (4:21.08.0-1) unstable; urgency=medium
 

debian/control

@@ -4,42 +4,57 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Aurélien COUDERC <coucouf@debian.org>,
            Norbert Preining <norbert@preining.info>,
-Build-Depends: cmake (>= 3.0~),
-               debhelper-compat (= 13),
-               extra-cmake-modules (>= 5.80.0~),
+Build-Depends: debhelper-compat (= 13),
+               cmake (>= 3.16~),
+               extra-cmake-modules (>= 6.0.0~),
                gettext,
-               libkf5codecs-dev (>= 5.80.0~),
-               libkf5config-dev (>= 5.80.0~),
-               libkf5coreaddons-dev (>= 5.80.0~),
-               libkf5i18n-dev (>= 5.80.0~),
-               libkf5kio-dev (>= 5.80.0~),
-               libkf5xmlgui-dev (>= 5.80.0~),
-               qtbase5-dev (>= 5.15.0~),
+               libkf6config-dev (>= 6.0.0~),
+               libkf6coreaddons-dev (>= 6.0.0~),
+               libkf6i18n-dev (>= 6.0.0~),
+               libkf6kio-dev (>= 6.0.0~),
+               libkf6xmlgui-dev (>= 6.0.0~),
                pkg-kde-tools (>= 0.12),
-Standards-Version: 4.5.1
+               qt6-base-dev (>= 6.5.0~),
+Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Homepage: https://invent.kde.org/sdk/libkomparediff2
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkomparediff2
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkomparediff2.git
 
-Package: libkomparediff2-5
+Package: libkomparediff2-6
 Section: libs
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: libkomparediff2-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: library to compare files and strings
  This package contains a library used to compare files and strings, and is
  used in Kompare and KDevelop.
  .
  This package is part of the KDE Software Development Kit module.
 
+Package: libkomparediff2-data
+Section: libs
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+Breaks: libkomparediff2-5,
+Replaces: libkomparediff2-5,
+Description: architecture-independent data files for libkomparediff2
+ This package contains a library used to compare files and strings, and is
+ used in Kompare and KDevelop.
+ .
+ This package contains the architecture-independent data files for
+ libkomparediff2.
+ .
+ This package is part of the KDE Software Development Kit module.
+
 Package: libkomparediff2-dev
 Section: libdevel
 Architecture: any
-Depends: libkomparediff2-5 (= ${binary:Version}),
-         libkf5config-dev (>= 5.80.0~),
-         libkf5xmlgui-dev (>= 5.80.0~),
-         qtbase5-dev (>= 5.15.0~),
+Depends: libkomparediff2-6 (= ${binary:Version}),
+         qt6-base-dev (>= 6.5.0~),
          ${misc:Depends},
 Description: library to compare files and strings - development files
  This package contains a library used to compare files and strings, and is