From e756dbbffdde6b059ebe332c8ba2ab99e5bdbf62 Mon Sep 17 00:00:00 2001 From: Volker Froehlich Date: Sun, 26 Feb 2017 11:00:06 +0100 Subject: [PATCH] New upstream release 2.18.4 Remove older patches from repo too --- .gitignore | 1 + qgis-2.12.0-arm.patch | 13 -- qgis-2.14.0-mssql-attributes.patch | 43 ----- qgis-2.18.2-sip419.patch | 256 ----------------------------- qgis-qreal.patch | 24 --- qgis.spec | 12 +- sources | 2 +- 7 files changed, 7 insertions(+), 344 deletions(-) delete mode 100644 qgis-2.12.0-arm.patch delete mode 100644 qgis-2.14.0-mssql-attributes.patch delete mode 100644 qgis-2.18.2-sip419.patch delete mode 100644 qgis-qreal.patch diff --git a/.gitignore b/.gitignore index 09273c9..3b99dc5 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ qgis_1.5.0.tar.gz /qgis-2.18.0.tar.bz2 /qgis-2.18.1.tar.bz2 /qgis-2.18.2.tar.bz2 +/qgis-2.18.4.tar.bz2 diff --git a/qgis-2.12.0-arm.patch b/qgis-2.12.0-arm.patch deleted file mode 100644 index 47e315e..0000000 --- a/qgis-2.12.0-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp -index 4a42a6d..5a4b975 100644 ---- a/src/app/qgswelcomepageitemsmodel.cpp -+++ b/src/app/qgswelcomepageitemsmodel.cpp -@@ -114,7 +114,7 @@ QSize QgsWelcomePageItemDelegate::sizeHint( const QStyleOptionViewItem & option, - index.data( QgsWelcomePageItemsModel::CrsRole ).toString() ) ); - doc.setTextWidth( width - ( !icon.isNull() ? icon.width() + 35 : 35 ) ); - -- return QSize( width, qMax( doc.size().height() + 10, ( double )icon.height() ) + 20 ); -+ return QSize( width, qMax( ( double ) doc.size().height() + 10, ( double )icon.height() ) + 20 ); - } - - QgsWelcomePageItemsModel::QgsWelcomePageItemsModel( QObject* parent ) diff --git a/qgis-2.14.0-mssql-attributes.patch b/qgis-2.14.0-mssql-attributes.patch deleted file mode 100644 index 7e44621..0000000 --- a/qgis-2.14.0-mssql-attributes.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 30449e577f0cd432bd8c60787743fba54c1e51b9 Mon Sep 17 00:00:00 2001 -From: Nyall Dawson -Date: Thu, 3 Mar 2016 10:34:32 +1100 -Subject: [PATCH] Fix fetching subset of attributes with mssql (fix #14402), - add test - ---- - src/providers/mssql/qgsmssqlfeatureiterator.cpp | 2 +- - tests/src/python/providertestbase.py | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp -index 53214d4..560d344 100644 ---- a/src/providers/mssql/qgsmssqlfeatureiterator.cpp -+++ b/src/providers/mssql/qgsmssqlfeatureiterator.cpp -@@ -284,7 +284,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature ) - for ( int i = 0; i < mAttributesToFetch.count(); i++ ) - { - QVariant v = mQuery->value( i ); -- const QgsField &fld = mSource->mFields.at( i ); -+ const QgsField &fld = mSource->mFields.at( mAttributesToFetch.at( i ) ); - if ( v.type() != fld.type() ) - v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() ); - feature.setAttribute( mAttributesToFetch.at( i ), v ); -diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py -index 7b8707e..26e6d86 100644 ---- a/tests/src/python/providertestbase.py -+++ b/tests/src/python/providertestbase.py -@@ -384,3 +384,14 @@ def testClosedIterators(self): - - # Test rewinding closed iterator - self.assertFalse(f_it.rewind(), 'Rewinding closed iterator successful, should not be allowed') -+ -+ def testGetFeaturesSubsetAttributes(self): -+ """ Test that expected results are returned when using subsets of attributes """ -+ -+ tests = {'pk': set([1, 2, 3, 4, 5]), -+ 'cnt': set([-200, 300, 100, 200, 400]), -+ 'name': set(['Pear', 'Orange', 'Apple', 'Honey', NULL]), -+ 'name2': set(['NuLl', 'PEaR', 'oranGe', 'Apple', 'Honey'])} -+ for field, expected in tests.iteritems(): -+ result = set([f[field] for f in self.provider.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([field], self.provider.fields()))]) -+ self.assertEqual(result, expected, 'Expected {}, got {}'.format(expected, result)) diff --git a/qgis-2.18.2-sip419.patch b/qgis-2.18.2-sip419.patch deleted file mode 100644 index 5f64293..0000000 --- a/qgis-2.18.2-sip419.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/qgis-qreal.patch b/qgis-qreal.patch deleted file mode 100644 index 8dfc1be..0000000 --- a/qgis-qreal.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up qgis-2.16.2/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp.qreal qgis-2.16.2/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp ---- qgis-2.16.2/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp.qreal 2016-08-26 05:58:37.000000000 -0600 -+++ qgis-2.16.2/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp 2016-09-26 14:27:41.330518186 -0600 -@@ -414,15 +414,15 @@ void QgsVectorGradientColorRampV2Dialog: - QColor newColor = mStopEditor->selectedStop().color; - - if ( mCurrentPlotColorComponent == 0 ) -- newColor = QColor::fromHslF( qBound( 0.0, point.y(), 1.0 ), newColor.hslSaturationF(), newColor.lightnessF(), newColor.alphaF() ); -+ newColor = QColor::fromHslF( qBound( qreal( 0.0 ), point.y(), qreal( 1.0 ) ), newColor.hslSaturationF(), newColor.lightnessF(), newColor.alphaF() ); - else if ( mCurrentPlotColorComponent == 1 ) -- newColor = QColor::fromHslF( newColor.hslHueF(), newColor.hslSaturationF(), qBound( 0.0, point.y(), 1.0 ), newColor.alphaF() ); -+ newColor = QColor::fromHslF( newColor.hslHueF(), newColor.hslSaturationF(), qBound( qreal( 0.0 ), point.y(), qreal( 1.0 ) ), newColor.alphaF() ); - else if ( mCurrentPlotColorComponent == 2 ) -- newColor = QColor::fromHslF( newColor.hslHueF(), qBound( 0.0, point.y(), 1.0 ), newColor.lightnessF(), newColor.alphaF() ); -+ newColor = QColor::fromHslF( newColor.hslHueF(), qBound( qreal( 0.0 ), point.y(), qreal( 1.0 ) ), newColor.lightnessF(), newColor.alphaF() ); - else if ( mCurrentPlotColorComponent == 3 ) -- newColor = QColor::fromHslF( newColor.hslHueF(), newColor.hslSaturationF(), newColor.lightnessF(), qBound( 0.0, point.y(), 1.0 ) ); -+ newColor = QColor::fromHslF( newColor.hslHueF(), newColor.hslSaturationF(), newColor.lightnessF(), qBound( qreal( 0.0 ), point.y(), qreal( 1.0 ) ) ); - -- mStopEditor->setSelectedStopDetails( newColor, qBound( 0.0, point.x(), 1.0 ) ); -+ mStopEditor->setSelectedStopDetails( newColor, qBound( qreal( 0.0 ), point.x(), qreal( 1.0 ) ) ); - } - - bool byX( QPointF p1, QPointF p2 ) diff --git a/qgis.spec b/qgis.spec index b9cd0f6..94cd865 100644 --- a/qgis.spec +++ b/qgis.spec @@ -15,8 +15,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.18.2 -Release: 5%{?dist} +Version: 2.18.4 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -40,10 +40,6 @@ Source5: %{name}-mime.xml # https://github.com/qgis/QGIS/commit/718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb.patch Patch0: %{name}-lib64.patch -# Restore build success with SIP 4.19 -# https://hub.qgis.org/issues/16071 -Patch1: %{name}-2.18.2-sip419.patch - # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: # http://code.google.com/p/pyspatialite/issues/detail?id=3 @@ -188,7 +184,6 @@ Please refer to %{name}-server-README.fedora for details! %prep %setup -q %patch0 -p1 -b .lib64 -%patch1 -p1 -b .sip419 # Remove executable permissions from source code files find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ @@ -411,6 +406,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Fri Feb 24 2017 Volker Froehlich - 2.18.4-1 +- New upstream release + * Mon Feb 20 2017 Rex Dieter - 2.18.2-5 - rebuild (qscintilla) diff --git a/sources b/sources index 634214e..351a6e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qgis-2.18.2.tar.bz2) = b78bc4f109015f943fa019f0c03208496626d8eae1887eddf975f5fdf81f455db47428b8051a3d02ae46e0482bd7c955871b7d5ead5a70205f6525f085dcbf7f +SHA512 (qgis-2.18.4.tar.bz2) = 3938fbc1f87990a08411ba8f793d7900f10eaea1824a5a9d2217ca0dea1a8b0849ec91c41be50dc65f590713391bb613429bf48f9ea0ffaaba876dde35b98fc7