[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
Date: Tue, 19 Dec 2023 09:23:39 +0000 (UTC)	[thread overview]
Message-ID: <1702977808.a58c876a30739c11547d08da178c88bf2d9dc76c.asturm@gentoo> (raw)

commit:     a58c876a30739c11547d08da178c88bf2d9dc76c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 08:59:04 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 09:23:28 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a58c876a

kde-apps/okular: Port to KF6, cleanup IUSE image-backend,plucker

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/files/okular-24.01.80-tests.patch | 98 +++++++++++++++++++++++
 kde-apps/okular/okular-9999.ebuild                | 97 ++++++++++------------
 2 files changed, 139 insertions(+), 56 deletions(-)

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 0000000000..1ae19277b5
--- /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-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 3f00fdca93..5f5755a30d 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -6,104 +6,89 @@ EAPI=8
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
 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"
+SLOT="6"
 KEYWORDS=""
-IUSE="crypt djvu epub +image-backend markdown mobi +pdf phonon +plucker +postscript qml share speech +tiff"
+IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +tiff"
 
-# slot op: Uses Qt5::CorePrivate
+# slot op: Uses Qt6::CorePrivate
 DEPEND="
-	>=dev-qt/qtcore-${QTMIN}:5=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}: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/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=kde-plasma/plasma-activities-${KFMIN}:5
+	>=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+	>=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/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/kparts-${KFMIN}:6
+	>=kde-frameworks/kpty-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	>=kde-plasma/plasma-activities-${KFMIN}:6
 	media-libs/freetype
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib
-	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+	crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
 	djvu? ( app-text/djvu )
 	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
-		>=kde-apps/libkexiv2-23.08.3:5
-	)
 	markdown? ( >=app-text/discount-2.2.7-r1:= )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-23.08.3:5 )
-	pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
-	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
-	plucker? ( media-libs/libjpeg-turbo:= )
+	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}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+	share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+	speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
 	tiff? ( media-libs/tiff:= )
 "
 RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	qml? (
-		>=dev-qt/qtquickcontrols2-${QTMIN}:5
-		>=kde-frameworks/kirigami-${KFMIN}:5
-	)
+	>=kde-frameworks/kimageformats-${KFMIN}:6
+	qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 )
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
+	"${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_CHM=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
-		-DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;"
+		-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 KF5Wallet)
+		$(cmake_use_find_package crypt KF6Wallet)
 		$(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 mobi QMobipocket6)
 		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package plucker JPEG)
+		$(cmake_use_find_package phonon Phonon4Qt6)
 		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
+		$(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, chmgeneratortest fails, bug #603116
+	# mainshelltest hangs, bug #603116
 	# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
 	# signunsignedfieldtest fails, whatever. bug #852749
 	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
+		-E "(mainshelltest|parttest|annotationtoolbartest|signunsignedfieldtest)"
 	)
 
 	ecm_src_test

next             reply	other threads:[~2023-12-19  9:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-19  9:23 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-09-17 20:07 [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/ Andreas Sturmlechner
2020-08-01 17:07 Andreas Sturmlechner
2020-07-12 22:55 Andreas Sturmlechner
2018-12-13 17:43 Andreas Sturmlechner
2018-08-19 19:42 Andreas Sturmlechner
2018-04-08 12:01 Andreas Sturmlechner

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:1ae19277b dfblob:3f00fdca9 dfblob:5f5755a30 )
 OR (
bs:"[gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1702977808.a58c876a30739c11547d08da178c88bf2d9dc76c.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox