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

2023-02-18 Thread Andreas Sturmlechner 
commit: cdddaea7a802a570a60e749b5179c0760d36e3fd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 18 10:44:02 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 18 13:06:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdddaea7

kde-apps/okular: Fix build with >=app-text/discount-3

Closes: https://bugs.gentoo.org/892633
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../okular/files/okular-22.12.2-discount-3.patch   | 47 ++
 kde-apps/okular/okular-22.12.2.ebuild  |  1 +
 2 files changed, 48 insertions(+)

diff --git a/kde-apps/okular/files/okular-22.12.2-discount-3.patch 
b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
new file mode 100644
index ..e9fef2679adb
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.12.2-discount-3.patch
@@ -0,0 +1,47 @@
+From f1f638c2c51a6ef699dee22f6e90aff67beff8ec Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Wed, 1 Feb 2023 22:01:52 +0100
+Subject: [PATCH] Compile with discount 3
+
+---
+ generators/markdown/converter.cpp | 17 +
+ 1 file changed, 17 insertions(+)
+
+diff --git a/generators/markdown/converter.cpp 
b/generators/markdown/converter.cpp
+index 20d3c725f..3c8546b32 100644
+--- a/generators/markdown/converter.cpp
 b/generators/markdown/converter.cpp
+@@ -93,6 +93,8 @@ QTextDocument *Converter::convertOpenFile()
+ {
+ rewind(m_markdownFile);
+ 
++#if defined(MKD_NOLINKS)
++// on discount 2 MKD_NOLINKS is a define
+ MMIOT *markdownHandle = mkd_in(m_markdownFile, 0);
+ 
+ int flags = MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK | MKD_TOC | 
MKD_IDANCHOR;
+@@ -103,6 +105,21 @@ QTextDocument *Converter::convertOpenFile()
+ Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
+ return nullptr;
+ }
++#else
++// on discount 3 MKD_NOLINKS is an enum value
++MMIOT *markdownHandle = mkd_in(m_markdownFile, nullptr);
++
++mkd_flag_t *flags = mkd_flags();
++mkd_set_flag_bitmap(flags, MKD_FENCEDCODE | MKD_GITHUBTAGS | MKD_AUTOLINK 
| MKD_TOC | MKD_IDANCHOR);
++if (!m_isFancyPantsEnabled) {
++mkd_set_flag_num(flags, MKD_NOPANTS);
++}
++if (!mkd_compile(markdownHandle, flags)) {
++Q_EMIT error(i18n("Failed to compile the Markdown document."), -1);
++return nullptr;
++}
++mkd_free_flags(flags);
++#endif
+ 
+ char *htmlDocument;
+ const int size = mkd_document(markdownHandle, );
+-- 
+GitLab
+

