app-office/skrooge: Fix build without dev-qt/qtwebkit installed
authorAndreas Sturmlechner <asturm@gentoo.org>
Thu, 24 Jan 2019 22:24:49 +0000 (23:24 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Thu, 24 Jan 2019 22:26:00 +0000 (23:26 +0100)
Closes: https://bugs.gentoo.org/676196
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch [new file with mode: 0644]
app-office/skrooge/skrooge-2.17.0.ebuild

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 (file)
index 0000000..cb56d16
--- /dev/null
@@ -0,0 +1,28 @@
+From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@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
+
index adde622d056a18426543a2c2a231e73745958e21..063a50e94080f8b4b3d36208fd2abff786f18ff2 100644 (file)
@@ -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)