subject:"\[gentoo\-commits\] proj\/kde\:master commit in\: kde\-apps\/okular\/, kde\-apps\/okular\/files\/"

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

2023-12-19 Thread Andreas Sturmlechner

commit: a58c876a30739c11547d08da178c88bf2d9dc76c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 19 08:59:04 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 19 09:23:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a58c876a

kde-apps/okular: Port to KF6, cleanup IUSE image-backend,plucker

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

 kde-apps/okular/files/okular-24.01.80-tests.patch | 98 +++
 kde-apps/okular/okular-.ebuild| 97 ++
 2 files changed, 139 insertions(+), 56 deletions(-)

diff --git a/kde-apps/okular/files/okular-24.01.80-tests.patch 
b/kde-apps/okular/files/okular-24.01.80-tests.patch
new file mode 100644
index 00..1ae19277b5
--- /dev/null
+++ b/kde-apps/okular/files/okular-24.01.80-tests.patch
@@ -0,0 +1,98 @@
+From 7e5c4aa3760db4dbb76af47e173be3dff229bff7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 19 Dec 2023 10:13:52 +0100
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ generators/chm/CMakeLists.txt | 11 +++
+ generators/chm/autotests/CMakeLists.txt   |  7 +++
+ generators/chm/autotests/chmgeneratortest.cpp |  2 +-
+ generators/comicbook/CMakeLists.txt   |  9 +++--
+ generators/comicbook/autotests/CMakeLists.txt |  5 +
+ 5 files changed, 19 insertions(+), 15 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 5d569499f..2784f75fc 100644
+--- a/generators/chm/CMakeLists.txt
 b/generators/chm/CMakeLists.txt
