From d1d8adbfd346340c3784c72a9fa0868dde6ff736 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 27 Jul 2022 15:01:59 +0100 Subject: gentoo auto-resync : 27:07:2022 - 15:01:59 --- kde-apps/Manifest.gz | Bin 37059 -> 37058 bytes kde-apps/okular/Manifest | 1 - .../files/okular-21.08.1-optional-options.patch | 109 --------------------- 3 files changed, 110 deletions(-) delete mode 100644 kde-apps/okular/files/okular-21.08.1-optional-options.patch (limited to 'kde-apps') diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz index bcae6d85765a..afa71870b9d2 100644 Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 3b9b0818f83c..c8081ba97c72 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,5 +1,4 @@ AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b -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 AUX okular-22.04.0-optional-options.patch 3197 BLAKE2B c9ec04ec790f955d6efa05317a31ec17b81e9cdfc3ca56d8d9bc247133418af53db2c5bd03c51784da20342d5f662c307fa785cbcb6dba306e359f43dd016d4a SHA512 699019061db4ad27348e77ca42d7ec528dbbf48aa0a6194c1a9cf13ae0d914f0dc2c64353a6367e7a0169f62196d635a1084880cd5aa7324a2f1bf4cf0f0343b DIST okular-22.04.3.tar.xz 8219616 BLAKE2B 016e01d3a8495faa0c3c51ac583817ecdedf253ef98b81e99c5ed2e24a6174ef11eab0840b1c51ef80644b080bff4c9b4ef6087a46656bef2a1c81555008623f SHA512 bf4dc64b1230b8e7852307aefdc4658c99d3078af3466c0d760e5cdbd763891f910a7ece21853a350b3102cbe69ea1614958ed59c50c30cc4c866f1037a5d1d5 diff --git a/kde-apps/okular/files/okular-21.08.1-optional-options.patch b/kde-apps/okular/files/okular-21.08.1-optional-options.patch deleted file mode 100644 index 71d8df156e51..000000000000 --- a/kde-apps/okular/files/okular-21.08.1-optional-options.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 54351076f87ce2a43a87427d9c3f3e00539b9fd5 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 2506c3cfa..984f3695e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,12 +76,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 -@@ -98,17 +95,15 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS - TextWidgets - ThreadWeaver - WindowSystem -- ${optionalComponents} -+ OPTIONAL_COMPONENTS - DocTools -- JS -- Wallet - ) - --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 051c2c922..f675ebcb3 100644 ---- a/core/generator.cpp -+++ b/core/generator.cpp -@@ -8,6 +8,7 @@ - SPDX-License-Identifier: GPL-2.0-or-later - */ - -+#include "config-okular.h" - #include "generator.h" - #include "generator_p.h" - #include "observer.h" -diff --git a/core/scripter.cpp b/core/scripter.cpp -index c60645895..d5b640dbb 100644 ---- a/core/scripter.cpp -+++ b/core/scripter.cpp -@@ -4,6 +4,7 @@ - SPDX-License-Identifier: GPL-2.0-or-later - */ - -+#include "config-okular.h" - #include "scripter.h" - - #include --- -2.33.0 - -- cgit v1.2.3