diff --git a/kde-apps/okular/okular-22.12.2.ebuild 
b/kde-apps/okular/okular-22.12.2.ebuild
index b53a5f62b2fd..02e1c3eb56af 100644
--- a/kde-apps/okular/okular-22.12.2.ebuild
+++ b/kde-apps/okular/okular-22.12.2.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
+   "${FILESDIR}/${PN}-22.12.2-discount-3.patch" # bug 892633
 )
 
 src_configure() {

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

2022-12-03 Thread Andreas Sturmlechner 
commit: 7e044dac9a5475c01ad91887a4b77617066d44cc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  3 10:50:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  3 10:50:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e044dac

kde-apps/okular: Drop obsolete patch

Signed-off-by: Andreas Sturmlechner  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 caaf389b670b..
--- 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 
-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 

- 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 
- #include 
--- 
-2.35.1
-

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

2022-11-16 Thread Andreas Sturmlechner 
commit: 85158026a6962c95119add10dd1d858d26d3a447
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 16 19:03:59 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 16 19:07:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85158026

kde-apps/okular: Drop version check broken by KF-5.100

Upstream commit d25eaebc8004aa69b4eca3cacfef2701e728c8ef

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...ular-22.08.3-drop-broken-kf-version-check.patch | 30 ++
 kde-apps/okular/okular-22.08.3.ebuild  |  1 +
 2 files changed, 31 insertions(+)

diff --git 
a/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch 
b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch
new file mode 100644
index ..610f36663d27
--- /dev/null
+++ b/kde-apps/okular/files/okular-22.08.3-drop-broken-kf-version-check.patch
@@ -0,0 +1,30 @@
+From d25eaebc8004aa69b4eca3cacfef2701e728c8ef Mon Sep 17 00:00:00 2001
+From: Jonathan Esk-Riddell 
+Date: Fri, 21 Oct 2022 11:47:53 +0100
+Subject: [PATCH] remove ecm_version check which breaks on 5.100, we already
+ depend on ecm 5.68 anyway so it serves no purpose
+
+---
+ CMakeLists.txt | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 98cfd2b17..3817078c2 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -611,11 +611,7 @@ install(FILES okular.upd DESTINATION 
${KDE_INSTALL_KCONFUPDATEDIR})
+ install( FILES okular_part.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} 
)
+ install( FILES part/part.rc part/part-viewermode.rc DESTINATION 
${KDE_INSTALL_KXMLGUI5DIR}/okular )
+ 
+-if (${ECM_VERSION} STRGREATER "5.58.0")
+-install(FILES okular.categories  DESTINATION  
${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+-else()
+-install(FILES okular.categories  DESTINATION ${KDE_INSTALL_CONFDIR})
+-endif()
++install(FILES okular.categories  DESTINATION  
${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+ 
+ ki18n_install(po)
+ if(KF5DocTools_FOUND)
+-- 
+GitLab
+

diff --git a/kde-apps/okular/okular-22.08.3.ebuild 
b/kde-apps/okular/okular-22.08.3.ebuild
index 9693c79978ad..2bd095913a16 100644
--- a/kde-apps/okular/okular-22.08.3.ebuild
+++ b/kde-apps/okular/okular-22.08.3.ebuild
@@ -70,6 +70,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
+   "${FILESDIR}/${P}-drop-broken-kf-version-check.patch"
 )
 
 src_configure() {

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

2022-07-27 Thread Andreas Sturmlechner 
commit: 833a7c001ebc198c289dcc9686fd3a84ff15cc86
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jul 26 16:50:04 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 27 09:23:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833a7c00

kde-apps/okular: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/okular-21.08.1-optional-options.patch| 109 -
 1 file changed, 109 deletions(-)

diff --git a/kde-apps/okular/files/okular-21.08.1-optional-options.patch 
b/kde-apps/okular/files/okular-21.08.1-optional-options.patch
deleted file mode 100644
index 71d8df156e51..
--- a/kde-apps/okular/files/okular-21.08.1-optional-options.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 54351076f87ce2a43a87427d9c3f3e00539b9fd5 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-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 

- 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 2506c3cfa..984f3695e 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,12 +76,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
-@@ -98,17 +95,15 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED 
COMPONENTS
- TextWidgets
- ThreadWeaver
- WindowSystem
--${optionalComponents}
-+OPTIONAL_COMPONENTS
- DocTools
--JS
--Wallet
- )
- 
--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 051c2c922..f675ebcb3 100644
 a/core/generator.cpp
-+++ b/core/generator.cpp
-@@ -8,6 +8,7 @@
- SPDX-License-Identifier: GPL-2.0-or-later
- */
- 
-+#include "config-okular.h"
- #include "generator.h"
- #include "generator_p.h"
- #include "observer.h"
-diff --git a/core/scripter.cpp b/core/scripter.cpp
-index c60645895..d5b640dbb 100644
 a/core/scripter.cpp
-+++ b/core/scripter.cpp
-@@ -4,6 +4,7 @@
- SPDX-License-Identifier: GPL-2.0-or-later
- */
- 
-+#include "config-okular.h"
- #include "scripter.h"
- 
- #include 
--- 
-2.33.0
-

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

2022-04-25 Thread Conrad Kostecki 
commit: c6f61c7ae3f84cbbcd3d1f1fc5f8d33c53dc8996
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Apr 23 16:06:53 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Apr 25 21:46:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f61c7a

kde-apps/okular: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  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 633513bd2af3..
--- 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 
-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="$")
-+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 0..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 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 0..aaacb341a

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

2021-11-30 Thread Andreas Sturmlechner 
commit: 15ff189ae3ccc7d26e95a942cb0a4eeba290e7d1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 30 12:06:43 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 30 13:29:53 2021 +
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  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 0..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="$")
-+   add_subdirectory(tests)
- endif()
- 
- 
-diff --git a/generators/kimgio/tests/CMakeLists.txt 
b/generators/kimgio/tests/CMakeLists.txt
-new file mode 100644
-index 0..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="$")
-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 
 -- 
 2.33.0

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

