diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-27 23:40:35 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-28 09:40:42 +0200 |
commit | 8e871b28114deab128c97103f0f7743fe6b6d7ff (patch) | |
tree | 4986e2bcbc65ebb897bc61ed51535bff9513fcb8 /sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch | |
parent | sci-geosciences/qgis: 2.18.14 version bump, switch to https (diff) | |
download | gentoo-8e871b28114deab128c97103f0f7743fe6b6d7ff.tar.gz gentoo-8e871b28114deab128c97103f0f7743fe6b6d7ff.tar.bz2 gentoo-8e871b28114deab128c97103f0f7743fe6b6d7ff.zip |
sci-geosciences/qgis: Drop obsolete patches
Package-Manager: Portage-2.3.12, Repoman-2.3.4
Diffstat (limited to 'sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch')
-rw-r--r-- | sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch b/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch deleted file mode 100644 index ff8989227f69..000000000000 --- a/sci-geosciences/qgis/files/qgis-2.18.3-sip-4.19.1.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 ---- a/python/core/core.sip -+++ b/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 ---- a/src/gui/qgsfiledownloader.h -+++ b/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. |