+@@ -24,14 +24,9 @@ target_include_directories(okularGenerator_chmlib PRIVATE 
${CHM_INCLUDE_DIR} ${L
+ target_link_libraries(okularGenerator_chmlib  okularcore ${CHM_LIBRARY} 
${LIBZIP_LIBRARY} KF6::KHtml)
+ 
+ ### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+-TEST_NAME "chmgeneratortest"
+-LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
++if(BUILD_TESTING)
++   add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( PROGRAMS okularApplication_chm.desktop 
org.kde.mobile.okular_chm.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt 
b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 0..36c468156
+--- /dev/null
 b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,7 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++ecm_add_test(chmgeneratortest.cpp
++TEST_NAME "chmgeneratortest"
++LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE 
-DGENERATOR_PATH="$")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp 
b/generators/chm/autotests/chmgeneratortest.cpp
+index 2c7696ab1..24742248b 100644
+--- a/generators/chm/autotests/chmgeneratortest.cpp
 b/generators/chm/autotests/chmgeneratortest.cpp
+@@ -30,7 +30,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 2fc8ff710..d92c75905 100644
+--- a/generators/comicbook/CMakeLists.txt
 b/generators/comicbook/CMakeLists.txt
+@@ -27,12 +27,9 @@ if (KArchive_HAVE_LZMA)
+ endif()
+ 
+ ### autotests ###
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/comicbooktest.cpp
+-TEST_NAME "comicbooktest"
+-LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook
+-)
++if(BUILD_TESTING)
++add_subdirectory(autotests)
++endif()
+ 
+ ### install files ###
+ install( PROGRAMS okularApplication_comicbook.desktop 
org.kde.mobile.okular_comicbook.desktop  DESTINATION  ${KDE_INSTALL_APPDIR} )
+diff --git a/generators/comicbook/autotests/CMakeLists.txt 
b/generators/comicbook/autotests/CMakeLists.txt
+new file mode 100644
+index 0..6426105e4
+--- /dev/null
 b/generators/comicbook/autotests/CMakeLists.txt
+@@ -0,0 +1,5 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++ecm_add_test(comicbooktest.cpp
++

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

2020-09-17 Thread Andreas Sturmlechner

commit: 9f0ca6c8ab9c49f68567c728ef6fab403d3222c6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 17 18:22:09 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 17 18:44:02 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9f0ca6c8

kde-apps/okular: Fix IUSE=mobile->qml, fix RDEPENDs, drop src_prepare

Upstream commits:
8dfdfa69fcf1c90092b582ab8db1743458d27b34
c1b396af3e9a528288fe3d74bbaa487c4736d05b
1fb77446a7378368de5288ca9f57627ae2946d84
a96c082d6969c47b5738eb9b02d064a09232f0f9
fd44517bae86dba4c3cc6d2a8ef278998ee40e5a

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

 .../files/okular-20.08.2-hide-mobile-app.patch | 27 ++
 kde-apps/okular/metadata.xml   |  2 +-
 kde-apps/okular/okular-20.08.49..ebuild| 18 +++
 kde-apps/okular/okular-.ebuild | 19 +++
 4 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch 
b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch
new file mode 100644
index 00..175e5c178c
--- /dev/null
+++ b/kde-apps/okular/files/okular-20.08.2-hide-mobile-app.patch
@@ -0,0 +1,27 @@
+From 6f7f17a24a564ffbf712fd5e0917fcabc8d19229 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Thu, 17 Sep 2020 20:36:37 +0200
+Subject: [PATCH] Revert "Don't hide the mobile app"
+
+We have no use for this on the desktop, but need it for peruse.
+
+This reverts commit 0991819a497594233b7564755bbc189009188bd0.
+---
+ mobile/app/package/metadata.desktop | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mobile/app/package/metadata.desktop 
b/mobile/app/package/metadata.desktop
+index f9432748b..0fcf20843 100644
+--- a/mobile/app/package/metadata.desktop
 b/mobile/app/package/metadata.desktop
+@@ -110,6 +110,7 @@ GenericName[zh_TW]=文件檢視器
+ Type=Application
+ Exec=okularkirigami
+ Icon=okular
++NoDisplay=true
+ X-KDE-ParentApp=
+ X-KDE-PluginInfo-Author=Marco Martin
+ X-KDE-PluginInfo-Email=m...@kde.org
+-- 
+2.28.0
+

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index b36cde3d0a..f07864be71 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -11,8 +11,8 @@
Enable image viewing support
Enable Markdown support via 
app-text/discount
Enable mobipocket support
-   Enable Plasma mobile support
Enable Plucker E-Book for Palm OS devices 
support
+   Install Okular Qml components
Enable support for a share menu using 
kde-frameworks/purpose
Enable text-to-speech support


diff --git a/kde-apps/okular/okular-20.08.49..ebuild 
b/kde-apps/okular/okular-20.08.49..ebuild
index 2ad5264100..32174dc6b1 100644
--- a/kde-apps/okular/okular-20.08.49..ebuild
+++ b/kde-apps/okular/okular-20.08.49..ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org 
https://kde.org/applications/office/org.kde.oku
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript share speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf plucker 
+postscript qml share speech +tiff"
 
 DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
@@ -64,22 +64,20 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-   mobile? (
-   >=dev-qt/qtquickcontrols-${QTMIN}:5
+   qml? (
+   >=dev-qt/qtquickcontrols2-${QTMIN}:5
>=kde-frameworks/kirigami-${KFMIN}:5
)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138
-
-src_prepare() {
-   ecm_src_prepare
-   use mobile || cmake_comment_add_subdirectory mobile
-   use test || cmake_comment_add_subdirectory conf/autotests
-}
+PATCHES=(
+   "${FILESDIR}/${PN}-20.07.90-tests.patch" # bug 734138
+   "${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name 
entry
+)
 
 src_configure() {
local mycmakeargs=(
+   -DOKULAR_UI=$(usex qml "both" "desktop")
$(cmake_use_find_package chm CHM)
$(cmake_use_find_package crypt Qca-qt5)
$(cmake_use_find_package djvu DjVuLibre)

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 31ff3ae80a..8fd7c53e3c 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://okular.kde.org 
https://kde.org/applications/office/org.kde.oku
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker 
+postscript share speech +tiff"
+IUSE="chm crypt djvu epub +image-backend markdown mobi +pdf plucker

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

2020-08-01 Thread Andreas Sturmlechner

commit: ff582f9be402830adf5fbcadd994e03d523b1c44
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug  1 17:05:35 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Aug  1 17:06:23 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff582f9b

kde-apps/okular: Re-add modified tests-optional.patch

Closes: https://bugs.gentoo.org/734138
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-20.07.90-tests.patch | 148 ++
 kde-apps/okular/okular-20.07.90.ebuild|   2 +
 kde-apps/okular/okular-20.08.49..ebuild   |   2 +
 kde-apps/okular/okular-.ebuild|   2 +
 4 files changed, 154 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 00..6bd229fc38
--- /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

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

2020-07-12 Thread Andreas Sturmlechner

commit: 5e62be6e74c9db769d52d56ed47122db65b202a3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 11 21:45:45 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 12 22:51:51 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e62be6e

kde-apps/okular: Drop broken tests-optional patch

Now we rely on patched ECMAddTests.cmake to skip them.

Closes: https://bugs.gentoo.org/732312
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/okular/files/okular-18.12.0-tests.patch  |  17 ---
 kde-apps/okular/files/okular-20.03.70-tests.patch | 148 --
 kde-apps/okular/okular-20.08.49..ebuild   |   5 -
 kde-apps/okular/okular-.ebuild|   5 -
 4 files changed, 175 deletions(-)

diff --git a/kde-apps/okular/files/okular-18.12.0-tests.patch 
b/kde-apps/okular/files/okular-18.12.0-tests.patch
deleted file mode 100644
index 2b61715050..00
--- a/kde-apps/okular/files/okular-18.12.0-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
 a/generators/epub/CMakeLists.txt   2018-08-19 21:34:51.151645090 +0200
-+++ b/generators/epub/CMakeLists.txt   2018-08-19 21:36:28.771109586 +0200
-@@ -23,12 +23,13 @@
- 
- ### autotests ###
- 
-+if(BUILD_TESTING)
- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
- ecm_add_test(autotests/epubgeneratortest.cpp
- TEST_NAME "epubgeneratortest"
- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
- )
--
-+endif()
- 
- ### install files ###
- install( FILES okularEPub.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

diff --git a/kde-apps/okular/files/okular-20.03.70-tests.patch 
b/kde-apps/okular/files/okular-20.03.70-tests.patch
deleted file mode 100644
index d906e2a00f..00
--- a/kde-apps/okular/files/okular-20.03.70-tests.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From c675ba8bed1e792f351fabf3ba040a86138f9f84 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-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 =

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

2018-12-13 Thread Andreas Sturmlechner

commit: 9af2c8c0746a3db9ec1cbd0c124e15217c2521de
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 13 17:43:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 13 17:43:29 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9af2c8c0

kde-apps/okular: Sync with tree

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

 .../okular/files/{okular-tests.patch => okular-18.12.0-tests.patch}   | 0
 kde-apps/okular/okular-18.12.49..ebuild   | 2 +-
 kde-apps/okular/okular-.ebuild| 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-18.12.0-tests.patch
similarity index 100%
rename from kde-apps/okular/files/okular-tests.patch
rename to kde-apps/okular/files/okular-18.12.0-tests.patch

diff --git a/kde-apps/okular/okular-18.12.49..ebuild 
b/kde-apps/okular/okular-18.12.49..ebuild
index ca08c260a9..8907af7df4 100644
--- a/kde-apps/okular/okular-18.12.49..ebuild
+++ b/kde-apps/okular/okular-18.12.49..ebuild
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-18.08.0-tests.patch"
-   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${PN}-18.12.0-tests.patch"
 )
 
 src_prepare() {

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 4eaf510647..8907af7df4 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-18.08.0-tests.patch"
-   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${PN}-18.12.0-tests.patch"
 )
 
 src_prepare() {

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

2018-08-19 Thread Andreas Sturmlechner

commit: 43a315f7f04b4111d6f8577c1606c0eefcb63f04
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 19 19:42:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug 19 19:42:16 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=43a315f7

kde-apps/okular: Fix USE=-test for okular-

Closes: https://bugs.gentoo.org/664020
Package-Manager: Portage-2.3.47, Repoman-2.3.10

 ...ular-tests.patch => okular-18.08.0-tests.patch} |   0
 kde-apps/okular/files/okular-tests.patch   | 119 +++--
 kde-apps/okular/okular-18.08.0.ebuild  |   2 +-
 kde-apps/okular/okular-18.08.49..ebuild|   2 +-
 kde-apps/okular/okular-.ebuild |   5 +-
 5 files changed, 18 insertions(+), 110 deletions(-)

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-18.08.0-tests.patch
similarity index 100%
copy from kde-apps/okular/files/okular-tests.patch
copy to kde-apps/okular/files/okular-18.08.0-tests.patch

diff --git a/kde-apps/okular/files/okular-tests.patch 
b/kde-apps/okular/files/okular-tests.patch
index 0e2cdaecd4..2b61715050 100644
--- a/kde-apps/okular/files/okular-tests.patch
+++ b/kde-apps/okular/files/okular-tests.patch
@@ -1,112 +1,17 @@
-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)
+--- a/generators/epub/CMakeLists.txt   2018-08-19 21:34:51.151645090 +0200
 b/generators/epub/CMakeLists.txt   2018-08-19 21:36:28.771109586 +0200
+@@ -23,12 +23,13 @@
+ 
+ ### autotests ###
  
--### 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)
+ add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+ ecm_add_test(autotests/epubgeneratortest.cpp
+ TEST_NAME "epubgeneratortest"
+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+ )
+-
 +endif()
  
  ### install files ###
- install( FILES 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)
-

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

2018-04-08 Thread Andreas Sturmlechner

commit: 228cad863fc6a75564afeafd41a7dfef22d43683
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr  8 12:00:57 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  8 12:00:57 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=228cad86

kde-apps/okular: Initialise kcrash

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 kde-apps/okular/files/okular-18.03.90-kcrash.patch | 60 ++
 kde-apps/okular/okular-18.03.90.ebuild |  6 ++-
 kde-apps/okular/okular-18.04.49..ebuild|  6 ++-
 kde-apps/okular/okular-.ebuild |  1 +
 4 files changed, 71 insertions(+), 2 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
new file mode 100644
index 00..39ce8c3b03
--- /dev/null
+++ b/kde-apps/okular/files/okular-18.03.90-kcrash.patch
@@ -0,0 +1,60 @@
+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
+

diff --git a/kde-apps/okular/okular-18.03.90.ebuild 
b/kde-apps/okular/okular-18.03.90.ebuild
index 950d0b1d6a..60bde14510 100644
--- a/kde-apps/okular/okular-18.03.90.ebuild
+++ b/kde-apps/okular/okular-18.03.90.ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -63,7 +64,10 @@ RDEPEND="${DEPEND}
)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${P}-kcrash.patch"
+)
 
 src_prepare() {
kde5_src_prepare

diff --git a/kde-apps/okular/okular-18.04.49..ebuild 
b/kde-apps/okular/okular-18.04.49..ebuild
index 1eba56641a..80d688c222 100644
--- a/kde-apps/okular/okular-18.04.49..ebuild
+++ b/kde-apps/okular/okular-18.04.49..ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)
@@ -63,7 +64,10 @@ RDEPEND="${DEPEND}
)
 "
 
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-tests.patch"
+   "${FILESDIR}/${PN}-18.03.90-kcrash.patch"
+)
 
 src_prepare() {
kde5_src_prepare

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index 1eba56641a..0596092ab1 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kio)
$(add_frameworks_dep kjs)
$(add_frameworks_dep kparts)

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

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

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

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

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

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

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

7 matches

Site Navigation

Mail list logo

Footer information