Git commit c6120046e1a68209a0f72a59ab2af8aec6cf99f1 by Michael Reeves. Committed on 06/09/2022 at 22:35. Pushed by mreeves into branch '1.10'.
Update version info M +8 -8 INSTALL M +4 -7 README M +1 -1 doc/en/index.docbook M +7 -0 src/kdiff3part.desktop https://invent.kde.org/sdk/kdiff3/commit/c6120046e1a68209a0f72a59ab2af8aec6cf99f1 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..8d817ab 100644 --- a/README +++ b/README @@ -5,10 +5,11 @@ Author: Joachim Eibl (joachim.eibl at gmx.de) Port to KF5/Qt5 by Michael Reeves ([email protected]) 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. +Now requires Qt 5.15 or later and KF5 5.50+. 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. +is not ported and no longer maintained. This plug-in would only apply to KDE before 4.6. + +cmake 3.14+ is the targeted cmake version. cmake is now the only build system supported. KF5/Qt5 was big jump. A lot changed besides just the API. I am not against a Qt5-only build variant but see no reason to maintain two separate build systems. @@ -33,10 +34,6 @@ KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs. These are available for Un*x, Windows, Mac. Thus there are many setup possibilities to consider. -Supported Qt-versions: 4.8, 5.2 or higher. -Supported KDE-version: 4, 5 -(For KDE3/Qt3 use KDiff3-0.9.92 or older.) - Contents -------- diff --git a/doc/en/index.docbook b/doc/en/index.docbook index b02a338..6fdfc1a 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.10. </para> </abstract> diff --git a/src/kdiff3part.desktop b/src/kdiff3part.desktop index 70d1902..f7e842e 100644 --- a/src/kdiff3part.desktop +++ b/src/kdiff3part.desktop @@ -49,3 +49,10 @@ ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart MimeType=text/x-patch; X-KDE-Library=kf5/parts/kdiff3part Type=Service +X-KDE-PluginInfo-Name=KDiff3Part +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;[email protected] +X-KDE-PluginInfo-Version=1.9.70 +