2021-07-16 Thread Andreas Sturmlechner 
commit: e4d8b169b44eca034e4a9850fa63d42ec5df2669
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jul 16 13:58:42 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jul 16 15:20:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d8b169

kde-apps/okular: Fix fictionbook loading

Upstream commit 504eec7688e7139e9d193fc2b3ddafac0f835b6f

See also: https://mail.kde.org/pipermail/distributions/2021-July/001034.html
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=439807
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../okular-21.04.3-fix-fictionbook-support.patch   |  27 ++
 kde-apps/okular/okular-21.04.3-r1.ebuild   | 108 +
 2 files changed, 135 insertions(+)

diff --git a/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch 
b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
new file mode 100644
index 000..061db80d2bc
--- /dev/null
+++ b/kde-apps/okular/files/okular-21.04.3-fix-fictionbook-support.patch
@@ -0,0 +1,27 @@
+From 504eec7688e7139e9d193fc2b3ddafac0f835b6f Mon Sep 17 00:00:00 2001
+From: Yaroslav Sidlovsky 
+Date: Mon, 12 Jul 2021 11:06:26 +0300
+Subject: [PATCH] Fix non unique KPlugin Id for fictionbook generator
+
+BUG: 439807
+(cherry picked from commit 8dc58c7617abcacf9325e5b93a5e38149f6e2aaf)
+---
+ generators/fictionbook/libokularGenerator_fb.json | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/fictionbook/libokularGenerator_fb.json 
b/generators/fictionbook/libokularGenerator_fb.json
+index 1ef01a2d5..3d499a50f 100644
+--- a/generators/fictionbook/libokularGenerator_fb.json
 b/generators/fictionbook/libokularGenerator_fb.json
+@@ -120,7 +120,7 @@
+ "Description[x-test]": "xxA renderer for FictionBook eBooksxx",
+ "Description[zh_CN]": "FictionBook 电子书渲染器",
+ "Description[zh_TW]": "FictionBook 電子書成像器",
+-"Id": "okular_fax",
++"Id": "okular_fictionbook",
+ "License": "GPL",
+ "MimeTypes": [
+ "application/x-fictionbook+xml"
+-- 
+GitLab
+

diff --git a/kde-apps/okular/okular-21.04.3-r1.ebuild 
b/kde-apps/okular/okular-21.04.3-r1.ebuild
new file mode 100644
index 000..45e203a7aa5
--- /dev/null
+++ b/kde-apps/okular/okular-21.04.3-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://apps.kde.org/okular/;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="chm djvu epub +image-backend markdown mobi +pdf +plucker +postscript qml 
share speech +tiff"
+
+DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtprintsupport-${QTMIN}:5
+   >=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=kde-frameworks/kactivities-${KFMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kcrash-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjs-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kpty-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/threadweaver-${KFMIN}:5
+   media-libs/freetype
+   >=media-libs/phonon-4.11.0
+   sys-libs/zlib
+   chm? (
+   dev-libs/chmlib
+   dev-libs/libzip:=
+   >=kde-frameworks/khtml-${KFMIN}:5
+   )
+   djvu? ( app-text/djvu )
+   epub? ( app-text/ebook-tools )
+   image-backend? (
+   >=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
+   >=kde-apps/libkexiv2-${PVCUT}:5
+   )
+   markdown? ( app-text/discount )
+   mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
+   pdf? ( app-text/poppler[nss,qt5] )
+   plucker? ( virtual/jpeg:0 )
+   postscript? ( app-text/libspectre )
+   share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
+   speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+   tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+   image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
+   qml? (
+   >=dev-qt/qtquickcontrols2-${QTMIN}:5
+   >=kde-frameworks/kirigami-${KFMIN}:5
+   )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-20.11.90-tests.patch" # bug 734138
+   "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid

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

2020-08-13 Thread Andreas Sturmlechner 
commit: 81d7b5d4d0269e071951932c27ab405487fa4c36
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 13 18:57:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 13 18:57:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81d7b5d4

kde-apps/okular: Add missing patch

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-20.07.90-tests.patch | 148 ++
 1 file changed, 148 insertions(+)

diff --git a/kde-apps/okular/files/okular-20.07.90-tests.patch 
b/kde-apps/okular/files/okular-20.07.90-tests.patch
new file mode 100644
index 000..6bd229fc385
--- /dev/null
+++ b/kde-apps/okular/files/okular-20.07.90-tests.patch
@@ -0,0 +1,148 @@
+From c675ba8bed1e792f351fabf3ba040a86138f9f84 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/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="$")
++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 0..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 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 0..aaacb341a
+--- /dev/null

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

2020-08-07 Thread Andreas Sturmlechner 
commit: e24c229bed5ae8ede56500bc7e1a2f6ab322bf2a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Aug  7 18:45:51 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug  7 23:23:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24c229b

kde-apps/okular: remove unused patch

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-18.08.0-tests.patch | 112 ---
 1 file changed, 112 deletions(-)

diff --git a/kde-apps/okular/files/okular-18.08.0-tests.patch 
b/kde-apps/okular/files/okular-18.08.0-tests.patch
deleted file mode 100644
index 0e2cdaecd4a..000
--- a/kde-apps/okular/files/okular-18.08.0-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 0..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

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

2020-04-23 Thread Andreas Sturmlechner 
commit: 93194f11fbf514797e222deb6f4a4f44cf4aa130
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 24 00:41:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 24 00:41:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93194f11

kde-apps/okular: Add missing patch

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-20.03.70-tests.patch | 148 ++
 1 file changed, 148 insertions(+)

diff --git a/kde-apps/okular/files/okular-20.03.70-tests.patch 
b/kde-apps/okular/files/okular-20.03.70-tests.patch
new file mode 100644
index 000..d906e2a00f3
--- /dev/null
+++ b/kde-apps/okular/files/okular-20.03.70-tests.patch
@@ -0,0 +1,148 @@
+From c675ba8bed1e792f351fabf3ba040a86138f9f84 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/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="$")
++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 0..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 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 0..aaacb341a
+--- /dev/null

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

