diff --git a/.gitignore b/.gitignore index a4ac498..ed95e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ qgis_1.5.0.tar.gz /qgis-2.16.1.tar.bz2 /qgis-2.16.2.tar.bz2 /qgis-2.16.3.tar.bz2 +/qgis-2.18.0.tar.bz2 diff --git a/qgis-qreal.patch b/qgis-qreal.patch new file mode 100644 index 0000000..8dfc1be --- /dev/null +++ b/qgis-qreal.patch @@ -0,0 +1,24 @@ +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 8afa740..2517f0e 100644 --- a/qgis.spec +++ b/qgis.spec @@ -18,7 +18,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.16.3 +Version: 2.18.0 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -405,9 +405,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog -* Tue Sep 27 2016 Daniele ViganĂ² - 2.16.3-1 +* Fri Oct 21 2016 Volker Froehlich - 2.18.0-1 - New upstream release +* Mon Sep 26 2016 Orion Poplawski - 2.16.3-1 +- Update to 2.16.3 +- Add patch to fix qreal usage on arm + * Mon Sep 26 2016 Orion Poplawski - 2.16.2-1 - Update to 2.16.2 (bug #1378240) - Add patch to fix build on 64-bit machines @@ -417,9 +421,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : * Mon Sep 26 2016 Dominik Mierzejewski - 2.14.3-6 - rebuilt for matplotlib-2.0.0 -* Tue Aug 23 2016 Daniele ViganĂ² - 2.16.1-1 -- New upstream release - * Thu Aug 11 2016 Volker Froehlich - 2.14.3-5 - Replace dependency on PyQt4 with PyQt4-webkit, since webkit is in a sub-package now (BZ #1360485) diff --git a/sources b/sources index 765ba7e..3138c7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50a1799c6eb8c90eeeda4affedeea49c qgis-2.16.3.tar.bz2 +861c4af53113158581b42df2acbc3773 qgis-2.18.0.tar.bz2