diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-28 22:40:39 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-28 23:45:21 +0200 |
commit | 489310a6d906eb10bb0a7c0f5fa2c69eecd55551 (patch) | |
tree | 994c0058896dba2a4eb274f917e847723109a34d /sci-geosciences/qgis/files | |
parent | profiles: Drop speech from package.use.stable.mask (diff) | |
download | gentoo-489310a6d906eb10bb0a7c0f5fa2c69eecd55551.tar.gz gentoo-489310a6d906eb10bb0a7c0f5fa2c69eecd55551.tar.bz2 gentoo-489310a6d906eb10bb0a7c0f5fa2c69eecd55551.zip |
sci-geosciences/qgis: 3.0.1 version bump
Bug: https://bugs.gentoo.org/635798
Package-Manager: Portage-2.3.25, Repoman-2.3.7
Diffstat (limited to 'sci-geosciences/qgis/files')
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch | 237 | ||||
-rw-r--r-- | sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch | 199 |
2 files changed, 436 insertions, 0 deletions
diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch b/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch new file mode 100644 index 000000000000..c07cd554dbf4 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch @@ -0,0 +1,237 @@ +From f07389b421065d40abe9b5355c8e329229f792d9 Mon Sep 17 00:00:00 2001 +From: Denis Rouzaud <denis.rouzaud@gmail.com> +Date: Sat, 24 Mar 2018 18:30:45 +0100 +Subject: [PATCH] fix constraints not checked when they should be (#6550) + (#6599) + +--- + python/gui/qgsattributeform.sip.in | 15 ++++++++++++++- + src/gui/attributetable/qgsdualview.cpp | 9 ++++++--- + src/gui/attributetable/qgsdualview.h | 2 +- + src/gui/qgsattributeform.cpp | 21 +++++++++++++++------ + src/gui/qgsattributeform.h | 14 +++++++++++++- + tests/src/gui/testqgsattributeform.cpp | 14 +++++++------- + 6 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/python/gui/qgsattributeform.sip.in b/python/gui/qgsattributeform.sip.in +index 8b489dd3089..45deba11a31 100644 +--- a/python/gui/qgsattributeform.sip.in ++++ b/python/gui/qgsattributeform.sip.in +@@ -139,12 +139,25 @@ on all attribute widgets. + + signals: + +- void attributeChanged( const QString &attribute, const QVariant &value ); ++ void attributeChanged( const QString &attribute, const QVariant &value ); + %Docstring + Notifies about changes of attributes + + :param attribute: The name of the attribute that changed. + :param value: The new value of the attribute. ++ ++.. deprecated:: since 3.0 ++%End ++ ++ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged ); ++%Docstring ++Notifies about changes of attributes ++ ++:param attribute: The name of the attribute that changed. ++:param value: The new value of the attribute. ++:param attributeChanged: If true, it corresponds to an actual change of the feature attribute ++ ++.. versionadded:: 3.0.1 + %End + + +diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp +index d7ccfa1a8a1..2c640036a02 100644 +--- a/src/gui/attributetable/qgsdualview.cpp ++++ b/src/gui/attributetable/qgsdualview.cpp +@@ -98,7 +98,7 @@ void QgsDualView::init( QgsVectorLayer *layer, QgsMapCanvas *mapCanvas, const Qg + mAttributeEditor->layout()->addWidget( mAttributeForm ); + } + +- connect( mAttributeForm, &QgsAttributeForm::attributeChanged, this, &QgsDualView::featureFormAttributeChanged ); ++ connect( mAttributeForm, &QgsAttributeForm::widgetValueChanged, this, &QgsDualView::featureFormAttributeChanged ); + connect( mAttributeForm, &QgsAttributeForm::modeChanged, this, &QgsDualView::formModeChanged ); + connect( mMasterModel, &QgsAttributeTableModel::modelChanged, mAttributeForm, &QgsAttributeForm::refreshFeature ); + connect( mAttributeForm, &QgsAttributeForm::filterExpressionSet, this, &QgsDualView::filterExpressionSet ); +@@ -880,9 +880,12 @@ void QgsDualView::extentChanged() + emit filterChanged(); + } + +-void QgsDualView::featureFormAttributeChanged() ++void QgsDualView::featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged ) + { +- mFeatureList->setCurrentFeatureEdited( true ); ++ Q_UNUSED( attribute ); ++ Q_UNUSED( value ); ++ if ( attributeChanged ) ++ mFeatureList->setCurrentFeatureEdited( true ); + } + + void QgsDualView::setFilteredFeatures( const QgsFeatureIds &filteredFeatures ) +diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h +index 73cb420f44b..264adbacb29 100644 +--- a/src/gui/attributetable/qgsdualview.h ++++ b/src/gui/attributetable/qgsdualview.h +@@ -327,7 +327,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas + * Will forward this signal to the feature list to visually represent + * that there has been an edit event. + */ +- void featureFormAttributeChanged(); ++ void featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged ); + + /** + * Will be called periodically, when loading layers from slow data providers. +diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp +index df1e98282f6..7a707c6fd7d 100644 +--- a/src/gui/qgsattributeform.cpp ++++ b/src/gui/qgsattributeform.cpp +@@ -240,6 +240,7 @@ void QgsAttributeForm::changeAttribute( const QString &field, const QVariant &va + + void QgsAttributeForm::setFeature( const QgsFeature &feature ) + { ++ mIsSettingFeature = true; + mFeature = feature; + + switch ( mMode ) +@@ -266,6 +267,7 @@ void QgsAttributeForm::setFeature( const QgsFeature &feature ) + break; + } + } ++ mIsSettingFeature = false; + } + + bool QgsAttributeForm::saveEdits() +@@ -692,11 +694,7 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value ) + QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( sender() ); + Q_ASSERT( eww ); + +- const QVariant oldValue = mFeature.attribute( eww->fieldIdx() ); +- +- // Safety check, if we receive the same value again, no reason to do anything +- if ( oldValue == value && oldValue.isNull() == value.isNull() ) +- return; ++ bool signalEmitted = false; + + if ( mValuesInitialized ) + mDirty = true; +@@ -707,7 +705,12 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value ) + case IdentifyMode: + case AddFeatureMode: + { ++ Q_NOWARN_DEPRECATED_PUSH + emit attributeChanged( eww->field().name(), value ); ++ Q_NOWARN_DEPRECATED_PUSH ++ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature ); ++ ++ signalEmitted = true; + + updateJoinedFields( *eww ); + +@@ -739,7 +742,13 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value ) + + updateConstraints( eww ); + +- emit attributeChanged( eww->field().name(), value ); ++ if ( !signalEmitted ) ++ { ++ Q_NOWARN_DEPRECATED_PUSH ++ emit attributeChanged( eww->field().name(), value ); ++ Q_NOWARN_DEPRECATED_PUSH ++ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature ); ++ } + } + + void QgsAttributeForm::updateAllConstraints() +diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h +index 6102825b286..41f16cd8614 100644 +--- a/src/gui/qgsattributeform.h ++++ b/src/gui/qgsattributeform.h +@@ -178,8 +178,19 @@ class GUI_EXPORT QgsAttributeForm : public QWidget + * + * \param attribute The name of the attribute that changed. + * \param value The new value of the attribute. ++ * \deprecated since 3.0 + */ +- void attributeChanged( const QString &attribute, const QVariant &value ); ++ Q_DECL_DEPRECATED void attributeChanged( const QString &attribute, const QVariant &value ); ++ ++ /** ++ * Notifies about changes of attributes ++ * ++ * \param attribute The name of the attribute that changed. ++ * \param value The new value of the attribute. ++ * \param attributeChanged If true, it corresponds to an actual change of the feature attribute ++ * \since QGIS 3.0.1 ++ */ ++ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged ); + + /** + * Will be emitted before the feature is saved. Use this signal to perform sanity checks. +@@ -367,6 +378,7 @@ class GUI_EXPORT QgsAttributeForm : public QWidget + QMap<const QgsVectorLayerJoinInfo *, QgsFeature> mJoinedFeatures; + bool mValuesInitialized = false; + bool mDirty = false; ++ bool mIsSettingFeature = false; + + struct ContainerInformation + { +diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp +index d4629cb0762..9b6d5c46444 100644 +--- a/tests/src/gui/testqgsattributeform.cpp ++++ b/tests/src/gui/testqgsattributeform.cpp +@@ -111,24 +111,24 @@ void TestQgsAttributeForm::testFieldConstraint() + // build a form for this feature + QgsAttributeForm form2( layer ); + form2.setFeature( ft ); +- QSignalSpy spy( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) ); ++ QSignalSpy spy( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) ); + ww = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[0] ); + + // set value to 1 + ww->setValue( 1 ); +- QCOMPARE( spy.count(), 2 ); ++ QCOMPARE( spy.count(), 1 ); + QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel ); + + // set value to null + spy.clear(); + ww->setValue( QVariant() ); +- QCOMPARE( spy.count(), 2 ); ++ QCOMPARE( spy.count(), 1 ); + QCOMPARE( constraintsLabel( &form2, ww )->text(), invalidLabel ); + + // set value to 1 + spy.clear(); + ww->setValue( 1 ); +- QCOMPARE( spy.count(), 2 ); ++ QCOMPARE( spy.count(), 1 ); + QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel ); + + // set a soft constraint +@@ -205,11 +205,11 @@ void TestQgsAttributeForm::testFieldMultiConstraints() + ww1 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[1] ); + ww2 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[2] ); + ww3 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[3] ); +- QSignalSpy spy2( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) ); ++ QSignalSpy spy2( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) ); + + // change value + ww0->setValue( 2 ); // update col0 +- QCOMPARE( spy2.count(), 2 ); ++ QCOMPARE( spy2.count(), 1 ); + + QCOMPARE( constraintsLabel( &form2, ww0 )->text(), inv ); // 2 < ( 1 + 2 ) + QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() ); +@@ -219,7 +219,7 @@ void TestQgsAttributeForm::testFieldMultiConstraints() + // change value + spy2.clear(); + ww0->setValue( 1 ); // update col0 +- QCOMPARE( spy2.count(), 2 ); ++ QCOMPARE( spy2.count(), 1 ); + + QCOMPARE( constraintsLabel( &form2, ww0 )->text(), val ); // 1 < ( 1 + 2 ) + QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() ); diff --git a/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch b/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch new file mode 100644 index 000000000000..c78c0dec3bb0 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch @@ -0,0 +1,199 @@ +From 0a903118389029fd25fbf4eddd20f60c8856ab4e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Wed, 28 Mar 2018 20:48:58 +0200 +Subject: [PATCH] Fix build with Qt-5.11 (missing headers) + +--- + src/app/layout/qgslayoutpolylinewidget.cpp | 2 ++ + src/app/layout/qgslayoutscalebarwidget.cpp | 1 + + src/app/layout/qgslayoutscalebarwidget.h | 2 ++ + src/app/qgslabelinggui.cpp | 2 ++ + src/app/qgsrulebasedlabelingwidget.cpp | 1 + + src/gui/layout/qgslayoutitemwidget.cpp | 2 ++ + src/gui/layout/qgslayoutnewitempropertiesdialog.cpp | 2 ++ + src/gui/qgscompoundcolorwidget.cpp | 1 + + src/gui/qgsextentgroupbox.cpp | 1 + + src/gui/qgsgradientcolorrampdialog.cpp | 1 + + src/gui/qgsgroupwmsdatadialog.cpp | 1 + + src/gui/qgstextformatwidget.cpp | 2 ++ + src/gui/symbology/qgssymbollayerwidget.cpp | 1 + + src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp | 1 + + 14 files changed, 20 insertions(+) + +diff --git a/src/app/layout/qgslayoutpolylinewidget.cpp b/src/app/layout/qgslayoutpolylinewidget.cpp +index 178968917a..28d5d25a4d 100644 +--- a/src/app/layout/qgslayoutpolylinewidget.cpp ++++ b/src/app/layout/qgslayoutpolylinewidget.cpp +@@ -21,6 +21,8 @@ + #include "qgslayoutitemregistry.h" + #include "qgslayout.h" + #include "qgslayoutundostack.h" ++ ++#include <QButtonGroup> + #include <QFileDialog> + + QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polyline ) +diff --git a/src/app/layout/qgslayoutscalebarwidget.cpp b/src/app/layout/qgslayoutscalebarwidget.cpp +index c1b8ad1509..569a4e0573 100644 +--- a/src/app/layout/qgslayoutscalebarwidget.cpp ++++ b/src/app/layout/qgslayoutscalebarwidget.cpp +@@ -19,6 +19,7 @@ + #include "qgslayoutitemscalebar.h" + #include "qgslayout.h" + #include "qgsguiutils.h" ++ + #include <QColorDialog> + #include <QFontDialog> + #include <QWidget> +diff --git a/src/app/layout/qgslayoutscalebarwidget.h b/src/app/layout/qgslayoutscalebarwidget.h +index a60b777bfa..ec7cc46cca 100644 +--- a/src/app/layout/qgslayoutscalebarwidget.h ++++ b/src/app/layout/qgslayoutscalebarwidget.h +@@ -20,6 +20,8 @@ + #include "ui_qgslayoutscalebarwidgetbase.h" + #include "qgslayoutitemwidget.h" + ++#include <QButtonGroup> ++ + class QgsLayoutItemScaleBar; + + /** +diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp +index e5cf8ff626..4d6a83700d 100644 +--- a/src/app/qgslabelinggui.cpp ++++ b/src/app/qgslabelinggui.cpp +@@ -24,6 +24,8 @@ + #include "qgsauxiliarystorage.h" + #include "qgsnewauxiliarylayerdialog.h" + ++#include <QButtonGroup> ++ + QgsExpressionContext QgsLabelingGui::createExpressionContext() const + { + QgsExpressionContext expContext; +diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp +index 6f1f77ef9a..57b7d34799 100644 +--- a/src/app/qgsrulebasedlabelingwidget.cpp ++++ b/src/app/qgsrulebasedlabelingwidget.cpp +@@ -26,6 +26,7 @@ + #include "qgsvectorlayerlabeling.h" + #include "qgslogger.h" + ++#include <QAction> + #include <QClipboard> + #include <QMessageBox> + +diff --git a/src/gui/layout/qgslayoutitemwidget.cpp b/src/gui/layout/qgslayoutitemwidget.cpp +index 1d3d4f8171..d68799234b 100644 +--- a/src/gui/layout/qgslayoutitemwidget.cpp ++++ b/src/gui/layout/qgslayoutitemwidget.cpp +@@ -21,6 +21,8 @@ + #include "qgsprintlayout.h" + #include "qgslayoutatlas.h" + ++#include <QButtonGroup> ++ + // + // QgsLayoutConfigObject + // +diff --git a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp +index 9fa5f98358..c53d002acb 100644 +--- a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp ++++ b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp +@@ -19,6 +19,8 @@ + #include "qgslayoutpagecollection.h" + #include "qgsgui.h" + ++#include <QButtonGroup> ++ + QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Qt::WindowFlags flags ) + : QDialog( parent, flags ) + { +diff --git a/src/gui/qgscompoundcolorwidget.cpp b/src/gui/qgscompoundcolorwidget.cpp +index a7dbb77501..48032a2456 100644 +--- a/src/gui/qgscompoundcolorwidget.cpp ++++ b/src/gui/qgscompoundcolorwidget.cpp +@@ -20,6 +20,7 @@ + #include "qgsapplication.h" + #include "qgssettings.h" + ++#include <QHeaderView> + #include <QPushButton> + #include <QMenu> + #include <QToolButton> +diff --git a/src/gui/qgsextentgroupbox.cpp b/src/gui/qgsextentgroupbox.cpp +index ffc8ab7195..d5d77db6a0 100644 +--- a/src/gui/qgsextentgroupbox.cpp ++++ b/src/gui/qgsextentgroupbox.cpp +@@ -24,6 +24,7 @@ + + #include <QMenu> + #include <QAction> ++#include <QDoubleValidator> + + QgsExtentGroupBox::QgsExtentGroupBox( QWidget *parent ) + : QgsCollapsibleGroupBox( parent ) +diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp +index fcc93d74fb..317f373423 100644 +--- a/src/gui/qgsgradientcolorrampdialog.cpp ++++ b/src/gui/qgsgradientcolorrampdialog.cpp +@@ -22,6 +22,7 @@ + #include "qgssettings.h" + + #include <QColorDialog> ++#include <QHeaderView> + #include <QInputDialog> + #include <QPainter> + #include <QTableWidget> +diff --git a/src/gui/qgsgroupwmsdatadialog.cpp b/src/gui/qgsgroupwmsdatadialog.cpp +index 456c813f5f..f9bb15ab6d 100644 +--- a/src/gui/qgsgroupwmsdatadialog.cpp ++++ b/src/gui/qgsgroupwmsdatadialog.cpp +@@ -16,6 +16,7 @@ + #include "qgsapplication.h" + #include "qgsgroupwmsdatadialog.h" + ++#include <QRegExpValidator> + + QgsGroupWmsDataDialog::QgsGroupWmsDataDialog( QWidget *parent, Qt::WindowFlags fl ) + : QDialog( parent, fl ) +diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp +index 8c3c67d8e9..9005a40081 100644 +--- a/src/gui/qgstextformatwidget.cpp ++++ b/src/gui/qgstextformatwidget.cpp +@@ -29,6 +29,8 @@ + #include "qgseffectstack.h" + #include "qgspainteffectregistry.h" + ++#include <QButtonGroup> ++ + QgsTextFormatWidget::QgsTextFormatWidget( const QgsTextFormat &format, QgsMapCanvas *mapCanvas, QWidget *parent ) + : QWidget( parent ) + , mMapCanvas( mapCanvas ) +diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp +index 3a5f3c5314..da599a27ae 100644 +--- a/src/gui/symbology/qgssymbollayerwidget.cpp ++++ b/src/gui/symbology/qgssymbollayerwidget.cpp +@@ -43,6 +43,7 @@ + #include "qgsauxiliarystorage.h" + + #include <QAbstractButton> ++#include <QButtonGroup> + #include <QColorDialog> + #include <QCursor> + #include <QDir> +diff --git a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp +index 4cc3e8b301..d377d718b7 100644 +--- a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp ++++ b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp +@@ -29,6 +29,7 @@ + #include "qgssettings.h" + #include "qgsmapcanvas.h" + ++#include <QButtonGroup> + #include <QListWidgetItem> + #include <QMessageBox> + #include <QFileDialog> +-- +2.16.3 + |