From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- kde-apps/okular/Manifest | 7 +- .../okular-18.04.3-path-traversal-issue.patch | 46 +++++++++ kde-apps/okular/files/okular-18.08.0-tests.patch | 112 +++++++++++++++++++++ kde-apps/okular/files/okular-tests.patch | 112 --------------------- kde-apps/okular/okular-18.04.3-r1.ebuild | 106 +++++++++++++++++++ kde-apps/okular/okular-18.04.3.ebuild | 103 ------------------- kde-apps/okular/okular-18.08.1.ebuild | 103 +++++++++++++++++++ 7 files changed, 372 insertions(+), 217 deletions(-) create mode 100644 kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch create mode 100644 kde-apps/okular/files/okular-18.08.0-tests.patch delete mode 100644 kde-apps/okular/files/okular-tests.patch create mode 100644 kde-apps/okular/okular-18.04.3-r1.ebuild delete mode 100644 kde-apps/okular/okular-18.04.3.ebuild create mode 100644 kde-apps/okular/okular-18.08.1.ebuild (limited to 'kde-apps/okular') diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index 57f5a4b4b39a..a0cccdad8318 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,4 +1,7 @@ -AUX okular-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96 +AUX okular-18.04.3-path-traversal-issue.patch 1618 BLAKE2B 7a4339189f98e24e2cd85af6cb34efa7858b1e110e504b7957826944f30e7f0a822764d29a734c258b64b5fdc51c6f1d904c8b6c8ea3d15673b3b850afcedf46 SHA512 35fbc65d941cf83d916ff2c44b220f7f72bc9ee4afac2e35652f4a86ed2e68b260a8316d5960a6537152e33b96675870c0dd0afdad45b921036f42af1cb4a5dc +AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96 DIST okular-18.04.3.tar.xz 5784876 BLAKE2B 5f6c28f3825a9dd3f551044d22ec57fbcbb209afd5e2e2b4900d99b6fb4bf74ab4ed9999c4146c27cecf3004469841950b13039690fd31b8c1c757ea10f5920d SHA512 9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b -EBUILD okular-18.04.3.ebuild 2928 BLAKE2B 70873bee40c4526a0f624247f3b88ccdd484f47e6bb22c75399dbaaba4583c13de4006892c8d0a5944cd7aa69fa81c184651e029d6ebaffe0b30276eba2ba888 SHA512 e921d939740240f9bdf4883323d23fe81b2fa85bee30c852d6ef9107f11d39d29857cab8d6e11b7d85769a459793f517375f9051495f4ffc0256824a7e2df681 +DIST okular-18.08.1.tar.xz 5768144 BLAKE2B 8e4c7be02f92cba12abb34f94c513f72d1fa23cb772d87c002846cfecfe6acd8a7ae50ba9683c51db8688a84c18391fe5dac078aabe9d0fc8bc7121c70d4b399 SHA512 4114c614c3d773de158469a201c976ad36d706a0eb00b238af49d5e5a97fb272ce6033f744101c7e26110a7ac6b9c6cda26e3fc8c9c1bde22277f3ba2c55a375 +EBUILD okular-18.04.3-r1.ebuild 2984 BLAKE2B 1932c162cc3533da8f955f6d885b369bba7519a5168745a2cc9cc16ff019589742b312077783bf785ffc10401a1f9bbf132ad43a920d33a41cd4eb2857537b4c SHA512 2ecde3207633e2cb45c79b3bd3a729a4df124ac50b680519204e0ff398ad75a4359d2314518bd7952d1eb8be19c805219b76c514257ff8ecf6bc6ef82f0590c0 +EBUILD okular-18.08.1.ebuild 2940 BLAKE2B 2554f14df7c6d81302faf0de1bb4f9543dc15641fc21aaf6df28306eb059879a36a225e02b486da4384ee077eb739c98439b4eaa14aae880919a3c5685924275 SHA512 c2af85a8888d031e7b853600619e563ebddbdfe21452396ee793e18cec06f7f47e9e799a34418016cd029f7277af4563c918e7a55e7d37b7b7cbffa92c723bfb MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e diff --git a/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch b/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch new file mode 100644 index 000000000000..216f235d8646 --- /dev/null +++ b/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch @@ -0,0 +1,46 @@ +From 8ff7abc14d41906ad978b6bc67e69693863b9d47 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Mon, 3 Sep 2018 21:14:30 +0200 +Subject: Fix path traversal issue when extracting an .okular file + +Summary: +With specially crafted .okular files you can trick okular to create temporary files outside the temporary folder + +We fix that by making sure the file doesn't have folders since the ones we create don't + +BUGS: 398096 + +Subscribers: okular-devel + +Tags: #okular + +Differential Revision: https://phabricator.kde.org/D15192 +--- + core/document.cpp | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/core/document.cpp b/core/document.cpp +index 5e3c169..7d46173 100644 +--- a/core/document.cpp ++++ b/core/document.cpp +@@ -4819,6 +4819,18 @@ ArchiveData *DocumentPrivate::unpackDocumentArchive( const QString &archivePath + return nullptr; + + const KArchiveDirectory * mainDir = okularArchive.directory(); ++ ++ // Check the archive doesn't have folders, we don't create them when saving the archive ++ // and folders mean paths and paths mean path traversal issues ++ for ( const QString &entry : mainDir->entries() ) ++ { ++ if ( mainDir->entry( entry )->isDirectory() ) ++ { ++ qWarning() << "Warning: Found a directory inside" << archivePath << " - Okular does not create files like that so it is most probably forged."; ++ return nullptr; ++ } ++ } ++ + const KArchiveEntry * mainEntry = mainDir->entry( QStringLiteral("content.xml") ); + if ( !mainEntry || !mainEntry->isFile() ) + return nullptr; +-- +cgit v0.11.2 diff --git a/kde-apps/okular/files/okular-18.08.0-tests.patch b/kde-apps/okular/files/okular-18.08.0-tests.patch new file mode 100644 index 000000000000..0e2cdaecd4af --- /dev/null +++ b/kde-apps/okular/files/okular-18.08.0-tests.patch @@ -0,0 +1,112 @@ +From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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/kimgio/CMakeLists.txt | 6 +----- + generators/kimgio/tests/CMakeLists.txt | 5 +++++ + generators/kimgio/tests/kimgiotest.cpp | 2 +- + 6 files changed, 19 insertions(+), 16 deletions(-) + create mode 100644 generators/chm/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="$") ++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="$") +diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp +index 6b0b8efc7..25fd6631a 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( 0 ); +- 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/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="$") ++ 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="$") +diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp +index b3039a6bb..78608df9d 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 + #include +-- +2.14.2 + diff --git a/kde-apps/okular/files/okular-tests.patch b/kde-apps/okular/files/okular-tests.patch deleted file mode 100644 index 0e2cdaecd4af..000000000000 --- a/kde-apps/okular/files/okular-tests.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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/kimgio/CMakeLists.txt | 6 +----- - generators/kimgio/tests/CMakeLists.txt | 5 +++++ - generators/kimgio/tests/kimgiotest.cpp | 2 +- - 6 files changed, 19 insertions(+), 16 deletions(-) - create mode 100644 generators/chm/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="$") -+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="$") -diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp -index 6b0b8efc7..25fd6631a 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( 0 ); -- 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/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="$") -+ 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="$") -diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp -index b3039a6bb..78608df9d 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 - #include --- -2.14.2 - diff --git a/kde-apps/okular/okular-18.04.3-r1.ebuild b/kde-apps/okular/okular-18.04.3-r1.ebuild new file mode 100644 index 000000000000..08b241b19658 --- /dev/null +++ b/kde-apps/okular/okular-18.04.3-r1.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Universal document viewer based on KDE Frameworks" +HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular" +KEYWORDS="amd64 x86" +IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" + +DEPEND=" + $(add_frameworks_dep kactivities) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjs) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kpty) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep threadweaver) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + media-libs/freetype + media-libs/phonon[qt5(+)] + sys-libs/zlib + chm? ( + $(add_frameworks_dep khtml) + dev-libs/chmlib + ) + crypt? ( app-crypt/qca:2[qt5(+)] ) + djvu? ( app-text/djvu ) + epub? ( app-text/ebook-tools ) + image-backend? ( + $(add_kdeapps_dep libkexiv2) + $(add_qt_dep qtgui 'gif,jpeg,png') + ) + markdown? ( app-text/discount ) + mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) + pdf? ( app-text/poppler[qt5] ) + plucker? ( virtual/jpeg:0 ) + postscript? ( app-text/libspectre ) + share? ( $(add_frameworks_dep purpose) ) + speech? ( $(add_qt_dep qtspeech) ) + tiff? ( media-libs/tiff:0 ) +" +RDEPEND="${DEPEND} + image-backend? ( $(add_frameworks_dep kimageformats) ) + mobile? ( + $(add_frameworks_dep kirigami) + $(add_qt_dep qtquickcontrols) + ) +" + +PATCHES=( + "${FILESDIR}/${PN}-18.08.0-tests.patch" + "${FILESDIR}/${P}-path-traversal-issue.patch" +) + +src_prepare() { + kde5_src_prepare + use mobile || cmake_comment_add_subdirectory mobile + use test || cmake_comment_add_subdirectory conf/autotests +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package chm CHM) + $(cmake-utils_use_find_package crypt Qca-qt5) + $(cmake-utils_use_find_package djvu DjVuLibre) + $(cmake-utils_use_find_package epub EPub) + $(cmake-utils_use_find_package image-backend KF5KExiv2) + $(cmake-utils_use_find_package markdown Discount) + $(cmake-utils_use_find_package mobi QMobipocket) + $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package plucker JPEG) + $(cmake-utils_use_find_package postscript LibSpectre) + $(cmake-utils_use_find_package share KDEExperimentalPurpose) + $(cmake-utils_use_find_package speech Qt5TextToSpeech) + $(cmake-utils_use_find_package tiff TIFF) + ) + + kde5_src_configure +} + +src_test() { + # mainshelltest hangs, chmgeneratortest fails, bug #603116 + # parttest hangs, bug #641728 + local myctestargs=( + -E "(mainshelltest|chmgeneratortest|parttest)" + ) + + kde5_src_test +} diff --git a/kde-apps/okular/okular-18.04.3.ebuild b/kde-apps/okular/okular-18.04.3.ebuild deleted file mode 100644 index da9ded78a2b8..000000000000 --- a/kde-apps/okular/okular-18.04.3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Universal document viewer based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular" -KEYWORDS="amd64 x86" -IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpty) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep threadweaver) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - media-libs/freetype - media-libs/phonon[qt5(+)] - sys-libs/zlib - chm? ( - $(add_frameworks_dep khtml) - dev-libs/chmlib - ) - crypt? ( app-crypt/qca:2[qt5(+)] ) - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - image-backend? ( - $(add_kdeapps_dep libkexiv2) - $(add_qt_dep qtgui 'gif,jpeg,png') - ) - markdown? ( app-text/discount ) - mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) - pdf? ( app-text/poppler[qt5] ) - plucker? ( virtual/jpeg:0 ) - postscript? ( app-text/libspectre ) - share? ( $(add_frameworks_dep purpose) ) - speech? ( $(add_qt_dep qtspeech) ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - image-backend? ( $(add_frameworks_dep kimageformats) ) - mobile? ( - $(add_frameworks_dep kirigami) - $(add_qt_dep qtquickcontrols) - ) -" - -PATCHES=( "${FILESDIR}/${PN}-tests.patch" ) - -src_prepare() { - kde5_src_prepare - use mobile || cmake_comment_add_subdirectory mobile - use test || cmake_comment_add_subdirectory conf/autotests -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package chm CHM) - $(cmake-utils_use_find_package crypt Qca-qt5) - $(cmake-utils_use_find_package djvu DjVuLibre) - $(cmake-utils_use_find_package epub EPub) - $(cmake-utils_use_find_package image-backend KF5KExiv2) - $(cmake-utils_use_find_package markdown Discount) - $(cmake-utils_use_find_package mobi QMobipocket) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package plucker JPEG) - $(cmake-utils_use_find_package postscript LibSpectre) - $(cmake-utils_use_find_package share KDEExperimentalPurpose) - $(cmake-utils_use_find_package speech Qt5TextToSpeech) - $(cmake-utils_use_find_package tiff TIFF) - ) - - kde5_src_configure -} - -src_test() { - # mainshelltest hangs, chmgeneratortest fails, bug #603116 - # parttest hangs, bug #641728 - local myctestargs=( - -E "(mainshelltest|chmgeneratortest|parttest)" - ) - - kde5_src_test -} diff --git a/kde-apps/okular/okular-18.08.1.ebuild b/kde-apps/okular/okular-18.08.1.ebuild new file mode 100644 index 000000000000..50de28d6ef9f --- /dev/null +++ b/kde-apps/okular/okular-18.08.1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Universal document viewer based on KDE Frameworks" +HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular" +KEYWORDS="~amd64 ~x86" +IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" + +DEPEND=" + $(add_frameworks_dep kactivities) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjs) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kpty) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep threadweaver) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + media-libs/freetype + media-libs/phonon[qt5(+)] + sys-libs/zlib:= + chm? ( + $(add_frameworks_dep khtml) + dev-libs/chmlib + ) + crypt? ( app-crypt/qca:2[qt5(+)] ) + djvu? ( app-text/djvu ) + epub? ( app-text/ebook-tools ) + image-backend? ( + $(add_kdeapps_dep libkexiv2) + $(add_qt_dep qtgui 'gif,jpeg,png') + ) + markdown? ( app-text/discount ) + mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) + pdf? ( app-text/poppler[qt5] ) + plucker? ( virtual/jpeg:0 ) + postscript? ( app-text/libspectre ) + share? ( $(add_frameworks_dep purpose) ) + speech? ( $(add_qt_dep qtspeech) ) + tiff? ( media-libs/tiff:0 ) +" +RDEPEND="${DEPEND} + image-backend? ( $(add_frameworks_dep kimageformats) ) + mobile? ( + $(add_frameworks_dep kirigami) + $(add_qt_dep qtquickcontrols) + ) +" + +PATCHES=( "${FILESDIR}/${PN}-18.08.0-tests.patch" ) + +src_prepare() { + kde5_src_prepare + use mobile || cmake_comment_add_subdirectory mobile + use test || cmake_comment_add_subdirectory conf/autotests +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package chm CHM) + $(cmake-utils_use_find_package crypt Qca-qt5) + $(cmake-utils_use_find_package djvu DjVuLibre) + $(cmake-utils_use_find_package epub EPub) + $(cmake-utils_use_find_package image-backend KF5KExiv2) + $(cmake-utils_use_find_package markdown Discount) + $(cmake-utils_use_find_package mobi QMobipocket) + $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package plucker JPEG) + $(cmake-utils_use_find_package postscript LibSpectre) + $(cmake-utils_use_find_package share KDEExperimentalPurpose) + $(cmake-utils_use_find_package speech Qt5TextToSpeech) + $(cmake-utils_use_find_package tiff TIFF) + ) + + kde5_src_configure +} + +src_test() { + # mainshelltest hangs, chmgeneratortest fails, bug #603116 + # parttest hangs, bug #641728 + local myctestargs=( + -E "(mainshelltest|chmgeneratortest|parttest)" + ) + + kde5_src_test +} -- cgit v1.2.3