[sdk/kdiff3] /: Update version info
Michael Reeves
null at kde.org
Wed Aug 31 04:52:25 BST 2022
Git commit 2f6f383e1292c6ed17e293a855e6b7afb2e19af7 by Michael Reeves.
Committed on 30/08/2022 at 16:08.
Pushed by mreeves into branch 'master'.
Update version info
M +1 -1 CMakeLists.txt
M +8 -8 INSTALL
M +2 -2 README
M +1 -1 doc/en/index.docbook
M +1 -1 src/kdiff3part.desktop
https://invent.kde.org/sdk/kdiff3/commit/2f6f383e1292c6ed17e293a855e6b7afb2e19af7
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ecad63..4be6260 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ include(ECMSetupVersion)
include(ECMAddTests)
include(ECMOptionalAddSubdirectory)
-ecm_setup_version(1.9.70 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h)
+ecm_setup_version(1.10.70 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h)
# Some older versions on boost contain a bug that prevents compiling gcc offers a built-in workaround
# but that isn't enough to ship as clang has no such workaround. 1.65 is known to be affected.
diff --git a/INSTALL b/INSTALL
index cb7b6d3..aef4a87 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,10 +1,10 @@
Building KDiff3 requires the fallowing minimum versions:
1)Qt 5.12 or later
- 2)KF5 5.50+
- 3)CMake 3.1
- 4)ECM 1.8
- 5)boost 1.66+
- Support compilers:(Must have full c++17 support version cut offs are approximate)
+ 2)KF5 5.80+
+ 3)CMake 3.18
+ 4)ECM 5.80+
+ 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+
*nix:
@@ -41,8 +41,8 @@ Run:
2)C:\CraftRoot\craft\craftenv.ps1
3)craft png2ico
4)craft kdiff3
-If you what to build 1.9x than use:
-4) craft --target 1.9 kdiff3
+If you what to build 1.10.x than use:
+4) craft --target 1.10 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.9 --package kdiff3
+6)craft --package kdiff3 or craft --target 1.10 --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 fbbddf8..1e30eca 100644
--- a/README
+++ b/README
@@ -3,9 +3,9 @@ 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.9.70
+KDiff3-Version: 1.10.70
-Now requires Qt 5.8 or later and KF5 5.37+. Legacy 0.9.98 and earlier builds are not supported.
+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
is not ported and no longer maintained. This plug-in would only apply to KDE before 4.6. As of 1/13/17
cmake 3.1+ is the targeted cmake version.
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
index b02a338..31e626a 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.9.
+ This document describes &kdiff3;-version 1.11.
</para>
</abstract>
diff --git a/src/kdiff3part.desktop b/src/kdiff3part.desktop
index 531ea61..cbef6a1 100644
--- a/src/kdiff3part.desktop
+++ b/src/kdiff3part.desktop
@@ -31,5 +31,5 @@ X-KDE-PluginInfo-License=GPLv2
X-KDE-PluginInfo-Description= A KPart for displaying diffs
X-KDE-PluginInfo-Authors=Joachim Eibl;Michael Reeves
X-KDE-PluginInfo-Emails=joachim.eibl at gmx.de;reeves.87 at gmail.com
-X-KDE-PluginInfo-Version=1.9.70
+X-KDE-PluginInfo-Version=1.10.70
More information about the kde-doc-english
mailing list