[gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     15ff189ae3ccc7d26e95a942cb0a4eeba290e7d1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 12:06:43 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 13:29:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ff189a

kde-apps/okular: Drop obsolete part from 21.11.80-tests.patch

Bug: https://bugs.gentoo.org/827875
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-apps/okular/files/okular-21.11.80-tests.patch | 46 +----------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/kde-apps/okular/files/okular-21.11.80-tests.patch b/kde-apps/okular/files/okular-21.11.80-tests.patch
index 683a07bc1aeb..a0babcad1c05 100644
--- a/kde-apps/okular/files/okular-21.11.80-tests.patch
+++ b/kde-apps/okular/files/okular-21.11.80-tests.patch
@@ -9,13 +9,9 @@ Subject: [PATCH] Move tests into existing (auto)tests subdirectories
  generators/chm/autotests/chmgeneratortest.cpp |  2 +-
  generators/comicbook/CMakeLists.txt           | 10 +++-------
  generators/comicbook/autotests/CMakeLists.txt |  6 ++++++
- generators/kimgio/CMakeLists.txt              |  5 +----
- generators/kimgio/tests/CMakeLists.txt        |  5 +++++
- generators/kimgio/tests/kimgiotest.cpp        |  2 +-
- 8 files changed, 28 insertions(+), 22 deletions(-)
+ 8 files changed, 27 insertions(+), 18 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 0d7452cba..3adb3fd54 100644
@@ -100,46 +96,6 @@ index 000000000..aaacb341a
 +    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 6919bad1a..765f36c0b 100644
---- a/generators/kimgio/CMakeLists.txt
-+++ b/generators/kimgio/CMakeLists.txt
-@@ -7,10 +7,7 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
- 
- if(BUILD_TESTING AND BUILD_DESKTOP)
--    add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--    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 )
--    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()
- 
- 
-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt
-new file mode 100644
-index 000000000..844c9096a
---- /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}/part/pagepainter.cpp ${CMAKE_SOURCE_DIR}/part/guiutils.cpp ${CMAKE_SOURCE_DIR}/part/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 d521a5a7b..259bb4894 100644
---- a/generators/kimgio/tests/kimgiotest.cpp
-+++ b/generators/kimgio/tests/kimgiotest.cpp
-@@ -4,7 +4,7 @@
-     SPDX-License-Identifier: GPL-2.0-or-later
- */
- 
--#include "../../settings_core.h"
-+#include "../../../settings_core.h"
- #include "../generator_kimgio.h"
- 
- #include <core/observer.h>
 -- 
 2.33.0