| 1 |
commit: 5ca89b45bc362c3383540a11c9a35e61b462753b |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 27 16:42:08 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 27 17:20:28 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca89b45 |
| 7 |
|
| 8 |
app-office/skrooge: Switch to upstream patch |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.58, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
.../skrooge/files/skrooge-2.17.0-noqtwebkit.patch | 34 +++++++++++++--------- |
| 14 |
app-office/skrooge/skrooge-2.17.0.ebuild | 7 ++--- |
| 15 |
2 files changed, 24 insertions(+), 17 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch |
| 18 |
index cb56d16388f..588c4c116e0 100644 |
| 19 |
--- a/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch |
| 20 |
+++ b/app-office/skrooge/files/skrooge-2.17.0-noqtwebkit.patch |
| 21 |
@@ -1,28 +1,36 @@ |
| 22 |
-From 6ba59f2f707829242ad2410803f48089062c7241 Mon Sep 17 00:00:00 2001 |
| 23 |
-From: Andreas Sturmlechner <asturm@g.o> |
| 24 |
-Date: Thu, 24 Jan 2019 23:20:09 +0100 |
| 25 |
-Subject: [PATCH] Fix build without Qt5WebKit installed |
| 26 |
+From dab0fd4adf2cbee89a417c483350ddffda77ed3b Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Stephane MANKOWSKI <stephane@×××××××××.fr> |
| 28 |
+Date: Sun, 27 Jan 2019 17:13:28 +0100 |
| 29 |
+Subject: skrooge w/ -DSKG_WEBENGINE=ON: ui_skgtablewithgraph.h:15:10: fatal |
| 30 |
+ error: QtWebKitWidgets/QWebView: No such file or directory BUG:403575 |
| 31 |
|
| 32 |
--- |
| 33 |
- skgbasegui/skgtablewithgraph.ui | 5 ----- |
| 34 |
- 1 file changed, 5 deletions(-) |
| 35 |
+ skgbasegui/skgtablewithgraph.ui | 6 ------ |
| 36 |
+ 1 file changed, 6 deletions(-) |
| 37 |
|
| 38 |
diff --git a/skgbasegui/skgtablewithgraph.ui b/skgbasegui/skgtablewithgraph.ui |
| 39 |
-index e1a3058aa..df93115f3 100644 |
| 40 |
+index e1a3058..b00273f 100644 |
| 41 |
--- a/skgbasegui/skgtablewithgraph.ui |
| 42 |
+++ b/skgbasegui/skgtablewithgraph.ui |
| 43 |
-@@ -151,11 +151,6 @@ |
| 44 |
- </layout> |
| 45 |
+@@ -152,11 +152,6 @@ |
| 46 |
</widget> |
| 47 |
<customwidgets> |
| 48 |
-- <customwidget> |
| 49 |
+ <customwidget> |
| 50 |
- <class>QWebView</class> |
| 51 |
- <extends>QWidget</extends> |
| 52 |
- <header>QtWebKitWidgets/QWebView</header> |
| 53 |
- </customwidget> |
| 54 |
- <customwidget> |
| 55 |
+- <customwidget> |
| 56 |
<class>SKGGraphicsView</class> |
| 57 |
<extends>QWidget</extends> |
| 58 |
+ <header>skggraphicsview.h</header> |
| 59 |
+@@ -173,7 +168,6 @@ |
| 60 |
+ </customwidget> |
| 61 |
+ <customwidget> |
| 62 |
+ <class>SKGWebView</class> |
| 63 |
+- <extends>QWebView</extends> |
| 64 |
+ <header>skgwebview.h</header> |
| 65 |
+ </customwidget> |
| 66 |
+ </customwidgets> |
| 67 |
-- |
| 68 |
-2.20.1 |
| 69 |
- |
| 70 |
+cgit v1.1 |
| 71 |
|
| 72 |
diff --git a/app-office/skrooge/skrooge-2.17.0.ebuild b/app-office/skrooge/skrooge-2.17.0.ebuild |
| 73 |
index 063a50e9408..2aa99f0b78d 100644 |
| 74 |
--- a/app-office/skrooge/skrooge-2.17.0.ebuild |
| 75 |
+++ b/app-office/skrooge/skrooge-2.17.0.ebuild |
| 76 |
@@ -77,10 +77,9 @@ RDEPEND="${COMMON_DEPEND} |
| 77 |
# hangs + installs files |
| 78 |
RESTRICT+=" test" |
| 79 |
|
| 80 |
-src_prepare() { |
| 81 |
- use webkit || eapply "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196 |
| 82 |
- kde5_src_prepare |
| 83 |
-} |
| 84 |
+PATCHES=( |
| 85 |
+ "${FILESDIR}"/${P}-noqtwebkit.patch # bug 676196 |
| 86 |
+) |
| 87 |
|
| 88 |
src_configure() { |
| 89 |
local mycmakeargs=( |
Archives