[sdk/kdiff3] /: Update version info

[Michael Reeves]

Git commit 7af15f87d27bb2e319f90e54dc254b623fd6b10b by Michael Reeves.
Committed on 31/12/2023 at 20:03.
Pushed by mreeves into branch 'master'.

Update version info

M  +7    -7    CMakeLists.txt
M  +10   -10   INSTALL
M  +1    -1    README
M  +1    -1    doc/en/index.docbook

https://invent.kde.org/sdk/kdiff3/-/commit/7af15f87d27bb2e319f90e54dc254b623fd6b10b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c5efa136..d60efb91b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,9 @@
 
 #cmake < 3.1 has no sane way of checking C++11 features and needed flags
 #CMP0077 is defined in 3.13 or later
-cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
-project(kdiff3 VERSION 1.10.70)
+project(kdiff3 VERSION 1.11.70)
 
 #Avaliable as QtVersionOption starting in ECM 5.82.
 option(BUILD_WITH_QT6 "Build against Qt 6" OFF)
@@ -16,13 +16,13 @@ set(CMAKE_CXX_EXTENSIONS ON ) #disable trigraphs in clang/gcc -- officially remo
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CXX_STANDARD_REQUIRED ON)#Force early fail if we cann't get c++17.
 
-set(KF_MIN_VERSION "5.95.0")
+set(KF_MIN_VERSION "5.100.0")
 if (BUILD_WITH_QT6)
     set(QT_MAJOR_VERSION "6")
     set(QT_MIN_VERSION "6.5.0")
 else()
     set(QT_MAJOR_VERSION "5")
-    set(QT_MIN_VERSION "5.15.5")
+    set(QT_MIN_VERSION "5.15.8")
 endif()
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.2)
@@ -177,10 +177,10 @@ add_definitions(
     #the warning useless.
     -DBOOST_ALLOW_DEPRECATED_HEADERS
     #KF5 5.64+ flags
-    #Don't warn for API depreciated after 5.104.0 (below as hex.hex.hex number)
+    #Don't warn for API depreciated after 5.110.0 (below as hex.hex.hex number)
     -DKF_DEPRECATED_WARNINGS_SINCE=0x056800
-    -DKIOCORE_DEPRECATED_WARNINGS_SINCE=0x056800
-    -DKXMLGUI_DEPRECATED_WARNINGS_SINCE=0x056800
+    -DKIOCORE_DEPRECATED_WARNINGS_SINCE=0x056E00
+    -DKXMLGUI_DEPRECATED_WARNINGS_SINCE=0x056E00
     -DKF_VERSION_MAJOR=${KF_VERSION_MAJOR}
     -DKF_VERSION_MINOR=${KF_VERSION_MINOR}
     -DKF_VERSION_PATCH=${KF_VERSION_PATCH}
diff --git a/INSTALL b/INSTALL
index ffb54f049..7193b4ba3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,15 +1,15 @@
-Building KDiff3 requires the fallowing minimum versions:
+Building KDiff3 requires the following minimum versions:
  1)Qt 5.15 or later
- 2)KF5 5.80+
- 3)CMake 3.18
- 4)ECM 5.80+
+ 2)KF5 5.100+
+ 3)CMake 3.20
+ 4)ECM 5.100+
  5)boost 1.71+
  Supported compilers:(Must have full c++17 support version cut offs are approximate)
- 6)MSVC 2019+, gcc 8.0+, clang 7+
+ 6)MSVC 2019+, gcc 9.0+, clang 10+
 
 *nix:
-
 On debian based systems you needed to install the fallowing.
+
 gettext, qtbase5-dev, extra-cmake-modules, libboost-dev, libkf5i18n-dev, libkf5coreaddons-dev, libkf5iconthemes-dev libkf5parts-dev, libkf5doctools-dev, libkf5crash-dev, cmake, (gcc or clang)
 These should available as part of the standard repos.
 To build KDiff3 run:
@@ -22,7 +22,7 @@ Windows:
 For windows the build should be done via. craft. Although other methods may work they are not
 tested.
 
-Craft requires python 3.6 or later to be installed it can be downloaded here:
+Craft requires python 3.7 or later to be installed it can be downloaded here:
 https://www.python.org/downloads/windows/
 This should be automatically installed by craft.
 
@@ -41,8 +41,8 @@ Run:
 2)C:\CraftRoot\craft\craftenv.ps1
 3)craft png2ico
 4)craft kdiff3
-If you what to build 1.10.x than use:
-4) craft --target 1.10 kdiff3
+If you what to build 1.12.x than use:
+4) craft --target 1.12 kdiff3
 
 Otherwise craft will use master which is the development branch and therefor more likely to experience breakage.
 
@@ -53,7 +53,7 @@ bin/kdiff3
 If you want to create an install package you would run:
 5)craft nsis
 
-6)craft --package kdiff3 or craft --target 1.10 --package kdiff3
+6)craft --package kdiff3 or craft --target 1.12 --package kdiff3
 
 This will be a time consuming process on first run as craft will have to download all dependencies.
 KDiff3 does not require special configuration for craft.
diff --git a/README b/README
index 1e30ecaec..1f3e5e7d9 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ KDiff3-Readme
 
 Author: Joachim Eibl  (joachim.eibl at gmx.de)
 Port to KF5/Qt5 by Michael Reeves (reeves.87 at gmail.com)
-KDiff3-Version: 1.10.70
+KDiff3-Version: 1.12
 
 Now requires Qt 5.12 or later and KF5 5.70+. Legacy 0.9.98 and earlier builds are not supported.
 MacOS X build is 64-bit only unfortunately I can't test build locally. The Konqueror specific plug-in
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index 7c0e474f2..49b471cc4 100644
--- a/doc/en/index.docbook
+++ b/doc/en/index.docbook
@@ -70,7 +70,7 @@ Do NOT change these in the translation. -->
 <listitem><para>supports version control keyword and history merging.</para></listitem>
 </itemizedlist>
 </para><para>
-   This document describes &kdiff3;-version 1.11.
+   This document describes &kdiff3;-version 1.12.
 </para>
 </abstract>