Version 8.2 released

The release adds support for KDE Framework 5 instead of KDE4
and initial support for Qt6 instead of Qt4.

Author: u-235

ChangeLog

@@ -1,9 +1,16 @@
+2021-11-12 u-235 <nicegorov@yandex.com>
+    - v8.2-rc published
+
+2022-02-08 u-235 <nicegorov@yandex.com>
+    - The application is built with Qt6.2, but had to disable printing and rely on default settings when browsing pages.
+
 2022-01-24 u-235 <nicegorov@yandex.com>
-    - Added support for Qt 6 and KF 5.
+    - Added support for KF5.
+    - Added support for Qt6 in build scripts.
     - Version changed to 8.2
 
 2022-01-14 u-235 <nicegorov@yandex.com>
-    - Ended support for Qt 4 and KDE 4 on the master branch.
+    - Ended support for Qt4 and KDE4 on the master branch.
 
 2021-11-21 u-235 <nicegorov@yandex.com>
     - Renamed fork Kchmviewer => uChmViewer.

INSTALL.md

@@ -15,7 +15,7 @@
 - C++11 compiler which is supported by the [Qt SDK][1].
 - Qt tools such as `moc` and the resource packer.
 - `CMake` or `Qmake` to generate the build scripts. For builds I recommend CMake, and Qmake is mainly used as a Qt Creator project.
-- SDK for `Qt 4`, `Qt 5` or `KDE 4`.
+- SDK for `Qt5` or `Qt6`. Note that with Qt6 you need an additional `Core5Compat` module.
 - The [CHMLib][2] library for handling chm files. You can choose dynamic or static linking. In the first case, you need a library and headers for development. In the second case you need to download the repository submodule and specify `USE_STATIC_CHMLIB` flag when generating the build script.
 - The [libzip][3] library and headers for software development. When building this library from source you will need the [zlib][4] library.
 
@@ -24,6 +24,7 @@
 
 - I recommend using [Git][5] to retrieve the source code. Although you can download and unpack the archive with the sources, this option is not covered here. Also, Git is more convenient if you want to use a submodule with CHMLib.
 - [GNU Gettext][6] is required to translate the user interface.
+- [KDELibs4Support][7] and [ECM][8] to build with KDE support.
 
 
 ## Getting sources
@@ -39,7 +40,7 @@ git clone -b release --recursive https://github.com/u-235/uchmviewer
 
 ## Usage CMake
 
