* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/
@ 2015-02-24 22:35 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2015-02-24 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 3934ef31af8d45b378ad9f0fe4c0338f7a58a391
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Feb 23 22:22:10 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Feb 24 22:35:02 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3934ef31
[kde-apps/okular] Fix tests-optional.patch
Package-Manager: portage-2.2.17
---
.../files/okular-5.9999-tests-optional.patch | 31 ++++++++++------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/kde-apps/okular/files/okular-5.9999-tests-optional.patch b/kde-apps/okular/files/okular-5.9999-tests-optional.patch
index 9494cbc..309c092 100644
--- a/kde-apps/okular/files/okular-5.9999-tests-optional.patch
+++ b/kde-apps/okular/files/okular-5.9999-tests-optional.patch
@@ -1,24 +1,21 @@
---- a/CMakeLists.txt 2015-01-25 14:40:33.935040773 +0100
-+++ b/CMakeLists.txt 2015-01-25 14:42:53.287043165 +0100
-@@ -20,7 +20,7 @@
+--- a/CMakeLists.txt 2015-02-23 23:12:24.420881583 +0100
++++ b/CMakeLists.txt 2015-02-23 23:17:07.173858317 +0100
+@@ -18,7 +18,17 @@
include(ECMAddTests)
-find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick)
+find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport Svg Qml Quick)
- find_package(KF5 REQUIRED COMPONENTS
- Activities
- Archive
-@@ -68,7 +68,11 @@
- add_subdirectory( ui )
- add_subdirectory( shell )
- add_subdirectory( generators )
--add_subdirectory( autotests )
+
-+if(BUILD_TESTING)
-+ find_package(Qt5Test CONFIG REQUIRED)
-+ add_subdirectory( autotests )
++find_package(Qt5Test CONFIG QUIET)
++set_package_properties(Qt5Test PROPERTIES
++ PURPOSE "Required for tests"
++ TYPE OPTIONAL)
++add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests")
++if (NOT Qt5Test_FOUND)
++ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.")
+endif()
-
- add_subdirectory(doc)
-
++
+ find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech)
+ if (NOT Qt5TextToSpeech_FOUND)
+ message(STATUS "Qt5TextToSpeech not found, speech features will be disabled")
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/
@ 2020-03-03 11:58 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-03-03 11:58 UTC (permalink / raw
To: gentoo-commits
commit: b4ba65469a85574f2528d4f8fc829a799d6ebf60
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 3 11:58:03 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 3 11:58:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b4ba6546
kde-apps/okular: Re-add accidentally removed patch
okular-18.08.0-tests.patch
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/okular/files/okular-18.08.0-tests.patch | 112 +++++++++++++++++++++++
1 file changed, 112 insertions(+)
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 0000000000..0e2cdaecd4
--- /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 <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/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="$<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 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="$<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 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 <core/observer.h>
+ #include <core/page.h>
+--
+2.14.2
+
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/
@ 2020-03-12 23:33 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-03-12 23:33 UTC (permalink / raw
To: gentoo-commits
commit: afc59a3c8ee5e8638a848dc70ba56d7e03e5fa00
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 22:56:24 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 23:33:19 2020 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=afc59a3c
kde-apps/okular: Rebase ${PN}-20.03.70-tests.patch on top of HEAD
Necessary after upstream commit 4019ec56e
Thanks-to: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/712218
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/okular/files/okular-20.03.70-tests.patch | 46 ++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/kde-apps/okular/files/okular-20.03.70-tests.patch b/kde-apps/okular/files/okular-20.03.70-tests.patch
index db7ec3993d..d906e2a00f 100644
--- a/kde-apps/okular/files/okular-20.03.70-tests.patch
+++ b/kde-apps/okular/files/okular-20.03.70-tests.patch
@@ -1,4 +1,4 @@
-From 5f093fa9798ad30cda115cea573d18296696a0a9 Mon Sep 17 00:00:00 2001
+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
@@ -7,11 +7,14 @@ 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 +-
- 6 files changed, 19 insertions(+), 16 deletions(-)
+ 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
@@ -52,7 +55,7 @@ index 000000000..59753ca45
+
+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 6b0b8efc7..25fd6631a 100644
+index 9245a736f..5a2c487b4 100644
--- a/generators/chm/autotests/chmgeneratortest.cpp
+++ b/generators/chm/autotests/chmgeneratortest.cpp
@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
@@ -64,6 +67,39 @@ index 6b0b8efc7..25fd6631a 100644
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
@@ -95,7 +131,7 @@ index 000000000..f31bf3fe8
+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 b3039a6bb..78608df9d 100644
+index f2e50641d..a24f7af80 100644
--- a/generators/kimgio/tests/kimgiotest.cpp
+++ b/generators/kimgio/tests/kimgiotest.cpp
@@ -9,7 +9,7 @@
@@ -108,5 +144,5 @@ index b3039a6bb..78608df9d 100644
#include <core/observer.h>
#include <core/page.h>
--
-2.14.2
+2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/
@ 2021-11-30 12:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-11-30 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 9c8d408fdba995a29d3e9dc83b748acbffce7ba2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 12:00:35 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 12:00:35 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c8d408f
kde-apps/okular: Drop obsolete part from 21.11.80-tests.patch
Closes: 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 683a07bc1a..a0babcad1c 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/
@ 2021-11-30 12:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2021-11-30 12:01 UTC (permalink / raw
To: gentoo-commits
commit: b80df155f4cb5db9c0c2b5c670c6de61a038aad2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 12:00:49 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 12:00:49 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b80df155
kde-apps/okular: Drop obsolete patch
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/okular/files/okular-20.11.90-tests.patch | 148 ----------------------
1 file changed, 148 deletions(-)
diff --git a/kde-apps/okular/files/okular-20.11.90-tests.patch b/kde-apps/okular/files/okular-20.11.90-tests.patch
deleted file mode 100644
index 633513bd2a..0000000000
--- a/kde-apps/okular/files/okular-20.11.90-tests.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From d9cdea559ffa730fd3592b78f5f8530da3d4c803 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 18305913e..b28822d68 100644
---- a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -32,7 +32,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 db14d741f..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}/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()
-
--
- ########### 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..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 2b507ed79..acd70b168 100644
---- a/generators/kimgio/tests/kimgiotest.cpp
-+++ b/generators/kimgio/tests/kimgiotest.cpp
-@@ -7,7 +7,7 @@
- * (at your option) any later version. *
- ***************************************************************************/
-
--#include "../../settings_core.h"
-+#include "../../../settings_core.h"
- #include "../generator_kimgio.h"
-
- #include <core/observer.h>
---
-2.29.2
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/
@ 2022-03-30 5:48 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-03-30 5:48 UTC (permalink / raw
To: gentoo-commits
commit: a626daadc0d9e5626aaa1ee3b52580e523b90b6c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 05:47:38 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 05:47:38 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a626daad
kde-apps/okular: Rebase optional-options patch on top of 22.07.70
Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
Closes: https://bugs.gentoo.org/836389
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/okular/files/okular-22.07.70-optional-options.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kde-apps/okular/files/okular-22.07.70-optional-options.patch b/kde-apps/okular/files/okular-22.07.70-optional-options.patch
index 6c83b03e06..0cadfe415d 100644
--- a/kde-apps/okular/files/okular-22.07.70-optional-options.patch
+++ b/kde-apps/okular/files/okular-22.07.70-optional-options.patch
@@ -1,4 +1,4 @@
-From 86729e7698250dcb11ccbec0a6cc9690501ad691 Mon Sep 17 00:00:00 2001
+From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 31 Aug 2021 16:48:42 +0200
Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
@@ -21,7 +21,7 @@ Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 43a45c7b9..57d0f6f74 100644
+index 547671f24..f1e14fa8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names(
@@ -40,7 +40,7 @@ index 43a45c7b9..57d0f6f74 100644
find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
Archive
-@@ -111,21 +108,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
TextWidgets
ThreadWeaver
WindowSystem
@@ -52,7 +52,7 @@ index 43a45c7b9..57d0f6f74 100644
)
if (BUILD_DESKTOP)
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash)
+ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes)
endif()
-if(KF5Wallet_FOUND)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/
@ 2023-02-18 11:11 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-02-18 11:11 UTC (permalink / raw
To: gentoo-commits
commit: 0149bf3b57d686de6e9388045f1fb26bf53660b0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 10:45:18 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 10:45:18 2023 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0149bf3b
kde-apps/okular: Drop obsolete patch
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/okular-22.04.0-optional-options.patch | 113 ---------------------
1 file changed, 113 deletions(-)
diff --git a/kde-apps/okular/files/okular-22.04.0-optional-options.patch b/kde-apps/okular/files/okular-22.04.0-optional-options.patch
deleted file mode 100644
index caaf389b67..0000000000
--- a/kde-apps/okular/files/okular-22.04.0-optional-options.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From f29b89d8ac7fcca1cf74462dcc33da24551c924f Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 31 Aug 2021 16:48:42 +0200
-Subject: [PATCH] Make WITH_KWALLET and WITH_KJS proper cmake options
-
-Since I was asked to implement this, might as well make it real options,
-not just limited to ANDROID. Even though optional find_package() call is
-already being used for KF5Purpose as well.
-
-KF5DocTools is not made required more often than not.
-
-See also: https://invent.kde.org/graphics/okular/-/issues/61
-Downstream report: https://bugs.gentoo.org/810958
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- CMakeLists.txt | 21 ++++++++-------------
- config-okular.h.cmake | 6 ++++++
- core/generator.cpp | 1 +
- core/scripter.cpp | 1 +
- 4 files changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 547671f24..f1e14fa8b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -91,12 +91,9 @@ ecm_setup_qtplugin_macro_names(
- PACKAGE_SETUP_AUTOMOC_VARIABLES
- )
-
--set(optionalComponents)
--if (ANDROID)
--# we want to make sure that generally all components are found
--
-- set(optionalComponents "OPTIONAL_COMPONENTS")
--endif()
-+# we want to make sure that generally all components are found
-+option(WITH_KWALLET "Build with desktop-wide storage for password support" ON)
-+option(WITH_KJS "Build with scripting support" ON)
-
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
- Archive
-@@ -110,21 +107,19 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
- KIO
- ThreadWeaver
- WindowSystem
-- ${optionalComponents}
-+ OPTIONAL_COMPONENTS
- DocTools
-- JS
-- Wallet
- )
-
- if (BUILD_DESKTOP)
- find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS Parts Crash IconThemes TextWidgets)
- endif()
-
--if(KF5Wallet_FOUND)
-- add_definitions(-DWITH_KWALLET=1)
-+if(WITH_KWALLET)
-+ find_package(KF5Wallet ${KF5_REQUIRED_VERSION} REQUIRED)
- endif()
--if(KF5JS_FOUND)
-- add_definitions(-DWITH_KJS=1)
-+if(WITH_KJS)
-+ find_package(KF5JS ${KF5_REQUIRED_VERSION} REQUIRED)
- endif()
-
- if(NOT WIN32 AND NOT ANDROID)
-diff --git a/config-okular.h.cmake b/config-okular.h.cmake
-index 905aac9cb..00e45f77c 100644
---- a/config-okular.h.cmake
-+++ b/config-okular.h.cmake
-@@ -1,6 +1,12 @@
- /* Defines if force the use DRM in okular */
- #define OKULAR_FORCE_DRM ${_OKULAR_FORCE_DRM}
-
-+/* Defines if the KJS framework is available */
-+#cmakedefine WITH_KJS
-+
-+/* Defines if the kwallet framework is available */
-+#cmakedefine WITH_KWALLET
-+
- /* Defines if the purpose framework is available */
- #define PURPOSE_FOUND ${PURPOSE_FOUND}
-
-diff --git a/core/generator.cpp b/core/generator.cpp
-index 8360bb32b..0871c17ee 100644
---- a/core/generator.cpp
-+++ b/core/generator.cpp
-@@ -9,6 +9,7 @@
- */
-
- #include "generator.h"
-+#include "config-okular.h"
- #include "generator_p.h"
- #include "observer.h"
-
-diff --git a/core/scripter.cpp b/core/scripter.cpp
-index c60645895..2e6eacc72 100644
---- a/core/scripter.cpp
-+++ b/core/scripter.cpp
-@@ -5,6 +5,7 @@
- */
-
- #include "scripter.h"
-+#include "config-okular.h"
-
- #include <QDebug>
- #include <QFile>
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-02-18 11:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-24 22:35 [gentoo-commits] proj/kde:master commit in: kde-apps/okular/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2020-03-03 11:58 Andreas Sturmlechner
2020-03-12 23:33 Andreas Sturmlechner
2021-11-30 12:01 Andreas Sturmlechner
2021-11-30 12:01 Andreas Sturmlechner
2022-03-30 5:48 Andreas Sturmlechner
2023-02-18 11:11 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox