1 |
commit: cc051bc7852a76dbd12ebc49010583df6abf6a2c |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 29 14:26:21 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 29 14:26:21 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc051bc7 |
7 |
|
8 |
sci-geosciences/qgis: Drop 3.0.1 |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
sci-geosciences/qgis/Manifest | 1 - |
13 |
.../qgis/files/qgis-3.0.1-check-constraints.patch | 237 --------------------- |
14 |
.../qgis/files/qgis-3.0.1-qt-5.11.patch | 199 ----------------- |
15 |
sci-geosciences/qgis/qgis-3.0.1.ebuild | 222 ------------------- |
16 |
4 files changed, 659 deletions(-) |
17 |
|
18 |
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest |
19 |
index 83c6586a07c..d81dfa8c495 100644 |
20 |
--- a/sci-geosciences/qgis/Manifest |
21 |
+++ b/sci-geosciences/qgis/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST qgis-3.0.1.tar.bz2 94217493 BLAKE2B 9f3b9e9d76dfac574cbe7c9b95f0dc59fb9ad74ddd5c5a420931107200b1ba6641e2b74cff681ecec8cdab777cda69c0e698fa952bc28cd79c761f4636f62f00 SHA512 c07fc9b033fa043e38098d226dac69ea35890109c45ccc4c47017e0af2d3fbed4b1a71b3fd7dc76fea3eb43fbcdbfb660df50d779da8c43f68a4402b239f8f75 |
24 |
DIST qgis-3.0.2.tar.bz2 94483208 BLAKE2B 198587a8440bf6d1dff6d08e706f1c0972088f8f90df4def27a0066f659e4273be35687ad0f35b4f3dcd7fb60e30ead74093541c69ddbd456bcbbcbae4c99c76 SHA512 4eec027f81ee693293e87d3c16b7b210ebd66f35a2884dc4662b5a3359b18cfd8a11919132ab88489456121eab36f8e5a9c20afcb34fa9dbe54673d838fc2be1 |
25 |
DIST qgis-3.0.3.tar.bz2 94462631 BLAKE2B 047f4d8852b7572dc94b9c04ec9c81e53bab2ed63a7a490682b7c557ae1b21fcc3257e751cc794d368dc4124c20c008ffdc7f1f4b79af2faea78774dc6ef430c SHA512 67f46f1acacd6688984b0c13aa5880e2f31d85b5a28ebf12830d33f198c2e5983887a8c85036b8be59edf3836ba7d38985f58433f53d3164c2ffb4a6db94d046 |
26 |
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d |
27 |
|
28 |
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 |
29 |
deleted file mode 100644 |
30 |
index c07cd554dbf..00000000000 |
31 |
--- a/sci-geosciences/qgis/files/qgis-3.0.1-check-constraints.patch |
32 |
+++ /dev/null |
33 |
@@ -1,237 +0,0 @@ |
34 |
-From f07389b421065d40abe9b5355c8e329229f792d9 Mon Sep 17 00:00:00 2001 |
35 |
-From: Denis Rouzaud <denis.rouzaud@×××××.com> |
36 |
-Date: Sat, 24 Mar 2018 18:30:45 +0100 |
37 |
-Subject: [PATCH] fix constraints not checked when they should be (#6550) |
38 |
- (#6599) |
39 |
- |
40 |
---- |
41 |
- python/gui/qgsattributeform.sip.in | 15 ++++++++++++++- |
42 |
- src/gui/attributetable/qgsdualview.cpp | 9 ++++++--- |
43 |
- src/gui/attributetable/qgsdualview.h | 2 +- |
44 |
- src/gui/qgsattributeform.cpp | 21 +++++++++++++++------ |
45 |
- src/gui/qgsattributeform.h | 14 +++++++++++++- |
46 |
- tests/src/gui/testqgsattributeform.cpp | 14 +++++++------- |
47 |
- 6 files changed, 56 insertions(+), 19 deletions(-) |
48 |
- |
49 |
-diff --git a/python/gui/qgsattributeform.sip.in b/python/gui/qgsattributeform.sip.in |
50 |
-index 8b489dd3089..45deba11a31 100644 |
51 |
---- a/python/gui/qgsattributeform.sip.in |
52 |
-+++ b/python/gui/qgsattributeform.sip.in |
53 |
-@@ -139,12 +139,25 @@ on all attribute widgets. |
54 |
- |
55 |
- signals: |
56 |
- |
57 |
-- void attributeChanged( const QString &attribute, const QVariant &value ); |
58 |
-+ void attributeChanged( const QString &attribute, const QVariant &value ); |
59 |
- %Docstring |
60 |
- Notifies about changes of attributes |
61 |
- |
62 |
- :param attribute: The name of the attribute that changed. |
63 |
- :param value: The new value of the attribute. |
64 |
-+ |
65 |
-+.. deprecated:: since 3.0 |
66 |
-+%End |
67 |
-+ |
68 |
-+ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged ); |
69 |
-+%Docstring |
70 |
-+Notifies about changes of attributes |
71 |
-+ |
72 |
-+:param attribute: The name of the attribute that changed. |
73 |
-+:param value: The new value of the attribute. |
74 |
-+:param attributeChanged: If true, it corresponds to an actual change of the feature attribute |
75 |
-+ |
76 |
-+.. versionadded:: 3.0.1 |
77 |
- %End |
78 |
- |
79 |
- |
80 |
-diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp |
81 |
-index d7ccfa1a8a1..2c640036a02 100644 |
82 |
---- a/src/gui/attributetable/qgsdualview.cpp |
83 |
-+++ b/src/gui/attributetable/qgsdualview.cpp |
84 |
-@@ -98,7 +98,7 @@ void QgsDualView::init( QgsVectorLayer *layer, QgsMapCanvas *mapCanvas, const Qg |
85 |
- mAttributeEditor->layout()->addWidget( mAttributeForm ); |
86 |
- } |
87 |
- |
88 |
-- connect( mAttributeForm, &QgsAttributeForm::attributeChanged, this, &QgsDualView::featureFormAttributeChanged ); |
89 |
-+ connect( mAttributeForm, &QgsAttributeForm::widgetValueChanged, this, &QgsDualView::featureFormAttributeChanged ); |
90 |
- connect( mAttributeForm, &QgsAttributeForm::modeChanged, this, &QgsDualView::formModeChanged ); |
91 |
- connect( mMasterModel, &QgsAttributeTableModel::modelChanged, mAttributeForm, &QgsAttributeForm::refreshFeature ); |
92 |
- connect( mAttributeForm, &QgsAttributeForm::filterExpressionSet, this, &QgsDualView::filterExpressionSet ); |
93 |
-@@ -880,9 +880,12 @@ void QgsDualView::extentChanged() |
94 |
- emit filterChanged(); |
95 |
- } |
96 |
- |
97 |
--void QgsDualView::featureFormAttributeChanged() |
98 |
-+void QgsDualView::featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged ) |
99 |
- { |
100 |
-- mFeatureList->setCurrentFeatureEdited( true ); |
101 |
-+ Q_UNUSED( attribute ); |
102 |
-+ Q_UNUSED( value ); |
103 |
-+ if ( attributeChanged ) |
104 |
-+ mFeatureList->setCurrentFeatureEdited( true ); |
105 |
- } |
106 |
- |
107 |
- void QgsDualView::setFilteredFeatures( const QgsFeatureIds &filteredFeatures ) |
108 |
-diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h |
109 |
-index 73cb420f44b..264adbacb29 100644 |
110 |
---- a/src/gui/attributetable/qgsdualview.h |
111 |
-+++ b/src/gui/attributetable/qgsdualview.h |
112 |
-@@ -327,7 +327,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas |
113 |
- * Will forward this signal to the feature list to visually represent |
114 |
- * that there has been an edit event. |
115 |
- */ |
116 |
-- void featureFormAttributeChanged(); |
117 |
-+ void featureFormAttributeChanged( const QString &attribute, const QVariant &value, bool attributeChanged ); |
118 |
- |
119 |
- /** |
120 |
- * Will be called periodically, when loading layers from slow data providers. |
121 |
-diff --git a/src/gui/qgsattributeform.cpp b/src/gui/qgsattributeform.cpp |
122 |
-index df1e98282f6..7a707c6fd7d 100644 |
123 |
---- a/src/gui/qgsattributeform.cpp |
124 |
-+++ b/src/gui/qgsattributeform.cpp |
125 |
-@@ -240,6 +240,7 @@ void QgsAttributeForm::changeAttribute( const QString &field, const QVariant &va |
126 |
- |
127 |
- void QgsAttributeForm::setFeature( const QgsFeature &feature ) |
128 |
- { |
129 |
-+ mIsSettingFeature = true; |
130 |
- mFeature = feature; |
131 |
- |
132 |
- switch ( mMode ) |
133 |
-@@ -266,6 +267,7 @@ void QgsAttributeForm::setFeature( const QgsFeature &feature ) |
134 |
- break; |
135 |
- } |
136 |
- } |
137 |
-+ mIsSettingFeature = false; |
138 |
- } |
139 |
- |
140 |
- bool QgsAttributeForm::saveEdits() |
141 |
-@@ -692,11 +694,7 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value ) |
142 |
- QgsEditorWidgetWrapper *eww = qobject_cast<QgsEditorWidgetWrapper *>( sender() ); |
143 |
- Q_ASSERT( eww ); |
144 |
- |
145 |
-- const QVariant oldValue = mFeature.attribute( eww->fieldIdx() ); |
146 |
-- |
147 |
-- // Safety check, if we receive the same value again, no reason to do anything |
148 |
-- if ( oldValue == value && oldValue.isNull() == value.isNull() ) |
149 |
-- return; |
150 |
-+ bool signalEmitted = false; |
151 |
- |
152 |
- if ( mValuesInitialized ) |
153 |
- mDirty = true; |
154 |
-@@ -707,7 +705,12 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value ) |
155 |
- case IdentifyMode: |
156 |
- case AddFeatureMode: |
157 |
- { |
158 |
-+ Q_NOWARN_DEPRECATED_PUSH |
159 |
- emit attributeChanged( eww->field().name(), value ); |
160 |
-+ Q_NOWARN_DEPRECATED_PUSH |
161 |
-+ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature ); |
162 |
-+ |
163 |
-+ signalEmitted = true; |
164 |
- |
165 |
- updateJoinedFields( *eww ); |
166 |
- |
167 |
-@@ -739,7 +742,13 @@ void QgsAttributeForm::onAttributeChanged( const QVariant &value ) |
168 |
- |
169 |
- updateConstraints( eww ); |
170 |
- |
171 |
-- emit attributeChanged( eww->field().name(), value ); |
172 |
-+ if ( !signalEmitted ) |
173 |
-+ { |
174 |
-+ Q_NOWARN_DEPRECATED_PUSH |
175 |
-+ emit attributeChanged( eww->field().name(), value ); |
176 |
-+ Q_NOWARN_DEPRECATED_PUSH |
177 |
-+ emit widgetValueChanged( eww->field().name(), value, !mIsSettingFeature ); |
178 |
-+ } |
179 |
- } |
180 |
- |
181 |
- void QgsAttributeForm::updateAllConstraints() |
182 |
-diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h |
183 |
-index 6102825b286..41f16cd8614 100644 |
184 |
---- a/src/gui/qgsattributeform.h |
185 |
-+++ b/src/gui/qgsattributeform.h |
186 |
-@@ -178,8 +178,19 @@ class GUI_EXPORT QgsAttributeForm : public QWidget |
187 |
- * |
188 |
- * \param attribute The name of the attribute that changed. |
189 |
- * \param value The new value of the attribute. |
190 |
-+ * \deprecated since 3.0 |
191 |
- */ |
192 |
-- void attributeChanged( const QString &attribute, const QVariant &value ); |
193 |
-+ Q_DECL_DEPRECATED void attributeChanged( const QString &attribute, const QVariant &value ); |
194 |
-+ |
195 |
-+ /** |
196 |
-+ * Notifies about changes of attributes |
197 |
-+ * |
198 |
-+ * \param attribute The name of the attribute that changed. |
199 |
-+ * \param value The new value of the attribute. |
200 |
-+ * \param attributeChanged If true, it corresponds to an actual change of the feature attribute |
201 |
-+ * \since QGIS 3.0.1 |
202 |
-+ */ |
203 |
-+ void widgetValueChanged( const QString &attribute, const QVariant &value, bool attributeChanged ); |
204 |
- |
205 |
- /** |
206 |
- * Will be emitted before the feature is saved. Use this signal to perform sanity checks. |
207 |
-@@ -367,6 +378,7 @@ class GUI_EXPORT QgsAttributeForm : public QWidget |
208 |
- QMap<const QgsVectorLayerJoinInfo *, QgsFeature> mJoinedFeatures; |
209 |
- bool mValuesInitialized = false; |
210 |
- bool mDirty = false; |
211 |
-+ bool mIsSettingFeature = false; |
212 |
- |
213 |
- struct ContainerInformation |
214 |
- { |
215 |
-diff --git a/tests/src/gui/testqgsattributeform.cpp b/tests/src/gui/testqgsattributeform.cpp |
216 |
-index d4629cb0762..9b6d5c46444 100644 |
217 |
---- a/tests/src/gui/testqgsattributeform.cpp |
218 |
-+++ b/tests/src/gui/testqgsattributeform.cpp |
219 |
-@@ -111,24 +111,24 @@ void TestQgsAttributeForm::testFieldConstraint() |
220 |
- // build a form for this feature |
221 |
- QgsAttributeForm form2( layer ); |
222 |
- form2.setFeature( ft ); |
223 |
-- QSignalSpy spy( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) ); |
224 |
-+ QSignalSpy spy( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) ); |
225 |
- ww = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[0] ); |
226 |
- |
227 |
- // set value to 1 |
228 |
- ww->setValue( 1 ); |
229 |
-- QCOMPARE( spy.count(), 2 ); |
230 |
-+ QCOMPARE( spy.count(), 1 ); |
231 |
- QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel ); |
232 |
- |
233 |
- // set value to null |
234 |
- spy.clear(); |
235 |
- ww->setValue( QVariant() ); |
236 |
-- QCOMPARE( spy.count(), 2 ); |
237 |
-+ QCOMPARE( spy.count(), 1 ); |
238 |
- QCOMPARE( constraintsLabel( &form2, ww )->text(), invalidLabel ); |
239 |
- |
240 |
- // set value to 1 |
241 |
- spy.clear(); |
242 |
- ww->setValue( 1 ); |
243 |
-- QCOMPARE( spy.count(), 2 ); |
244 |
-+ QCOMPARE( spy.count(), 1 ); |
245 |
- QCOMPARE( constraintsLabel( &form2, ww )->text(), validLabel ); |
246 |
- |
247 |
- // set a soft constraint |
248 |
-@@ -205,11 +205,11 @@ void TestQgsAttributeForm::testFieldMultiConstraints() |
249 |
- ww1 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[1] ); |
250 |
- ww2 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[2] ); |
251 |
- ww3 = qobject_cast<QgsEditorWidgetWrapper *>( form2.mWidgets[3] ); |
252 |
-- QSignalSpy spy2( &form2, SIGNAL( attributeChanged( QString, QVariant ) ) ); |
253 |
-+ QSignalSpy spy2( &form2, SIGNAL( widgetValueChanged( QString, QVariant, bool ) ) ); |
254 |
- |
255 |
- // change value |
256 |
- ww0->setValue( 2 ); // update col0 |
257 |
-- QCOMPARE( spy2.count(), 2 ); |
258 |
-+ QCOMPARE( spy2.count(), 1 ); |
259 |
- |
260 |
- QCOMPARE( constraintsLabel( &form2, ww0 )->text(), inv ); // 2 < ( 1 + 2 ) |
261 |
- QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() ); |
262 |
-@@ -219,7 +219,7 @@ void TestQgsAttributeForm::testFieldMultiConstraints() |
263 |
- // change value |
264 |
- spy2.clear(); |
265 |
- ww0->setValue( 1 ); // update col0 |
266 |
-- QCOMPARE( spy2.count(), 2 ); |
267 |
-+ QCOMPARE( spy2.count(), 1 ); |
268 |
- |
269 |
- QCOMPARE( constraintsLabel( &form2, ww0 )->text(), val ); // 1 < ( 1 + 2 ) |
270 |
- QCOMPARE( constraintsLabel( &form2, ww1 )->text(), QString() ); |
271 |
|
272 |
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 |
273 |
deleted file mode 100644 |
274 |
index c78c0dec3bb..00000000000 |
275 |
--- a/sci-geosciences/qgis/files/qgis-3.0.1-qt-5.11.patch |
276 |
+++ /dev/null |
277 |
@@ -1,199 +0,0 @@ |
278 |
-From 0a903118389029fd25fbf4eddd20f60c8856ab4e Mon Sep 17 00:00:00 2001 |
279 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
280 |
-Date: Wed, 28 Mar 2018 20:48:58 +0200 |
281 |
-Subject: [PATCH] Fix build with Qt-5.11 (missing headers) |
282 |
- |
283 |
---- |
284 |
- src/app/layout/qgslayoutpolylinewidget.cpp | 2 ++ |
285 |
- src/app/layout/qgslayoutscalebarwidget.cpp | 1 + |
286 |
- src/app/layout/qgslayoutscalebarwidget.h | 2 ++ |
287 |
- src/app/qgslabelinggui.cpp | 2 ++ |
288 |
- src/app/qgsrulebasedlabelingwidget.cpp | 1 + |
289 |
- src/gui/layout/qgslayoutitemwidget.cpp | 2 ++ |
290 |
- src/gui/layout/qgslayoutnewitempropertiesdialog.cpp | 2 ++ |
291 |
- src/gui/qgscompoundcolorwidget.cpp | 1 + |
292 |
- src/gui/qgsextentgroupbox.cpp | 1 + |
293 |
- src/gui/qgsgradientcolorrampdialog.cpp | 1 + |
294 |
- src/gui/qgsgroupwmsdatadialog.cpp | 1 + |
295 |
- src/gui/qgstextformatwidget.cpp | 2 ++ |
296 |
- src/gui/symbology/qgssymbollayerwidget.cpp | 1 + |
297 |
- src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp | 1 + |
298 |
- 14 files changed, 20 insertions(+) |
299 |
- |
300 |
-diff --git a/src/app/layout/qgslayoutpolylinewidget.cpp b/src/app/layout/qgslayoutpolylinewidget.cpp |
301 |
-index 178968917a..28d5d25a4d 100644 |
302 |
---- a/src/app/layout/qgslayoutpolylinewidget.cpp |
303 |
-+++ b/src/app/layout/qgslayoutpolylinewidget.cpp |
304 |
-@@ -21,6 +21,8 @@ |
305 |
- #include "qgslayoutitemregistry.h" |
306 |
- #include "qgslayout.h" |
307 |
- #include "qgslayoutundostack.h" |
308 |
-+ |
309 |
-+#include <QButtonGroup> |
310 |
- #include <QFileDialog> |
311 |
- |
312 |
- QgsLayoutPolylineWidget::QgsLayoutPolylineWidget( QgsLayoutItemPolyline *polyline ) |
313 |
-diff --git a/src/app/layout/qgslayoutscalebarwidget.cpp b/src/app/layout/qgslayoutscalebarwidget.cpp |
314 |
-index c1b8ad1509..569a4e0573 100644 |
315 |
---- a/src/app/layout/qgslayoutscalebarwidget.cpp |
316 |
-+++ b/src/app/layout/qgslayoutscalebarwidget.cpp |
317 |
-@@ -19,6 +19,7 @@ |
318 |
- #include "qgslayoutitemscalebar.h" |
319 |
- #include "qgslayout.h" |
320 |
- #include "qgsguiutils.h" |
321 |
-+ |
322 |
- #include <QColorDialog> |
323 |
- #include <QFontDialog> |
324 |
- #include <QWidget> |
325 |
-diff --git a/src/app/layout/qgslayoutscalebarwidget.h b/src/app/layout/qgslayoutscalebarwidget.h |
326 |
-index a60b777bfa..ec7cc46cca 100644 |
327 |
---- a/src/app/layout/qgslayoutscalebarwidget.h |
328 |
-+++ b/src/app/layout/qgslayoutscalebarwidget.h |
329 |
-@@ -20,6 +20,8 @@ |
330 |
- #include "ui_qgslayoutscalebarwidgetbase.h" |
331 |
- #include "qgslayoutitemwidget.h" |
332 |
- |
333 |
-+#include <QButtonGroup> |
334 |
-+ |
335 |
- class QgsLayoutItemScaleBar; |
336 |
- |
337 |
- /** |
338 |
-diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp |
339 |
-index e5cf8ff626..4d6a83700d 100644 |
340 |
---- a/src/app/qgslabelinggui.cpp |
341 |
-+++ b/src/app/qgslabelinggui.cpp |
342 |
-@@ -24,6 +24,8 @@ |
343 |
- #include "qgsauxiliarystorage.h" |
344 |
- #include "qgsnewauxiliarylayerdialog.h" |
345 |
- |
346 |
-+#include <QButtonGroup> |
347 |
-+ |
348 |
- QgsExpressionContext QgsLabelingGui::createExpressionContext() const |
349 |
- { |
350 |
- QgsExpressionContext expContext; |
351 |
-diff --git a/src/app/qgsrulebasedlabelingwidget.cpp b/src/app/qgsrulebasedlabelingwidget.cpp |
352 |
-index 6f1f77ef9a..57b7d34799 100644 |
353 |
---- a/src/app/qgsrulebasedlabelingwidget.cpp |
354 |
-+++ b/src/app/qgsrulebasedlabelingwidget.cpp |
355 |
-@@ -26,6 +26,7 @@ |
356 |
- #include "qgsvectorlayerlabeling.h" |
357 |
- #include "qgslogger.h" |
358 |
- |
359 |
-+#include <QAction> |
360 |
- #include <QClipboard> |
361 |
- #include <QMessageBox> |
362 |
- |
363 |
-diff --git a/src/gui/layout/qgslayoutitemwidget.cpp b/src/gui/layout/qgslayoutitemwidget.cpp |
364 |
-index 1d3d4f8171..d68799234b 100644 |
365 |
---- a/src/gui/layout/qgslayoutitemwidget.cpp |
366 |
-+++ b/src/gui/layout/qgslayoutitemwidget.cpp |
367 |
-@@ -21,6 +21,8 @@ |
368 |
- #include "qgsprintlayout.h" |
369 |
- #include "qgslayoutatlas.h" |
370 |
- |
371 |
-+#include <QButtonGroup> |
372 |
-+ |
373 |
- // |
374 |
- // QgsLayoutConfigObject |
375 |
- // |
376 |
-diff --git a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp |
377 |
-index 9fa5f98358..c53d002acb 100644 |
378 |
---- a/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp |
379 |
-+++ b/src/gui/layout/qgslayoutnewitempropertiesdialog.cpp |
380 |
-@@ -19,6 +19,8 @@ |
381 |
- #include "qgslayoutpagecollection.h" |
382 |
- #include "qgsgui.h" |
383 |
- |
384 |
-+#include <QButtonGroup> |
385 |
-+ |
386 |
- QgsLayoutItemPropertiesDialog::QgsLayoutItemPropertiesDialog( QWidget *parent, Qt::WindowFlags flags ) |
387 |
- : QDialog( parent, flags ) |
388 |
- { |
389 |
-diff --git a/src/gui/qgscompoundcolorwidget.cpp b/src/gui/qgscompoundcolorwidget.cpp |
390 |
-index a7dbb77501..48032a2456 100644 |
391 |
---- a/src/gui/qgscompoundcolorwidget.cpp |
392 |
-+++ b/src/gui/qgscompoundcolorwidget.cpp |
393 |
-@@ -20,6 +20,7 @@ |
394 |
- #include "qgsapplication.h" |
395 |
- #include "qgssettings.h" |
396 |
- |
397 |
-+#include <QHeaderView> |
398 |
- #include <QPushButton> |
399 |
- #include <QMenu> |
400 |
- #include <QToolButton> |
401 |
-diff --git a/src/gui/qgsextentgroupbox.cpp b/src/gui/qgsextentgroupbox.cpp |
402 |
-index ffc8ab7195..d5d77db6a0 100644 |
403 |
---- a/src/gui/qgsextentgroupbox.cpp |
404 |
-+++ b/src/gui/qgsextentgroupbox.cpp |
405 |
-@@ -24,6 +24,7 @@ |
406 |
- |
407 |
- #include <QMenu> |
408 |
- #include <QAction> |
409 |
-+#include <QDoubleValidator> |
410 |
- |
411 |
- QgsExtentGroupBox::QgsExtentGroupBox( QWidget *parent ) |
412 |
- : QgsCollapsibleGroupBox( parent ) |
413 |
-diff --git a/src/gui/qgsgradientcolorrampdialog.cpp b/src/gui/qgsgradientcolorrampdialog.cpp |
414 |
-index fcc93d74fb..317f373423 100644 |
415 |
---- a/src/gui/qgsgradientcolorrampdialog.cpp |
416 |
-+++ b/src/gui/qgsgradientcolorrampdialog.cpp |
417 |
-@@ -22,6 +22,7 @@ |
418 |
- #include "qgssettings.h" |
419 |
- |
420 |
- #include <QColorDialog> |
421 |
-+#include <QHeaderView> |
422 |
- #include <QInputDialog> |
423 |
- #include <QPainter> |
424 |
- #include <QTableWidget> |
425 |
-diff --git a/src/gui/qgsgroupwmsdatadialog.cpp b/src/gui/qgsgroupwmsdatadialog.cpp |
426 |
-index 456c813f5f..f9bb15ab6d 100644 |
427 |
---- a/src/gui/qgsgroupwmsdatadialog.cpp |
428 |
-+++ b/src/gui/qgsgroupwmsdatadialog.cpp |
429 |
-@@ -16,6 +16,7 @@ |
430 |
- #include "qgsapplication.h" |
431 |
- #include "qgsgroupwmsdatadialog.h" |
432 |
- |
433 |
-+#include <QRegExpValidator> |
434 |
- |
435 |
- QgsGroupWmsDataDialog::QgsGroupWmsDataDialog( QWidget *parent, Qt::WindowFlags fl ) |
436 |
- : QDialog( parent, fl ) |
437 |
-diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp |
438 |
-index 8c3c67d8e9..9005a40081 100644 |
439 |
---- a/src/gui/qgstextformatwidget.cpp |
440 |
-+++ b/src/gui/qgstextformatwidget.cpp |
441 |
-@@ -29,6 +29,8 @@ |
442 |
- #include "qgseffectstack.h" |
443 |
- #include "qgspainteffectregistry.h" |
444 |
- |
445 |
-+#include <QButtonGroup> |
446 |
-+ |
447 |
- QgsTextFormatWidget::QgsTextFormatWidget( const QgsTextFormat &format, QgsMapCanvas *mapCanvas, QWidget *parent ) |
448 |
- : QWidget( parent ) |
449 |
- , mMapCanvas( mapCanvas ) |
450 |
-diff --git a/src/gui/symbology/qgssymbollayerwidget.cpp b/src/gui/symbology/qgssymbollayerwidget.cpp |
451 |
-index 3a5f3c5314..da599a27ae 100644 |
452 |
---- a/src/gui/symbology/qgssymbollayerwidget.cpp |
453 |
-+++ b/src/gui/symbology/qgssymbollayerwidget.cpp |
454 |
-@@ -43,6 +43,7 @@ |
455 |
- #include "qgsauxiliarystorage.h" |
456 |
- |
457 |
- #include <QAbstractButton> |
458 |
-+#include <QButtonGroup> |
459 |
- #include <QColorDialog> |
460 |
- #include <QCursor> |
461 |
- #include <QDir> |
462 |
-diff --git a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp |
463 |
-index 4cc3e8b301..d377d718b7 100644 |
464 |
---- a/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp |
465 |
-+++ b/src/providers/arcgisrest/qgsarcgisservicesourceselect.cpp |
466 |
-@@ -29,6 +29,7 @@ |
467 |
- #include "qgssettings.h" |
468 |
- #include "qgsmapcanvas.h" |
469 |
- |
470 |
-+#include <QButtonGroup> |
471 |
- #include <QListWidgetItem> |
472 |
- #include <QMessageBox> |
473 |
- #include <QFileDialog> |
474 |
--- |
475 |
-2.16.3 |
476 |
- |
477 |
|
478 |
diff --git a/sci-geosciences/qgis/qgis-3.0.1.ebuild b/sci-geosciences/qgis/qgis-3.0.1.ebuild |
479 |
deleted file mode 100644 |
480 |
index 79614147766..00000000000 |
481 |
--- a/sci-geosciences/qgis/qgis-3.0.1.ebuild |
482 |
+++ /dev/null |
483 |
@@ -1,222 +0,0 @@ |
484 |
-# Copyright 1999-2018 Gentoo Foundation |
485 |
-# Distributed under the terms of the GNU General Public License v2 |
486 |
- |
487 |
-EAPI=6 |
488 |
- |
489 |
-PYTHON_COMPAT=( python3_5 ) |
490 |
-PYTHON_REQ_USE="sqlite" |
491 |
-QT_MIN_VER="5.9.1" |
492 |
- |
493 |
-if [[ ${PV} != *9999 ]]; then |
494 |
- SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 |
495 |
- examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" |
496 |
- KEYWORDS="amd64 x86" |
497 |
-else |
498 |
- GIT_ECLASS="git-r3" |
499 |
- EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git" |
500 |
-fi |
501 |
-inherit cmake-utils eutils ${GIT_ECLASS} gnome2-utils python-single-r1 qmake-utils xdg-utils |
502 |
-unset GIT_ECLASS |
503 |
- |
504 |
-DESCRIPTION="User friendly Geographic Information System" |
505 |
-HOMEPAGE="https://www.qgis.org/" |
506 |
- |
507 |
-LICENSE="GPL-2+ GPL-3+" |
508 |
-SLOT="0" |
509 |
-IUSE="3d examples georeferencer grass mapserver oracle polar postgres python webkit" |
510 |
- |
511 |
-REQUIRED_USE=" |
512 |
- mapserver? ( python ) |
513 |
- python? ( ${PYTHON_REQUIRED_USE} )" |
514 |
- |
515 |
-COMMON_DEPEND=" |
516 |
- app-crypt/qca:2[qt5(+),ssl] |
517 |
- >=dev-db/spatialite-4.2.0 |
518 |
- dev-db/sqlite:3 |
519 |
- dev-libs/expat |
520 |
- dev-libs/libzip:= |
521 |
- dev-libs/qtkeychain[qt5(+)] |
522 |
- >=dev-qt/designer-${QT_MIN_VER}:5 |
523 |
- >=dev-qt/qtconcurrent-${QT_MIN_VER}:5 |
524 |
- >=dev-qt/qtcore-${QT_MIN_VER}:5 |
525 |
- >=dev-qt/qtgui-${QT_MIN_VER}:5 |
526 |
- >=dev-qt/qtnetwork-${QT_MIN_VER}:5[ssl] |
527 |
- >=dev-qt/qtpositioning-${QT_MIN_VER}:5 |
528 |
- >=dev-qt/qtprintsupport-${QT_MIN_VER}:5 |
529 |
- >=dev-qt/qtsvg-${QT_MIN_VER}:5 |
530 |
- >=dev-qt/qtsql-${QT_MIN_VER}:5 |
531 |
- >=dev-qt/qtwidgets-${QT_MIN_VER}:5 |
532 |
- >=dev-qt/qtxml-${QT_MIN_VER}:5 |
533 |
- >=sci-libs/gdal-2.2.3:=[geos,python?,${PYTHON_USEDEP}] |
534 |
- sci-libs/geos |
535 |
- sci-libs/libspatialindex:= |
536 |
- sci-libs/proj |
537 |
- >=x11-libs/qscintilla-2.10.1:=[qt5(+)] |
538 |
- >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] |
539 |
- 3d? ( >=dev-qt/qt3d-${QT_MIN_VER}:5 ) |
540 |
- georeferencer? ( sci-libs/gsl:= ) |
541 |
- grass? ( >=sci-geosciences/grass-7.0.0:= ) |
542 |
- mapserver? ( dev-libs/fcgi ) |
543 |
- oracle? ( |
544 |
- dev-db/oracle-instantclient:= |
545 |
- sci-libs/gdal:=[oracle] |
546 |
- ) |
547 |
- polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) |
548 |
- postgres? ( dev-db/postgresql:= ) |
549 |
- python? ( ${PYTHON_DEPS} |
550 |
- dev-python/future[${PYTHON_USEDEP}] |
551 |
- dev-python/httplib2[${PYTHON_USEDEP}] |
552 |
- dev-python/jinja[${PYTHON_USEDEP}] |
553 |
- dev-python/markupsafe[${PYTHON_USEDEP}] |
554 |
- dev-python/owslib[${PYTHON_USEDEP}] |
555 |
- dev-python/pygments[${PYTHON_USEDEP}] |
556 |
- dev-python/PyQt5[designer,network,sql,svg,webkit?,${PYTHON_USEDEP}] |
557 |
- dev-python/python-dateutil[${PYTHON_USEDEP}] |
558 |
- dev-python/pytz[${PYTHON_USEDEP}] |
559 |
- dev-python/pyyaml[${PYTHON_USEDEP}] |
560 |
- >=dev-python/qscintilla-python-2.10.1[qt5(+),${PYTHON_USEDEP}] |
561 |
- dev-python/requests[${PYTHON_USEDEP}] |
562 |
- dev-python/sip:=[${PYTHON_USEDEP}] |
563 |
- dev-python/six[${PYTHON_USEDEP}] |
564 |
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) |
565 |
- ) |
566 |
- webkit? ( >=dev-qt/qtwebkit-${QT_MIN_VER}:5 ) |
567 |
-" |
568 |
-DEPEND="${COMMON_DEPEND} |
569 |
- >=dev-qt/linguist-tools-${QT_MIN_VER}:5 |
570 |
- >=dev-qt/qttest-${QT_MIN_VER}:5 |
571 |
- >=dev-qt/qtxmlpatterns-${QT_MIN_VER}:5 |
572 |
- sys-devel/bison |
573 |
- sys-devel/flex |
574 |
-" |
575 |
-RDEPEND="${COMMON_DEPEND} |
576 |
- sci-geosciences/gpsbabel |
577 |
-" |
578 |
- |
579 |
-# Disabling test suite because upstream disallow running from install path |
580 |
-RESTRICT="test" |
581 |
- |
582 |
-PATCHES=( |
583 |
- # git master |
584 |
- "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" |
585 |
- # release-3_0 branch |
586 |
- "${FILESDIR}/${P}-check-constraints.patch" |
587 |
- # TODO upstream |
588 |
- "${FILESDIR}/${P}-qt-5.11.patch" |
589 |
- "${FILESDIR}/${PN}-3.0.0-featuresummary.patch" |
590 |
-) |
591 |
- |
592 |
-pkg_setup() { |
593 |
- python-single-r1_pkg_setup |
594 |
-} |
595 |
- |
596 |
-src_prepare() { |
597 |
- cmake-utils_src_prepare |
598 |
- |
599 |
- sed -e "s:\${QT_BINARY_DIR}:$(qt5_get_bindir):" \ |
600 |
- -i CMakeLists.txt || die "Failed to fix lrelease path" |
601 |
- |
602 |
- sed -e "/QT_LRELEASE_EXECUTABLE/d" \ |
603 |
- -e "/QT_LUPDATE_EXECUTABLE/s/set/find_program/" \ |
604 |
- -e "s:lupdate-qt5:NAMES lupdate PATHS $(qt5_get_bindir) NO_DEFAULT_PATH:" \ |
605 |
- -i cmake/modules/ECMQt4To5Porting.cmake || die "Failed to fix ECMQt4To5Porting.cmake" |
606 |
- |
607 |
- cd src/plugins || die |
608 |
-} |
609 |
- |
610 |
-src_configure() { |
611 |
- local mycmakeargs=( |
612 |
- -DQGIS_MANUAL_SUBDIR=/share/man/ |
613 |
- -DBUILD_SHARED_LIBS=ON |
614 |
- -DQGIS_LIB_SUBDIR=$(get_libdir) |
615 |
- -DQGIS_PLUGIN_SUBDIR=$(get_libdir)/qgis |
616 |
- -DQWT_INCLUDE_DIR=/usr/include/qwt6 |
617 |
- -DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so |
618 |
- -DPEDANTIC=OFF |
619 |
- -DWITH_APIDOC=OFF |
620 |
- -DWITH_QSPATIALITE=ON |
621 |
- -DENABLE_TESTS=OFF |
622 |
- -DWITH_3D=$(usex 3d) |
623 |
- -DWITH_GEOREFERENCER=$(usex georeferencer) |
624 |
- -DWITH_GRASS=$(usex grass) |
625 |
- -DWITH_SERVER=$(usex mapserver) |
626 |
- -DWITH_ORACLE=$(usex oracle) |
627 |
- -DWITH_QWTPOLAR=$(usex polar) |
628 |
- -DWITH_POSTGRESQL=$(usex postgres) |
629 |
- -DWITH_BINDINGS=$(usex python) |
630 |
- -DWITH_CUSTOM_WIDGETS=$(usex python) |
631 |
- -DWITH_QTWEBKIT=$(usex webkit) |
632 |
- ) |
633 |
- |
634 |
- if use grass; then |
635 |
- mycmakeargs+=( |
636 |
- -DWITH_GRASS7=ON |
637 |
- -DGRASS_PREFIX7=/usr/$(get_libdir)/grass70 |
638 |
- ) |
639 |
- fi |
640 |
- |
641 |
- use python && mycmakeargs+=( -DBINDINGS_GLOBAL_INSTALL=ON ) |
642 |
- |
643 |
- # bugs 612956, 648726 |
644 |
- addpredict /dev/dri/renderD128 |
645 |
- addpredict /dev/dri/renderD129 |
646 |
- |
647 |
- cmake-utils_src_configure |
648 |
-} |
649 |
- |
650 |
-src_install() { |
651 |
- cmake-utils_src_install |
652 |
- |
653 |
- domenu debian/qgis.desktop |
654 |
- |
655 |
- local size type |
656 |
- for size in 16 22 24 32 48 64 96 128 256; do |
657 |
- newicon -s ${size} debian/icons/${PN}-icon${size}x${size}.png ${PN}.png |
658 |
- newicon -c mimetypes -s ${size} debian/icons/${PN}-mime-icon${size}x${size}.png ${PN}-mime.png |
659 |
- for type in qgs qml qlr qpt; do |
660 |
- newicon -c mimetypes -s ${size} debian/icons/${PN}-${type}${size}x${size}.png ${PN}-${type}.png |
661 |
- done |
662 |
- done |
663 |
- newicon -s scalable images/icons/qgis_icon.svg qgis.svg |
664 |
- |
665 |
- insinto /usr/share/mime/packages |
666 |
- doins debian/qgis.xml |
667 |
- |
668 |
- if use examples; then |
669 |
- docinto examples |
670 |
- dodoc -r "${WORKDIR}"/qgis_sample_data/. |
671 |
- docompress -x /usr/share/doc/${PF}/examples |
672 |
- fi |
673 |
- |
674 |
- python_optimize "${ED%/}"/usr/share/qgis/python |
675 |
- |
676 |
- if use grass; then |
677 |
- python_fix_shebang "${ED%/}"/usr/share/qgis/grass/scripts |
678 |
- fi |
679 |
-} |
680 |
- |
681 |
-pkg_postinst() { |
682 |
- if use postgres; then |
683 |
- elog "If you don't intend to use an external PostGIS server" |
684 |
- elog "you should install:" |
685 |
- elog " dev-db/postgis" |
686 |
- elif use python; then |
687 |
- elog "Support of PostgreSQL is disabled." |
688 |
- elog "But some installed python-plugins import the psycopg2 module." |
689 |
- elog "If you do not need these plugins just disable them" |
690 |
- elog "in the Plugins menu, else you need to set USE=\"postgres\"" |
691 |
- fi |
692 |
- if has_version "<sci-geosciences/qgis-3"; then |
693 |
- elog "QGIS is now based on PyQt5. Old scripts may not work anymore." |
694 |
- fi |
695 |
- |
696 |
- gnome2_icon_cache_update |
697 |
- xdg_mimeinfo_database_update |
698 |
- xdg_desktop_database_update |
699 |
-} |
700 |
- |
701 |
-pkg_postrm() { |
702 |
- gnome2_icon_cache_update |
703 |
- xdg_mimeinfo_database_update |
704 |
- xdg_desktop_database_update |
705 |
-} |