diff options
Diffstat (limited to 'kde-apps/okular')
| -rw-r--r-- | kde-apps/okular/Manifest | 1 | ||||
| -rw-r--r-- | kde-apps/okular/files/okular-18.12.0-tests.patch | 17 | ||||
| -rw-r--r-- | kde-apps/okular/files/okular-20.03.70-tests.patch | 148 | ||||
| -rw-r--r-- | kde-apps/okular/metadata.xml | 1 | ||||
| -rw-r--r-- | kde-apps/okular/okular-20.04.3-r1.ebuild | 114 |
5 files changed, 0 insertions, 281 deletions
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 7c24cc4d0113..0408c8c705fc 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,2 +1 @@ -DIST okular-20.04.3.tar.xz 7236056 BLAKE2B a387a997b1747c08a23d483bc9e72d960d1be877764dc602ed56f322dd80d13301c9fc7a21561b1f267ad197278f8e6510cdb890427fd420c2ae84eded39fbf9 SHA512 1d6a02590a4d1b7ab6dbf63b370f3cceb0e35c763310b54d5aeac3cc5122c2041f2cf0206a7e32ad18c494c7fd0caf51d50e457ae8ca54daa8494e4302110c01 DIST okular-20.08.3.tar.xz 7520168 BLAKE2B 351a3d786b5451473aa8e9e155cac2a330890fac0acc34e5c897a7faca03844211ab721083408c338df681759f6d5986219395fb54397b185b75512b9f0f618f SHA512 15bbd2fa2f8d836e80f2fa30d0fbcb6e7303ee2bfb12ebc305ec7b51f046cc0f66a3abeb94458e60f1b17dce7cc964d679d038207766c2d941a238a32b663573 diff --git a/kde-apps/okular/files/okular-18.12.0-tests.patch b/kde-apps/okular/files/okular-18.12.0-tests.patch deleted file mode 100644 index 2b617150508e..000000000000 --- a/kde-apps/okular/files/okular-18.12.0-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/generators/epub/CMakeLists.txt 2018-08-19 21:34:51.151645090 +0200 -+++ b/generators/epub/CMakeLists.txt 2018-08-19 21:36:28.771109586 +0200 -@@ -23,12 +23,13 @@ - - ########### autotests ############### - -+if(BUILD_TESTING) - add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) - ecm_add_test(autotests/epubgeneratortest.cpp - TEST_NAME "epubgeneratortest" - LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore - ) -- -+endif() - - ########### install files ############### - install( FILES okularEPub.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) diff --git a/kde-apps/okular/files/okular-20.03.70-tests.patch b/kde-apps/okular/files/okular-20.03.70-tests.patch deleted file mode 100644 index d906e2a00f30..000000000000 --- a/kde-apps/okular/files/okular-20.03.70-tests.patch +++ /dev/null @@ -1,148 +0,0 @@ -From c675ba8bed1e792f351fabf3ba040a86138f9f84 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -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 ++++++ - generators/kimgio/CMakeLists.txt | 6 +----- - generators/kimgio/tests/CMakeLists.txt | 5 +++++ - generators/kimgio/tests/kimgiotest.cpp | 2 +- - 8 files changed, 28 insertions(+), 23 deletions(-) - create mode 100644 generators/chm/autotests/CMakeLists.txt - create mode 100644 generators/comicbook/autotests/CMakeLists.txt - create mode 100644 generators/kimgio/tests/CMakeLists.txt - -diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt -index 9d82b9394..b3a33afe4 100644 ---- a/generators/chm/CMakeLists.txt -+++ b/generators/chm/CMakeLists.txt -@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS - okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS}) - 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 9245a736f..5a2c487b4 100644 ---- a/generators/chm/autotests/chmgeneratortest.cpp -+++ b/generators/chm/autotests/chmgeneratortest.cpp -@@ -34,7 +34,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 9a07c7183..316c93152 100644 ---- a/generators/comicbook/CMakeLists.txt -+++ b/generators/comicbook/CMakeLists.txt -@@ -29,13 +29,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 -+) -diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt -index b8cac76df..49f893bc1 100644 ---- a/generators/kimgio/CMakeLists.txt -+++ b/generators/kimgio/CMakeLists.txt -@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp) - target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n) - - if(BUILD_TESTING) -- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) -- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp ) -- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) -- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>") -+ add_subdirectory(tests) - endif() - -- - ########### install files ############### - install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} ) -diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt -new file mode 100644 -index 000000000..f31bf3fe8 ---- /dev/null -+++ b/generators/kimgio/tests/CMakeLists.txt -@@ -0,0 +1,5 @@ -+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) -+ -+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp ) -+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) -+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>") -diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp -index f2e50641d..a24f7af80 100644 ---- a/generators/kimgio/tests/kimgiotest.cpp -+++ b/generators/kimgio/tests/kimgiotest.cpp -@@ -9,7 +9,7 @@ - - - #include "../generator_kimgio.h" --#include "../../settings_core.h" -+#include "../../../settings_core.h" - - #include <core/observer.h> - #include <core/page.h> --- -2.25.1 - diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml index eacad295ded8..f07864be71d3 100644 --- a/kde-apps/okular/metadata.xml +++ b/kde-apps/okular/metadata.xml @@ -11,7 +11,6 @@ <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</flag> - <flag name="mobile">Enable Plasma mobile support</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> diff --git a/kde-apps/okular/okular-20.04.3-r1.ebuild b/kde-apps/okular/okular-20.04.3-r1.ebuild deleted file mode 100644 index ecd83477439f..000000000000 --- a/kde-apps/okular/okular-20.04.3-r1.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-3) -KFMIN=5.70.0 -QTMIN=5.14.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Universal document viewer based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://apps.kde.org/en/okular" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}: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/kio-${KFMIN}:5 - >=kde-frameworks/kjs-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/threadweaver-${KFMIN}:5 - media-libs/freetype - >=media-libs/phonon-4.11.0 - sys-libs/zlib - chm? ( - dev-libs/chmlib - dev-libs/libzip:= - >=kde-frameworks/khtml-${KFMIN}:5 - ) - crypt? ( app-crypt/qca:2[qt5(+)] ) - 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 ) - mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 ) - pdf? ( app-text/poppler[qt5] ) - plucker? ( virtual/jpeg:0 ) - postscript? ( app-text/libspectre ) - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - speech? ( >=dev-qt/qtspeech-${QTMIN}:5 ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 ) - mobile? ( - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-18.12.0-tests.patch" - "${FILESDIR}/${PN}-20.03.70-tests.patch" -) - -src_prepare() { - ecm_src_prepare - use mobile || cmake_comment_add_subdirectory mobile - use test || cmake_comment_add_subdirectory conf/autotests -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package chm CHM) - $(cmake_use_find_package chm KF5KHtml) - $(cmake_use_find_package chm LibZip) - $(cmake_use_find_package crypt Qca-qt5) - $(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 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 - local myctestargs=( - -E "(mainshelltest|chmgeneratortest|parttest)" - ) - - ecm_src_test -} |