diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /kde-apps/okular/files | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'kde-apps/okular/files')
-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/files/okular-20.08.2-hide-mobile-app.patch | 27 |
3 files changed, 27 insertions, 165 deletions
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/files/okular-20.08.2-hide-mobile-app.patch b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch new file mode 100644 index 000000000000..175e5c178ce3 --- /dev/null +++ b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch @@ -0,0 +1,27 @@ +From 6f7f17a24a564ffbf712fd5e0917fcabc8d19229 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 17 Sep 2020 20:36:37 +0200 +Subject: [PATCH] Revert "Don't hide the mobile app" + +We have no use for this on the desktop, but need it for peruse. + +This reverts commit 0991819a497594233b7564755bbc189009188bd0. +--- + mobile/app/package/metadata.desktop | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mobile/app/package/metadata.desktop b/mobile/app/package/metadata.desktop +index f9432748b..0fcf20843 100644 +--- a/mobile/app/package/metadata.desktop ++++ b/mobile/app/package/metadata.desktop +@@ -110,6 +110,7 @@ GenericName[zh_TW]=文件檢視器 + Type=Application + Exec=okularkirigami + Icon=okular ++NoDisplay=true + X-KDE-ParentApp= + X-KDE-PluginInfo-Author=Marco Martin + X-KDE-PluginInfo-Email=mart@kde.org +-- +2.28.0 + |