Bug#1050015: okular: Drop khtml and kjs
Upstream is going to drop support for CHM with the next release.
Please consider applying the enclosed patch to get rid of it for the current Debian revision.
khelpcenter is going to remove the khtml dependency from its dependencies with the next release as well,
so we should be able to get rid of it in Debian.
diff -Nru okular-23.08.1/debian/changelog okular-23.08.1/debian/changelog
--- okular-23.08.1/debian/changelog 2023-09-22 17:24:18.000000000 +0000
+++ okular-23.08.1/debian/changelog 2024-02-25 18:21:23.000000000 +0000
@@ -1,3 +1,11 @@
+okular (4:23.08.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop chm support. (Closes: #1050015, #814602)
+ * Drop unnecessary Build-Depends: libkf5kjs-dev.
+
+ -- Bastian Germann <bage@debian.org> Sun, 25 Feb 2024 18:21:23 +0000
+
okular (4:23.08.1-2) unstable; urgency=medium
[ Patrick Franz ]
diff -Nru okular-23.08.1/debian/control okular-23.08.1/debian/control
--- okular-23.08.1/debian/control 2023-09-22 17:22:56.000000000 +0000
+++ okular-23.08.1/debian/control 2024-02-25 18:21:23.000000000 +0000
@@ -9,7 +9,6 @@
extra-cmake-modules (>= 5.68.0~),
gettext,
kirigami2-dev (>= 5.85.0~),
- libchm-dev,
libdjvulibre-dev (>= 3.5.17~),
libepub-dev,
libfreetype-dev,
@@ -26,9 +25,7 @@
libkf5i18n-dev (>= 5.68.0~),
libkf5iconthemes-dev (>= 5.68.0~),
libkf5kexiv2-dev (>= 5.68.0~),
- libkf5khtml-dev (>= 5.68.0~),
libkf5kio-dev (>= 5.68.0~),
- libkf5kjs-dev (>= 5.68.0~),
libkf5parts-dev (>= 5.68.0~),
libkf5pty-dev (>= 5.68.0~),
libkf5purpose-dev (>= 5.68.0~),
@@ -47,7 +44,6 @@
libqt5x11extras5-dev,
libspectre-dev (>= 0.2~),
libtiff-dev,
- libzip-dev,
pkg-config,
qtbase5-dev (>= 5.15.2~),
qtbase5-private-dev,
@@ -124,7 +120,6 @@
These plugins allow Okular to view additional document formats:
* DeJaVu Format
* TIFF Image Format
- * Microsoft CHM Format
* EPUB
* Markdown
.
@@ -174,7 +169,6 @@
* FictionBook Format
* Plucker Format
* OpenDocument Text Format
- * Microsofts CHM Format
* Microsofts XML Document Format
.
This package is part of the KDE graphics module.
diff -Nru okular-23.08.1/debian/not-installed okular-23.08.1/debian/not-installed
--- okular-23.08.1/debian/not-installed 1970-01-01 00:00:00.000000000 +0000
+++ okular-23.08.1/debian/not-installed 2024-02-25 18:21:23.000000000 +0000
@@ -0,0 +1 @@
+usr/share/locale/*/LC_MESSAGES/okular_chm.mo
diff -Nru okular-23.08.1/debian/okular-extra-backends.install okular-23.08.1/debian/okular-extra-backends.install
--- okular-23.08.1/debian/okular-extra-backends.install 2023-09-19 19:00:52.000000000 +0000
+++ okular-23.08.1/debian/okular-extra-backends.install 2024-02-25 18:21:23.000000000 +0000
@@ -1,30 +1,23 @@
-usr/lib/*/qt5/plugins/kf5/kio/kio_msits.so
-usr/lib/*/qt5/plugins/okular/generators/okularGenerator_chmlib.so
usr/lib/*/qt5/plugins/okular/generators/okularGenerator_djvu.so
usr/lib/*/qt5/plugins/okular/generators/okularGenerator_epub.so
usr/lib/*/qt5/plugins/okular/generators/okularGenerator_md.so
usr/lib/*/qt5/plugins/okular/generators/okularGenerator_tiff.so
-usr/share/applications/okularApplication_chm.desktop
usr/share/applications/okularApplication_djvu.desktop
usr/share/applications/okularApplication_epub.desktop
usr/share/applications/okularApplication_md.desktop
usr/share/applications/okularApplication_tiff.desktop
-usr/share/applications/org.kde.mobile.okular_chm.desktop
usr/share/applications/org.kde.mobile.okular_djvu.desktop
usr/share/applications/org.kde.mobile.okular_epub.desktop
usr/share/applications/org.kde.mobile.okular_md.desktop
usr/share/applications/org.kde.mobile.okular_tiff.desktop
-usr/share/kservices5/okularChm.desktop
usr/share/kservices5/okularDjvu.desktop
usr/share/kservices5/okularEPub.desktop
usr/share/kservices5/okularMd.desktop
usr/share/kservices5/okularTiff.desktop
-usr/share/locale/*/LC_MESSAGES/okular_chm.mo
usr/share/locale/*/LC_MESSAGES/okular_djvu.mo
usr/share/locale/*/LC_MESSAGES/okular_epub.mo
usr/share/locale/*/LC_MESSAGES/okular_markdown.mo
usr/share/locale/*/LC_MESSAGES/okular_tiff.mo
-usr/share/metainfo/org.kde.okular-chm.metainfo.xml
usr/share/metainfo/org.kde.okular-djvu.metainfo.xml
usr/share/metainfo/org.kde.okular-epub.metainfo.xml
usr/share/metainfo/org.kde.okular-md.metainfo.xml
diff -Nru okular-23.08.1/debian/rules okular-23.08.1/debian/rules
--- okular-23.08.1/debian/rules 2023-09-19 19:00:52.000000000 +0000
+++ okular-23.08.1/debian/rules 2024-02-25 18:21:23.000000000 +0000
@@ -9,7 +9,7 @@
dh $@
override_dh_auto_configure:
- dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF -DOKULAR_UI=both
+ dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF -DOKULAR_UI=both -DFORCE_NOT_REQUIRED_DEPENDENCIES="CHM;KF5KHtml;LibZip;"
override_dh_auto_test:
# Disable dh_auto_test at build time
Reply to: