* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
@ 2020-09-17 20:07 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-09-17 20:07 UTC (permalink / raw
To: gentoo-commits
commit: 9f0ca6c8ab9c49f68567c728ef6fab403d3222c6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 18:22:09 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 18:44:02 2020 +0000
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 <asturm <AT> 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.9999.ebuild | 18 +++++++--------
kde-apps/okular/okular-9999.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 0000000000..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 <asturm@gentoo.org>
+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=mart@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 @@
<flag name="image-backend">Enable image viewing support</flag>
<flag name="markdown">Enable Markdown support via <pkg>app-text/discount</pkg></flag>
<flag name="mobi">Enable mobipocket support</flag>
- <flag name="mobile">Enable Plasma mobile support</flag>
<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
+ <flag name="qml">Install Okular Qml components</flag>
<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
<flag name="speech">Enable text-to-speech support</flag>
</use>
diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild
index 2ad5264100..32174dc6b1 100644
--- a/kde-apps/okular/okular-20.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.08.49.9999.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-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 31ff3ae80a..8fd7c53e3c 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.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)
@@ -94,7 +92,6 @@ src_configure() {
$(cmake_use_find_package speech Qt5TextToSpeech)
$(cmake_use_find_package tiff TIFF)
)
-
ecm_src_configure
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
@ 2023-12-19 9:23 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2023-12-19 9:23 UTC (permalink / raw
To: gentoo-commits
commit: a58c876a30739c11547d08da178c88bf2d9dc76c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 08:59:04 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 09:23:28 2023 +0000
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 <asturm <AT> gentoo.org>
kde-apps/okular/files/okular-24.01.80-tests.patch | 98 +++++++++++++++++++++++
kde-apps/okular/okular-9999.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 0000000000..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 <asturm@gentoo.org>
+Date: Tue, 19 Dec 2023 10:13:52 +0100
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ 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="$<TARGET_FILE:okularGenerator_chmlib>")
++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 000000000..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="$<TARGET_FILE:okularGenerator_chmlib>")
+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 000000000..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
++ TEST_NAME "comicbooktest"
++ LINK_LIBRARIES Qt6::Test KF6::CoreAddons okularcore okular_comicbook
++)
+--
+2.43.0
+
diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 3f00fdca93..5f5755a30d 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -6,104 +6,89 @@ EAPI=8
ECM_HANDBOOK="optional"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
inherit ecm gear.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"
+SLOT="6"
KEYWORDS=""
-IUSE="crypt djvu epub +image-backend markdown mobi +pdf phonon +plucker +postscript qml share speech +tiff"
+IUSE="crypt djvu epub markdown mobi +pdf phonon +postscript qml share speech +tiff"
-# slot op: Uses Qt5::CorePrivate
+# slot op: Uses Qt6::CorePrivate
DEPEND="
- >=dev-qt/qtcore-${QTMIN}:5=
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtx11extras-${QTMIN}: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/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kpty-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/threadweaver-${KFMIN}:5
- >=kde-plasma/plasma-activities-${KFMIN}:5
+ >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-apps/libkexiv2-${PVCUT}:6
+ >=kde-frameworks/karchive-${KFMIN}:6
+ >=kde-frameworks/kbookmarks-${KFMIN}:6
+ >=kde-frameworks/kcompletion-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kpty-${KFMIN}:6
+ >=kde-frameworks/ktextwidgets-${KFMIN}:6
+ >=kde-frameworks/threadweaver-${KFMIN}:6
+ >=kde-plasma/plasma-activities-${KFMIN}:6
media-libs/freetype
+ media-libs/libjpeg-turbo:=
sys-libs/zlib
- crypt? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
+ crypt? ( >=kde-frameworks/kwallet-${KFMIN}:6 )
djvu? ( app-text/djvu )
epub? ( app-text/ebook-tools )
- image-backend? (
- >=dev-qt/qtgui-${QTMIN}:5[gif(+),jpeg,png]
- >=kde-apps/libkexiv2-23.08.3:5
- )
markdown? ( >=app-text/discount-2.2.7-r1:= )
- mobi? ( >=kde-apps/kdegraphics-mobipocket-23.08.3:5 )
- pdf? ( >=app-text/poppler-21.10.0[nss,qt5] )
- phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
- plucker? ( media-libs/libjpeg-turbo:= )
+ mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:6 )
+ pdf? ( >=app-text/poppler-23.12.0[nss,qt6] )
+ phonon? ( >=media-libs/phonon-4.12.0[qt6] )
postscript? ( app-text/libspectre )
- share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
- speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+ share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+ speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
tiff? ( media-libs/tiff:= )
"
RDEPEND="${DEPEND}
- image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
- qml? (
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- )
+ >=kde-frameworks/kimageformats-${KFMIN}:6
+ qml? ( >=kde-frameworks/kirigami-${KFMIN}:6 )
"
PATCHES=(
- "${FILESDIR}/${PN}-21.11.80-tests.patch" # bug 734138
+ "${FILESDIR}/${PN}-24.01.80-tests.patch" # bug 734138
"${FILESDIR}/${PN}-20.08.2-hide-mobile-app.patch" # avoid same-name entry
)
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_CHM=ON
- -DCMAKE_DISABLE_FIND_PACKAGE_KF5KHtml=ON
-DCMAKE_DISABLE_FIND_PACKAGE_LibZip=ON
- -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF5DocTools;CHM;KF5KHtml;LibZip;KF5Wallet;DjVuLibre;EPub;KF5KExiv2;Discount;QMobipocket;Poppler;JPEG;LibSpectre;KF5Purpose;Qt5TextToSpeech;TIFF;"
+ -DFORCE_NOT_REQUIRED_DEPENDENCIES="KF6DocTools;LibZip;KF6Wallet;DjVuLibre;EPub;Discount;QMobipocket6;Poppler;LibSpectre;KF6Purpose;Qt6TextToSpeech;TIFF;"
-DOKULAR_UI=$(usex qml "both" "desktop")
- $(cmake_use_find_package crypt KF5Wallet)
+ $(cmake_use_find_package crypt KF6Wallet)
$(cmake_use_find_package djvu DjVuLibre)
$(cmake_use_find_package epub EPub)
- $(cmake_use_find_package image-backend KF5KExiv2)
$(cmake_use_find_package markdown Discount)
- $(cmake_use_find_package mobi QMobipocket)
+ $(cmake_use_find_package mobi QMobipocket6)
$(cmake_use_find_package pdf Poppler)
- $(cmake_use_find_package phonon Phonon4Qt5)
- $(cmake_use_find_package plucker JPEG)
+ $(cmake_use_find_package phonon Phonon4Qt6)
$(cmake_use_find_package postscript LibSpectre)
- $(cmake_use_find_package share KF5Purpose)
- $(cmake_use_find_package speech Qt5TextToSpeech)
+ $(cmake_use_find_package share KF6Purpose)
+ $(cmake_use_find_package speech Qt6TextToSpeech)
$(cmake_use_find_package tiff TIFF)
)
ecm_src_configure
}
src_test() {
- # mainshelltest hangs, chmgeneratortest fails, bug #603116
+ # mainshelltest hangs, bug #603116
# parttest hangs, bug #641728, annotationtoolbartest fails, KDE-Bug #429640
# signunsignedfieldtest fails, whatever. bug #852749
local myctestargs=(
- -E "(mainshelltest|chmgeneratortest|parttest|annotationtoolbartest|signunsignedfieldtest)"
+ -E "(mainshelltest|parttest|annotationtoolbartest|signunsignedfieldtest)"
)
ecm_src_test
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
@ 2020-08-01 17:07 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-08-01 17:07 UTC (permalink / raw
To: gentoo-commits
commit: ff582f9be402830adf5fbcadd994e03d523b1c44
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 1 17:05:35 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 17:06:23 2020 +0000
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 <asturm <AT> 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.9999.ebuild | 2 +
kde-apps/okular/okular-9999.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 0000000000..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 <andreas.sturmlechner@gmail.com>
+Date: Thu, 12 Oct 2017 14:09:09 +0200
+Subject: [PATCH] Move tests into existing (auto)tests subdirectories
+
+---
+ generators/chm/CMakeLists.txt | 12 +++---------
+ generators/chm/autotests/CMakeLists.txt | 8 ++++++++
+ generators/chm/autotests/chmgeneratortest.cpp | 2 +-
+ generators/comicbook/CMakeLists.txt | 10 +++-------
+ generators/comicbook/autotests/CMakeLists.txt | 6 ++++++
+ generators/kimgio/CMakeLists.txt | 6 +-----
+ generators/kimgio/tests/CMakeLists.txt | 5 +++++
+ generators/kimgio/tests/kimgiotest.cpp | 2 +-
+ 8 files changed, 28 insertions(+), 23 deletions(-)
+ create mode 100644 generators/chm/autotests/CMakeLists.txt
+ create mode 100644 generators/comicbook/autotests/CMakeLists.txt
+ create mode 100644 generators/kimgio/tests/CMakeLists.txt
+
+diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
+index 9d82b9394..b3a33afe4 100644
+--- a/generators/chm/CMakeLists.txt
++++ b/generators/chm/CMakeLists.txt
+@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
+ okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
+ target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
+
+-########### autotests ###############
+-
+-add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+-ecm_add_test(autotests/chmgeneratortest.cpp
+- TEST_NAME "chmgeneratortest"
+- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+-)
+-
+-target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
++if(BUILD_TESTING)
++ add_subdirectory(autotests)
++endif()
+
+ ########### install files ###############
+ install( FILES okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
+new file mode 100644
+index 000000000..59753ca45
+--- /dev/null
++++ b/generators/chm/autotests/CMakeLists.txt
+@@ -0,0 +1,8 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(chmgeneratortest.cpp
++ TEST_NAME "chmgeneratortest"
++ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
++)
++
++target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
+diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
+index 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 000000000..aaacb341a
+--- /dev/null
++++ b/generators/comicbook/autotests/CMakeLists.txt
+@@ -0,0 +1,6 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++ecm_add_test(comicbooktest.cpp
++ TEST_NAME "comicbooktest"
++ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
++)
+diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
+index b8cac76df..49f893bc1 100644
+--- a/generators/kimgio/CMakeLists.txt
++++ b/generators/kimgio/CMakeLists.txt
+@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
+ target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
+
+ if(BUILD_TESTING)
+- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
+- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
+- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
++ add_subdirectory(tests)
+ endif()
+
+-
+ ########### install files ###############
+ install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
+ install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
+diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt
+new file mode 100644
+index 000000000..f31bf3fe8
+--- /dev/null
++++ b/generators/kimgio/tests/CMakeLists.txt
+@@ -0,0 +1,5 @@
++add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
++
++set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
++ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
++target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
+diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
+index f2e50641d..a24f7af80 100644
+--- a/generators/kimgio/tests/kimgiotest.cpp
++++ b/generators/kimgio/tests/kimgiotest.cpp
+@@ -9,7 +9,7 @@
+ ***************************************************************************/
+
+
+-#include "../../settings_core.h"
++#include "../../../settings_core.h"
+ #include "../generator_kimgio.h"
+
+ #include <core/observer.h>
+--
+2.25.1
+
diff --git a/kde-apps/okular/okular-20.07.90.ebuild b/kde-apps/okular/okular-20.07.90.ebuild
index c9ad0072e8..b90821208b 100644
--- a/kde-apps/okular/okular-20.07.90.ebuild
+++ b/kde-apps/okular/okular-20.07.90.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${DEPEND}
)
"
+PATCHES=( "${FILESDIR}/${P}-tests.patch" ) # bug 734138
+
src_prepare() {
ecm_src_prepare
use mobile || cmake_comment_add_subdirectory mobile
diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild
index 91bb31a944..80da659569 100644
--- a/kde-apps/okular/okular-20.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.08.49.9999.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${DEPEND}
)
"
+PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138
+
src_prepare() {
ecm_src_prepare
use mobile || cmake_comment_add_subdirectory mobile
diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 91bb31a944..80da659569 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${DEPEND}
)
"
+PATCHES=( "${FILESDIR}/${PN}-20.07.90-tests.patch" ) # bug 734138
+
src_prepare() {
ecm_src_prepare
use mobile || cmake_comment_add_subdirectory mobile
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
@ 2020-07-12 22:55 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-07-12 22:55 UTC (permalink / raw
To: gentoo-commits
commit: 5e62be6e74c9db769d52d56ed47122db65b202a3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 21:45:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 22:51:51 2020 +0000
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 <asturm <AT> 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.9999.ebuild | 5 -
kde-apps/okular/okular-9999.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..0000000000
--- 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..0000000000
--- 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 <andreas.sturmlechner@gmail.com>
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-
----
- generators/chm/CMakeLists.txt | 12 +++---------
- generators/chm/autotests/CMakeLists.txt | 8 ++++++++
- generators/chm/autotests/chmgeneratortest.cpp | 2 +-
- generators/comicbook/CMakeLists.txt | 10 +++-------
- generators/comicbook/autotests/CMakeLists.txt | 6 ++++++
- generators/kimgio/CMakeLists.txt | 6 +-----
- generators/kimgio/tests/CMakeLists.txt | 5 +++++
- generators/kimgio/tests/kimgiotest.cpp | 2 +-
- 8 files changed, 28 insertions(+), 23 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/comicbook/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 9d82b9394..b3a33afe4 100644
---- a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
-
--########### autotests ###############
--
--add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
--ecm_add_test(autotests/chmgeneratortest.cpp
-- TEST_NAME "chmgeneratortest"
-- LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
--)
--
--target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-+if(BUILD_TESTING)
-+ add_subdirectory(autotests)
-+endif()
-
- ########### install files ###############
- install( FILES okularChm.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
-diff --git a/generators/chm/autotests/CMakeLists.txt b/generators/chm/autotests/CMakeLists.txt
-new file mode 100644
-index 000000000..59753ca45
---- /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+ TEST_NAME "chmgeneratortest"
-+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
-index 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 000000000..aaacb341a
---- /dev/null
-+++ b/generators/comicbook/autotests/CMakeLists.txt
-@@ -0,0 +1,6 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(comicbooktest.cpp
-+ TEST_NAME "comicbooktest"
-+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore okular_comicbook
-+)
-diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
-index b8cac76df..49f893bc1 100644
---- a/generators/kimgio/CMakeLists.txt
-+++ b/generators/kimgio/CMakeLists.txt
-@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
-
- if(BUILD_TESTING)
-- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
-- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-+ add_subdirectory(tests)
- endif()
-
--
- ########### install files ###############
- install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
- install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt
-new file mode 100644
-index 000000000..f31bf3fe8
---- /dev/null
-+++ b/generators/kimgio/tests/CMakeLists.txt
-@@ -0,0 +1,5 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
-index f2e50641d..a24f7af80 100644
---- a/generators/kimgio/tests/kimgiotest.cpp
-+++ b/generators/kimgio/tests/kimgiotest.cpp
-@@ -9,7 +9,7 @@
-
-
- #include "../generator_kimgio.h"
--#include "../../settings_core.h"
-+#include "../../../settings_core.h"
-
- #include <core/observer.h>
- #include <core/page.h>
---
-2.25.1
-
diff --git a/kde-apps/okular/okular-20.08.49.9999.ebuild b/kde-apps/okular/okular-20.08.49.9999.ebuild
index a588356dd7..91bb31a944 100644
--- a/kde-apps/okular/okular-20.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-20.08.49.9999.ebuild
@@ -70,11 +70,6 @@ RDEPEND="${DEPEND}
)
"
-PATCHES=(
- "${FILESDIR}/${PN}-18.12.0-tests.patch"
- "${FILESDIR}/${PN}-20.03.70-tests.patch"
-)
-
src_prepare() {
ecm_src_prepare
use mobile || cmake_comment_add_subdirectory mobile
diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index a588356dd7..91bb31a944 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -70,11 +70,6 @@ RDEPEND="${DEPEND}
)
"
-PATCHES=(
- "${FILESDIR}/${PN}-18.12.0-tests.patch"
- "${FILESDIR}/${PN}-20.03.70-tests.patch"
-)
-
src_prepare() {
ecm_src_prepare
use mobile || cmake_comment_add_subdirectory mobile
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
@ 2018-12-13 17:43 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-12-13 17:43 UTC (permalink / raw
To: gentoo-commits
commit: 9af2c8c0746a3db9ec1cbd0c124e15217c2521de
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 17:43:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 17:43:29 2018 +0000
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 <asturm <AT> gentoo.org>
.../okular/files/{okular-tests.patch => okular-18.12.0-tests.patch} | 0
kde-apps/okular/okular-18.12.49.9999.ebuild | 2 +-
kde-apps/okular/okular-9999.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.9999.ebuild b/kde-apps/okular/okular-18.12.49.9999.ebuild
index ca08c260a9..8907af7df4 100644
--- a/kde-apps/okular/okular-18.12.49.9999.ebuild
+++ b/kde-apps/okular/okular-18.12.49.9999.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-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 4eaf510647..8907af7df4 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.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() {
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
@ 2018-08-19 19:42 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-08-19 19:42 UTC (permalink / raw
To: gentoo-commits
commit: 43a315f7f04b4111d6f8577c1606c0eefcb63f04
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 19 19:42:16 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 19 19:42:16 2018 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=43a315f7
kde-apps/okular: Fix USE=-test for okular-9999
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.9999.ebuild | 2 +-
kde-apps/okular/okular-9999.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 <andreas.sturmlechner@gmail.com>
-Date: Thu, 12 Oct 2017 14:09:09 +0200
-Subject: [PATCH] Move tests into existing (auto)tests subdirectories
-
----
- generators/chm/CMakeLists.txt | 12 +++---------
- generators/chm/autotests/CMakeLists.txt | 8 ++++++++
- generators/chm/autotests/chmgeneratortest.cpp | 2 +-
- generators/kimgio/CMakeLists.txt | 6 +-----
- generators/kimgio/tests/CMakeLists.txt | 5 +++++
- generators/kimgio/tests/kimgiotest.cpp | 2 +-
- 6 files changed, 19 insertions(+), 16 deletions(-)
- create mode 100644 generators/chm/autotests/CMakeLists.txt
- create mode 100644 generators/kimgio/tests/CMakeLists.txt
-
-diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt
-index 9d82b9394..b3a33afe4 100644
---- a/generators/chm/CMakeLists.txt
-+++ b/generators/chm/CMakeLists.txt
-@@ -30,15 +30,9 @@ set(okularGenerator_chmlib_SRCS
- okular_add_generator(okularGenerator_chmlib ${okularGenerator_chmlib_SRCS})
- target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${LIBZIP_LIBRARY} KF5::KHtml)
+--- 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="$<TARGET_FILE:okularGenerator_chmlib>")
+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 000000000..59753ca45
---- /dev/null
-+++ b/generators/chm/autotests/CMakeLists.txt
-@@ -0,0 +1,8 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+ecm_add_test(chmgeneratortest.cpp
-+ TEST_NAME "chmgeneratortest"
-+ LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
-+)
-+
-+target_compile_definitions(chmgeneratortest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_chmlib>")
-diff --git a/generators/chm/autotests/chmgeneratortest.cpp b/generators/chm/autotests/chmgeneratortest.cpp
-index 6b0b8efc7..25fd6631a 100644
---- a/generators/chm/autotests/chmgeneratortest.cpp
-+++ b/generators/chm/autotests/chmgeneratortest.cpp
-@@ -34,7 +34,7 @@ void ChmGeneratorTest::initTestCase()
- {
- Okular::SettingsCore::instance( QStringLiteral("ChmGeneratorTest") );
- m_document = new Okular::Document( 0 );
-- const QString testFile = QStringLiteral(KDESRCDIR "autotests/data/test.chm");
-+ const QString testFile = QStringLiteral(KDESRCDIR "data/test.chm");
- QMimeDatabase db;
- const QMimeType mime = db.mimeTypeForFile( testFile );
- QCOMPARE( m_document->openDocument(testFile, QUrl(), mime), Okular::Document::OpenSuccess );
-diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt
-index b8cac76df..49f893bc1 100644
---- a/generators/kimgio/CMakeLists.txt
-+++ b/generators/kimgio/CMakeLists.txt
-@@ -13,13 +13,9 @@ okular_add_generator(okularGenerator_kimgio generator_kimgio.cpp)
- target_link_libraries(okularGenerator_kimgio okularcore KF5::KExiv2 KF5::I18n)
-
- if(BUILD_TESTING)
-- add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
-- set( kimgiotest_SRCS tests/kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-- ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-- target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-+ add_subdirectory(tests)
- endif()
-
--
- ########### install files ###############
- install( FILES okularKimgio.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
- install( PROGRAMS okularApplication_kimgio.desktop org.kde.mobile.okular_kimgio.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-diff --git a/generators/kimgio/tests/CMakeLists.txt b/generators/kimgio/tests/CMakeLists.txt
-new file mode 100644
-index 000000000..f31bf3fe8
---- /dev/null
-+++ b/generators/kimgio/tests/CMakeLists.txt
-@@ -0,0 +1,5 @@
-+add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/../" )
-+
-+set( kimgiotest_SRCS kimgiotest.cpp ${CMAKE_SOURCE_DIR}/ui/pagepainter.cpp ${CMAKE_SOURCE_DIR}/ui/guiutils.cpp ${CMAKE_SOURCE_DIR}/ui/debug_ui.cpp )
-+ecm_add_test(${kimgiotest_SRCS} TEST_NAME "kimgiotest" LINK_LIBRARIES okularcore okularpart Qt5::Svg Qt5::Test)
-+target_compile_definitions(kimgiotest PRIVATE -DGENERATOR_PATH="$<TARGET_FILE:okularGenerator_kimgio>")
-diff --git a/generators/kimgio/tests/kimgiotest.cpp b/generators/kimgio/tests/kimgiotest.cpp
-index b3039a6bb..78608df9d 100644
---- a/generators/kimgio/tests/kimgiotest.cpp
-+++ b/generators/kimgio/tests/kimgiotest.cpp
-@@ -9,7 +9,7 @@
-
-
- #include "../generator_kimgio.h"
--#include "../../settings_core.h"
-+#include "../../../settings_core.h"
-
- #include <core/observer.h>
- #include <core/page.h>
---
-2.14.2
-
+ install( FILES okularEPub.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kde-apps/okular/okular-18.08.0.ebuild b/kde-apps/okular/okular-18.08.0.ebuild
index 3b0a59ddda..e7c417affc 100644
--- a/kde-apps/okular/okular-18.08.0.ebuild
+++ b/kde-apps/okular/okular-18.08.0.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
)
"
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
src_prepare() {
kde5_src_prepare
diff --git a/kde-apps/okular/okular-18.08.49.9999.ebuild b/kde-apps/okular/okular-18.08.49.9999.ebuild
index eca8cfddbc..fe034479f4 100644
--- a/kde-apps/okular/okular-18.08.49.9999.ebuild
+++ b/kde-apps/okular/okular-18.08.49.9999.ebuild
@@ -64,7 +64,7 @@ RDEPEND="${DEPEND}
)
"
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=( "${FILESDIR}/${PN}-18.08.0-tests.patch" )
src_prepare() {
kde5_src_prepare
diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index eca8cfddbc..4eaf510647 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.ebuild
@@ -64,7 +64,10 @@ RDEPEND="${DEPEND}
)
"
-PATCHES=( "${FILESDIR}/${PN}-tests.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-18.08.0-tests.patch"
+ "${FILESDIR}/${PN}-tests.patch"
+)
src_prepare() {
kde5_src_prepare
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/
@ 2018-04-08 12:01 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-04-08 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 228cad863fc6a75564afeafd41a7dfef22d43683
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 8 12:00:57 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 12:00:57 2018 +0000
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.9999.ebuild | 6 ++-
kde-apps/okular/okular-9999.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 0000000000..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 <aacid@kde.org>
+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 <kwindowsystem.h>
+ #include <QApplication>
+ #include <KAboutData>
++#include <KCrash>
+ #include <KMessageBox>
+ #include <QCommandLineParser>
+ #include <QCommandLineOption>
+@@ -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.9999.ebuild b/kde-apps/okular/okular-18.04.49.9999.ebuild
index 1eba56641a..80d688c222 100644
--- a/kde-apps/okular/okular-18.04.49.9999.ebuild
+++ b/kde-apps/okular/okular-18.04.49.9999.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-9999.ebuild b/kde-apps/okular/okular-9999.ebuild
index 1eba56641a..0596092ab1 100644
--- a/kde-apps/okular/okular-9999.ebuild
+++ b/kde-apps/okular/okular-9999.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)
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-12-19 9:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-17 20:07 [gentoo-commits] proj/kde:master commit in: kde-apps/okular/, kde-apps/okular/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 9:23 Andreas Sturmlechner
2020-08-01 17:07 Andreas Sturmlechner
2020-07-12 22:55 Andreas Sturmlechner
2018-12-13 17:43 Andreas Sturmlechner
2018-08-19 19:42 Andreas Sturmlechner
2018-04-08 12:01 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox