gentoo auto-resync : 28:02:2024 - 17:40:54

3 files changed, 201 insertions, 0 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 12293182263c..9d3be49b1ab1 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,10 @@
 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-24.01.80-tests.patch 4225 BLAKE2B b550eca4ff3b4e51b0fa8e9122800874f893a945e804c02b8d9423fcf16ceabd3078741ab978190863f0aed784fcb1f1805dfd88b9eb274cb20a5b09f88933b9 SHA512 4203ef7a3f1c966e50386a917038c9f50d22adcefc0444fb38c984a367ea12cf09b4945d897635abd1ccbf38e88d4ddea1ba0d6672c63dce4104b23bddd708d0
 DIST okular-23.08.4.tar.xz 8516856 BLAKE2B 82f69bd1469c87cb65c521e5e75eb0bca8b804a95e859add92a9d3725c5a96e7e2f2c25baa5ce42893a76c4bbd916f4b16b4b179cdef3794a01eb869ddb705e3 SHA512 a655345d13e94c515f55c498505f3694d4e5f6c9f2e54bba109468344d6d4e20fb47330760fbcdbec1337d15286e675e1f112f7a377499e149e3d550c9e886a5
 DIST okular-23.08.5.tar.xz 8515760 BLAKE2B ec8ddf33917cc092e23934cc184280bf69fd92e184f05a14a3b0ec3636f00a90e35ab7c5b05e6b4083a4a94fb3d8725aa7b71686d5fe1d8962c4678690670f29 SHA512 c9e8b430fa4a5486cee0587f9beb077b4e8b5476f00ed42c9369fbb195ad9733ed310e01ebefc3c08cf78a53a3e72eab44c42a236b3dcad7e02421a864331dd6
+DIST okular-24.02.0.tar.xz 8550540 BLAKE2B e7636e65077e75e10d9cbc620278995c0700970bc299b5880fea0effd8887bd7c9b11e811e72f3d5f065556469f9285a03ef0ecfbe18e21bae601c712f8a78aa SHA512 9612054b0c6f50955821c8b211c875f2e62a15ef0aef2b76946a01a3f88263eb9a255c675c9cce5e5244ecfa19e888eec1b01a6a18f95f307ae267b50ecd3dd1
 EBUILD okular-23.08.4.ebuild 3664 BLAKE2B 46782334281c719ce56e7e50909decdca86706e0bb8a74073cc10582fbbecbfc6e1e1e196f05298cfb0c7d79fd9f12fc212fbdaec5c2af663c978967f2de462e SHA512 d7f80401b728a4bbd20b3fc904ceee8fbf4ccad695bf6e1095fa9d7b5a3d614289c2623b9f68f4089d5fb706a149f777ab5963dacd42462c2eb35de1f55993a5
 EBUILD okular-23.08.5.ebuild 3667 BLAKE2B 029aa906ca953aaea2e36c7b9a9bfb374fc45ec171e55dad828098c275b8cd1e700ed151b7035b48c039b7d2c0ff6a1e64cba6e4ff2d2e51e3687db741713f1f SHA512 3e124b809458ca6347fe9b7eecacd8fb9e87c0f468487451a4f4775c94ab78081670a43005778750cb91b2e690b1ccb38d9ead4d1a91fcf1e43785d59e7bef27
+EBUILD okular-24.02.0.ebuild 3289 BLAKE2B 2a896b67e004aa7c6ed3d6a52a7cd110c641f09512faa3ad48459fdef0af74630d6721dbdb21790441a7c61a2e5c7003f95766d467d4ea77f77dca6f611b8e07 SHA512 572835f48e9333bdd588ccb5c590fa48a74043e537d0b71b389fefd37327848993a8da784693973a84edaa53662c7a546b7ab5fd95e8dee8e34607f708e29cf9
 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
new file mode 100644
index 000000000000..1ae19277b56e
--- /dev/null
+++ b/kde-apps/okular/files/okular-24.01.80-tests.patch
@@ -0,0 +1,98 @@
+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/okular-24.02.0.ebuild b/kde-apps/okular/okular-24.02.0.ebuild
new file mode 100644
index 000000000000..479cb58acf43
--- /dev/null
+++ b/kde-apps/okular/okular-24.02.0.ebuild
@@ -0,0 +1,100 @@
+# 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
+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
+	media-libs/libjpeg-turbo:=
+	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.01.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
+}