gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sci-geosciences/merkaartor: Drop 0.18.3-r4

Browse Source 
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2020-04-10 11:26:17 +02:00
parent fc8df273ff
commit 74efd9738e
7 changed files with 0 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sci-geosciences/merkaartor/Manifest
View File

@@ -1,2 +1 @@
DIST merkaartor-0.18.3.tar.gz 7104234 BLAKE2B e7d84297452ad20daf2ab18c4aef3736758d98e6f839be1152651aa0196ccee2983d89935f121d4436245d7fdd1fa6b97cd99e6a154158cad4751eba02819a74 SHA512 b34087e0317c196b59dd1de57778b9293d23e4530bd5734661dc2ce53eef85317f512ee446056e045aa8a06146bd029d6274fa5a6f68128db27795d44f0ef915
DIST merkaartor-0.18.4.tar.gz 6562065 BLAKE2B 2dbd85c81f337138b249807dcb404b9167cc63bec51cc19afa95b088733375bec234df75fef2652864c811ff6d9927c93f16df42044be3706b68332fcd817706 SHA512 16001688584fd13eb7573159092a21ed0189ae0ce900474bacd5b1e47b8cebb0c4b2bd5b904e13a0029ec01167b68a32a9936914b3f5a1360b389aa31858cf9c

30
sci-geosciences/merkaartor/files/merkaartor-0.18.3-desktopfile.patch
View File

