1 |
commit: 18930bc543d1582937aab1b70294d7721595ea66 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 29 23:25:10 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 29 23:52:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18930bc5 |
7 |
|
8 |
sci-geosciences/merkaartor: Patch for USE webengine; drop Qt5WebKit |
9 |
|
10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../files/merkaartor-0.18.3-webengine1.patch | 186 +++++++++++++++++++++ |
14 |
.../files/merkaartor-0.18.3-webengine2.patch | 35 ++++ |
15 |
.../files/merkaartor-0.18.3-webengine3.patch | 135 +++++++++++++++ |
16 |
.../merkaartor/merkaartor-0.18.3-r4.ebuild | 6 +- |
17 |
4 files changed, 360 insertions(+), 2 deletions(-) |
18 |
|
19 |
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..5f4f605ce5b |
22 |
--- /dev/null |
23 |
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch |
24 |
@@ -0,0 +1,186 @@ |
25 |
+From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001 |
26 |
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@××××××××.org> |
27 |
+Date: Mon, 26 Sep 2016 13:02:57 +0200 |
28 |
+Subject: [PATCH] Updated QWeb to QWebView. |
29 |
+ |
30 |
+--- |
31 |
+ src/Layers/LicenseDisplayDialog.ui | 6 +++--- |
32 |
+ src/QMapControl/browserimagemanager.cpp | 20 +++++++++----------- |
33 |
+ src/QMapControl/browserimagemanager.h | 17 ++++++----------- |
34 |
+ src/src.pro | 2 +- |
35 |
+ 4 files changed, 19 insertions(+), 26 deletions(-) |
36 |
+ |
37 |
+diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui |
38 |
+index 103816c6..3dabd130 100755 |
39 |
+--- a/src/Layers/LicenseDisplayDialog.ui |
40 |
++++ b/src/Layers/LicenseDisplayDialog.ui |
41 |
+@@ -15,7 +15,7 @@ |
42 |
+ </property> |
43 |
+ <layout class="QVBoxLayout" name="verticalLayout"> |
44 |
+ <item> |
45 |
+- <widget class="QWebView" name="webView"> |
46 |
++ <widget class="QWebEngineView" name="webView"> |
47 |
+ <property name="url"> |
48 |
+ <url> |
49 |
+ <string>about:blank</string> |
50 |
+@@ -41,9 +41,9 @@ |
51 |
+ </widget> |
52 |
+ <customwidgets> |
53 |
+ <customwidget> |
54 |
+- <class>QWebView</class> |
55 |
++ <class>QWebEngineView</class> |
56 |
+ <extends>QWidget</extends> |
57 |
+- <header>QtWebKit/QWebView</header> |
58 |
++ <header>QWebEngineView</header> |
59 |
+ </customwidget> |
60 |
+ </customwidgets> |
61 |
+ <resources/> |
62 |
+diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp |
63 |
+index 468cf2b6..4021d40f 100644 |
64 |
+--- a/src/QMapControl/browserimagemanager.cpp |
65 |
++++ b/src/QMapControl/browserimagemanager.cpp |
66 |
+@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin |
67 |
+ //printf("%s\n", s); |
68 |
+ } |
69 |
+ |
70 |
+-void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg ) |
71 |
++void BrowserWebPage::javaScriptAlert ( const QString & msg ) |
72 |
+ { |
73 |
+- Q_UNUSED(frame) |
74 |
+ //QMessageBox::information(NULL, tr("Javascript alert"), msg); |
75 |
+ |
76 |
+ if (msg.startsWith("Coord")) { |
77 |
+@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg ) |
78 |
+ |
79 |
+ void BrowserWebPage::launchRequest ( const QUrl & url ) |
80 |
+ { |
81 |
++ qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<< |
82 |
++ "This code is not tested and may not work as expected. If you experience issues, please let us know."; |
83 |
+ sw = sh = 0; |
84 |
+- mainFrame()->load(url); |
85 |
++ load(url); |
86 |
+ } |
87 |
+ |
88 |
+ BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0; |
89 |
+@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent) |
90 |
+ } |
91 |
+ |
92 |
+ page = new BrowserWebPage(); |
93 |
+- page->setNetworkAccessManager(m_networkManager); |
94 |
+- page->setViewportSize(QSize(1024, 1024)); |
95 |
+ |
96 |
+ connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool))); |
97 |
+ |
98 |
+@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest() |
99 |
+ |
100 |
+ QUrl u = QUrl( R.url); |
101 |
+ |
102 |
+- page->networkAccessManager()->setProxy(M_PREFS->getProxy(u)); |
103 |
+ page->launchRequest(u); |
104 |
+ requestActive = true; |
105 |
+ #ifndef BROWSERIMAGEMANAGER_IS_THREADED |
106 |
+@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok) |
107 |
+ qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash; |
108 |
+ QPixmap pt(page->sw, page->sh); |
109 |
+ QPainter P(&pt); |
110 |
+- page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh)); |
111 |
++ page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh)); |
112 |
+ P.end(); |
113 |
+ |
114 |
+ // if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) { |
115 |
+@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty() |
116 |
+ void BrowserImageManager::abortLoading() |
117 |
+ { |
118 |
+ //qDebug() << "BrowserImageManager::abortLoading"; |
119 |
+- page->triggerAction(QWebPage::Stop); |
120 |
++ page->triggerAction(QWebEnginePage::Stop); |
121 |
+ if (!loadingRequests.isEmpty()) { |
122 |
+ LoadingRequest R = loadingRequests.dequeue(); |
123 |
+ loadingRequests.clear(); |
124 |
+@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading() |
125 |
+ #ifdef BROWSERIMAGEMANAGER_IS_THREADED |
126 |
+ void BrowserImageManager::run() |
127 |
+ { |
128 |
+- page = new BrowserWebPage(); |
129 |
++ page = new BrowserWebEnginePage(); |
130 |
+ page->setViewportSize(QSize(1024, 1024)); |
131 |
+ |
132 |
+ QTimer theTimer; |
133 |
+@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests() |
134 |
+ } else { |
135 |
+ if ((requestDuration++) > 100) { |
136 |
+ requestDuration = 0; |
137 |
+- page->triggerAction(QWebPage::Stop); |
138 |
++ page->triggerAction(QWebEnginePage::Stop); |
139 |
+ qDebug() << "BrowserImageManager Timeout"; |
140 |
+ } |
141 |
+ } |
142 |
+@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests() |
143 |
+ void BrowserImageManager::timeout() |
144 |
+ { |
145 |
+ qDebug() << "BrowserImageManager::timeout"; |
146 |
+- page->triggerAction(QWebPage::Stop); |
147 |
++ page->triggerAction(QWebEnginePage::Stop); |
148 |
+ pageLoadFinished(false); |
149 |
+ } |
150 |
+ #endif // BROWSERIMAGEMANAGER_IS_THREADED |
151 |
+diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h |
152 |
+index 10f8a477..ca846e31 100644 |
153 |
+--- a/src/QMapControl/browserimagemanager.h |
154 |
++++ b/src/QMapControl/browserimagemanager.h |
155 |
+@@ -24,14 +24,10 @@ |
156 |
+ #include <QPixmap> |
157 |
+ |
158 |
+ #include <QtNetwork/QtNetwork> |
159 |
+-#include <QWebFrame> |
160 |
+-#include "qwebhistory.h" |
161 |
+-#include "qwebhistoryinterface.h" |
162 |
+-#include "qwebkitglobal.h" |
163 |
+-#include "qwebpage.h" |
164 |
+-#include "qwebpluginfactory.h" |
165 |
+-#include "qwebsettings.h" |
166 |
+-#include "qwebview.h" |
167 |
++#include <QWebEnginePage> |
168 |
++#include <QWebEngineHistory> |
169 |
++#include <QWebEngineSettings> |
170 |
++#include <QWebEngineView> |
171 |
+ |
172 |
+ #include <QThread> |
173 |
+ |
174 |
+@@ -41,13 +37,13 @@ |
175 |
+ @author Chris Browet <cbro@×××××××××.com> |
176 |
+ */ |
177 |
+ |
178 |
+-class BrowserWebPage : public QWebPage |
179 |
++class BrowserWebPage : public QWebEnginePage |
180 |
+ { |
181 |
+ friend class BrowserImageManager; |
182 |
+ |
183 |
+ protected: |
184 |
+ virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID ); |
185 |
+- virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ; |
186 |
++ virtual void javaScriptAlert ( const QString & msg ) ; |
187 |
+ void launchRequest ( const QUrl & url ); |
188 |
+ |
189 |
+ private: |
190 |
+@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager |
191 |
+ static BrowserImageManager* m_BrowserImageManagerInstance; |
192 |
+ |
193 |
+ BrowserWebPage* page; |
194 |
+- QWebFrame *frame; |
195 |
+ QNetworkAccessManager* qnam; |
196 |
+ |
197 |
+ signals: |
198 |
+diff --git a/src/src.pro b/src/src.pro |
199 |
+index eb93b263..137d7e14 100644 |
200 |
+--- a/src/src.pro |
201 |
++++ b/src/src.pro |
202 |
+@@ -34,7 +34,7 @@ TEMPLATE = app |
203 |
+ |
204 |
+ CONFIG += rtti stl exceptions |
205 |
+ #CONFIG -= exceptions |
206 |
+-QT += svg network xml core gui webkitwidgets concurrent printsupport |
207 |
++QT += svg network xml core gui webenginewidgets concurrent printsupport |
208 |
+ win32-msvc* { |
209 |
+ LIBS += -lzlib |
210 |
+ } else { |
211 |
|
212 |
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch |
213 |
new file mode 100644 |
214 |
index 00000000000..48c4af7b9c5 |
215 |
--- /dev/null |
216 |
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch |
217 |
@@ -0,0 +1,35 @@ |
218 |
+From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001 |
219 |
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@××××××××.org> |
220 |
+Date: Mon, 26 Sep 2016 13:11:33 +0200 |
221 |
+Subject: [PATCH] Replaced missing QT += webkit, updated linux package list. |
222 |
+ |
223 |
+--- |
224 |
+ ci/travis-linux-install.sh | 3 +-- |
225 |
+ src/QMapControl.pri | 2 +- |
226 |
+ 2 files changed, 2 insertions(+), 3 deletions(-) |
227 |
+ |
228 |
+diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh |
229 |
+index 79975d27..4e83c9bb 100755 |
230 |
+--- a/ci/travis-linux-install.sh |
231 |
++++ b/ci/travis-linux-install.sh |
232 |
+@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa |
233 |
+ sudo apt-get update -qq |
234 |
+ sudo apt-cache search qt |
235 |
+ sudo apt-get -qq install gdb libgdal-dev libproj-dev |
236 |
+-sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake |
237 |
+-sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser |
238 |
++sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser |
239 |
+ qtchooser -list-versions |
240 |
+diff --git a/src/QMapControl.pri b/src/QMapControl.pri |
241 |
+index bbfc09b5..92769565 100644 |
242 |
+--- a/src/QMapControl.pri |
243 |
++++ b/src/QMapControl.pri |
244 |
+@@ -26,7 +26,7 @@ QT += network |
245 |
+ DEFINES += USE_WEBKIT |
246 |
+ SOURCES += browserimagemanager.cpp |
247 |
+ HEADERS += browserimagemanager.h |
248 |
+- QT += webkit |
249 |
++ QT += webenginewidgets |
250 |
+ contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED |
251 |
+ } |
252 |
+ } |
253 |
|
254 |
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch |
255 |
new file mode 100644 |
256 |
index 00000000000..97d76a18764 |
257 |
--- /dev/null |
258 |
+++ b/sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch |
259 |
@@ -0,0 +1,135 @@ |
260 |
+From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001 |
261 |
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@××××××××.org> |
262 |
+Date: Wed, 28 Sep 2016 21:41:02 +0200 |
263 |
+Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed |
264 |
+ conditional. |
265 |
+ |
266 |
+This removes the QWebEngine dependency for most build configurations. |
267 |
+None of the code actually uses it, but there are some plugins that do. |
268 |
+I expect they are all obsolete, but will keep it in until they are |
269 |
+replaced/deemed not working. |
270 |
+--- |
271 |
+ COMPILE.md | 2 +- |
272 |
+ src/Layers/ImageMapLayer.cpp | 2 +- |
273 |
+ src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++-------------- |
274 |
+ src/QMapControl.pri | 14 ++++++-------- |
275 |
+ src/src.pro | 2 +- |
276 |
+ 5 files changed, 24 insertions(+), 25 deletions(-) |
277 |
+ |
278 |
+diff --git a/COMPILE.md b/COMPILE.md |
279 |
+index 9324019d..108a2eee 100644 |
280 |
+--- a/COMPILE.md |
281 |
++++ b/COMPILE.md |
282 |
+@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build: |
283 |
+ | TRANSDIR_MERKAARTOR=<path> | where will the Merkaartor translations be installed | |
284 |
+ | TRANSDIR_SYSTEM=<path> | where your global Qt translation directory is | |
285 |
+ | NODEBUG=1 | release target | |
286 |
+-| NOUSEWEBKIT | disable use of WebKit (Yahoo adapter) | |
287 |
++| USEWEBENGINE=1 | enable use of WebEngine (required for some external plugins) | |
288 |
+ | SYSTEM_QTSA | use system copy of qtsingleapplication instead of internal | |
289 |
+ |
290 |
+ |
291 |
+diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp |
292 |
+index 31966b09..b46199b9 100644 |
293 |
+--- a/src/Layers/ImageMapLayer.cpp |
294 |
++++ b/src/Layers/ImageMapLayer.cpp |
295 |
+@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser |
296 |
+ QDialog dlg; |
297 |
+ ui.setupUi(&dlg); |
298 |
+ dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name())); |
299 |
+- ui.webView->load(u); |
300 |
++ ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString())); |
301 |
+ |
302 |
+ bool OK = false; |
303 |
+ while (!OK) { |
304 |
+diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui |
305 |
+index 3dabd130..dd748e41 100755 |
306 |
+--- a/src/Layers/LicenseDisplayDialog.ui |
307 |
++++ b/src/Layers/LicenseDisplayDialog.ui |
308 |
+@@ -6,8 +6,8 @@ |
309 |
+ <rect> |
310 |
+ <x>0</x> |
311 |
+ <y>0</y> |
312 |
+- <width>650</width> |
313 |
+- <height>400</height> |
314 |
++ <width>786</width> |
315 |
++ <height>171</height> |
316 |
+ </rect> |
317 |
+ </property> |
318 |
+ <property name="windowTitle"> |
319 |
+@@ -15,11 +15,19 @@ |
320 |
+ </property> |
321 |
+ <layout class="QVBoxLayout" name="verticalLayout"> |
322 |
+ <item> |
323 |
+- <widget class="QWebEngineView" name="webView"> |
324 |
+- <property name="url"> |
325 |
+- <url> |
326 |
+- <string>about:blank</string> |
327 |
+- </url> |
328 |
++ <widget class="QLabel" name="label"> |
329 |
++ <property name="text"> |
330 |
++ <string><html><head/><body><p>The content selected is shared under a non-standard license agreement. The full text is available on the following URL. It is your reponsibility to read, understand and agree to the license.</p></body></html></string> |
331 |
++ </property> |
332 |
++ <property name="wordWrap"> |
333 |
++ <bool>true</bool> |
334 |
++ </property> |
335 |
++ </widget> |
336 |
++ </item> |
337 |
++ <item> |
338 |
++ <widget class="QLabel" name="urlLabel"> |
339 |
++ <property name="text"> |
340 |
++ <string>TextLabel</string> |
341 |
+ </property> |
342 |
+ </widget> |
343 |
+ </item> |
344 |
+@@ -39,13 +47,6 @@ |
345 |
+ </item> |
346 |
+ </layout> |
347 |
+ </widget> |
348 |
+- <customwidgets> |
349 |
+- <customwidget> |
350 |
+- <class>QWebEngineView</class> |
351 |
+- <extends>QWidget</extends> |
352 |
+- <header>QWebEngineView</header> |
353 |
+- </customwidget> |
354 |
+- </customwidgets> |
355 |
+ <resources/> |
356 |
+ <connections> |
357 |
+ <connection> |
358 |
+diff --git a/src/QMapControl.pri b/src/QMapControl.pri |
359 |
+index 92769565..3491c8b1 100644 |
360 |
+--- a/src/QMapControl.pri |
361 |
++++ b/src/QMapControl.pri |
362 |
+@@ -21,13 +21,11 @@ SOURCES += \ |
363 |
+ |
364 |
+ QT += network |
365 |
+ |
366 |
+-!contains(NOUSEWEBKIT,1) { |
367 |
+- greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) { |
368 |
+- DEFINES += USE_WEBKIT |
369 |
+- SOURCES += browserimagemanager.cpp |
370 |
+- HEADERS += browserimagemanager.h |
371 |
+- QT += webenginewidgets |
372 |
+- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED |
373 |
+- } |
374 |
++contains(USEWEBENGINE,1) { |
375 |
++ DEFINES += USE_WEBKIT |
376 |
++ SOURCES += browserimagemanager.cpp |
377 |
++ HEADERS += browserimagemanager.h |
378 |
++ QT += webenginewidgets |
379 |
++ contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED |
380 |
+ } |
381 |
+ |
382 |
+diff --git a/src/src.pro b/src/src.pro |
383 |
+index 137d7e14..81a65f34 100644 |
384 |
+--- a/src/src.pro |
385 |
++++ b/src/src.pro |
386 |
+@@ -34,7 +34,7 @@ TEMPLATE = app |
387 |
+ |
388 |
+ CONFIG += rtti stl exceptions |
389 |
+ #CONFIG -= exceptions |
390 |
+-QT += svg network xml core gui webenginewidgets concurrent printsupport |
391 |
++QT += svg network xml core gui concurrent printsupport |
392 |
+ win32-msvc* { |
393 |
+ LIBS += -lzlib |
394 |
+ } else { |
395 |
|
396 |
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
397 |
index c4f7ac66d49..ef8f4c26acf 100644 |
398 |
--- a/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
399 |
+++ b/sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild |
400 |
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar |
401 |
LICENSE="GPL-2" |
402 |
SLOT="0" |
403 |
KEYWORDS="~amd64 ~x86" |
404 |
-IUSE="debug exif gps libproxy" |
405 |
+IUSE="debug exif gps libproxy webengine" |
406 |
|
407 |
RDEPEND=" |
408 |
dev-qt/qtconcurrent:5 |
409 |
@@ -23,7 +23,6 @@ RDEPEND=" |
410 |
dev-qt/qtprintsupport:5 |
411 |
dev-qt/qtsingleapplication[X,qt5(+)] |
412 |
dev-qt/qtsvg:5 |
413 |
- dev-qt/qtwebkit:5 |
414 |
dev-qt/qtwidgets:5 |
415 |
dev-qt/qtxml:5 |
416 |
sci-libs/gdal |
417 |
@@ -32,6 +31,7 @@ RDEPEND=" |
418 |
exif? ( media-gfx/exiv2:= ) |
419 |
gps? ( >=sci-geosciences/gpsd-3.17-r2 ) |
420 |
libproxy? ( net-libs/libproxy ) |
421 |
+ webengine? ( dev-qt/qtwebengine:5 ) |
422 |
" |
423 |
DEPEND="${RDEPEND} |
424 |
dev-qt/linguist-tools:5 |
425 |
@@ -40,6 +40,7 @@ DEPEND="${RDEPEND} |
426 |
PATCHES=( |
427 |
"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826 |
428 |
"${FILESDIR}"/${P}-desktopfile.patch |
429 |
+ "${FILESDIR}"/${P}-webengine{1,2,3}.patch |
430 |
) |
431 |
|
432 |
DOCS=( AUTHORS CHANGELOG ) |
433 |
@@ -78,6 +79,7 @@ src_configure() { |
434 |
GEOIMAGE=$(usex exif 1 0) \ |
435 |
GPSDLIB=$(usex gps 1 0) \ |
436 |
LIBPROXY=$(usex libproxy 1 0) \ |
437 |
+ USEWEBENGINE=$(usex webengine 1 0) \ |
438 |
ZBAR=0 \ |
439 |
Merkaartor.pro |
440 |
} |