summaryrefslogtreecommitdiff
path: root/kde-apps/okular
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-05-21 00:05:36 +0100
committerV3n3RiX <venerix@koprulu.sector>2024-05-21 00:05:36 +0100
commitbfd63d5b0e96ad32e0d0a8fe15512b6a9ac6fc9e (patch)
tree4d1f8172a8137960573865b4a5ac8b7846d281df /kde-apps/okular
parent77b275a53383b07b154caa09feb6f4961b206638 (diff)
gentoo auto-resync : 21:05:2024 - 00:05:35
Diffstat (limited to 'kde-apps/okular')
-rw-r--r--kde-apps/okular/Manifest6
-rw-r--r--kde-apps/okular/files/okular-24.01.80-tests.patch98
-rw-r--r--kde-apps/okular/files/okular-24.04.80-tests.patch46
-rw-r--r--kde-apps/okular/okular-24.04.90.ebuild (renamed from kde-apps/okular/okular-24.02.2.ebuild)4
4 files changed, 50 insertions, 104 deletions
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 82fa313a6e22..98b27435982d 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-21.11.80-tests.patch 4269 BLAKE2B bbe4f8761b113b42e5c882db5c68ab95419cf64b317acf62565de35984604f94cc93f8432487585156f743a9dd314f585f6470513fc8897a42c8c212da2aa03e SHA512 45a8a3331cb5bec3e00f424c700abb8dff4a49ec29d620366006dcf72af335a2af95c5c4d0e0df29b821ecefe138084aa25036b22148802e47a7edf48920b2d5
AUX okular-23.08.5-implicit-vasprintf.patch 964 BLAKE2B 4a29253fe6f6cc0de8e60a2cbf736b4fe47dbd5ea646fe526fb3db3a913c995485b93c6574eb0f3f11123d8cbfc378e0bd144f9b45c0e81f124e3b7ae77fb3c4 SHA512 00478d4d79c9f74dc39dd4a6ce7c06f41306c70e69d474971eb7d8efaaaecbf412532dbcbacbaee77dcdb2b8b9cd2fd3beacba5424b3543a647ddfbd280ef941
-AUX okular-24.01.80-tests.patch 4225 BLAKE2B b550eca4ff3b4e51b0fa8e9122800874f893a945e804c02b8d9423fcf16ceabd3078741ab978190863f0aed784fcb1f1805dfd88b9eb274cb20a5b09f88933b9 SHA512 4203ef7a3f1c966e50386a917038c9f50d22adcefc0444fb38c984a367ea12cf09b4945d897635abd1ccbf38e88d4ddea1ba0d6672c63dce4104b23bddd708d0
+AUX okular-24.04.80-tests.patch 1711 BLAKE2B a653423e1511e280ff3c24b8d35de898908cd297a8486158b22e24cfdf3b0fe1f38f96877d619e107f12151b6de28d87120c61fd3350b2b5f122bb5bb6cc84d0 SHA512 0060ee64238c8e4b5069994f24928b13e194acfbc26715b798638af2c89049a1f452d6c18ead3dc2dc4ba289580d8f6aefea8a5820213136117728706d28a749
DIST okular-23.08.5.tar.xz 8515760 BLAKE2B ec8ddf33917cc092e23934cc184280bf69fd92e184f05a14a3b0ec3636f00a90e35ab7c5b05e6b4083a4a94fb3d8725aa7b71686d5fe1d8962c4678690670f29 SHA512 c9e8b430fa4a5486cee0587f9beb077b4e8b5476f00ed42c9369fbb195ad9733ed310e01ebefc3c08cf78a53a3e72eab44c42a236b3dcad7e02421a864331dd6
-DIST okular-24.02.2.tar.xz 8551012 BLAKE2B df72990d03b3b3467508faf12efa3b5101a520025b860b51949c09e6c488c65facea746bc5c0f9a66f88450f84bec41b404b6956b6e741c5b87ea60b1517556b SHA512 86cc798a867a711114cc80ad90fb3871a9db38578975699a341614d5c8600a6baec83c04eb6a8bb8c306c89f222e41b7c227c54a7028dfada8fb01e0179358c6
+DIST okular-24.04.90.tar.xz 8017732 BLAKE2B 44760fc6da6e47b33bf6d6601e41d9918cccc0d9c6c4a6d11c976bd9a094a972d2968257ded46096406793bc863729b1e61dc450d9cf068ceb7b274d148d8438 SHA512 394ad44bc93061ee31b282acb190233d2417b6ade89d2205c2868155c3d284da93e00d9a52b1fa3865236cc26be0c931c3cd5a59af4214cd2afb2dcefa8068a6
EBUILD okular-23.08.5.ebuild 3740 BLAKE2B eaa2b9d832a0af554696996ec9600c08b60b537f6ec0044d4f9324956135aac3ab13eaef40b494a2a260af082616a7639e08d561bafd7470059e0adf45618a1f SHA512 975a16bfd14af2ec70e27d26b4827df1370252f24a24b816ede3aedeeb8212049c03fc59f5ef56667463e82cbd2bd2c8641b60bf670e3d9a815b5f886b74f007
-EBUILD okular-24.02.2.ebuild 3376 BLAKE2B 6f1722ed658de3343e374bc3134142d74abbbafcdd66f650c23d0e6e36171b4900121de1167f3db1fe6444283c28879869cd0050f6444b853db356eae9168696 SHA512 c530cd9329c4a81655d172d1f64aeb57c4b206f8f2fb38591248f2df0c35f53da9890947bd8aba1346271f9073b8eb8281df027e21705bc14d916c2ea636e136
+EBUILD okular-24.04.90.ebuild 3263 BLAKE2B e9ef0dc97aea1a1658c7d1ddd3d56f78c62c6a7b5b3f04ac3866147a5a14a9005e00c6d86d4a6fbd89e7cab47548087a1cb15ca658dd75c0edfae95ed11108a8 SHA512 0e061538ba95407de95b4a0168c83a213bd01aaf39ad25ef74446d26dea70f76aa2d8413e0ae28bb57b497e8d64efb54fc925e169e4e4091e365c7368b69898e
MISC metadata.xml 1158 BLAKE2B 531049f2d7584fc27dc696e31f98257f9cfa2586c29598a547933d29058131aa07a6a2662f3b61312f24c43d826f8ce99c17c6ebfd4372fe22900aea020c5e46 SHA512 51112b94fab4711ef02e962ff7346bfad44ab22878196bc16e809bd3cd1ff25282b7871cfeaacff5ed3ccd1f32cff4c948a4706bbb993055cdae93a6bc8a6686
diff --git a/kde-apps/okular/files/okular-24.01.80-tests.patch b/kde-apps/okular/files/okular-24.01.80-tests.patch
deleted file mode 100644
index 1ae19277b56e..000000000000
--- a/kde-apps/okular/files/okular-24.01.80-tests.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 7e5c4aa3760db4dbb76af47e173be3dff229bff7 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/chm/CMakeLists.txt | 11 +++--------
- generators/chm/autotests/CMakeLists.txt | 7 +++++++
- generators/chm/autotests/chmgeneratortest.cpp | 2 +-
- generators/comicbook/CMakeLists.txt | 9 +++------
- generators/comicbook/autotests/CMakeLists.txt | 5 +++++
- 5 files changed, 19 insertions(+), 15 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/comicbook/autotests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 5d569499f..2784f75fc 100644
---- a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -24,14 +24,9 @@ target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} ${L
- target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF6::KHtml)
-
- ########### autotests ###############
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
-- TEST_NAME "chmgeneratortest"
-- LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-+if(BUILD_TESTING)
-+ add_subdirectory(autotests)
-+endif()
-
- ########### install files ###############
- install( PROGRAMS okularApplication_chm.desktop org.kde.mobile.okular_chm.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 000000000..36c468156
---- /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,7 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+ecm_add_test(chmgeneratortest.cpp
-+ TEST_NAME "chmgeneratortest"
-+ LINK_LIBRARIES Qt6::Test KF6::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 2c7696ab1..24742248b 100644
---- a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -30,7 +30,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 2fc8ff710..d92c75905 100644
---- a/generators/comicbook/CMakeLists.txt
-+++ b/generators/comicbook/CMakeLists.txt
-@@ -27,12 +27,9 @@ if (KArchive_HAVE_LZMA)
- 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.43.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/okular-24.02.2.ebuild b/kde-apps/okular/okular-24.04.90.ebuild
index 223ed8af1b50..1eeaf98e1388 100644
--- a/kde-apps/okular/okular-24.02.2.ebuild
+++ b/kde-apps/okular/okular-24.04.90.ebuild
@@ -44,7 +44,6 @@ DEPEND="
>=kde-frameworks/threadweaver-${KFMIN}:6
kde-plasma/plasma-activities:6
media-libs/freetype
- media-libs/libjpeg-turbo:=
sys-libs/zlib
crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
djvu? ( app-text/djvu )
@@ -64,9 +63,8 @@ RDEPEND="${DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-24.01.80-tests.patch" # bug 734138
+ "${FILESDIR}/${PN}-24.04.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
- "${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
)
src_configure() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-29 12:36:48 +0000