Hopefully solve build error with SIP 4.19
This commit is contained in:
parent
4502f08c4b
commit
b736bd1807
256
qgis-2.18.2-sip419.patch
Normal file
256
qgis-2.18.2-sip419.patch
Normal file
|
@ -0,0 +1,256 @@
|
|||
From 718581ffb12b723f9a3c0ae01b7ec2d8aed9d4bb Mon Sep 17 00:00:00 2001
|
||||
From: "Juergen E. Fischer" <jef@norbit.de>
|
||||
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<TYPE>
|
||||
|
||||
// QMap<qint64, TYPE> is implemented as a Python dictionary.
|
||||
template<TYPE>
|
||||
-%MappedType QMap<qint64, TYPE> /DocType="dict-of-qint64-TYPE"/
|
||||
+%MappedType QMap<qint64, TYPE>
|
||||
{
|
||||
%TypeHeaderCode
|
||||
#include <qmap.h>
|
||||
@@ -1873,7 +1873,7 @@ template <TYPE>
|
||||
};
|
||||
|
||||
// QList<QgsField> is implemented as a Python list of QgsField.
|
||||
-%MappedType QList<QgsField> /DocType="list-of-qgsfield"/
|
||||
+%MappedType QList<QgsField>
|
||||
{
|
||||
%TypeHeaderCode
|
||||
#include <qgsfield.h>
|
||||
@@ -1978,7 +1978,7 @@ template <TYPE>
|
||||
|
||||
%If (QVECTORINT_CONVERSION)
|
||||
// QVector<int> is implemented as a Python list of integers.
|
||||
-%MappedType QVector<int> /DocType="list-of-int"/
|
||||
+%MappedType QVector<int>
|
||||
{
|
||||
%TypeHeaderCode
|
||||
#include <qvector.h>
|
||||
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 <qgscoordinatetransform.h>
|
||||
%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<int, QVariant> QgsAttributeMap;
|
||||
typedef QVector<QVariant> QgsAttributes;
|
||||
|
||||
// QgsAttributes is implemented as a Python list of Python objects.
|
||||
-%MappedType QgsAttributes /DocType="list-of-attributes"/
|
||||
+%MappedType QgsAttributes
|
||||
{
|
||||
%TypeHeaderCode
|
||||
#include <qgsfeature.h>
|
||||
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<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> is implemented as a Python dictionary.
|
||||
-%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*> /DocType="dict-of-QgsPalLayerSettings.DataDefinedProperties-QgsDataDefined*"/
|
||||
+%MappedType QMap<QgsPalLayerSettings::DataDefinedProperties, QgsDataDefined*>
|
||||
{
|
||||
%TypeHeaderCode
|
||||
#include <qmap.h>
|
||||
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")
|
||||
|
||||
|
11
qgis.spec
11
qgis.spec
|
@ -16,7 +16,7 @@
|
|||
|
||||
Name: qgis
|
||||
Version: 2.18.2
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: A user friendly Open Source Geographic Information System
|
||||
Group: Applications/Engineering
|
||||
|
||||
|
@ -37,8 +37,13 @@ Source4: %{name}-server-README.fedora
|
|||
Source5: %{name}-mime.xml
|
||||
# Fix builds on 64-bit machines
|
||||
# https://hub.qgis.org/issues/15602
|
||||
# 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
|
||||
|
@ -183,6 +188,7 @@ 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 {} \+
|
||||
|
@ -405,6 +411,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 14 2017 Volker Froehlich <volker27@gmx.at> - 2.18.2-4
|
||||
- Apply build patch for SIP 4.19 (#16071)
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
|
|
Reference in New Issue
Block a user