2018-09-12 Thread Andreas Sturmlechner 
commit: 4b320689d35ef7882a004844400070f26557b458
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 12 17:02:50 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 12 17:02:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b320689

kde-apps/okular: Drop duplicate patch

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 kde-apps/okular/files/okular-tests.patch | 112 ---
 kde-apps/okular/okular-18.04.3-r1.ebuild |   2 +-
 kde-apps/okular/okular-18.04.3.ebuild|   2 +-
 3 files changed, 2 insertions(+), 114 deletions(-)

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-tests.patch
deleted file mode 100644
index 0e2cdaecd4a..000
--- 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 0..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

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

2018-09-08 Thread Andreas Sturmlechner 
commit: 54c9794f8f127350c837ab164c9021815b59c670
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  8 12:50:02 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  8 12:51:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c9794f

kde-apps/okular: Add missing patch

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 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 000..0e2cdaecd4a
--- /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 0..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

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

2018-04-19 Thread Andreas Sturmlechner 
commit: 5c0f5e49fbef5090a880c4eb69c2cc7c387e481b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 19 17:24:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Apr 19 17:24:29 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c0f5e49

kde-apps/okular: Drop unnecessary patch

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 kde-apps/okular/files/okular-18.03.90-kcrash.patch | 60 --
 1 file changed, 60 deletions(-)

diff --git a/kde-apps/okular/files/okular-18.03.90-kcrash.patch 
b/kde-apps/okular/files/okular-18.03.90-kcrash.patch
deleted file mode 100644
index 39ce8c3b035..000
--- a/kde-apps/okular/files/okular-18.03.90-kcrash.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 3e25263d7709524e227207092533397ef65f2c82 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid 
-Date: Sun, 8 Apr 2018 11:50:18 +0200
-Subject: Use KCrash
-

- CMakeLists.txt   | 1 +
- shell/CMakeLists.txt | 2 +-
- shell/main.cpp   | 3 +++
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2b38cac..fd2d55e 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,6 +53,7 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
- Config
- ConfigWidgets
- CoreAddons
-+Crash
- DocTools
- IconThemes
- JS
-diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
-index ec2f1ba..e85076d 100644
 a/shell/CMakeLists.txt
-+++ b/shell/CMakeLists.txt
-@@ -27,7 +27,7 @@ ecm_add_app_icon(okular_SRCS ICONS ${ICONS_SRCS})
- 
- add_executable(okular ${okular_SRCS})
- 
--target_link_libraries(okular KF5::Parts KF5::WindowSystem)
-+target_link_libraries(okular KF5::Parts KF5::WindowSystem KF5::Crash)
- 
- if(NOT WIN32)
-   target_link_libraries(okular KF5::Activities)
-diff --git a/shell/main.cpp b/shell/main.cpp
-index 3f8dc43..de8a5c2 100644
 a/shell/main.cpp
