Git commit 4887768972df198efdc306a3f9d3b5ca3e4589e4 by Albert Astals Cid. Committed on 21/10/2024 at 21:02. Pushed by aacid into branch 'master'.
Remove the last mentions of CHM support M +1 -16 CMakeLists.txt M +0 -1 Mainpage.dox D +0 -31 cmake/modules/FindCHM.cmake D +0 -32 cmake/modules/FindLibZip.cmake M +1 -2 doc/index.docbook M +1 -1 shell/org.kde.okular.appdata.xml https://invent.kde.org/graphics/okular/-/commit/4887768972df198efdc306a3f9d3b5ca3e4589e4 diff --git a/CMakeLists.txt b/CMakeLists.txt index d0a35a487a..e004e2d77e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ include(ECMSetupQtPluginMacroNames) include(ECMAddAndroidApk) if (ANDROID AND (FORCE_NOT_REQUIRED_DEPENDENCIES STREQUAL "")) - set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF6Wallet;KF6DocTools;Qt6Qml;TIFF;LibSpectre;KExiv2Qt6;CHM;LibZip;DjVuLibre;EPub;Discount;") + set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF6Wallet;KF6DocTools;Qt6Qml;TIFF;LibSpectre;KExiv2Qt6;DjVuLibre;EPub;Discount;") endif() function(set_okular_optional_package_properties _name _props) @@ -251,21 +251,6 @@ set_okular_optional_package_properties(KExiv2Qt6 PROPERTIES URL "https://commits.kde.org/libkexiv2"; PURPOSE "Support for exif rotation in image files.") -if (FALSE ) # Investigate porting at some point - find_package(CHM) - set_okular_optional_package_properties(CHM PROPERTIES - DESCRIPTION "A library for dealing with Microsoft ITSS/CHM format files" - URL "http://www.jedrea.com/chmlib"; - PURPOSE "Support CHM files in okular.") - -endif() - -find_package(LibZip) -set_okular_optional_package_properties(LibZip PROPERTIES - DESCRIPTION "A library for reading, creating, and modifying zip archives" - URL "https://libzip.org/"; - PURPOSE "Support CHM files in okular.") - find_package(DjVuLibre "3.5.28") set_okular_optional_package_properties(DjVuLibre PROPERTIES DESCRIPTION "A library for dealing with DjVu formatted files" diff --git a/Mainpage.dox b/Mainpage.dox index 502e479c02..1b23eb44a4 100644 --- a/Mainpage.dox +++ b/Mainpage.dox @@ -52,7 +52,6 @@ Currently Generators for the following document types are available: \li FictionBook Format \li Plucker Format \li OpenDocument Text Format - \li Microsoft's CHM Format \li Microsoft's XML Document Format \li Markdown Format diff --git a/cmake/modules/FindCHM.cmake b/cmake/modules/FindCHM.cmake deleted file mode 100644 index 10d0ed4cb2..0000000000 --- a/cmake/modules/FindCHM.cmake +++ /dev/null @@ -1,31 +0,0 @@ -# - Try to find the chm library -# Once done this will define -# -# CHM_FOUND - system has the chm library -# CHM_INCLUDE_DIR - the chm include directory -# CHM_LIBRARY - Link this to use the chm library -# -# SPDX-FileCopyrightText: 2006 Pino Toscano <toscano.p...@tiscali.it> -# SPDX-License-Identifier: BSD-3-Clause - -if (CHM_LIBRARY AND CHM_INCLUDE_DIR) - # in cache already - set(CHM_FOUND TRUE) -else (CHM_LIBRARY AND CHM_INCLUDE_DIR) - - find_path(CHM_INCLUDE_DIR chm_lib.h - ${GNUWIN32_DIR}/include - ) - - find_library(CHM_LIBRARY NAMES chm - PATHS - ${GNUWIN32_DIR}/lib - ) - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(CHM DEFAULT_MSG CHM_INCLUDE_DIR CHM_LIBRARY ) - # ensure that they are cached - set(CHM_INCLUDE_DIR ${CHM_INCLUDE_DIR} CACHE INTERNAL "The chmlib include path") - set(CHM_LIBRARY ${CHM_LIBRARY} CACHE INTERNAL "The libraries needed to use chmlib") - -endif (CHM_LIBRARY AND CHM_INCLUDE_DIR) diff --git a/cmake/modules/FindLibZip.cmake b/cmake/modules/FindLibZip.cmake deleted file mode 100644 index 8600e0eafb..0000000000 --- a/cmake/modules/FindLibZip.cmake +++ /dev/null @@ -1,32 +0,0 @@ -# - Try to find libzip -# Once done this will define -# -# LIBZIP_FOUND - system has the zip library -# LIBZIP_INCLUDE_DIR - the zip include directory -# LIBZIP_LIBRARY - Link this to use the zip library -# -# SPDX-FileCopyrightText: 2006 Pino Toscano <toscano.p...@tiscali.it> -# SPDX-License-Identifier: BSD-3-Clause - -if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR) - # in cache already - set(LIBZIP_FOUND TRUE) -else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR) - - find_path(LIBZIP_INCLUDE_DIR zip.h - ${GNUWIN32_DIR}/include - ) - - find_library(LIBZIP_LIBRARY NAMES zip - PATHS - ${GNUWIN32_DIR}/lib - ) - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR) - - # ensure that they are cached - set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path") - set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip") - -endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR) diff --git a/doc/index.docbook b/doc/index.docbook index f3ff7fb773..001bf34114 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -47,7 +47,6 @@ Context menu actions like Rename Bookmarks etc.) <keyword>tiff</keyword> <keyword>djvu</keyword> <keyword>dvi</keyword> - <keyword>chm</keyword> <keyword>xps</keyword> <keyword>comicbook</keyword> <keyword>fictionbook</keyword> @@ -63,7 +62,7 @@ Context menu actions like Rename Bookmarks etc.) improved presentation support and annotation support. </para> <para> - &okular; supports a lot of different formats like &PDF;, &PostScript;, Tiff, CHM, DjVU, Images (png, jpg, &etc;) + &okular; supports a lot of different formats like &PDF;, &PostScript;, Tiff, DjVU, Images (png, jpg, &etc;) XPS, Fiction Books, Comic Book, Plucker, EPub, Fax and Markdown. For all supported formats and their features see <ulink url="https://okular.kde.org/formats.php";> &okular; Document Format Handlers</ulink>. diff --git a/shell/org.kde.okular.appdata.xml b/shell/org.kde.okular.appdata.xml index 1b782c138a..dc506202c5 100644 --- a/shell/org.kde.okular.appdata.xml +++ b/shell/org.kde.okular.appdata.xml @@ -202,7 +202,7 @@ <p xml:lang="zh-CN">功能特性：</p> <p xml:lang="zh-TW">功能：</p> <ul> - <li>Supported Formats: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li> + <li>Supported Formats: PDF, PS, Tiff, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li> <li xml:lang="ar">يدعم التنسيقات: PDF و PS و Tiff و CHM و DjVu و Images و DVI و XPS و Fiction Book و Comic Book و Plucker و EPub و Fax</li> <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> <li xml:lang="be">Падтрымліваюцца фарматы: PDF, PS, Tiff, CHM, DjVu, Images, DVI, XPS, Fiction Book, Comic Book, Plucker, EPub, Fax</li>
