diff options
| author | tcberner <tcberner@FreeBSD.org> | 2017-04-30 18:07:23 +0800 |
|---|---|---|
| committer | tcberner <tcberner@FreeBSD.org> | 2017-04-30 18:07:23 +0800 |
| commit | a10b20936507869f5c602054ddc8aef5d0cd759f (patch) | |
| tree | 14a76c1351a42a41d3f48c96da3e0b221f278796 /graphics | |
| parent | a05611c310beba6a3c8e6804fc08fe199de8c98f (diff) | |
| download | freebsd-ports-gnome-a10b20936507869f5c602054ddc8aef5d0cd759f.tar.gz freebsd-ports-gnome-a10b20936507869f5c602054ddc8aef5d0cd759f.tar.zst freebsd-ports-gnome-a10b20936507869f5c602054ddc8aef5d0cd759f.zip | |
Update py-sip to 4.19.2, py-qt4 to 4.12 and py-qt5 to 5.7.1
* This is mostly based on the work by Adriaan de Groot <groot@kde.org> in our development repo.
PR: 217305
PR: 218539
Submitted by: Adriaan de Groot <groot@kde.org>
Reviewed by: rakuco, mat
Approved by: rakuco (mentor)
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D9771
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/qgis/files/patch-gentoogit_d9559d0_qgis-2.18.3-sip-4.19.1 | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/graphics/qgis/files/patch-gentoogit_d9559d0_qgis-2.18.3-sip-4.19.1 b/graphics/qgis/files/patch-gentoogit_d9559d0_qgis-2.18.3-sip-4.19.1 new file mode 100644 index 000000000000..2dc8444c768c --- /dev/null +++ b/graphics/qgis/files/patch-gentoogit_d9559d0_qgis-2.18.3-sip-4.19.1 @@ -0,0 +1,44 @@ +Obtained from: https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-geosciences/qgis + +From 85a0db24f32351f6096cd8282f03ad5c2f4e6ef5 Mon Sep 17 00:00:00 2001 +From: Sandro Mani <manisandro@gmail.com> +Date: Wed, 1 Mar 2017 16:12:38 +0100 +Subject: [PATCH] Fix build against recent sip/PyQt4: + +qgsfiledownloader.sip:33:0: +src/gui/qgsfiledownloader.h:94:5: error: overriding non-deleted function 'virtual QgsFileDownloader::~QgsFileDownloader()' + +RuntimeError: qgis._core cannot import type 'QList<QVariant>' from PyQt4.QtCore +--- + python/core/core.sip | 1 + + src/gui/qgsfiledownloader.h | 4 +++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/python/core/core.sip b/python/core/core.sip +index 8f0b6af..41f5450 100644 +--- python/core/core.sip ++++ python/core/core.sip +@@ -3,6 +3,7 @@ + + %Feature QT5_SUPPORT + ++%Import QtCore/QtCoremod.sip + %Import QtXml/QtXmlmod.sip + %Import QtNetwork/QtNetworkmod.sip + %Import QtSql/QtSqlmod.sip +diff --git a/src/gui/qgsfiledownloader.h b/src/gui/qgsfiledownloader.h +index c9276f7..841e4b6 100644 +--- src/gui/qgsfiledownloader.h ++++ src/gui/qgsfiledownloader.h +@@ -90,8 +90,10 @@ class GUI_EXPORT QgsFileDownloader : public QObject + void onSslErrors( QNetworkReply *reply, const QList<QSslError> &errors ); + #endif + +- private: ++ protected: + ~QgsFileDownloader(); ++ ++ private: + /** + * Abort current request and show an error if the instance has GUI + * notifications enabled. |