dani/copr-dani-qgis
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge branch 'master' into daniviga-2.18

Browse Source
This commit is contained in:
Daniele Viganò 2016-10-27 19:26:56 +02:00
commit 5f50e99082
4 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

24
qgis-qreal.patch Normal file
View File

@ -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 )

11
qgis.spec
View File

@ -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ò <daniele@vigano.me> - 2.16.3-1
* Fri Oct 21 2016 Volker Froehlich <volker27@gmx.at> - 2.18.0-1
- New upstream release
* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 2.16.3-1
- Update to 2.16.3
- Add patch to fix qreal usage on arm
* Mon Sep 26 2016 Orion Poplawski <orion@cora.nwra.com> - 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 <rpm@greysector.net> - 2.14.3-6
- rebuilt for matplotlib-2.0.0
* Tue Aug 23 2016 Daniele Viganò <daniele@vigano.me> - 2.16.1-1
- New upstream release
* Thu Aug 11 2016 Volker Froehlich <volker27@gmx.at> - 2.14.3-5
- Replace dependency on PyQt4 with PyQt4-webkit, since webkit
is in a sub-package now (BZ #1360485)

2
sources
View File

@ -1 +1 @@
50a1799c6eb8c90eeeda4affedeea49c qgis-2.16.3.tar.bz2
861c4af53113158581b42df2acbc3773 qgis-2.18.0.tar.bz2