Skip to content

Commit 4887768

Browse files
committed
Remove the last mentions of CHM support
1 parent cab0b19 commit 4887768

File tree

6 files changed

+3
-83
lines changed

6 files changed

+3
-83
lines changed

CMakeLists.txt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ include(ECMSetupQtPluginMacroNames)
3434
include(ECMAddAndroidApk)
3535

3636
if (ANDROID AND (FORCE_NOT_REQUIRED_DEPENDENCIES STREQUAL ""))
37-
set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF6Wallet;KF6DocTools;Qt6Qml;TIFF;LibSpectre;KExiv2Qt6;CHM;LibZip;DjVuLibre;EPub;Discount;")
37+
set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF6Wallet;KF6DocTools;Qt6Qml;TIFF;LibSpectre;KExiv2Qt6;DjVuLibre;EPub;Discount;")
3838
endif()
3939

4040
function(set_okular_optional_package_properties _name _props)
@@ -251,21 +251,6 @@ set_okular_optional_package_properties(KExiv2Qt6 PROPERTIES
251251
URL "https://commits.kde.org/libkexiv2"
252252
PURPOSE "Support for exif rotation in image files.")
253253

254-
if (FALSE ) # Investigate porting at some point
255-
find_package(CHM)
256-
set_okular_optional_package_properties(CHM PROPERTIES
257-
DESCRIPTION "A library for dealing with Microsoft ITSS/CHM format files"
258-
URL "http://www.jedrea.com/chmlib"
259-
PURPOSE "Support CHM files in okular.")
260-
261-
endif()
262-
263-
find_package(LibZip)
264-
set_okular_optional_package_properties(LibZip PROPERTIES
265-
DESCRIPTION "A library for reading, creating, and modifying zip archives"
266-
URL "https://libzip.org/"
267-
PURPOSE "Support CHM files in okular.")
268-
269254
find_package(DjVuLibre "3.5.28")
270255
set_okular_optional_package_properties(DjVuLibre PROPERTIES
271256
DESCRIPTION "A library for dealing with DjVu formatted files"

Mainpage.dox

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ Currently Generators for the following document types are available:
5252
\li FictionBook Format
5353
\li Plucker Format
5454
\li OpenDocument Text Format
55-
\li Microsoft's CHM Format
5655
\li Microsoft's XML Document Format
5756
\li Markdown Format
5857

cmake/modules/FindCHM.cmake

Lines changed: 0 additions & 31 deletions
This file was deleted.

cmake/modules/FindLibZip.cmake

Lines changed: 0 additions & 32 deletions
This file was deleted.

doc/index.docbook

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Context menu actions like Rename Bookmarks etc.)
4747
<keyword>tiff</keyword>
4848
<keyword>djvu</keyword>
4949
<keyword>dvi</keyword>
50-
<keyword>chm</keyword>
5150
<keyword>xps</keyword>
5251
<keyword>comicbook</keyword>
5352
<keyword>fictionbook</keyword>
@@ -63,7 +62,7 @@ Context menu actions like Rename Bookmarks etc.)
6362
improved presentation support and annotation support.
6463
</para>
6564
<para>
66-
&okular; supports a lot of different formats like &PDF;, &PostScript;, Tiff, CHM, DjVU, Images (png, jpg, &etc;)
65+
&okular; supports a lot of different formats like &PDF;, &PostScript;, Tiff, DjVU, Images (png, jpg, &etc;)
6766
XPS, Fiction Books, Comic Book, Plucker, EPub, Fax and Markdown.
6867
For all supported formats and their features see <ulink url="https://okular.kde.org/formats.php">
6968
&okular; Document Format Handlers</ulink>.

shell/org.kde.okular.appdata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<p xml:lang="zh-CN">功能特性:</p>
203203
<p xml:lang="zh-TW">功能:</p>
204204
<ul>
205-
<li>Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li>
205+
<li>Supported Formats: PDF, PS, Tiff, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li>
206206
<li xml:lang="ar">يدعم التنسيقات: PDF و PS و Tiff و CHM و DjVu و Images و DVI و XPS و Fiction Book و Comic Book و Plucker و EPub و Fax</li>
207207
<li xml:lang="az">Dəstəklənən formatlar: PDF, PS, Tiff, CHM, DjVu, şəkillər, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li>
208208
<li xml:lang="be">Падтрымліваюцца фарматы: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li>

0 commit comments

Comments
 (0)