summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-01-27 17:42:08 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-01-27 18:20:28 +0100
commit5ca89b45bc362c3383540a11c9a35e61b462753b (patch)
treead9f591bee005a0efff5ba9e4481adc5f098ab8a /app-office
parentapp-emulation/winetricks: Sync with ::wine (diff)
downloadgentoo-5ca89b45bc362c3383540a11c9a35e61b462753b.tar.gz
gentoo-5ca89b45bc362c3383540a11c9a35e61b462753b.tar.bz2
gentoo-5ca89b45bc362c3383540a11c9a35e61b462753b.zip
app-office/skrooge: Switch to upstream patch
Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office')
-rw-r--r--app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch34
-rw-r--r--app-office/skrooge/skrooge-2.17.0.ebuild7
2 files changed, 24 insertions, 17 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
index cb56d16388f..588c4c116e0 100644
--- a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
+++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
@@ -1,28 +1,36 @@
-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
+From dab0fd4adf2cbee89a417c483350ddffda77ed3b Mon Sep 17 00:00:00 2001
+From: Stephane MANKOWSKI <stephane@mankowski.fr>
+Date: Sun, 27 Jan 2019 17:13:28 +0100
+Subject: skrooge w/ -DSKG_WEBENGINE=ON: ui_skgtablewithgraph.h:15:10: fatal
+ error: QtWebKitWidgets/QWebView: No such file or directory BUG:403575
---
- skgbasegui/skgtablewithgraph.ui | 5 -----
- 1 file changed, 5 deletions(-)
+ skgbasegui/skgtablewithgraph.ui | 6 ------
+ 1 file changed, 6 deletions(-)
diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui
-index e1a3058aa..df93115f3 100644
+index e1a3058..b00273f 100644
--- a/skgbasegui/skgtablewithgraph.ui
+++ b/skgbasegui/skgtablewithgraph.ui
-@@ -151,11 +151,6 @@
- </layout>
+@@ -152,11 +152,6 @@
</widget>
<customwidgets>
-- <customwidget>
+ <customwidget>
- <class>QWebView</class>
- <extends>QWidget</extends>
- <header>QtWebKitWidgets/QWebView</header>
- </customwidget>
- <customwidget>
+- <customwidget>
<class>SKGGraphicsView</class>
<extends>QWidget</extends>
+ <header>skggraphicsview.h</header>
+@@ -173,7 +168,6 @@
+ </customwidget>
+ <customwidget>
+ <class>SKGWebView</class>
+- <extends>QWebView</extends>
+ <header>skgwebview.h</header>
+ </customwidget>
+ </customwidgets>
--
-2.20.1
-
+cgit v1.1
diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild
index 063a50e9408..2aa99f0b78d 100644
--- a/app-office/skrooge/skrooge-2.17.0.ebuild
+++ b/app-office/skrooge/skrooge-2.17.0.ebuild
@@ -77,10 +77,9 @@ RDEPEND="${COMMON_DEPEND}
# hangs + installs files
RESTRICT+=" test"
-src_prepare() {
- use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
- kde5_src_prepare
-}
+PATCHES=(
+ "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196
+)
src_configure() {
local mycmakeargs=(