| 1 |
commit: 15ff189ae3ccc7d26e95a942cb0a4eeba290e7d1 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 30 12:06:43 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 30 13:29:53 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ff189a |
| 7 |
|
| 8 |
kde-apps/okular: Drop obsolete part from 21.11.80-tests.patch |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/827875 |
| 11 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
kde-apps/okular/files/okular-21.11.80-tests.patch | 46 +---------------------- |
| 15 |
1 file changed, 1 insertion(+), 45 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch b/kde-apps/okular/files/okular-21.11.80-tests.patch |
| 18 |
index 683a07bc1aeb..a0babcad1c05 100644 |
| 19 |
--- a/kde-apps/okular/files/okular-21.11.80-tests.patch |
| 20 |
+++ b/kde-apps/okular/files/okular-21.11.80-tests.patch |
| 21 |
@@ -9,13 +9,9 @@ Subject: [PATCH] Move tests into existing (auto)tests subdirectories |
| 22 |
generators/chm/autotests/chmgeneratortest.cpp | 2 +- |
| 23 |
generators/comicbook/CMakeLists.txt | 10 +++------- |
| 24 |
generators/comicbook/autotests/CMakeLists.txt | 6 ++++++ |
| 25 |
- generators/kimgio/CMakeLists.txt | 5 +---- |
| 26 |
- generators/kimgio/tests/CMakeLists.txt | 5 +++++ |
| 27 |
- generators/kimgio/tests/kimgiotest.cpp | 2 +- |
| 28 |
- 8 files changed, 28 insertions(+), 22 deletions(-) |
| 29 |
+ 8 files changed, 27 insertions(+), 18 deletions(-) |
| 30 |
create mode 100644 generators/chm/autotests/CMakeLists.txt |
| 31 |
create mode 100644 generators/comicbook/autotests/CMakeLists.txt |
| 32 |
- create mode 100644 generators/kimgio/tests/CMakeLists.txt |
| 33 |
|
| 34 |
diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt |
| 35 |
index 0d7452cba..3adb3fd54 100644 |
| 36 |
@@ -100,46 +96,6 @@ index 000000000..aaacb341a |
| 37 |
+ TEST_NAME "comicbooktest" |
| 38 |
+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook |
| 39 |
+) |
| 40 |
-diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt |
| 41 |
-index 6919bad1a..765f36c0b 100644 |
| 42 |
---- a/generators/kimgio/CMakeLists.txt |
| 43 |
-+++ b/generators/kimgio/CMakeLists.txt |
| 44 |
-@@ -7,10 +7,7 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp) |
| 45 |
- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n) |
| 46 |
- |
| 47 |
- if(BUILD_TESTING AND BUILD_DESKTOP) |
| 48 |
-- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" ) |
| 49 |
-- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp ) |
| 50 |
-- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) |
| 51 |
-- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>") |
| 52 |
-+ add_subdirectory(tests) |
| 53 |
- endif() |
| 54 |
- |
| 55 |
- |
| 56 |
-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt |
| 57 |
-new file mode 100644 |
| 58 |
-index 000000000..844c9096a |
| 59 |
---- /dev/null |
| 60 |
-+++ b/generators/kimgio/tests/CMakeLists.txt |
| 61 |
-@@ -0,0 +1,5 @@ |
| 62 |
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" ) |
| 63 |
-+ |
| 64 |
-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/debug_ui.cpp ) |
| 65 |
-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test) |
| 66 |
-+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>") |
| 67 |
-diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp |
| 68 |
-index d521a5a7b..259bb4894 100644 |
| 69 |
---- a/generators/kimgio/tests/kimgiotest.cpp |
| 70 |
-+++ b/generators/kimgio/tests/kimgiotest.cpp |
| 71 |
-@@ -4,7 +4,7 @@ |
| 72 |
- SPDX-License-Identifier: GPL-2.0-or-later |
| 73 |
- */ |
| 74 |
- |
| 75 |
--#include "../../settings_core.h" |
| 76 |
-+#include "../../../settings_core.h" |
| 77 |
- #include "../generator_kimgio.h" |
| 78 |
- |
| 79 |
- #include <core/observer.h> |
| 80 |
-- |
| 81 |
2.33.0 |
Archives