diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-05-12 16:42:50 +0300 |
commit | 752d6256e5204b958b0ef7905675a940b5e9172f (patch) | |
tree | 330d16e6362a49cbed8875a777fe641a43376cd3 /kde-apps/okular | |
parent | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff) |
gentoo resync : 12.05.2022
Diffstat (limited to 'kde-apps/okular')
-rw-r--r-- | kde-apps/okular/Manifest | 10 | ||||
-rw-r--r-- | kde-apps/okular/files/okular-20.11.90-tests.patch | 148 | ||||
-rw-r--r-- | kde-apps/okular/files/okular-22.04.0-optional-options.patch | 113 | ||||
-rw-r--r-- | kde-apps/okular/metadata.xml | 1 | ||||
-rw-r--r-- | kde-apps/okular/okular-21.12.3.ebuild | 2 | ||||
-rw-r--r-- | kde-apps/okular/okular-22.04.0.ebuild (renamed from kde-apps/okular/okular-21.08.3.ebuild) | 32 |
6 files changed, 131 insertions, 175 deletions
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 30a09860fb5a..30bc51476439 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,9 +1,9 @@ AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b -AUX okular-20.11.90-tests.patch 6748 BLAKE2B 309fb48b50fcd594e9827c4c9b1cbd86e3631fea791e55fbe2d3773b0c46730cd1ab1e9397197287872ad42ebe2f03eccef58cec8237f93c9da7df0c1f19364c SHA512 a0f41a9285f67a3b4878cfaa38e59074ab493e43d5ccb78d65dcb9dd94605b76c36f2345b32a66a5764e9ad564e41282a4470cfeda6af305721a198defab134e AUX okular-21.08.1-optional-options.patch 3144 BLAKE2B 1770bba880ab336998c628887c52062e10a87d1b2ed5fcf08870c17837ec8c2c2c608952153fcf6459eb63fb1302e3cb2276be60fc0607f23886442a920defc9 SHA512 5b34ffa7b58e67ec34b95e50274a97b55eafc5a5b47e07efb43597d5314f785c8dbf34222de220511327b6f9f9d8a98288a50ef9fe4a42c9b3f899dc580b7587 AUX okular-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419cf64b317acf62565de35984604f94cc93f8432487585156f743a9dd314f585f6470513fc8897a42c8c212da2aa03e SHA512 45a8a3331cb5bec3e00f424c700abb8dff4a49ec29d620366006dcf72af335a2af95c5c4d0e0df29b821ecefe138084aa25036b22148802e47a7edf48920b2d5 -DIST okular-21.08.3.tar.xz 8088712 BLAKE2B 50ded7dba63355a995db869d2b4f6eabd3aad905c1d17cd9b5e51cfd0d082ade838d641aee246c0aabf10d24c7c4704cdae03d2e9499452a1cb3c344b05997da SHA512 50f5e4718ae879932aad411dc6569905c541852f81ecf0e4c1896eb249039311c1360274d051ae3aba05e37dd2ec010844b56e277f52b1cc5326a86f8ecba85d +AUX okular-22.04.0-optional-options.patch 3197 BLAKE2B c9ec04ec790f955d6efa05317a31ec17b81e9cdfc3ca56d8d9bc247133418af53db2c5bd03c51784da20342d5f662c307fa785cbcb6dba306e359f43dd016d4a SHA512 699019061db4ad27348e77ca42d7ec528dbbf48aa0a6194c1a9cf13ae0d914f0dc2c64353a6367e7a0169f62196d635a1084880cd5aa7324a2f1bf4cf0f0343b DIST okular-21.12.3.tar.xz 8150344 BLAKE2B 57661406e352ae5deca610a5c3ab5846449cd3b3cdce4ef4ca55eacf8932e07840b85ebf273ed47c8227789800ddd7e8c2510886e136f7b827d98775e5add52a SHA512 6ead15b1994daba427ba5498636706bbc7341ce468fb36bba62e008e881980ebef22449dcc61f6dc848c7ba95c239709c4106f9f61fb6d92e44e1c11d539360d -EBUILD okular-21.08.3.ebuild 3439 BLAKE2B 3ac74bb8a79e759bba1eb4630c069d80c4348dacd5d583fa627913c6d4f4b287e368c4d0ca40e160a31051d7cde5402fb3bf83f60748411495a99005017d899c SHA512 6c1c6da62fdf9f2ff0ffb45312444f148a18e92e86c74f144fff0a95eaafa4dfbd4823a066459990d285852aa3ebcf371bfdee793de4b930c908ba67aded88ad -EBUILD okular-21.12.3.ebuild 3293 BLAKE2B 50f31411cf8f87a51eb84f68f5aeb9123c74676eeab911c64f18d2b1979379058b5d4ac4a86187fc51a1193a83864f5ea138285bc64322bceac729f030f13b73 SHA512 220f994e2359e17ff2fdabbc1af1424faa9469bbeb339a08be2284eab35fb4773e848e3a0c34fa621e2b86fedac152d4855627d8c8f69d38fffa21a8132de317 -MISC metadata.xml 1113 BLAKE2B c13cccdc34297b23156dd5ef8f41c8515df5d2f2adf5aac584080aebf43556ab27f03716ed6f844617d5abf426f434febc69f99f0f2d8fac5f4dedd83c34b8ae SHA512 de94d9c06c35e64f67f191cb15a6347042bf57da991a182e1ce1ef576453b0f56fb39209829702f2d6a6297d53e0d1606d3dfdc82dd176bc65b6f1cb8b4710e5 +DIST okular-22.04.0.tar.xz 8178256 BLAKE2B 320e92660082b68dcddfb31ba607e455e0025aa1d22b50c36eeaf17b81cd7c489c181360e6a3fc02f02a8496883be3d7b76afd227928c50dc10652f2429204d6 SHA512 884154cdb04062307530313606ba0ffb9eea7e092d83a6b4d39d6925f3368300b47e17b0de04f46ac9547a9890d1658bada80065d33f44b04cadeeaf4239f127 +EBUILD okular-21.12.3.ebuild 3292 BLAKE2B 148ffe9a1dd2412da9a1716c2466b67bc596277a5f23346c61d2aa4b1197a9e3830f32c5a82c166a5215143087414941e3ae89f186fe140bcbf4214ec13dc6c5 SHA512 60b9b77b42d3f9e00ac100449a9288fecafc9a355837ba491b4d094d60ccc5fc2153769808841e26a181ace85c13f2c0adbb1a42b208cd6397f386fd14ceab4f +EBUILD okular-22.04.0.ebuild 3286 BLAKE2B d5be0c9ac06be14748fb5af50cfe4319d6dfb362a4c54441834b9dc2e8abbc00eb0242d3153dc0fabc6580301e64b669c1f22c5dd4b9f91d4f5e931c6fb94ffa SHA512 9c3092ac8897c903010e1c166e12501a2932faaaddbc6ef4e2d97e8cce819d29e54272be0f0b8270731ee0588eb513705e712a64d730dfb449eb138854e3284b +MISC metadata.xml 1033 BLAKE2B a75a5164782acbc7d91406190f38a62e6f0b85e79eb039f0d9489001525c1f1a770960a552f10b1e98cb6fb6780ef092df9f0562fbd8234eb9c89177d08a935b SHA512 5f9ffca95088857d8d7c22037407cc5ccdf5dc4e8bec7a12999431111952408bc7ce5123f50d5691123a82ece47cbb8173dc17e866685179a5d2fe5c532352f4 diff --git a/kde-apps/okular/files/okular-20.11.90-tests.patch b/kde-apps/okular/files/okular-20.11.90-tests.patch deleted file mode 100644 index 633513bd2af3..000000000000 --- a/kde-apps/okular/files/okular-20.11.90-tests.patch +++ /dev/null @@ -1,148 +0,0 @@ -From d9cdea559ffa730fd3592b78f5f8530da3d4c803 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Thu, 12 Oct 2017 14:09:09 +0200 -Subject: [PATCH] Move tests into existing (auto)tests subdirectories - ---- - generators/chm/CMakeLists.txt | 12 +++--------- - generators/chm/autotests/CMakeLists.txt | 8 ++++++++ - generators/chm/autotests/chmgeneratortest.cpp | 2 +- - generators/comicbook/CMakeLists.txt | 10 +++------- - generators/comicbook/autotests/CMakeLists.txt | 6 ++++++ - generators/kimgio/CMakeLists.txt | 6 +----- - generators/kimgio/tests/CMakeLists.txt | 5 +++++ - generators/kimgio/tests/kimgiotest.cpp | 2 +- - 8 files changed, 28 insertions(+), 23 deletions(-) - create mode 100644 generators/chm/autotests/CMakeLists.txt - create mode 100644 generators/comicbook/autotests/CMakeLists.txt - create mode 100644 generators/kimgio/tests/CMakeLists.txt - -diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt -index 9d82b9394..b3a33afe4 100644 ---- a/generators/chm/CMakeLists.txt -+++ b/generators/chm/CMakeLists.txt -@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS - okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS}) - target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml) - --########### autotests ############### -- --add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) --ecm_add_test(autotests/chmgeneratortest.cpp -- TEST_NAME "chmgeneratortest" -- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore --) -- --target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>") -+if(BUILD_TESTING) -+ add_subdirectory(autotests) -+endif() - - ########### install files ############### - install( FILES okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) -diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt -new file mode 100644 -index 000000000..59753ca45 ---- /dev/null -+++ b/generators/chm/autotests/CMakeLists.txt -@@ -0,0 +1,8 @@ -+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) -+ -+ecm_add_test(chmgeneratortest.cpp -+ TEST_NAME "chmgeneratortest" -+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore -+) -+ -+target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>") -diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp -index 18305913e..b28822d68 100644 ---- a/generators/chm/autotests/chmgeneratortest.cpp -+++ b/generators/chm/autotests/chmgeneratortest.cpp -@@ -32,7 +32,7 @@ void ChmGeneratorTest::initTestCase() - { - Okular::SettingsCore::instance(QStringLiteral("ChmGeneratorTest")); - m_document = new Okular::Document(nullptr); -- const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm"); -+ const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm"); - QMimeDatabase db; - const QMimeType mime = db.mimeTypeForFile(testFile); - QCOMPARE(m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess); -diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt -index 9a07c7183..316c93152 100644 ---- a/generators/comicbook/CMakeLists.txt -+++ b/generators/comicbook/CMakeLists.txt -@@ -29,13 +29,9 @@ if (KArchive_HAVE_LZMA) - target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1) - endif() - --########### autotests ############### -- --add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) --ecm_add_test(autotests/comicbooktest.cpp -- TEST_NAME "comicbooktest" -- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook --) -+if(BUILD_TESTING) -+ add_subdirectory(autotests) -+endif() - - ########### install files ############### - install( FILES okularComicbook.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) -diff --git a/generators/comicbook/autotests/CMakeLists.txt b/generators/comicbook/autotests/CMakeLists.txt -new file mode 100644 -index 000000000..aaacb341a ---- /dev/null -+++ b/generators/comicbook/autotests/CMakeLists.txt -@@ -0,0 +1,6 @@ -+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) -+ -+ecm_add_test(comicbooktest.cpp -+ TEST_NAME "comicbooktest" -+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook -+) -diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt -index db14d741f..49f893bc1 100644 ---- a/generators/kimgio/CMakeLists.txt -+++ b/generators/kimgio/CMakeLists.txt -@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp) - target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n) - - if(BUILD_TESTING) -- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) -- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp ) -- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) -- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>") -+ add_subdirectory(tests) - endif() - -- - ########### install files ############### - install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) -diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt -new file mode 100644 -index 000000000..844c9096a ---- /dev/null -+++ b/generators/kimgio/tests/CMakeLists.txt -@@ -0,0 +1,5 @@ -+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) -+ -+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp ) -+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) -+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>") -diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp -index 2b507ed79..acd70b168 100644 ---- a/generators/kimgio/tests/kimgiotest.cpp -+++ b/generators/kimgio/tests/kimgiotest.cpp -@@ -7,7 +7,7 @@ - * (at your option) any later version. * - ***************************************************************************/ - --#include "../../settings_core.h" -+#include "../../../settings_core.h" - #include "../generator_kimgio.h" - - #include <core/observer.h> --- -2.29.2 - diff --git a/kde-apps/okular/files/okular-22.04.0-optional-options.patch b/kde-apps/okular/files/okular-22.04.0-optional-options.patch new file mode 100644 index 000000000000..caaf389b670b --- /dev/null +++ b/kde-apps/okular/files/okular-22.04.0-optional-options.patch @@ -0,0 +1,113 @@ +From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 31 Aug 2021 16:48:42 +0200 +Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options + +Since I was asked to implement this, might as well make it real options, +not just limited to ANDROID. Even though optional find_package() call is +already being used for KF5Purpose as well. + +KF5DocTools is not made required more often than not. + +See also: https://invent.kde.org/graphics/okular/-/issues/61 +Downstream report: https://bugs.gentoo.org/810958 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 21 ++++++++------------- + config-okular.h.cmake | 6 ++++++ + core/generator.cpp | 1 + + core/scripter.cpp | 1 + + 4 files changed, 16 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 547671f24..f1e14fa8b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names( + PACKAGE_SETUP_AUTOMOC_VARIABLES + ) + +-set(optionalComponents) +-if (ANDROID) +-# we want to make sure that generally all components are found +- +- set(optionalComponents "OPTIONAL_COMPONENTS") +-endif() ++# we want to make sure that generally all components are found ++option(WITH_KWALLET "Build with desktop-wide storage for password support" ON) ++option(WITH_KJS "Build with scripting support" ON) + + find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS + Archive +@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS + KIO + ThreadWeaver + WindowSystem +- ${optionalComponents} ++ OPTIONAL_COMPONENTS + DocTools +- JS +- Wallet + ) + + if (BUILD_DESKTOP) + find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes TextWidgets) + endif() + +-if(KF5Wallet_FOUND) +- add_definitions(-DWITH_KWALLET=1) ++if(WITH_KWALLET) ++ find_package(KF5Wallet ${KF5_REQUIRED_VERSION} REQUIRED) + endif() +-if(KF5JS_FOUND) +- add_definitions(-DWITH_KJS=1) ++if(WITH_KJS) ++ find_package(KF5JS ${KF5_REQUIRED_VERSION} REQUIRED) + endif() + + if(NOT WIN32 AND NOT ANDROID) +diff --git a/config-okular.h.cmake b/config-okular.h.cmake +index 905aac9cb..00e45f77c 100644 +--- a/config-okular.h.cmake ++++ b/config-okular.h.cmake +@@ -1,6 +1,12 @@ + /* Defines if force the use DRM in okular */ + #define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM} + ++/* Defines if the KJS framework is available */ ++#cmakedefine WITH_KJS ++ ++/* Defines if the kwallet framework is available */ ++#cmakedefine WITH_KWALLET ++ + /* Defines if the purpose framework is available */ + #define PURPOSE_FOUND ${PURPOSE_FOUND} + +diff --git a/core/generator.cpp b/core/generator.cpp +index 8360bb32b..0871c17ee 100644 +--- a/core/generator.cpp ++++ b/core/generator.cpp +@@ -9,6 +9,7 @@ + */ + + #include "generator.h" ++#include "config-okular.h" + #include "generator_p.h" + #include "observer.h" + +diff --git a/core/scripter.cpp b/core/scripter.cpp +index c60645895..2e6eacc72 100644 +--- a/core/scripter.cpp ++++ b/core/scripter.cpp +@@ -5,6 +5,7 @@ + */ + + #include "scripter.h" ++#include "config-okular.h" + + #include <QDebug> + #include <QFile> +-- +2.35.1 + diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml index 5294ccba1b21..b894d40b6886 100644 --- a/kde-apps/okular/metadata.xml +++ b/kde-apps/okular/metadata.xml @@ -9,7 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag> <flag name="crypt">Enable support for password-encrypted documents via <pkg>kde-frameworks/kwallet</pkg></flag> <flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag> <flag name="image-backend">Enable image viewing support</flag> diff --git a/kde-apps/okular/okular-21.12.3.ebuild b/kde-apps/okular/okular-21.12.3.ebuild index 62ae71413257..88b67da0a091 100644 --- a/kde-apps/okular/okular-21.12.3.ebuild +++ b/kde-apps/okular/okular-21.12.3.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" DEPEND=" diff --git a/kde-apps/okular/okular-21.08.3.ebuild b/kde-apps/okular/okular-22.04.0.ebuild index 44920f1e7242..bce77f9376d2 100644 --- a/kde-apps/okular/okular-21.08.3.ebuild +++ b/kde-apps/okular/okular-22.04.0.ebuild @@ -6,7 +6,7 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-3) -KFMIN=5.84.0 +KFMIN=5.92.0 QTMIN=5.15.2 VIRTUALX_REQUIRED="test" inherit ecm kde.org @@ -16,10 +16,10 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" -COMMON_DEPEND=" +DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 @@ -43,11 +43,6 @@ COMMON_DEPEND=" media-libs/freetype >=media-libs/phonon-4.11.0 sys-libs/zlib - chm? ( - dev-libs/chmlib - dev-libs/libzip:= - >=kde-frameworks/khtml-${KFMIN}:5 - ) crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) @@ -55,19 +50,16 @@ COMMON_DEPEND=" >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png] >=kde-apps/libkexiv2-${PVCUT}:5 ) - markdown? ( app-text/discount ) + markdown? ( >=app-text/discount-2.2.7-r1 ) mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) - pdf? ( app-text/poppler[nss,qt5] ) + pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) tiff? ( media-libs/tiff:0 ) " -DEPEND="${COMMON_DEPEND} - markdown? ( >=app-text/discount-2.2.7-r1 ) -" -RDEPEND="${COMMON_DEPEND} +RDEPEND="${DEPEND} image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) qml? ( >=dev-qt/qtquickcontrols2-${QTMIN}:5 @@ -76,17 +68,17 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138 + "${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138 "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry - "${FILESDIR}/${PN}-21.08.1-optional-options.patch" # bug 810958 + "${FILESDIR}/${P}-optional-options.patch" # bug 810958 ) src_configure() { local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON + -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON -DOKULAR_UI=$(usex qml "both" "desktop") - $(cmake_use_find_package chm CHM) - $(cmake_use_find_package chm KF5KHtml) - $(cmake_use_find_package chm LibZip) -DWITH_KWALLET=$(usex crypt) $(cmake_use_find_package djvu DjVuLibre) $(cmake_use_find_package epub EPub) |