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

Update to 2.16.3 

- Add patch to fix qreal usage on arm
This commit is contained in:
Orion Poplawski 2016-09-26 21:02:54 -06:00
parent 33ac1c18f8
commit 8b75df0b21
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -24,3 +24,4 @@ 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

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 )

10
qgis.spec
View File

@ -15,7 +15,7 @@
#TODO: Run test suite (see debian/rules)
Name: qgis
Version: 2.16.2
Version: 2.16.3
Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering
@ -38,6 +38,9 @@ Source5: %{name}-mime.xml
# Fix builds on 64-bit machines
# https://hub.qgis.org/issues/15602
Patch0: %{name}-lib64.patch
# Fix qreal type usage for arm comptability
# https://github.com/qgis/QGIS/pull/3529
Patch1: %{name}-qreal.patch
# Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see:
@ -181,6 +184,7 @@ Please refer to %{name}-server-README.fedora for details!
%prep
%setup -q
%patch0 -p1 -b .lib64
%patch1 -p1 -b .qreal
# Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@ -403,6 +407,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%changelog
* 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
50a1799c6eb8c90eeeda4affedeea49c qgis-2.16.3.tar.bz2