From f3ed9da3ba9bd8c0ddb6c7ac1d843c1f9d27c5eb Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Mon, 15 Jan 2024 19:29:49 +0100
Subject: [PATCH] okular: update for Qt6

---
 recipes-application/graphics/okular.inc | 32 +++++++++++++------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/recipes-application/graphics/okular.inc b/recipes-application/graphics/okular.inc
index 2d6c646..4c70759 100644
--- a/recipes-application/graphics/okular.inc
+++ b/recipes-application/graphics/okular.inc
@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2019-2020 Volker Krause <vkrause@kde.org>
+# SPDX-FileCopyrightText: 2024 Andreas Cord-Landwehr <cordlandwehr@kde.org>
 #
 # SPDX-License-Identifier: MIT
 
@@ -11,14 +12,21 @@ LIC_FILES_CHKSUM = " \
 "
 PR = "r0"
 
+inherit cmake_kdeapp
+inherit kf6-kcoreaddons
+inherit kf6-kconfig
+inherit kf6-kauth
+inherit mime-xdg
+
 DEPENDS += " \
-    exiv2 \
+    qtbase \
+    libkexiv2 \
+    libzip \
     kirigami \
     kparts \
     threadweaver \
     kwallet \
-    kjs \
-    kactivities \
+    plasma-activities \
     kpty \
     phonon \
     poppler \
@@ -26,19 +34,16 @@ DEPENDS += " \
     qca \
 "
 
+EXTRA_OECMAKE += " \
+    -DOKULAR_UI=both \
+    -DFORCE_NOT_REQUIRED_DEPENDENCIES='KExiv2Qt6;LibSpectre;DjVuLibre;EPub;Discount' \
+"
+
 # dirty hack to force the mobile version and hide the desktop one
 do_install:append() {
     sed -i 's/Exec=okular %U$/Exec=okularkirigami %U/g' ${D}${datadir}/applications/org.kde.okular.desktop
 }
 
-inherit cmake_kdeapp
-inherit kf6-kcoreaddons
-inherit kf6-kconfig
-inherit kf6-kauth
-inherit mime-xdg
-
-EXTRA_OECMAKE += " -DOE_QCA_PATH_HOST_ROOT=${STAGING_DIR_HOST} -DOKULAR_UI=both"
-
 # note: okularkirigami is the dedicated mobile version
 PACKAGES += " \
     ${PN}-desktop \
@@ -54,13 +59,9 @@ FILES:${PN}-shared = " \
     ${sysconfdir}/xdg/okular.categories \
     ${datadir}/okular/pics \
     ${datadir}/okular/icons \
-    ${datadir}/qlogging-categories5 \
     ${datadir}/config.kcfg \
     ${datadir}/icons \
     ${datadir}/kconf_update \
-    ${datadir}/kservicetypes5 \
-    ${datadir}/kservices5 \
-    ${datadir}/kxmlgui5 \
     ${datadir}/metainfo \
     ${datadir}/okular \
     ${datadir}/applications/org.kde.mobile.okular_xps.desktop \
@@ -93,6 +94,7 @@ FILES:${PN}-desktop = " \
 
 RDEPENDS:${PN} += " \
     ${PN}-shared \
+    kirigami-addons \
 "
 
 RDEPENDS:${PN}-desktop += " \