-A modern [cmake][7] generates an build system script and also can be used as a build and installation driver.
+A modern [cmake][9] generates an build system script and also can be used as a build and installation driver.
 
 ```sh
 # Generate build system
@@ -59,11 +60,14 @@ cmake --install . [<options>]
 
     **Project-specific variables**
 
-    - `FRAMEWORK=<Qt4 | Qt5 | KDE4>` - choosing the framework with which to build the application, default is `Qt5`.
+    - `USE_KF5=<ON | OFF>` - build application with KDE support.
     - `USE_STATIC_CHMLIB=<ON | OFF>` - choosing static linking with CHMLib, default is  `OFF`. For static linking, the library is compiled from source in the `lib/CHMLib` folder. This folder can be obtained along with the sources of the application using the command `git clone --recursive`.
     - `USE_WEBENGINE=<ON | OFF>` - choosing WebEngine instead of WebKit, default is `OFF`. WebEngine requires Qt version 5.9 or higher.
     - `USE_GETTEXT=<ON | OFF>` - enabling translation of the application, default is `ON`. If Gettext is not available, this option will be ignored.
     - `USE_DEPLOY_RUNTIME=<ON | OFF>` - copying runtime dependencies for deployment, default is `OFF`.
+    - `USE_MACOS_BUNDLE=<ON | OFF>` - install as macOS bundle, default is `ON`.
+    - `USE_MAC_APP=<ON | OFF>` - use derived QApplication, default to `ON` on macOS.
+    - `USE_DBUS=<ON | OFF>` - use D-Bus integration, default to `ON` on Linux.
     - `chmlib_ROOT=<path/to/chmlib>`- specifies an additional folder to look up the library and headers for CHMLib. The `chm_lib.h` file is expected either in the root folder or the `include` folder. The `chm` library must be either in the root folder or in the `lib` folder.
     - `libzip_ROOT=<path/to/libzip>`- specifies an additional folder to look up the library and headers for libzip. The `zip.h` file is expected either in the root folder or the `include` folder. The `zip` library must be either in the root folder or in the `lib` folder.
 
@@ -81,26 +85,19 @@ cmake --install . [<options>]
 
 ### Cpack
 
-CMake comes with a `cpack` utility for generating installers. The build scripts have basic `cpack` support, but in some cases [additional options][8] and [variables][9] may need to be specified. The [generator][10] must be specified in any case.
+CMake comes with a `cpack` utility for generating installers. The build scripts have basic `cpack` support, but in some cases [additional options][10] and [variables][11] may need to be specified. The [generator][12] must be specified in any case.
 
 
 ## Building in Debian
 
-In GNU/Linux with package manager DEB-based for any build configurations you need the following packages and their dependencies:
+In GNU/Linux with package manager DEB-based you need the following packages and their dependencies:
 
 - `build-essential` `cmake` `git` `libzip-dev`
+- `qt5-default`; `libqt5webkit5-dev` or `qtwebengine5-dev`
+- `libkf5kdelibs4support-dev` if you choose build with KDE support.
 - `libchm-dev`
 - `gettext`
 
-The table lists the required additional packages and CMake options for varios  build configuration.
-
-| Configuration    | Packages                                        | CMake Options        |
-|------------------|-------------------------------------------------|----------------------|
-| Qt 5 + WebKit    | `qt5-default` `libqt5webkit5-dev`               |                      |
-| Qt 5 + WebEngine | `qt5-default` `qtwebengine5-dev-dev`            | `-DUSE_WEBENGINE=ON` |
-| Qt 4             | `qt4-default` `libqtwebkit-dev`                 | `-DFRAMEWORK=QT4`    |
-| KDE 4            | `qt4-default` `libqtwebkit-dev`  `kdelibs5-dev` | `-DFRAMEWORK=KDE4`   |
-
 
 ### Build with WebKit
 
@@ -132,15 +129,15 @@ cpack -G DEB -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON
 ```
 
 
