Git commit 50d40fb66123ba8a5c8bcc3660233a32dcdbf7d9 by Michael Reeves. Committed on 15/02/2021 at 18:59. Pushed by mreeves into branch 'master'.
Update versions in docs M +8 -8 INSTALL M +1 -1 README M +1 -1 doc/en/index.docbook https://invent.kde.org/sdk/kdiff3/commit/50d40fb66123ba8a5c8bcc3660233a32dcdbf7d9 diff --git a/INSTALL b/INSTALL index 58f4d23..cb7b6d3 100644 --- a/INSTALL +++ b/INSTALL @@ -1,11 +1,11 @@ Building KDiff3 requires the fallowing minimum versions: - 1)Qt 5.6 or later - 2)KF5 5.27+ + 1)Qt 5.12 or later + 2)KF5 5.50+ 3)CMake 3.1 4)ECM 1.8 5)boost 1.66+ - Support compilers: - 6)MSVC 2015+, gcc 5.0+, clang 3.3+ + Support 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.8x than use: -4) craft --target 1.8 kdiff3 +If you what to build 1.9x than use: +4) craft --target 1.9 kdiff3 Otherwise craft will use master which is the development branch and therefor more likely to experience breakage. @@ -53,10 +53,10 @@ bin/kdiff3 If you want to create an install package you would run: 5)craft nsis -6)craft --package kdiff3 or craft --target 1.8 --package kdiff3 +6)craft --package kdiff3 or craft --target 1.9 --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. +KDiff3 does not require special configuration for craft. There should be an installer package generated in CraftRoot/tmp diff --git a/README b/README index cefe43f..a061b24 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 ([email protected]) -KDiff3-Version: 1.8.70 +KDiff3-Version: 1.9.70 Now requires Qt 5.8 or later and KF5 5.37+. 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 9ca3bf5..9946b1e 100644 --- a/doc/en/index.docbook +++ b/doc/en/index.docbook @@ -72,7 +72,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.8. + This document describes &kdiff3;-version 1.9. </para> </abstract>
