From d908a65e136a463552e293fa2735fbebb4f2724f32feec666f8d1ac57d6ac31d Mon Sep 17 00:00:00 2001 From: Nicolas Rochard Date: Wed, 12 Apr 2017 10:19:23 +0000 Subject: [PATCH] Accepting request 487481 from home:bruno_friedmann:branches:Application:Geo - Update to 2.18.6 - Packaging: + remove merged upstream-85a0db2-additionnal-fix-sip.patch + Add full source url + md5 OBS-URL: https://build.opensuse.org/request/show/487481 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=210 --- qgis-2.18.4.tar.bz2 | 3 - qgis-2.18.6.tar.bz2 | 3 + qgis-2.18.6.tar.bz2.md5 | 1 + qgis.changes | 8 + qgis.spec | 12 +- upstream-718581f-fix-sip-4.19.patch | 256 --------------------- upstream-85a0db2-additionnal-fix-sip.patch | 42 ---- 7 files changed, 16 insertions(+), 309 deletions(-) delete mode 100644 qgis-2.18.4.tar.bz2 create mode 100644 qgis-2.18.6.tar.bz2 create mode 100644 qgis-2.18.6.tar.bz2.md5 delete mode 100644 upstream-718581f-fix-sip-4.19.patch delete mode 100644 upstream-85a0db2-additionnal-fix-sip.patch diff --git a/qgis-2.18.4.tar.bz2 b/qgis-2.18.4.tar.bz2 deleted file mode 100644 index c3ff91d..0000000 --- a/qgis-2.18.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94167cdf80b1b7afa726d5dc83617e96e17d5d7ed747053f4227276ed701fc28 -size 94847872 diff --git a/qgis-2.18.6.tar.bz2 b/qgis-2.18.6.tar.bz2 new file mode 100644 index 0000000..10671a2 --- /dev/null +++ b/qgis-2.18.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cce11c255f82b29ddf64a84895f7411159de0fe69e85bb6b0767a0c675b8648 +size 84951747 diff --git a/qgis-2.18.6.tar.bz2.md5 b/qgis-2.18.6.tar.bz2.md5 new file mode 100644 index 0000000..6dfdfd3 --- /dev/null +++ b/qgis-2.18.6.tar.bz2.md5 @@ -0,0 +1 @@ +ea6d736f1b73d3e02867002fa7fabdb1 qgis-2.18.6.tar.bz2 diff --git a/qgis.changes b/qgis.changes index c7fcdcd..d30e167 100644 --- a/qgis.changes +++ b/qgis.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 11 19:06:09 UTC 2017 - bruno@ioda-net.ch + +- Update to 2.18.6 +- Packaging: + + remove merged upstream-85a0db2-additionnal-fix-sip.patch + + Add full source url + md5 + ------------------------------------------------------------------- Thu Mar 2 07:51:52 UTC 2017 - bruno@ioda-net.ch diff --git a/qgis.spec b/qgis.spec index fc454cc..629137d 100644 --- a/qgis.spec +++ b/qgis.spec @@ -17,18 +17,17 @@ Name: qgis -Version: 2.18.4 +Version: 2.18.6 Release: 0 Summary: QGIS is a Geographic Information System (GIS) License: GPL-2.0 Group: Productivity/Graphics/Visualization/Other -Url: http://www.qgis.org/ -Source: %{name}-%{version}.tar.bz2 +Url: https://qgis.org/ +Source: https://qgis.org/downloads/%{name}-%{version}.tar.bz2 +Source4: https://qgis.org/downloads/%{name}-%{version}.tar.bz2.md5 Source1: %{name}.desktop Source2: %{name}.rpmlintrc Source3: qgis_sample_data.zip -# Upstream fixes for sip 4.19 (TW) -Patch0: upstream-85a0db2-additionnal-fix-sip.patch BuildRequires: sqlite-devel >= 3.5 BuildRequires: fdupes # Fix TW dependencies @@ -138,9 +137,6 @@ QGIS sample data with free raster, vector, gps files and a GRASS location from A %prep %setup -q -%if 0%{?suse_version} > 1325 -%patch0 -p1 -%endif %build export CFLAGS="%{optflags}" diff --git a/upstream-718581f-fix-sip-4.19.patch b/upstream-718581f-fix-sip-4.19.patch deleted file mode 100644 index c006d48..0000000 --- a/upstream-718581f-fix-sip-4.19.patch +++ /dev/null @@ -1,256 +0,0 @@ -From 718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb Mon Sep 17 00:00:00 2001 -From: "Juergen E. Fischer" -Date: Sat, 11 Feb 2017 21:02:05 +0100 -Subject: [PATCH] adapt bindings to sip 4.19 (fixes #16071) - ---- - python/analysis/analysis.sip | 1 - - python/analysis/network/networkanalysis.sip | 1 - - python/core/conversions.sip | 6 +++--- - python/core/core.sip | 1 - - python/core/qgscoordinatetransform.sip | 3 ++- - python/core/qgsfeature.sip | 2 +- - python/core/qgspallabeling.sip | 2 +- - python/core/qgsvectorlayerfeatureiterator.sip | 3 ++- - python/core/raster/qgsrasterprojector.sip | 2 +- - python/gui/editorwidgets/qgsdatetimeedit.sip | 3 ++- - python/gui/editorwidgets/qgsdoublespinbox.sip | 1 + - python/gui/editorwidgets/qgsspinbox.sip | 2 +- - python/gui/gui.sip | 1 - - python/gui/qgslonglongvalidator.sip | 4 +++- - python/server/qgswmsconfigparser.sip | 2 +- - python/server/qgswmsprojectparser.sip | 2 +- - python/server/server.sip | 1 - - 17 files changed, 19 insertions(+), 18 deletions(-) - -diff --git a/python/analysis/analysis.sip b/python/analysis/analysis.sip -index ceb5056..bd90e10 100644 ---- a/python/analysis/analysis.sip -+++ b/python/analysis/analysis.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._analysis, -- version=0, - keyword_arguments="Optional") - - %Import QtCore/QtCoremod.sip -diff --git a/python/analysis/network/networkanalysis.sip b/python/analysis/network/networkanalysis.sip -index fb446d1..d2c192b 100644 ---- a/python/analysis/network/networkanalysis.sip -+++ b/python/analysis/network/networkanalysis.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._networkanalysis, -- version=0, - keyword_arguments="Optional") - - %Import QtCore/QtCoremod.sip -diff --git a/python/core/conversions.sip b/python/core/conversions.sip -index 564d4de..f07d3ab 100644 ---- a/python/core/conversions.sip -+++ b/python/core/conversions.sip -@@ -747,7 +747,7 @@ template - - // QMap is implemented as a Python dictionary. - template --%MappedType QMap /DocType="dict-of-qint64-TYPE"/ -+%MappedType QMap - { - %TypeHeaderCode - #include -@@ -1873,7 +1873,7 @@ template - }; - - // QList is implemented as a Python list of QgsField. --%MappedType QList /DocType="list-of-qgsfield"/ -+%MappedType QList - { - %TypeHeaderCode - #include -@@ -1978,7 +1978,7 @@ template - - %If (QVECTORINT_CONVERSION) - // QVector is implemented as a Python list of integers. --%MappedType QVector /DocType="list-of-int"/ -+%MappedType QVector - { - %TypeHeaderCode - #include -diff --git a/python/core/core.sip b/python/core/core.sip -index 577c4c1..8f0b6af 100644 ---- a/python/core/core.sip -+++ b/python/core/core.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._core, -- version=0, - keyword_arguments="Optional") - - %Feature QT5_SUPPORT -diff --git a/python/core/qgscoordinatetransform.sip b/python/core/qgscoordinatetransform.sip -index c14ba53..f9b7854 100644 ---- a/python/core/qgscoordinatetransform.sip -+++ b/python/core/qgscoordinatetransform.sip -@@ -15,6 +15,7 @@ - class QgsCoordinateTransform : QObject - { - %TypeHeaderCode -+extern PyObject *sipExportedExceptions__core[2]; // workaround: sipExportedExceptions__core is only defined in the first sip part - #include - %End - -@@ -215,5 +216,5 @@ class QgsCoordinateTransform : QObject - - signals: - /** Signal when an invalid pj_transform() has occurred */ -- void invalidTransformInput() const; -+ void invalidTransformInput() const; - }; -diff --git a/python/core/qgsfeature.sip b/python/core/qgsfeature.sip -index 596f8a8..4009b50 100644 ---- a/python/core/qgsfeature.sip -+++ b/python/core/qgsfeature.sip -@@ -4,7 +4,7 @@ typedef QMap QgsAttributeMap; - typedef QVector QgsAttributes; - - // QgsAttributes is implemented as a Python list of Python objects. --%MappedType QgsAttributes /DocType="list-of-attributes"/ -+%MappedType QgsAttributes - { - %TypeHeaderCode - #include -diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip -index 488b58b..3d99555 100644 ---- a/python/core/qgspallabeling.sip -+++ b/python/core/qgspallabeling.sip -@@ -1,5 +1,5 @@ - // QMap is implemented as a Python dictionary. --%MappedType QMap /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined*"/ -+%MappedType QMap - { - %TypeHeaderCode - #include -diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip -index 0685e20..ad3431c 100644 ---- a/python/core/qgsvectorlayerfeatureiterator.sip -+++ b/python/core/qgsvectorlayerfeatureiterator.sip -@@ -70,5 +70,6 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator - //void updateFeatureGeometry( QgsFeature& f ); - - private: -- QgsVectorLayerFeatureIterator(); -+ QgsVectorLayerFeatureIterator( const QgsVectorLayerFeatureIterator &rhs ); -+ - }; -diff --git a/python/core/raster/qgsrasterprojector.sip b/python/core/raster/qgsrasterprojector.sip -index 47bb697..40b9a10 100644 ---- a/python/core/raster/qgsrasterprojector.sip -+++ b/python/core/raster/qgsrasterprojector.sip -@@ -55,7 +55,7 @@ class QgsRasterProjector : QgsRasterInterface - - int bandCount() const; - -- int dataType( int bandNo ) const; -+ QGis::DataType dataType( int bandNo ) const; - - /** \brief set source and destination CRS */ - void setCRS( const QgsCoordinateReferenceSystem & theSrcCRS, const QgsCoordinateReferenceSystem & theDestCRS, -diff --git a/python/gui/editorwidgets/qgsdatetimeedit.sip b/python/gui/editorwidgets/qgsdatetimeedit.sip -index deda76d..be658a1 100644 ---- a/python/gui/editorwidgets/qgsdatetimeedit.sip -+++ b/python/gui/editorwidgets/qgsdatetimeedit.sip -@@ -37,6 +37,7 @@ class QgsDateTimeEdit : QDateTimeEdit - - protected: - virtual void resizeEvent( QResizeEvent* event ); -- - void mousePressEvent( QMouseEvent*event ); -+ virtual void fixup(QString & input) const; -+ virtual QValidator::State validate(QString &text, int &pos) const; - }; -diff --git a/python/gui/editorwidgets/qgsdoublespinbox.sip b/python/gui/editorwidgets/qgsdoublespinbox.sip -index 1666a02..58f589d 100644 ---- a/python/gui/editorwidgets/qgsdoublespinbox.sip -+++ b/python/gui/editorwidgets/qgsdoublespinbox.sip -@@ -80,4 +80,5 @@ class QgsDoubleSpinBox : QDoubleSpinBox - protected: - virtual void changeEvent( QEvent* event ); - virtual void paintEvent( QPaintEvent* event ); -+ virtual void fixup(QString & input) const; - }; -diff --git a/python/gui/editorwidgets/qgsspinbox.sip b/python/gui/editorwidgets/qgsspinbox.sip -index d560641..c953470 100644 ---- a/python/gui/editorwidgets/qgsspinbox.sip -+++ b/python/gui/editorwidgets/qgsspinbox.sip -@@ -78,7 +78,7 @@ class QgsSpinBox : QSpinBox - virtual QValidator::State validate( QString & input, int & pos ) const; - - protected: -- - virtual void changeEvent( QEvent* event ); - virtual void paintEvent( QPaintEvent* event ); -+ virtual void fixup(QString &input) const; - }; -diff --git a/python/gui/gui.sip b/python/gui/gui.sip -index 240c636..727ac707f 100644 ---- a/python/gui/gui.sip -+++ b/python/gui/gui.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._gui, -- version=0, - keyword_arguments="Optional") - - %Feature HAVE_QSCI_SIP -diff --git a/python/gui/qgslonglongvalidator.sip b/python/gui/qgslonglongvalidator.sip -index 9def830..7500357 100644 ---- a/python/gui/qgslonglongvalidator.sip -+++ b/python/gui/qgslonglongvalidator.sip -@@ -8,7 +8,7 @@ class QgsLongLongValidator : QValidator - QgsLongLongValidator( qint64 bottom, qint64 top, QObject *parent ); - ~QgsLongLongValidator(); - -- QValidator::State validate( QString &input, int& ) const; -+ virtual QValidator::State validate( QString &input, int& ) const; - - void setBottom( qint64 bottom ); - void setTop( qint64 top ); -@@ -17,4 +17,6 @@ class QgsLongLongValidator : QValidator - - qint64 bottom() const; - qint64 top() const; -+ -+ virtual void fixup(QString &input) const; - }; -diff --git a/python/server/qgswmsconfigparser.sip b/python/server/qgswmsconfigparser.sip -index f05752c..d231637 100644 ---- a/python/server/qgswmsconfigparser.sip -+++ b/python/server/qgswmsconfigparser.sip -@@ -115,7 +115,7 @@ class QgsWMSConfigParser - virtual void setScaleDenominator( double denom ) = 0; - virtual void addExternalGMLData( const QString& layerName, QDomDocument* gmlDoc ) = 0; - -- virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0; -+ // virtual QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const = 0; - - virtual int nLayers() const = 0; - -diff --git a/python/server/qgswmsprojectparser.sip b/python/server/qgswmsprojectparser.sip -index f6dd579..13fea73 100644 ---- a/python/server/qgswmsprojectparser.sip -+++ b/python/server/qgswmsprojectparser.sip -@@ -63,7 +63,7 @@ class QgsWMSProjectParser : public QgsWMSConfigParser - void setScaleDenominator( double ) /*override*/; - void addExternalGMLData( const QString&, QDomDocument* ) /*override*/ ; - -- QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ; -+ // QList< QPair< QString, QgsLayerCoordinateTransform > > layerCoordinateTransforms() const /*override*/ ; - - /** Fills a layer and a style list. The two list have the same number of entries and the style and the layer at a position belong together (similar to the HTTP parameters 'Layers' and 'Styles'. Returns 0 in case of success*/ - int layersAndStyles( QStringList& layers, QStringList& styles ) const /*override*/ ; -diff --git a/python/server/server.sip b/python/server/server.sip -index 537cd0b..355d3fa 100644 ---- a/python/server/server.sip -+++ b/python/server/server.sip -@@ -1,5 +1,4 @@ - %Module(name=qgis._server, -- version=0, - keyword_arguments="Optional") - - diff --git a/upstream-85a0db2-additionnal-fix-sip.patch b/upstream-85a0db2-additionnal-fix-sip.patch deleted file mode 100644 index 4b2ab4f..0000000 --- a/upstream-85a0db2-additionnal-fix-sip.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 85a0db24f32351f6096cd8282f03ad5c2f4e6ef5 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -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' 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 &errors ); - #endif - -- private: -+ protected: - ~QgsFileDownloader(); -+ -+ private: - /** - * Abort current request and show an error if the instance has GUI - * notifications enabled.