From 529abfa74a08ae5099db9780bcdf8250aa52ecb6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Dec 2022 14:59:59 +0000 Subject: gentoo auto-resync : 03:12:2022 - 14:59:58 --- kde-apps/okular/Manifest | 3 - .../files/okular-22.04.0-optional-options.patch | 113 --------------------- kde-apps/okular/okular-22.04.3-r1.ebuild | 107 ------------------- 3 files changed, 223 deletions(-) delete mode 100644 kde-apps/okular/files/okular-22.04.0-optional-options.patch delete mode 100644 kde-apps/okular/okular-22.04.3-r1.ebuild (limited to 'kde-apps/okular') diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index c6403c7de0f2..5e780b08bba9 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,9 +1,6 @@ AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b AUX okular-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419cf64b317acf62565de35984604f94cc93f8432487585156f743a9dd314f585f6470513fc8897a42c8c212da2aa03e SHA512 45a8a3331cb5bec3e00f424c700abb8dff4a49ec29d620366006dcf72af335a2af95c5c4d0e0df29b821ecefe138084aa25036b22148802e47a7edf48920b2d5 -AUX okular-22.04.0-optional-options.patch 3197 BLAKE2B c9ec04ec790f955d6efa05317a31ec17b81e9cdfc3ca56d8d9bc247133418af53db2c5bd03c51784da20342d5f662c307fa785cbcb6dba306e359f43dd016d4a SHA512 699019061db4ad27348e77ca42d7ec528dbbf48aa0a6194c1a9cf13ae0d914f0dc2c64353a6367e7a0169f62196d635a1084880cd5aa7324a2f1bf4cf0f0343b AUX okular-22.08.3-drop-broken-kf-version-check.patch 1116 BLAKE2B 6a136da55db35ac83416d5dffacd22e3f6468fa829eb5a4d31d2c90fde9d7d4cfd11b9d90dc63539565b16311daa4a18a0c2deea3e4988d92638f89569c034b0 SHA512 a9db6f222a2ed64ac82f3c3967340bde40784c0b1e76cdd87d23dce535d1c2b8772a86e65f871739c623f690f363bf394234b8a0adb5b0bbb954206e03e97208 -DIST okular-22.04.3.tar.xz 8219616 BLAKE2B 016e01d3a8495faa0c3c51ac583817ecdedf253ef98b81e99c5ed2e24a6174ef11eab0840b1c51ef80644b080bff4c9b4ef6087a46656bef2a1c81555008623f SHA512 bf4dc64b1230b8e7852307aefdc4658c99d3078af3466c0d760e5cdbd763891f910a7ece21853a350b3102cbe69ea1614958ed59c50c30cc4c866f1037a5d1d5 DIST okular-22.08.3.tar.xz 8225824 BLAKE2B 1a8a9bd669173a941ef337ecdaeded4fd9df30e2df693afb012f85fda8d06e588385264ca7134dcf39466f0f2730a1ce70c0434e292033b8a67585eb9a386a1f SHA512 c2d8384e6b0eba4a477e5b0bb1e8046ed10b28162fee9e902e0cc1409a982187244e46a51f0e79e5ba292ea57440ac55005984d31148462787a040308571b69a -EBUILD okular-22.04.3-r1.ebuild 3427 BLAKE2B 129b3b7b4d902093c5a68c90aadba4680f6791a9e7f63f6779f80dca2cc849970acaf0b852e4e8570a66b81b97259852067362e8c275b9d352f203f220acde93 SHA512 ced071782ba90f4a1f61029e3ec3da975d6fee77b5f5eba239de09056d7c74e28da796998d39635db0113a34c89e0aa2230683c6333347e48633da5fb3728515 EBUILD okular-22.08.3.ebuild 3569 BLAKE2B 4f7533fd9d0038f7436ade954b082af5a2ab1dd4bba8e36ca4e736d4c22c105132176c658ab408827d639a931707a3c281f3414d7c2aae82ec24151083677c7c SHA512 7b7e3b5dcbdff7d3b4874bd70a4a8e466be7e2c7d46a7ec565cff2b02389443b113c794f4b2c4c5a8db214c2d17e64592f9d558b2caeca52f22bbfb5cf1ac4df MISC metadata.xml 1134 BLAKE2B d2bf9a6b378094bfd999f9e4bc3f1ca40d0c9014e247d2df308ddd413999e7a9ffd2dbca3cecff50f696435b16e8be83a3167ed51e5bac737f1720f4502f02f0 SHA512 8dabf09a40eb2cf7c2e0be18d33020b6ccf777115e7c047bfc4791ad0e23554ac25e6ed8da8528281e067b71567dad3407634562273aedae419759bab4e0d416 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 -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 ---- - 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 - #include --- -2.35.1 - diff --git a/kde-apps/okular/okular-22.04.3-r1.ebuild b/kde-apps/okular/okular-22.04.3-r1.ebuild deleted file mode 100644 index f21215b1db73..000000000000 --- a/kde-apps/okular/okular-22.04.3-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.92.0 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -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="5" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="crypt djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml share speech +tiff" - -DEPEND=" - >=dev-qt/qtdbus-${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 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=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 - 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] - >=kde-apps/libkexiv2-${PVCUT}:5 - ) - markdown? ( >=app-text/discount-2.2.7-r1 ) - mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) - pdf? ( >=app-text/poppler-21.10.0[nss,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 ) -" -RDEPEND="${DEPEND} - image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) - qml? ( - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - ) -" - -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 -) - -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") - -DWITH_KWALLET=$(usex crypt) - $(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 plucker JPEG) - $(cmake_use_find_package postscript LibSpectre) - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package speech Qt5TextToSpeech) - $(cmake_use_find_package tiff TIFF) - ) - ecm_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 - local myctestargs=( - -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|epubgeneratortest|signunsignedfieldtest)" - ) - - ecm_src_test -} -- cgit v1.2.3