commit: eeebd3993a0f5e179fca4f02b000c890ad1928fb Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Sep 1 22:00:19 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 2 13:22:09 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeebd399
kde-apps/okular: drop 23.08.5 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/okular/Manifest | 1 - kde-apps/okular/files/okular-21.11.80-tests.patch | 101 ------------------- .../files/okular-23.08.5-implicit-vasprintf.patch | 29 ------ kde-apps/okular/metadata.xml | 2 - kde-apps/okular/okular-23.08.5.ebuild | 111 --------------------- 5 files changed, 244 deletions(-) diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 5e1a8a14c3a2..a3640cf765b0 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,3 +1,2 @@ -DIST okular-23.08.5.tar.xz 8515760 BLAKE2B ec8ddf33917cc092e23934cc184280bf69fd92e184f05a14a3b0ec3636f00a90e35ab7c5b05e6b4083a4a94fb3d8725aa7b71686d5fe1d8962c4678690670f29 SHA512 c9e8b430fa4a5486cee0587f9beb077b4e8b5476f00ed42c9369fbb195ad9733ed310e01ebefc3c08cf78a53a3e72eab44c42a236b3dcad7e02421a864331dd6 DIST okular-24.05.2.tar.xz 8016384 BLAKE2B 21a33ec0b9a451267f6772c460076c3150e02a76d0cf68ae80fda6567c1687ffeb96fe96dcb81bda20d3ada8cf89f782b133619755f80cce32cbc9804af9064c SHA512 029358a7c8935994a3a2949dc2e4629cd9dae9f8589d53759ce42696c9f5ac649d35d841b7ed826daf518c64971a84b04c86ff23c61964369933fa27841e0ceb DIST okular-24.08.0.tar.xz 8027692 BLAKE2B 4d62a464020953410773612fcfa8dbecf9e779246cc0aaa8a3eccdfca8bb1b0b634a990caaa3b3923b2e9dccb7d6354dc5de871adb5db1c76a862348ef536d9e SHA512 c647d728a7084c39d8ed951ce9d828d64de4f5f5888751e565f64683c8563834abb4fd3d97a182c04b6df5dd614f74b9802392fce4ffa71444aeec09bc4d7a9e diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch b/kde-apps/okular/files/okular-21.11.80-tests.patch deleted file mode 100644 index a0babcad1c05..000000000000 --- a/kde-apps/okular/files/okular-21.11.80-tests.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 323fed918995fe2e01036c74c1498446b4d2f122 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Thu, 12 Oct 2017 14:09:09 +0200 -Subject: [PATCH] Move tests into existing (auto)tests subdirectories - ---- - generators/chm/CMakeLists.txt | 12 +++--------- - generators/chm/autotests/CMakeLists.txt | 8 ++++++++ - generators/chm/autotests/chmgeneratortest.cpp | 2 +- - generators/comicbook/CMakeLists.txt | 10 +++------- - generators/comicbook/autotests/CMakeLists.txt | 6 ++++++ - 8 files changed, 27 insertions(+), 18 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 0d7452cba..3adb3fd54 100644 ---- a/generators/chm/CMakeLists.txt -+++ b/generators/chm/CMakeLists.txt -@@ -23,15 +23,9 @@ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS}) - target_include_directories(okularGenerator_chmlib PRIVATE ${CHM_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR}) - target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml) - --########### autotests ############### -- --add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) --ecm_add_test(autotests/chmgeneratortest.cpp -- TEST_NAME "chmgeneratortest" -- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore --) -- --target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>") -+if(BUILD_TESTING) -+ add_subdirectory(autotests) -+endif() - - ########### install files ############### - install( FILES okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) -diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt -new file mode 100644 -index 000000000..59753ca45 ---- /dev/null -+++ b/generators/chm/autotests/CMakeLists.txt -@@ -0,0 +1,8 @@ -+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) -+ -+ecm_add_test(chmgeneratortest.cpp -+ TEST_NAME "chmgeneratortest" -+ LINK_LIBRARIES Qt5::Test KF5::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 c428fa1b3..68f7a5821 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 a0e7569a2..91bcc6ec7 100644 ---- a/generators/comicbook/CMakeLists.txt -+++ b/generators/comicbook/CMakeLists.txt -@@ -25,13 +25,9 @@ if (KArchive_HAVE_LZMA) - target_compile_definitions(okular_comicbook PRIVATE -DWITH_K7ZIP=1) - endif() - --########### autotests ############### -- --add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) --ecm_add_test(autotests/comicbooktest.cpp -- TEST_NAME "comicbooktest" -- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook --) -+if(BUILD_TESTING) -+ add_subdirectory(autotests) -+endif() - - ########### install files ############### - install( FILES okularComicbook.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) -diff --git a/generators/comicbook/autotests/CMakeLists.txt b/generators/comicbook/autotests/CMakeLists.txt -new file mode 100644 -index 000000000..aaacb341a ---- /dev/null -+++ b/generators/comicbook/autotests/CMakeLists.txt -@@ -0,0 +1,6 @@ -+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) -+ -+ecm_add_test(comicbooktest.cpp -+ TEST_NAME "comicbooktest" -+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook -+) --- -2.33.0 - diff --git a/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch b/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch deleted file mode 100644 index 685da3112291..000000000000 --- a/kde-apps/okular/files/okular-23.08.5-implicit-vasprintf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a0f57bf7f984289c5b0ceefa2a784f97cd58428a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Germ=C3=A1n=20Poo-Caama=C3=B1o?= <[email protected]> -Date: Sat, 30 May 2020 16:15:27 -0400 -Subject: [PATCH] Fix implicit declaration of vasprintf - -Fix build when compiling with `-Werror=implicit-function-declaration`. ---- - core/synctex/synctex_parser.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/core/synctex/synctex_parser.c b/core/synctex/synctex_parser.c -index 9eed566b3..a67006d39 100644 ---- a/core/synctex/synctex_parser.c -+++ b/core/synctex/synctex_parser.c -@@ -55,6 +55,11 @@ - * First level objects are sheets and forms, containing boxes, glues, kerns... - * The third tree allows to browse leaves according to tag and line. - */ -+/* Declare _GNU_SOURCE for accessing vasprintf. For MSC compiler, vasprintf is -+ * defined in this file -+ */ -+#define _GNU_SOURCE -+ - #if defined(SYNCTEX_USE_LOCAL_HEADER) - #include "synctex_parser_local.h" - #else --- -2.44.0 - diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml index c64a8d45ad61..9068188f0ca1 100644 --- a/kde-apps/okular/metadata.xml +++ b/kde-apps/okular/metadata.xml @@ -12,11 +12,9 @@ <use> <flag name="crypt">Enable support for password-encrypted documents via <pkg>kde-frameworks/kwallet</pkg></flag> <flag name="epub">Enable E-Book support via <pkg>app-text/ebook-tools</pkg></flag> - <flag name="image-backend">Enable image viewing support</flag> <flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag> <flag name="mobi">Enable mobipocket support via <pkg>kde-apps/kdegraphics-mobipocket</pkg></flag> <flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag> - <flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag> <flag name="qml">Install Okular Qml components</flag> <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> </use> diff --git a/kde-apps/okular/okular-23.08.5.ebuild b/kde-apps/okular/okular-23.08.5.ebuild deleted file mode 100644 index 25f6cf6f093a..000000000000 --- a/kde-apps/okular/okular-23.08.5.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# 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=5.106.0 -QTMIN=5.15.9 -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" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86" -IUSE="crypt djvu epub +image-backend markdown mobi +pdf phonon +plucker +postscript qml share speech +tiff" - -# slot op: Uses Qt5::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 - media-libs/freetype - sys-libs/zlib - crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - image-backend? ( - >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png] - >=kde-apps/libkexiv2-${PVCUT}:5 - ) - markdown? ( >=app-text/discount-2.2.7-r1:= ) - mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) - pdf? ( >=app-text/poppler-21.10.0[nss,qt5] ) - phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] ) - plucker? ( media-libs/libjpeg-turbo:= ) - postscript? ( app-text/libspectre ) - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) - tiff? ( media-libs/tiff:= ) -" -RDEPEND="${DEPEND} - image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) - qml? ( - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138 - "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry - "${FILESDIR}/${P}-implicit-vasprintf.patch" # bug 922345; pending upstream -) - -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;" - -DOKULAR_UI=$(usex qml "both" "desktop") - $(cmake_use_find_package crypt KF5Wallet) - $(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 pdf Poppler) - $(cmake_use_find_package phonon Phonon4Qt5) - $(cmake_use_find_package plucker JPEG) - $(cmake_use_find_package postscript LibSpectre) - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package speech Qt5TextToSpeech) - $(cmake_use_find_package tiff TIFF) - ) - ecm_src_configure -} - -src_test() { - # mainshelltest hangs, chmgeneratortest fails, bug #603116 - # parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640 - # signunsignedfieldtest fails, whatever. bug #852749 - local myctestargs=( - -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)" - ) - - ecm_src_test -}
