[sdk/kdiff3/1.9] /: Update documents
Michael Reeves
null at kde.org
Mon Feb 15 19:23:55 GMT 2021
Git commit dec9f763e83fb6fd46860dcbb3d4ca1d3f593725 by Michael Reeves.
Committed on 15/02/2021 at 17:35.
Pushed by mreeves into branch '1.9'.
Update documents
M +6 -6 INSTALL
M +1 -1 doc/en/index.docbook
M +1 -1 doc/en/man-kdiff3.1.docbook
https://invent.kde.org/sdk/kdiff3/commit/dec9f763e83fb6fd46860dcbb3d4ca1d3f593725
diff --git a/INSTALL b/INSTALL
index 58f4d23..2f63898 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
Building KDiff3 requires the fallowing minimum versions:
- 1)Qt 5.6 or later
- 2)KF5 5.27+
+ 1)Qt 5.8 or later
+ 2)KF5 5.37+
3)CMake 3.1
4)ECM 1.8
5)boost 1.66+
@@ -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/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>
diff --git a/doc/en/man-kdiff3.1.docbook b/doc/en/man-kdiff3.1.docbook
index b2cebb5..20a349d 100644
--- a/doc/en/man-kdiff3.1.docbook
+++ b/doc/en/man-kdiff3.1.docbook
@@ -11,7 +11,7 @@
&Burkhard.Lueck.mail;
</author>
<date>2019-02-22</date>
-<releaseinfo>kdiff3 1.8</releaseinfo>
+<releaseinfo>kdiff3 1.9</releaseinfo>
</refentryinfo>
<refmeta>
More information about the kde-doc-english
mailing list