Skip to content

Commit

Permalink
app-office/skrooge: Switch to upstream patch
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Jan 27, 2019
1 parent fc80a25 commit 5ca89b4
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 17 deletions.
34 changes: 21 additions & 13 deletions app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch
Original file line number Diff line number Diff line change
@@ -1,28 +1,36 @@
From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
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 <[email protected]>
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
7 changes: 3 additions & 4 deletions app-office/skrooge/skrooge-2.17.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down

0 comments on commit 5ca89b4

Please sign in to comment.