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

Compare commits

base: dani:33ac1c18f8f3de92b4fd7c77b156739c02b8b9cf
Branches Tags
dani:daniviga-2.18
dani:grass74
dani:master
dani:epel7
dani:v2.18.10
dani:v2.18.9
dani:v2.18.8
dani:v2.18.7
...
compare: dani:6e94d0ad19b5b0cf936250a3e15693dcfc0131e1
Branches Tags
dani:daniviga-2.18
dani:grass74
dani:master
dani:epel7
dani:v2.18.10
dani:v2.18.9
dani:v2.18.8
dani:v2.18.7

2 Commits
33ac1c18f8 ... 6e94d0ad19

Author SHA1 Message Date
Volker Fröhlich
6e94d0ad19 New version 2.18.0 2016-10-23 19:44:59 +02:00
Orion Poplawski
8b75df0b21 Update to 2.16.3 
- Add patch to fix qreal usage on arm
 2016-09-26 21:02:54 -06:00
4 changed files with 35 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
.gitignore vendored
View File

@ -24,3 +24,5 @@ qgis_1.5.0.tar.gz
/qgis-2.14.1.tar.bz2
/qgis-2.14.3.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 )

9
qgis.spec
View File

@ -15,7 +15,7 @@
#TODO: Run test suite (see debian/rules)
Name: qgis
Version: 2.16.2
Version: 2.18.0
Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
@ -403,6 +403,13 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* 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

2
sources
View File

@ -1 +1 @@
e2a24b2c41af83dcc5b26fcd0e63366b qgis-2.16.2.tar.bz2
861c4af53113158581b42df2acbc3773 qgis-2.18.0.tar.bz2