gentoo auto-resync : 13:12:2024 - 02:01:50

3 files changed, 185 insertions, 0 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index f692ad6fcd46..5e554e07643d 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,6 +1,9 @@
 AUX okular-20.08.2-hide-mobile-app.patch 849 BLAKE2B 73e324e61d8a39d085bff4b818845f7392cfff8e01e38624e1e3aa1c7073bc4d6adbe2fbe314a6f4a43b6559cd83c5c45589df49aab8e7e5f0c5b8cf559a47bc SHA512 8b35589046581600c67a464011e34494626f3cd0f4d08080b51ac704f2c7c3f9bacc64f5b0d2f1bcd1732c6c50b924e1dbdb9bfdf259cfc88e8f583c4f1df53b
 AUX okular-23.08.5-implicit-vasprintf.patch 964 BLAKE2B 4a29253fe6f6cc0de8e60a2cbf736b4fe47dbd5ea646fe526fb3db3a913c995485b93c6574eb0f3f11123d8cbfc378e0bd144f9b45c0e81f124e3b7ae77fb3c4 SHA512 00478d4d79c9f74dc39dd4a6ce7c06f41306c70e69d474971eb7d8efaaaecbf412532dbcbacbaee77dcdb2b8b9cd2fd3beacba5424b3543a647ddfbd280ef941
 AUX okular-24.04.80-tests.patch 1711 BLAKE2B a653423e1511e280ff3c24b8d35de898908cd297a8486158b22e24cfdf3b0fe1f38f96877d619e107f12151b6de28d87120c61fd3350b2b5f122bb5bb6cc84d0 SHA512 0060ee64238c8e4b5069994f24928b13e194acfbc26715b798638af2c89049a1f452d6c18ead3dc2dc4ba289580d8f6aefea8a5820213136117728706d28a749
+AUX okular-24.11.80-tests.patch 3183 BLAKE2B ddca2585fe19f61652b0c4dce14ecd4ac056d5d0cb14bd16093d12c1e558be21d20adedb00de8170d569d1000399c9ae7112bbaf754eb709a8e13e31cadaf24a SHA512 e02b0c7d1718c05ad73c30487a15c3576636a2993fe9b1dcfe8f8a6c823313c6b8677d99d19e63d96dda5ee6281d14419c793c075267349eb31abb4d07052725
 DIST okular-24.08.3.tar.xz 8050372 BLAKE2B bf2697ae7fdca75c5a1ee3ee1bb3f44b1f79bdf60356e9e966f519502c39f0fa1be952a5a9a4455a7547252b1bf4167a48467b217f5f9229bc33f8563d2d3d0e SHA512 5f8b2c1a0353180bad6a0c706a4ce4db2a5b897e91d4c0baa24daff17ba8e789d70b8be2e5d95eab2b5f104f87dd24065178a27106b22ff2f4f73c61e5d91872
+DIST okular-24.12.0.tar.xz 8056456 BLAKE2B 509534868a3326778cf533c1a88eeb703facf417ca1814273c320c7374f92b7d606b6ed2a8252c330c7c26cbfbb562b4fcdca125cfbcb3f9dba02be31c7fdc60 SHA512 9f1249ded76482444571038a0e9155e85fea81c2e3ee513ae3e8df74a09f8035e6f1eba182e281756868fdb6f3a56e042d5570d0d5f82cceb9b19b43c1f96b33
 EBUILD okular-24.08.3.ebuild 3380 BLAKE2B 3eff0158e2a907258335c65fd8e19c182a232cac47907339a176528997d2d192a65d8c20429b6f00f6f36a4d60f521776721385ca1c6aa84f3fbcf34a2c243c5 SHA512 365c9a76ed8cc105bb0a2400f510af43a115bd1970e5c234751646302ec6d3889c2835b51044311c32c2ba513e63a8498e045d5bda5604c56797f5e22fb3364d
+EBUILD okular-24.12.0.ebuild 3358 BLAKE2B 1c514b4b1850d48d81ecea5c4b1118d7ab345c429ceafc2c52eb15db8ac3f1714039ae6c46caf62d25dbd36602d10be6af9ef9b6104eefec1b54895488d230cc SHA512 ab67f5c893487385d5e5c2f6f10a82f1e9ce5e674816d1e00f47778f64741758d230ab3d22b85b20b23e5e4531412cf2cf06a70ec3de32dea25b8686eef6360e
 MISC metadata.xml 1013 BLAKE2B caf7f5f5e74b5f98fe33eeebabf09945fee0feb0b1295baca9ef9f65f2cac8c788fd1b02d64d3f50189df7d987ae7ff9bc481ae33ee0ee0917632df1214acf24 SHA512 932e7a992cef55bc0aed5015c0ef8e889f10d0e2978385a5063b1bc0e9e5f1e6326a674c67b788657c84536957aeda120cd4f424f60cd70396d6b88e604c7c9c
