diff options
Diffstat (limited to 'kde-apps/okular')
-rw-r--r-- | kde-apps/okular/Manifest | 3 | ||||
-rw-r--r-- | kde-apps/okular/files/okular-22.04.0-optional-options.patch | 113 | ||||
-rw-r--r-- | kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch | 29 | ||||
-rw-r--r-- | kde-apps/okular/files/okular-24.04.80-tests.patch | 46 | ||||
-rw-r--r-- | kde-apps/okular/metadata.xml | 5 | ||||
-rw-r--r-- | kde-apps/okular/okular-23.08.5.ebuild (renamed from kde-apps/okular/okular-22.04.3.ebuild) | 36 | ||||
-rw-r--r-- | kde-apps/okular/okular-24.04.90.ebuild | 99 |
7 files changed, 199 insertions, 132 deletions
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 61729879f0c9..faced0634b45 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1 +1,2 @@ -DIST okular-22.04.3.tar.xz 8219616 BLAKE2B 016e01d3a8495faa0c3c51ac583817ecdedf253ef98b81e99c5ed2e24a6174ef11eab0840b1c51ef80644b080bff4c9b4ef6087a46656bef2a1c81555008623f SHA512 bf4dc64b1230b8e7852307aefdc4658c99d3078af3466c0d760e5cdbd763891f910a7ece21853a350b3102cbe69ea1614958ed59c50c30cc4c866f1037a5d1d5 +DIST okular-23.08.5.tar.xz 8515760 BLAKE2B ec8ddf33917cc092e23934cc184280bf69fd92e184f05a14a3b0ec3636f00a90e35ab7c5b05e6b4083a4a94fb3d8725aa7b71686d5fe1d8962c4678690670f29 SHA512 c9e8b430fa4a5486cee0587f9beb077b4e8b5476f00ed42c9369fbb195ad9733ed310e01ebefc3c08cf78a53a3e72eab44c42a236b3dcad7e02421a864331dd6 +DIST okular-24.04.90.tar.xz 8017732 BLAKE2B 44760fc6da6e47b33bf6d6601e41d9918cccc0d9c6c4a6d11c976bd9a094a972d2968257ded46096406793bc863729b1e61dc450d9cf068ceb7b274d148d8438 SHA512 394ad44bc93061ee31b282acb190233d2417b6ade89d2205c2868155c3d284da93e00d9a52b1fa3865236cc26be0c931c3cd5a59af4214cd2afb2dcefa8068a6 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 deleted file mode 100644 index caaf389b670b..000000000000 --- a/kde-apps/okular/files/okular-22.04.0-optional-options.patch +++ /dev/null @@ -1,113 +0,0 @@ -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/files/okular-23.08.5-implicit-vasprintf.patch b/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch new file mode 100644 index 000000000000..685da3112291 --- /dev/null +++ b/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch @@ -0,0 +1,29 @@ +From a0f57bf7f984289c5b0ceefa2a784f97cd58428a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <gpoo@gnome.org> +Date: Sat, 30 May 2020 16:15:27 -0400 +Subject: [PATCH] Fix implicit declaration of vasprintf + +Fix build when compiling with `-Werror=implicit-function-declaration`. +--- + core/synctex/synctex_parser.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/core/synctex/synctex_parser.c b/core/synctex/synctex_parser.c +index 9eed566b3..a67006d39 100644 +--- a/core/synctex/synctex_parser.c ++++ b/core/synctex/synctex_parser.c +@@ -55,6 +55,11 @@ + * First level objects are sheets and forms, containing boxes, glues, kerns... + * The third tree allows to browse leaves according to tag and line. + */ ++/* Declare _GNU_SOURCE for accessing vasprintf. For MSC compiler, vasprintf is ++ * defined in this file ++ */ ++#define _GNU_SOURCE ++ + #if defined(SYNCTEX_USE_LOCAL_HEADER) + #include "synctex_parser_local.h" + #else +-- +2.44.0 + diff --git a/kde-apps/okular/files/okular-24.04.80-tests.patch b/kde-apps/okular/files/okular-24.04.80-tests.patch new file mode 100644 index 000000000000..b36ab68432c9 --- /dev/null +++ b/kde-apps/okular/files/okular-24.04.80-tests.patch @@ -0,0 +1,46 @@ +From 3f90abab39233c2fb56b7cb3b95d552c0ca1146d Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 19 Dec 2023 10:13:52 +0100 +Subject: [PATCH] Move tests into existing (auto)tests subdirectories + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + generators/comicbook/CMakeLists.txt | 9 +++------ + generators/comicbook/autotests/CMakeLists.txt | 5 +++++ + 2 files changed, 8 insertions(+), 6 deletions(-) + create mode 100644 generators/comicbook/autotests/CMakeLists.txt + +diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt +index 53075836d..c601e9d7b 100644 +--- a/generators/comicbook/CMakeLists.txt ++++ b/generators/comicbook/CMakeLists.txt +@@ -29,12 +29,9 @@ else() + endif() + + ########### autotests ############### +- +-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) +-ecm_add_test(autotests/comicbooktest.cpp +- TEST_NAME "comicbooktest" +- LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook +-) ++if(BUILD_TESTING) ++ add_subdirectory(autotests) ++endif() + + ########### install files ############### + install( PROGRAMS okularApplication_comicbook.desktop org.kde.mobile.okular_comicbook.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) +diff --git a/generators/comicbook/autotests/CMakeLists.txt b/generators/comicbook/autotests/CMakeLists.txt +new file mode 100644 +index 000000000..6426105e4 +--- /dev/null ++++ b/generators/comicbook/autotests/CMakeLists.txt +@@ -0,0 +1,5 @@ ++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) ++ecm_add_test(comicbooktest.cpp ++ TEST_NAME "comicbooktest" ++ LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook ++) +-- +2.44.0 + diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml index b894d40b6886..c64a8d45ad61 100644 --- a/kde-apps/okular/metadata.xml +++ b/kde-apps/okular/metadata.xml @@ -7,16 +7,17 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:okular</remote-id> </upstream> <use> <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> <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag> - <flag name="mobi">Enable mobipocket support</flag> + <flag name="mobi">Enable mobipocket support via <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag> + <flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag> <flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag> <flag name="qml">Install Okular Qml components</flag> <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> - <flag name="speech">Enable text-to-speech support</flag> </use> </pkgmetadata> diff --git a/kde-apps/okular/okular-22.04.3.ebuild b/kde-apps/okular/okular-23.08.5.ebuild index ecbeee953349..25f6cf6f093a 100644 --- a/kde-apps/okular/okular-22.04.3.ebuild +++ b/kde-apps/okular/okular-23.08.5.ebuild @@ -1,14 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK="optional" ECM_TEST="forceoptional" PVCUT=$(ver_cut 1-3) -KFMIN=5.92.0 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" +KFMIN=5.106.0 +QTMIN=5.15.9 inherit ecm gear.kde.org DESCRIPTION="Universal document viewer based on KDE Frameworks" @@ -17,15 +16,18 @@ HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" +IUSE="crypt djvu epub +image-backend markdown mobi +pdf phonon +plucker +postscript qml share speech +tiff" +# slot op: Uses Qt5::CorePrivate DEPEND=" + >=dev-qt/qtcore-${QTMIN}:5= >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -35,29 +37,29 @@ DEPEND=" >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjs-${KFMIN}:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/kpty-${KFMIN}:5 >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/threadweaver-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 media-libs/freetype - >=media-libs/phonon-4.11.0 sys-libs/zlib crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( - >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png] + >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png] >=kde-apps/libkexiv2-${PVCUT}:5 ) - markdown? ( >=app-text/discount-2.2.7-r1 ) + markdown? ( >=app-text/discount-2.2.7-r1:= ) mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) + phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] ) plucker? ( media-libs/libjpeg-turbo:= ) postscript? ( app-text/libspectre ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) - tiff? ( media-libs/tiff:0 ) + tiff? ( media-libs/tiff:= ) " RDEPEND="${DEPEND} image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) @@ -70,7 +72,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138 "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry - "${FILESDIR}/${PN}-22.04.0-optional-options.patch" # bug 810958 + "${FILESDIR}/${P}-implicit-vasprintf.patch" # bug 922345; pending upstream ) src_configure() { @@ -78,14 +80,16 @@ src_configure() { -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON + -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;" -DOKULAR_UI=$(usex qml "both" "desktop") - -DWITH_KWALLET=$(usex crypt) + $(cmake_use_find_package crypt KF5Wallet) $(cmake_use_find_package djvu DjVuLibre) $(cmake_use_find_package epub EPub) $(cmake_use_find_package image-backend KF5KExiv2) $(cmake_use_find_package markdown Discount) $(cmake_use_find_package mobi QMobipocket) $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package phonon Phonon4Qt5) $(cmake_use_find_package plucker JPEG) $(cmake_use_find_package postscript LibSpectre) $(cmake_use_find_package share KF5Purpose) @@ -98,9 +102,9 @@ src_configure() { src_test() { # mainshelltest hangs, chmgeneratortest fails, bug #603116 # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640 - # epubgeneratortest and signunsignedfieldtest fail, whatever. bug #852749 + # signunsignedfieldtest fails, whatever. bug #852749 local myctestargs=( - -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|epubgeneratortest|signunsignedfieldtest)" + -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)" ) ecm_src_test diff --git a/kde-apps/okular/okular-24.04.90.ebuild b/kde-apps/okular/okular-24.04.90.ebuild new file mode 100644 index 000000000000..1eeaf98e1388 --- /dev/null +++ b/kde-apps/okular/okular-24.04.90.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm gear.kde.org + +DESCRIPTION="Universal document viewer based on KDE Frameworks" +HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +tiff" + +# slot op: Uses Qt6::CorePrivate +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-apps/libkexiv2-${PVCUT}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kpty-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/threadweaver-${KFMIN}:6 + kde-plasma/plasma-activities:6 + media-libs/freetype + sys-libs/zlib + crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 ) + djvu? ( app-text/djvu ) + epub? ( app-text/ebook-tools ) + markdown? ( >=app-text/discount-2.2.7-r1:= ) + mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:6 ) + pdf? ( >=app-text/poppler-23.12.0[nss,qt6] ) + phonon? ( >=media-libs/phonon-4.12.0[qt6] ) + postscript? ( app-text/libspectre ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) + speech? ( >=dev-qt/qtspeech-${QTMIN}:6 ) + tiff? ( media-libs/tiff:= ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kimageformats-${KFMIN}:6 + qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 ) +" + +PATCHES=( + "${FILESDIR}/${PN}-24.04.80-tests.patch" # bug 734138 + "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry +) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON + -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;LibZip;KF6Wallet;DjVuLibre;EPub;Discount;QMobipocket6;Poppler;LibSpectre;KF6Purpose;Qt6TextToSpeech;TIFF;" + -DOKULAR_UI=$(usex qml "both" "desktop") + $(cmake_use_find_package crypt KF6Wallet) + $(cmake_use_find_package djvu DjVuLibre) + $(cmake_use_find_package epub EPub) + $(cmake_use_find_package markdown Discount) + $(cmake_use_find_package mobi QMobipocket6) + $(cmake_use_find_package pdf Poppler) + $(cmake_use_find_package phonon Phonon4Qt6) + $(cmake_use_find_package postscript LibSpectre) + $(cmake_use_find_package share KF6Purpose) + $(cmake_use_find_package speech Qt6TextToSpeech) + $(cmake_use_find_package tiff TIFF) + ) + ecm_src_configure +} + +src_test() { + # mainshelltest hangs, bug #603116 + # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640 + # signunsignedfieldtest fails, whatever. bug #852749 + local myctestargs=( + -E "(mainshelltest|parttest|annotationtoolbartest|signunsignedfieldtest)" + ) + + ecm_src_test +} |