-### Build with KDE4
+### Build with KF5
 
 ```sh
 apt install build-essential cmake git libzip-dev libchm-dev\
- gettext qt4-default libqtwebkit-dev kdelibs5-dev
+ gettext qt5-default libqt5webkit5-dev libkf5kdelibs4support-dev
 git clone -b release --recursive https://github.com/u-235/uchmviewer
 mkdir uchmviewer/build
 cd uchmviewer/build
-cmake -DCMAKE_BUILD_TYPE=Release -DFRAMEWORK=KDE4 ../
+cmake -DCMAKE_BUILD_TYPE=Release -DUSE_KF5=ON ../
 cmake --build . --config Release
 # Optional generate package
 cpack -G DEB -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=ON
@@ -157,13 +154,15 @@ The project options for qmake are the similar to those for cmake.
 - `LIBZIP_ROOT=<path/to/libzip>`folder to look up the library and headers for libzip.
 
 
-[1]: https://doc.qt.io/qt-5/supported-platforms.html "Qt doc: supported platforms"
+[1]: https://doc.qt.io/qt-5/supported-platforms.html "Qt5 doc: supported platforms"
 [2]: https://github.com/jedwing/CHMLib "CHMLib repositoriy"
 [3]: https://github.com/nih-at/libzip "libzip repositoriy"
 [4]: https://github.com/madler/zlib "zlib repositoriy"
 [5]: https://git-scm.com/ "Git home page"
 [6]: https://www.gnu.org/software/gettext "GNU Gettext home page"
-[7]: https://cmake.org/cmake/help/latest/manual/cmake.1.html "Launch cmake"
-[8]: https://cmake.org/cmake/help/latest/manual/cpack.1.html "Launch cpack"
-[9]: https://cmake.org/cmake/help/latest/module/CPack.html "Cpack module"
-[10]: https://cmake.org/cmake/help/latest/manual/cpack-generators.7.html "cpack generators"
+[7]: https://api.kde.org/frameworks/kdelibs4support/html/index.html "Legacy support for kdelibs 4 compatibility"
+[8]: https://api.kde.org/frameworks/extra-cmake-modules/html/index.html "Extra CMake Modules"
+[9]: https://cmake.org/cmake/help/latest/manual/cmake.1.html "Launch cmake"
+[10]: https://cmake.org/cmake/help/latest/manual/cpack.1.html "Launch cpack"
+[11]: https://cmake.org/cmake/help/latest/module/CPack.html "Cpack module"
+[12]: https://cmake.org/cmake/help/latest/manual/cpack-generators.7.html "cpack generators"

NEWS.md

@@ -1,3 +1,14 @@
+## 2022-02-12 v8.2-rc
+
+The release adds support for KDE Framework 5 instead of KDE4 and initial support for Qt6 instead of Qt4.
+
+* Fork renamed to uChmViewer. Also removed the code checking for updates.
+* Ended support for Qt4 and KDE4 on the master branch. Qt4 specific code has been removed.
+* Added support for the KDE Framework 5 with KDELibs4Support.
+* Added limited support for Qt6. The application is built with Qt6.2, but had to disable printing and rely on default settings when browsing pages.
+* Added USE_DBUS option to the CMake build script. The option allows you to enable/disable building with D-Bus on any platform where this technology is available. Previously, building with D-Bus was supported only on Linux.
+
+
 ## 2021-11-15 v8.1-rc2
 
 * Fixed build failure with Qt WebKit. In some cases compilation of the src/qtwebkit/viewwindowmgr.cpp file failed with the message `error: invalid use of incomplete type 'class QTabBar'`.

README.md

@@ -13,7 +13,7 @@ This is a fork of the [kchmviewer](http://www.ulduzsoft.com/linux/kchmviewer) wi
 
 ## Overview
 
-KchmViewer is a chm (MS HTML help file format) and epub viewer, written in C++. Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget library, and does not depend on KDE or GNOME. It has full KDE 4 support.
+KchmViewer is a chm (MS HTML help file format) and epub viewer, written in C++. Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget library, and does not depend on KDE or GNOME. It has full KDE Framework 5 support.
 
 The main advantage of KchmViewer is extended support for non-English languages. Unlike others, KchmViewer in most cases correctly detects chm file encoding, correctly shows tables of context of Russian, Korean, Chinese and Japanese help files. It also correctly searches text in non-English help files, including Korean, Chinese and Japanese.
 
@@ -22,14 +22,14 @@ KchmViewer is written by [Georgy Yunaev](https://github.com/gyunaev), and is lic
 
 ## What's New
 
-The 8.1 release is dedicated to the translation of the UI. Initially, translation worked only in an application which was built with KDE support. Now, this is possible with GNU Gettext for the target platform and is independent of KDE. However, the translation files are outdated and only Russian translation is up to date.
-Read more in the [release notes](NEWS.md).
+Release 8.2 says goodbye to Qt4 and KDE4 and welcomes KDE Framework 5.
+Read more in the [release note](https://github.com/u-235/uchmviewer/releases/latest) and in the [news](NEWS.md).
 
 
 ## Features
 
-- Standalone viewer, depends on Qt 4 or Qt 5 only. Does not require KDE, GNOME or wxWidgets toolkit.
-- Could be optionally built with KDE 4 or KDE 5 support, using KDE dialogs.
+- Standalone viewer, depends on Qt 5 or Qt 6 only. Does not require KDE, GNOME or wxWidgets toolkit.
+- Could be optionally built with KDE Framework 5 support, using KDE dialogs.
 - Completely safe and harmless. JavaScript can be disabled in the settings, optionally warns you before opening an external web page, or switching to another help file.
 - Correctly detects and shows encoding of any valid chm file.
 - Correctly shows non-English chm files, including Cyrillic, Chinese, Japanese and others.