diff --git a/kde-apps/okular/files/okular-24.11.80-tests.patch b/kde-apps/okular/files/okular-24.11.80-tests.patch
new file mode 100644
index 000000000000..937cff87dcd9
--- /dev/null
+++ b/kde-apps/okular/files/okular-24.11.80-tests.patch
@@ -0,0 +1,83 @@
+From 2e0f29193a74081362fffa22765d84b633996fee Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 18 Nov 2024 22:48:47 +0100
+Subject: [PATCH] generators: Conditionalise tests behind BUILD_TESTING
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ generators/comicbook/CMakeLists.txt | 12 +++++++-----
+ generators/epub/CMakeLists.txt      | 13 +++++++------
+ generators/poppler/CMakeLists.txt   | 10 ++++++----
+ 3 files changed, 20 insertions(+), 15 deletions(-)
+
+diff --git a/generators/comicbook/CMakeLists.txt b/generators/comicbook/CMakeLists.txt
+index 53075836d..0daf94121 100644
+--- a/generators/comicbook/CMakeLists.txt
++++ b/generators/comicbook/CMakeLists.txt
+@@ -30,11 +30,13 @@ 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_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
++    ecm_add_test(autotests/comicbooktest.cpp
++        TEST_NAME "comicbooktest"
++        LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook
++    )
++endif()
+ 
+ ########### install files ###############
+ install( PROGRAMS okularApplication_comicbook.desktop org.kde.mobile.okular_comicbook.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+diff --git a/generators/epub/CMakeLists.txt b/generators/epub/CMakeLists.txt
+index 5f45820c0..ab4e43b0d 100644
+--- a/generators/epub/CMakeLists.txt
++++ b/generators/epub/CMakeLists.txt
+@@ -19,12 +19,13 @@ target_link_libraries(okularGenerator_epub okularcore ${EPUB_LIBRARIES} KF6::I18
+ 
+ ########### autotests ###############
+ 
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/epubgeneratortest.cpp
+-    TEST_NAME "epubgeneratortest"
+-    LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
+-)
+-
++if(BUILD_TESTING)
++  add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
++  ecm_add_test(autotests/epubgeneratortest.cpp
++      TEST_NAME "epubgeneratortest"
++      LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
++  )
++endif()
+ 
+ ########### install files ###############
+ install( PROGRAMS okularApplication_epub.desktop org.kde.mobile.okular_epub.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt
+index a7ec0bc51..cb18f4e81 100644
+--- a/generators/poppler/CMakeLists.txt
++++ b/generators/poppler/CMakeLists.txt
+@@ -32,10 +32,12 @@ target_link_libraries(okularGenerator_poppler okularcore KF6::I18n KF6::Completi
+ 
+ ########### autotests ###############
+ 
+-ecm_add_test(autotests/testimagescaling.cpp
+-    TEST_NAME "imageScalingTest"
+-    LINK_LIBRARIES Qt6::Test Qt6::Gui
+-)
++if(BUILD_TESTING)
++    ecm_add_test(autotests/testimagescaling.cpp
++        TEST_NAME "imageScalingTest"
++        LINK_LIBRARIES Qt6::Test Qt6::Gui
++    )
++endif()
+ 
+ ########### install files ###############
+ install( PROGRAMS okularApplication_pdf.desktop org.kde.mobile.okular_pdf.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+-- 
+2.47.0
+
diff --git a/kde-apps/okular/okular-24.12.0.ebuild b/kde-apps/okular/okular-24.12.0.ebuild
new file mode 100644
index 000000000000..04e61792712b
--- /dev/null
+++ b/kde-apps/okular/okular-24.12.0.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.5.0
+QTMIN=6.7.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 ~arm64 ~ppc64 ~riscv ~x86"
+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,X,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[X]
+	>=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-24.10.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}-20.08.2-hide-mobile-app.patch" # downstream; avoid same-name entry
+	"${FILESDIR}/${PN}-23.08.5-implicit-vasprintf.patch" # bug 922345; pending upstream
+	"${FILESDIR}/${PN}-24.11.80-tests.patch" # git master; bug 734138
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;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
+}