@@ -1,30 +0,0 @@
From 85ee9b1855bf3256daf4decd1f25021c1a28abdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Sat, 19 May 2018 13:43:24 +0200
Subject: [PATCH] Renamed merkaartor.desktop to
org.merkaartor.merkaartor.desktop
A possible solution for issue #150.
---
src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} | 0
src/src.pro | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
rename src/{merkaartor.desktop => org.merkaartor.merkaartor.desktop} (100%)
diff --git a/src/merkaartor.desktop b/src/org.merkaartor.merkaartor.desktop
similarity index 100%
rename from src/merkaartor.desktop
rename to src/org.merkaartor.merkaartor.desktop
diff --git a/src/src.pro b/src/src.pro
index 81a65f34..477c459e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -289,7 +289,7 @@ contains(SANITIZE, 2) {
unix:!macx {
desktop.path = $${PREFIX}/share/applications
- desktop.files = merkaartor.desktop
+ desktop.files = org.merkaartor.merkaartor.desktop
desktopicon8x8.path = $${PREFIX}/share/icons/hicolor/8x8/apps/
desktopicon8x8.files = $$PWD/../Icons/8x8/merkaartor.png
desktopicon16x16.path = $${PREFIX}/share/icons/hicolor/16x16/apps/

12
sci-geosciences/merkaartor/files/merkaartor-0.18.3-exiv2-0.27.1.patch
View File

@@ -1,12 +0,0 @@
--- a/src/Docks/GeoImageDock.h 2016-09-06 00:29:45.000000000 +0200
+++ b/src/Docks/GeoImageDock.h 2019-07-01 19:20:43.450789475 +0200
@@ -7,8 +7,7 @@
#include <QDockWidget>
#include <QMouseEvent>
#include <QShortcut>
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
#include <QDrag>
class ImageView;

186
sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine1.patch
View File

@@ -1,186 +0,0 @@
From df515ecf4e6ce1a249af299840e82126c68fcf91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Mon, 26 Sep 2016 13:02:57 +0200
Subject: [PATCH] Updated QWeb to QWebView.
---
src/Layers/LicenseDisplayDialog.ui | 6 +++---
src/QMapControl/browserimagemanager.cpp | 20 +++++++++-----------
src/QMapControl/browserimagemanager.h | 17 ++++++-----------
src/src.pro | 2 +-
4 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
index 103816c6..3dabd130 100755
--- a/src/Layers/LicenseDisplayDialog.ui
+++ b/src/Layers/LicenseDisplayDialog.ui
@@ -15,7 +15,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QWebView" name="webView">
+ <widget class="QWebEngineView" name="webView">
<property name="url">
<url>
<string>about:blank</string>
@@ -41,9 +41,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>QWebView</class>
+ <class>QWebEngineView</class>
<extends>QWidget</extends>
- <header>QtWebKit/QWebView</header>
+ <header>QWebEngineView</header>
</customwidget>
</customwidgets>
<resources/>
diff --git a/src/QMapControl/browserimagemanager.cpp b/src/QMapControl/browserimagemanager.cpp
index 468cf2b6..4021d40f 100644
--- a/src/QMapControl/browserimagemanager.cpp
+++ b/src/QMapControl/browserimagemanager.cpp
@@ -47,9 +47,8 @@ void BrowserWebPage::javaScriptConsoleMessage ( const QString & message, int lin
//printf("%s\n", s);
}
-void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
+void BrowserWebPage::javaScriptAlert ( const QString & msg )
{
- Q_UNUSED(frame)
//QMessageBox::information(NULL, tr("Javascript alert"), msg);
if (msg.startsWith("Coord")) {
@@ -105,8 +104,10 @@ void BrowserWebPage::javaScriptAlert ( QWebFrame * frame, const QString & msg )
void BrowserWebPage::launchRequest ( const QUrl & url )
{
+ qDebug() << "Warning: you are using BrowserWebPage to render background imagery. "<<
+ "This code is not tested and may not work as expected. If you experience issues, please let us know.";
sw = sh = 0;
- mainFrame()->load(url);
+ load(url);
}
BrowserImageManager* BrowserImageManager::m_BrowserImageManagerInstance = 0;
@@ -138,8 +139,6 @@ BrowserImageManager::BrowserImageManager(QObject* parent)
}
page = new BrowserWebPage();
- page->setNetworkAccessManager(m_networkManager);
- page->setViewportSize(QSize(1024, 1024));
connect(page, SIGNAL(loadFinished(bool)), this, SLOT(pageLoadFinished(bool)));
@@ -220,7 +219,6 @@ void BrowserImageManager::launchRequest()
QUrl u = QUrl( R.url);
- page->networkAccessManager()->setProxy(M_PREFS->getProxy(u));
page->launchRequest(u);
requestActive = true;
#ifndef BROWSERIMAGEMANAGER_IS_THREADED
@@ -246,7 +244,7 @@ void BrowserImageManager::pageLoadFinished(bool ok)
qDebug() << "BrowserImageManager::pageLoadFinished: " << " Hash: " << R.hash;
QPixmap pt(page->sw, page->sh);
QPainter P(&pt);
- page->mainFrame()->render(&P, QRegion(0,0,page->sw,page->sh));
+ page->view()->render(&P, QPoint(), QRegion(0,0,page->sw,page->sh));
P.end();
// if (page->sw != BROWSER_TILE_SIZE || page->sh != BROWSER_TILE_SIZE) {
@@ -319,7 +317,7 @@ void BrowserImageManager::loadingQueueEmpty()
void BrowserImageManager::abortLoading()
{
//qDebug() << "BrowserImageManager::abortLoading";
- page->triggerAction(QWebPage::Stop);
+ page->triggerAction(QWebEnginePage::Stop);
if (!loadingRequests.isEmpty()) {
LoadingRequest R = loadingRequests.dequeue();
loadingRequests.clear();
@@ -331,7 +329,7 @@ void BrowserImageManager::abortLoading()
#ifdef BROWSERIMAGEMANAGER_IS_THREADED
void BrowserImageManager::run()
{
- page = new BrowserWebPage();
+ page = new BrowserWebEnginePage();
page->setViewportSize(QSize(1024, 1024));
QTimer theTimer;
@@ -354,7 +352,7 @@ void BrowserImageManager::checkRequests()
} else {
if ((requestDuration++) > 100) {
requestDuration = 0;
- page->triggerAction(QWebPage::Stop);
+ page->triggerAction(QWebEnginePage::Stop);
qDebug() << "BrowserImageManager Timeout";
}
}
@@ -365,7 +363,7 @@ void BrowserImageManager::checkRequests()
void BrowserImageManager::timeout()
{
qDebug() << "BrowserImageManager::timeout";
- page->triggerAction(QWebPage::Stop);
+ page->triggerAction(QWebEnginePage::Stop);
pageLoadFinished(false);
}
#endif // BROWSERIMAGEMANAGER_IS_THREADED
diff --git a/src/QMapControl/browserimagemanager.h b/src/QMapControl/browserimagemanager.h
index 10f8a477..ca846e31 100644
--- a/src/QMapControl/browserimagemanager.h
+++ b/src/QMapControl/browserimagemanager.h
@@ -24,14 +24,10 @@
#include <QPixmap>
#include <QtNetwork/QtNetwork>
-#include <QWebFrame>
-#include "qwebhistory.h"
-#include "qwebhistoryinterface.h"
-#include "qwebkitglobal.h"
-#include "qwebpage.h"
-#include "qwebpluginfactory.h"
-#include "qwebsettings.h"
-#include "qwebview.h"
+#include <QWebEnginePage>
+#include <QWebEngineHistory>
+#include <QWebEngineSettings>
+#include <QWebEngineView>
#include <QThread>
@@ -41,13 +37,13 @@
@author Chris Browet <cbro@semperpax.com>
*/
-class BrowserWebPage : public QWebPage
+class BrowserWebPage : public QWebEnginePage
{
friend class BrowserImageManager;
protected:
virtual void javaScriptConsoleMessage ( const QString & message, int lineNumber, const QString & sourceID );
- virtual void javaScriptAlert ( QWebFrame * frame, const QString & msg ) ;
+ virtual void javaScriptAlert ( const QString & msg ) ;
void launchRequest ( const QUrl & url );
private:
@@ -116,7 +112,6 @@ class BrowserImageManager : public QObject, public IImageManager
static BrowserImageManager* m_BrowserImageManagerInstance;
BrowserWebPage* page;
- QWebFrame *frame;
QNetworkAccessManager* qnam;
signals:
diff --git a/src/src.pro b/src/src.pro
index eb93b263..137d7e14 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -34,7 +34,7 @@ TEMPLATE = app
CONFIG += rtti stl exceptions
#CONFIG -= exceptions
-QT += svg network xml core gui webkitwidgets concurrent printsupport
+QT += svg network xml core gui webenginewidgets concurrent printsupport
win32-msvc* {
LIBS += -lzlib
} else {

35
sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine2.patch
View File

@@ -1,35 +0,0 @@
From 20edcc7e85413e60ff180bd9f20e5428e5729222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Mon, 26 Sep 2016 13:11:33 +0200
Subject: [PATCH] Replaced missing QT += webkit, updated linux package list.
---
ci/travis-linux-install.sh | 3 +--
src/QMapControl.pri | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ci/travis-linux-install.sh b/ci/travis-linux-install.sh
index 79975d27..4e83c9bb 100755
--- a/ci/travis-linux-install.sh
+++ b/ci/travis-linux-install.sh
@@ -8,6 +8,5 @@ sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
sudo apt-get update -qq
sudo apt-cache search qt
sudo apt-get -qq install gdb libgdal-dev libproj-dev
-sudo apt-get -qq install libqt4-xml libqt4-network libqt4-gui libqt4-svg libqt4-webkit libqt4-dev qt4-qmake
-sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webkit5* libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
+sudo apt-get -qq install libqt5xml5* libqt5network5* libqt5gui5* libqt5svg5* libqt5webengine5{,-dev} libqt5quick5* qtdeclarative5-dev qttools5-dev qtbase5-dev qt5-qmake qtchooser
qtchooser -list-versions
diff --git a/src/QMapControl.pri b/src/QMapControl.pri
index bbfc09b5..92769565 100644
--- a/src/QMapControl.pri
+++ b/src/QMapControl.pri
@@ -26,7 +26,7 @@ QT += network
DEFINES += USE_WEBKIT
SOURCES += browserimagemanager.cpp
HEADERS += browserimagemanager.h
- QT += webkit
+ QT += webenginewidgets
contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
}
}

135
sci-geosciences/merkaartor/files/merkaartor-0.18.3-webengine3.patch
View File

@@ -1,135 +0,0 @@
From 3019f1d2c76a0ae0c51e70d34bc25a49cb030845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos@krakonos.org>
Date: Wed, 28 Sep 2016 21:41:02 +0200
Subject: [PATCH] Removed webengine from LicenseDisplayDialog and renamed
conditional.
This removes the QWebEngine dependency for most build configurations.
None of the code actually uses it, but there are some plugins that do.
I expect they are all obsolete, but will keep it in until they are
replaced/deemed not working.
---
COMPILE.md | 2 +-
src/Layers/ImageMapLayer.cpp | 2 +-
src/Layers/LicenseDisplayDialog.ui | 29 +++++++++++++++--------------
src/QMapControl.pri | 14 ++++++--------
src/src.pro | 2 +-
5 files changed, 24 insertions(+), 25 deletions(-)
diff --git a/COMPILE.md b/COMPILE.md
index 9324019d..108a2eee 100644
--- a/COMPILE.md
+++ b/COMPILE.md
@@ -151,7 +151,7 @@ There are some parameters you can pass to qmake to customize build:
| TRANSDIR_MERKAARTOR=<path> | where will the Merkaartor translations be installed |
| TRANSDIR_SYSTEM=<path> | where your global Qt translation directory is |
| NODEBUG=1 | release target |
-| NOUSEWEBKIT | disable use of WebKit (Yahoo adapter) |
+| USEWEBENGINE=1 | enable use of WebEngine (required for some external plugins) |
| SYSTEM_QTSA | use system copy of qtsingleapplication instead of internal |
diff --git a/src/Layers/ImageMapLayer.cpp b/src/Layers/ImageMapLayer.cpp
index 31966b09..b46199b9 100644
--- a/src/Layers/ImageMapLayer.cpp
+++ b/src/Layers/ImageMapLayer.cpp
@@ -263,7 +263,7 @@ void ImageMapLayer::setMapAdapter(const QUuid& theAdapterUid, const QString& ser
QDialog dlg;
ui.setupUi(&dlg);
dlg.setWindowTitle(tr("Licensing Terms: %1").arg(name()));
- ui.webView->load(u);
+ ui.urlLabel->setText(QString("<a href='%1'>%2</a>").arg(u.toString()).arg(u.toString()));
bool OK = false;
while (!OK) {
diff --git a/src/Layers/LicenseDisplayDialog.ui b/src/Layers/LicenseDisplayDialog.ui
index 3dabd130..dd748e41 100755
--- a/src/Layers/LicenseDisplayDialog.ui
+++ b/src/Layers/LicenseDisplayDialog.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>650</width>
- <height>400</height>
+ <width>786</width>
+ <height>171</height>
</rect>
</property>
<property name="windowTitle">
@@ -15,11 +15,19 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <widget class="QWebEngineView" name="webView">
- <property name="url">
- <url>
- <string>about:blank</string>
- </url>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="urlLabel">
+ <property name="text">
+ <string>TextLabel</string>
</property>
</widget>
</item>
@@ -39,13 +47,6 @@
</item>
</layout>
</widget>
- <customwidgets>
- <customwidget>
- <class>QWebEngineView</class>
- <extends>QWidget</extends>
- <header>QWebEngineView</header>
- </customwidget>
- </customwidgets>
<resources/>
<connections>
<connection>
diff --git a/src/QMapControl.pri b/src/QMapControl.pri
index 92769565..3491c8b1 100644
--- a/src/QMapControl.pri
+++ b/src/QMapControl.pri
@@ -21,13 +21,11 @@ SOURCES += \
QT += network
-!contains(NOUSEWEBKIT,1) {
- greaterThan(QT_VER_MAJ, 3) : greaterThan(QT_VER_MIN, 3) {
- DEFINES += USE_WEBKIT
- SOURCES += browserimagemanager.cpp
- HEADERS += browserimagemanager.h
- QT += webenginewidgets
- contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
- }
+contains(USEWEBENGINE,1) {
+ DEFINES += USE_WEBKIT
+ SOURCES += browserimagemanager.cpp
+ HEADERS += browserimagemanager.h
+ QT += webenginewidgets
+ contains(THREADED_BROWSERIMAGEMANAGER,1): DEFINES += BROWSERIMAGEMANAGER_IS_THREADED
}
diff --git a/src/src.pro b/src/src.pro
index 137d7e14..81a65f34 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -34,7 +34,7 @@ TEMPLATE = app
CONFIG += rtti stl exceptions
#CONFIG -= exceptions
-QT += svg network xml core gui webenginewidgets concurrent printsupport
+QT += svg network xml core gui concurrent printsupport
win32-msvc* {
LIBS += -lzlib
} else {

99
sci-geosciences/merkaartor/merkaartor-0.18.3-r4.ebuild
View File

@@ -1,99 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PLOCALES="ar cs de en es et fr hr hu id_ID it ja nl pl pt_BR pt ru sk sv uk vi zh_CN zh_TW"
inherit flag-o-matic l10n qmake-utils xdg-utils
DESCRIPTION="Qt based map editor for the openstreetmap.org project"
HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug exif gps libproxy webengine"
BDEPEND="
dev-qt/linguist-tools:5
virtual/pkgconfig
"
DEPEND="
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtprintsupport:5
dev-qt/qtsingleapplication[X,qt5(+)]
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
sci-libs/gdal
sci-libs/proj
sys-libs/zlib
exif? ( media-gfx/exiv2:= )
gps? ( >=sci-geosciences/gpsd-3.17-r2:= )
libproxy? ( net-libs/libproxy )
webengine? ( dev-qt/qtwebengine:5[widgets] )
"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-sharedir-pluginsdir.patch # bug 621826
"${FILESDIR}"/${P}-desktopfile.patch
"${FILESDIR}"/${P}-webengine{1,2,3}.patch
"${FILESDIR}"/${P}-exiv2-0.27.1.patch # bug 689098
)
DOCS=( AUTHORS CHANGELOG )
src_prepare() {
default
rm -r 3rdparty || die "Failed to remove bundled libs"
my_rm_loc() {
sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
rm "translations/${PN}_${1}.ts" || die
}
if [[ -n "$(l10n_get_locales)" ]]; then
l10n_for_each_disabled_locale_do my_rm_loc
$(qt5_get_bindir)/lrelease src/src.pro || die
fi
# build system expects to be building from git
sed -i src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g" || die
}
src_configure() {
append-flags -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
# TRANSDIR_SYSTEM is for bug #385671
eqmake5 \
PREFIX="${ED}/usr" \
LIBDIR="${ED}/usr/$(get_libdir)" \
PLUGINS_DIR="/usr/$(get_libdir)/${PN}/plugins" \
SHARE_DIR_PATH="/usr/share/${PN}" \
TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
SYSTEM_QTSA=1 \
RELEASE=1 \
NODEBUG=$(usex debug 0 1) \
GEOIMAGE=$(usex exif 1 0) \
GPSDLIB=$(usex gps 1 0) \
LIBPROXY=$(usex libproxy 1 0) \
USEWEBENGINE=$(usex webengine 1 0) \
ZBAR=0 \
Merkaartor.pro
}
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
}
pkg_postrm() {
xdg_desktop_database_update
xdg_icon_cache_update
}