-+++ b/shell/main.cpp
-@@ -20,6 +20,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -39,6 +40,8 @@ int main(int argc, char** argv)
- // set icon for shells which do not use desktop file metadata
- QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("okular")));
- 
-+KCrash::initialize();
-+
- QCommandLineParser parser;
- // The KDE4 version accepted flags such as -unique with a single dash -> 
preserve compatibility
- 
parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
--- 
-cgit v0.11.2
-

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

2017-12-14 Thread Andreas Sturmlechner 
commit: 5e8ef2f80aeba8adf204076ae910e8bcfbe0ba64
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Dec 15 06:19:56 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 15 06:20:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e8ef2f8

kde-apps/okular: Add missing patch

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 kde-apps/okular/files/okular-tests.patch | 112 +++
 1 file changed, 112 insertions(+)

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-tests.patch
new file mode 100644
index 000..0e2cdaecd4a
--- /dev/null
+++ b/kde-apps/okular/files/okular-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 0..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

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

2017-11-10 Thread Andreas Sturmlechner 
commit: 06c1ac768322d28e4e8ee00c81fe6c296c9a9459
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 10 10:40:07 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 10 10:40:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c1ac76

kde-apps/okular: Fix build w/ cmake-3.10

Package-Manager: Portage-2.3.8, Repoman-2.3.4

 .../okular/files/okular-17.08.3-cmake-3.10.patch   | 45 ++
 kde-apps/okular/okular-17.08.3.ebuild  |  2 +
 2 files changed, 47 insertions(+)

diff --git a/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch 
b/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch
new file mode 100644
index 000..33c56a6e7ec
--- /dev/null
+++ b/kde-apps/okular/files/okular-17.08.3-cmake-3.10.patch
@@ -0,0 +1,45 @@
+From f777e2a9241c4f384f60c467e226eee85fb5bc98 Mon Sep 17 00:00:00 2001
+From: Henrik Fehlauer 
+Date: Sat, 4 Nov 2017 00:22:09 +0100
+Subject: Fix CMake Error in generators/spectre/CMakeLists.txt
+
+Summary:
+When porting from `add_library` to `okular_add_generator`, 2f9246ae42ce
+missed to remove `MODULE` for spectre, which is already implicitly added
+as can be seen 
[here](https://phabricator.kde.org/source/kcoreaddons/browse/master/KF5CoreAddonsMacros.cmake;83623a46c9862ee37535de93427dec0b0c55e24d$139).
+
+This causes the upcoming CMake 3.10 to print the error `Cannot find
+source file`, which can be fixed by removing the superfluous `MODULE`.
+
+BUG: 386176
+
+Test Plan:
+No error shown anymore with CMake 3.10.0-rc4. Still works with CMake
+3.5.1.
+
+Reviewers: #okular, ngraham
+
+Reviewed By: ngraham
+
+Tags: #okular
+
+Differential Revision: https://phabricator.kde.org/D8612
+---
+ generators/spectre/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/generators/spectre/CMakeLists.txt 
b/generators/spectre/CMakeLists.txt
+index d808c36..5d6927d 100644
+--- a/generators/spectre/CMakeLists.txt
 b/generators/spectre/CMakeLists.txt
+@@ -24,7 +24,7 @@ ki18n_wrap_ui(okularGenerator_ghostview_SRCS
+ kconfig_add_kcfg_files(okularGenerator_ghostview_SRCS conf/gssettings.kcfgc )
+ 
+ 
+-okular_add_generator(okularGenerator_ghostview MODULE 
${okularGenerator_ghostview_SRCS})
++okular_add_generator(okularGenerator_ghostview 
${okularGenerator_ghostview_SRCS})
+ 
+ target_link_libraries(okularGenerator_ghostview okularcore 
${LIBSPECTRE_LIBRARY} KF5::I18n Qt5::Xml)
+ 
+-- 
+cgit v0.11.2

diff --git a/kde-apps/okular/okular-17.08.3.ebuild 
b/kde-apps/okular/okular-17.08.3.ebuild
index 283bc3eb368..d5f22e6d85a 100644
--- a/kde-apps/okular/okular-17.08.3.ebuild
+++ b/kde-apps/okular/okular-17.08.3.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 # bug 603116
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-cmake-3.10.patch" )
+
 src_prepare() {
kde5_src_prepare
use mobile || cmake_comment_add_subdirectory mobile