commit: 153c145d0b16557c8d8e5b5c7b79021c2765a9bf Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 24 22:24:49 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 24 22:26:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=153c145d
app-office/skrooge: Fix build without dev-qt/qtwebkit installed Closes: https://bugs.gentoo.org/676196 Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../skrooge/files/skrooge-2.17.0-noqtwebkit.patch | 28 ++++++++++++++++++++++ app-office/skrooge/skrooge-2.17.0.ebuild | 12 ++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch new file mode 100644 index 00000000000..cb56d16388f --- /dev/null +++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch @@ -0,0 +1,28 @@ +From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <ast...@gentoo.org> +Date: Thu, 24 Jan 2019 23:20:09 +0100 +Subject: [PATCH] Fix build without Qt5WebKit installed + +--- + skgbasegui/skgtablewithgraph.ui | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui +index e1a3058aa..df93115f3 100644 +--- a/skgbasegui/skgtablewithgraph.ui ++++ b/skgbasegui/skgtablewithgraph.ui +@@ -151,11 +151,6 @@ + </layout> + </widget> + <customwidgets> +- <customwidget> +- <class>QWebView</class> +- <extends>QWidget</extends> +- <header>QtWebKitWidgets/QWebView</header> +- </customwidget> + <customwidget> + <class>SKGGraphicsView</class> + <extends>QWidget</extends> +-- +2.20.1 + diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild index adde622d056..063a50e9408 100644 --- a/app-office/skrooge/skrooge-2.17.0.ebuild +++ b/app-office/skrooge/skrooge-2.17.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,6 +16,8 @@ LICENSE="GPL-2" KEYWORDS="~amd64 ~x86" IUSE="activities designer kde ofx webkit" +REQUIRED_USE="test? ( designer )" + COMMON_DEPEND=" $(add_frameworks_dep karchive) $(add_frameworks_dep kcompletion) @@ -62,7 +64,6 @@ DEPEND="${COMMON_DEPEND} $(add_frameworks_dep kwindowsystem) dev-libs/libxslt virtual/pkgconfig - x11-misc/shared-mime-info designer? ( $(add_frameworks_dep kdesignerplugin) $(add_qt_dep designer) @@ -73,11 +74,14 @@ RDEPEND="${COMMON_DEPEND} $(add_qt_dep qtquickcontrols) " -REQUIRED_USE="test? ( designer )" - # hangs + installs files RESTRICT+=" test" +src_prepare() { + use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196 + kde5_src_prepare +} + src_configure() { local mycmakeargs=( -DSKG_BUILD_TEST=$(usex test)
