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

Merging 2.14.1 from master

Browse Source
This commit is contained in:
Dave Johansen 2016-04-08 23:21:07 -07:00
commit 43714831db
8 changed files with 182 additions and 783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -14,4 +14,11 @@ qgis_1.5.0.tar.gz
/qgis-2.6.1.tar.bz2 /qgis-2.6.1.tar.bz2
/qgis-2.8.1.tar.bz2 /qgis-2.8.1.tar.bz2
/qgis-2.8.2.tar.bz2 /qgis-2.8.2.tar.bz2
/qgis-2.8.3.tar.bz2 /qgis-2.10.0.tar.bz2
/qgis-2.10.1.tar.bz2
/qgis-2.12.0.tar.bz2
/qgis-2.12.1.tar.bz2
/qgis-2.12.2.tar.bz2
/qgis-2.12.3.tar.bz2
/qgis-2.14.0.tar.bz2
/qgis-2.14.1.tar.bz2

13
qgis-2.12.0-arm.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
index 4a42a6d..5a4b975 100644
--- a/src/app/qgswelcomepageitemsmodel.cpp
+++ b/src/app/qgswelcomepageitemsmodel.cpp
@@ -114,7 +114,7 @@ QSize QgsWelcomePageItemDelegate::sizeHint( const QStyleOptionViewItem & option,
index.data( QgsWelcomePageItemsModel::CrsRole ).toString() ) );
doc.setTextWidth( width - ( !icon.isNull() ? icon.width() + 35 : 35 ) );
- return QSize( width, qMax( doc.size().height() + 10, ( double )icon.height() ) + 20 );
+ return QSize( width, qMax( ( double ) doc.size().height() + 10, ( double )icon.height() ) + 20 );
}
QgsWelcomePageItemsModel::QgsWelcomePageItemsModel( QObject* parent )

43
qgis-2.14.0-mssql-attributes.patch Normal file
View File

@ -0,0 +1,43 @@
From 30449e577f0cd432bd8c60787743fba54c1e51b9 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 3 Mar 2016 10:34:32 +1100
Subject: [PATCH] Fix fetching subset of attributes with mssql (fix #14402),
add test
---
src/providers/mssql/qgsmssqlfeatureiterator.cpp | 2 +-
tests/src/python/providertestbase.py | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
index 53214d4..560d344 100644
--- a/src/providers/mssql/qgsmssqlfeatureiterator.cpp
+++ b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -284,7 +284,7 @@ bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
for ( int i = 0; i < mAttributesToFetch.count(); i++ )
{
QVariant v = mQuery->value( i );
- const QgsField &fld = mSource->mFields.at( i );
+ const QgsField &fld = mSource->mFields.at( mAttributesToFetch.at( i ) );
if ( v.type() != fld.type() )
v = QgsVectorDataProvider::convertValue( fld.type(), v.toString() );
feature.setAttribute( mAttributesToFetch.at( i ), v );
diff --git a/tests/src/python/providertestbase.py b/tests/src/python/providertestbase.py
index 7b8707e..26e6d86 100644
--- a/tests/src/python/providertestbase.py
+++ b/tests/src/python/providertestbase.py
@@ -384,3 +384,14 @@ def testClosedIterators(self):
# Test rewinding closed iterator
self.assertFalse(f_it.rewind(), 'Rewinding closed iterator successful, should not be allowed')
+
+ def testGetFeaturesSubsetAttributes(self):
+ """ Test that expected results are returned when using subsets of attributes """
+
+ tests = {'pk': set([1, 2, 3, 4, 5]),
+ 'cnt': set([-200, 300, 100, 200, 400]),
+ 'name': set(['Pear', 'Orange', 'Apple', 'Honey', NULL]),
+ 'name2': set(['NuLl', 'PEaR', 'oranGe', 'Apple', 'Honey'])}
+ for field, expected in tests.iteritems():
+ result = set([f[field] for f in self.provider.getFeatures(QgsFeatureRequest().setSubsetOfAttributes([field], self.provider.fields()))])
+ self.assertEqual(result, expected, 'Expected {}, got {}'.format(expected, result))

13
qgis-2.4.0-grass.patch
View File

@ -1,13 +0,0 @@
diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
index 3435a12..2476743 100644
--- a/cmake/FindGRASS.cmake
+++ b/cmake/FindGRASS.cmake
@@ -36,7 +36,7 @@ MACRO (CHECK_GRASS G_PREFIX)
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
SET(LIB_PATH NOTFOUND)
- FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
+ FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib)
IF (LIB_PATH)
SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})

430
qgis-2.8.1-arm.patch
View File

@ -1,430 +0,0 @@
commit 1aff7335d004bc410eb61e1436ee7648716f9319
Author: Juergen E. Fischer <jef@norbit.de>
Date: Mon Mar 9 09:27:27 2015 +0100
fix arm build
diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp
index ba2f8c0..ba7735d 100644
--- a/src/app/qgsdecorationgrid.cpp
+++ b/src/app/qgsdecorationgrid.cpp
@@ -217,14 +217,14 @@ void QgsDecorationGrid::render( QPainter * p )
// p->setPen( mGridPen );
- QList< QPair< double, QLineF > > verticalLines;
+ QList< QPair< qreal, QLineF > > verticalLines;
yGridLines( verticalLines );
- QList< QPair< double, QLineF > > horizontalLines;
+ QList< QPair< qreal, QLineF > > horizontalLines;
xGridLines( horizontalLines );
//QgsDebugMsg( QString("grid has %1 vertical and %2 horizontal lines").arg( verticalLines.size() ).arg( horizontalLines.size() ) );
- QList< QPair< double, QLineF > >::const_iterator vIt = verticalLines.constBegin();
- QList< QPair< double, QLineF > >::const_iterator hIt = horizontalLines.constBegin();
+ QList< QPair< qreal, QLineF > >::const_iterator vIt = verticalLines.constBegin();
+ QList< QPair< qreal, QLineF > >::const_iterator hIt = horizontalLines.constBegin();
//simpler approach: draw vertical lines first, then horizontal ones
if ( mGridStyle == QgsDecorationGrid::Line )
@@ -338,7 +338,7 @@ void QgsDecorationGrid::render( QPainter * p )
}
}
-void QgsDecorationGrid::drawCoordinateAnnotations( QPainter* p, const QList< QPair< double, QLineF > >& hLines, const QList< QPair< double, QLineF > >& vLines )
+void QgsDecorationGrid::drawCoordinateAnnotations( QPainter* p, const QList< QPair< qreal, QLineF > >& hLines, const QList< QPair< qreal, QLineF > >& vLines )
{
if ( !p )
{
@@ -346,7 +346,7 @@ void QgsDecorationGrid::drawCoordinateAnnotations( QPainter* p, const QList< QPa
}
QString currentAnnotationString;
- QList< QPair< double, QLineF > >::const_iterator it = hLines.constBegin();
+ QList< QPair< qreal, QLineF > >::const_iterator it = hLines.constBegin();
for ( ; it != hLines.constEnd(); ++it )
{
currentAnnotationString = QString::number( it->first, 'f', mGridAnnotationPrecision );
@@ -566,7 +566,7 @@ QPolygonF canvasExtent()
return poly;
}
-int QgsDecorationGrid::xGridLines( QList< QPair< double, QLineF > >& lines ) const
+int QgsDecorationGrid::xGridLines( QList< QPair< qreal, QLineF > >& lines ) const
{
// prepare horizontal lines
lines.clear();
@@ -612,7 +612,7 @@ int QgsDecorationGrid::xGridLines( QList< QPair< double, QLineF > >& lines ) con
return 0;
}
-int QgsDecorationGrid::yGridLines( QList< QPair< double, QLineF > >& lines ) const
+int QgsDecorationGrid::yGridLines( QList< QPair< qreal, QLineF > >& lines ) const
{
// prepare vertical lines
diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h
index 22f4549..3ad7ebf 100644
--- a/src/app/qgsdecorationgrid.h
+++ b/src/app/qgsdecorationgrid.h
@@ -199,7 +199,7 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
@param p drawing painter
@param hLines horizontal coordinate lines in item coordinates
@param vLines vertical coordinate lines in item coordinates*/
- void drawCoordinateAnnotations( QPainter* p, const QList< QPair< double, QLineF > >& hLines, const QList< QPair< double, QLineF > >& vLines );
+ void drawCoordinateAnnotations( QPainter* p, const QList< QPair< qreal, QLineF > >& hLines, const QList< QPair< qreal, QLineF > >& vLines );
void drawCoordinateAnnotation( QPainter* p, const QPointF& pos, QString annotationString );
/**Draws a single annotation
@param p drawing painter
@@ -209,10 +209,10 @@ class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem
void drawAnnotation( QPainter* p, const QPointF& pos, int rotation, const QString& annotationText );
/**Returns the grid lines with associated coordinate value
@return 0 in case of success*/
- int xGridLines( QList< QPair< double, QLineF > >& lines ) const;
+ int xGridLines( QList< QPair< qreal, QLineF > >& lines ) const;
/**Returns the grid lines for the y-coordinates. Not vertical in case of rotation
@return 0 in case of success*/
- int yGridLines( QList< QPair< double, QLineF > >& lines ) const;
+ int yGridLines( QList< QPair< qreal, QLineF > >& lines ) const;
/**Returns the item border of a point (in item coordinates)*/
Border borderForLineCoord( const QPointF& point, QPainter* p ) const;
diff --git a/src/app/qgsmapmouseevent.cpp b/src/app/qgsmapmouseevent.cpp
index 997aaa0..631c750 100644
--- a/src/app/qgsmapmouseevent.cpp
+++ b/src/app/qgsmapmouseevent.cpp
@@ -86,8 +86,7 @@ void QgsMapMouseEvent::snapPoint()
QPoint QgsMapMouseEvent::mapToPixelCoordinates( QgsMapCanvas* canvas, const QgsPoint& point )
{
- double x = point.x();
- double y = point.y();
+ qreal x = point.x(), y = point.y();
canvas->mapSettings().mapToPixel().transformInPlace( x, y );
diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
index 7d790e6..7656be2 100644
--- a/src/core/composer/qgscomposermapgrid.cpp
+++ b/src/core/composer/qgscomposermapgrid.cpp
@@ -1838,7 +1838,7 @@ bool QgsComposerMapGrid::shouldShowDivisionForDisplayMode( const QgsComposerMapG
|| ( mode == QgsComposerMapGrid::LongitudeOnly && coordinate == QgsComposerMapGrid::Longitude );
}
-bool sortByDistance( const QPair<double, QgsComposerMapGrid::BorderSide>& a, const QPair<double, QgsComposerMapGrid::BorderSide>& b )
+bool sortByDistance( const QPair<qreal , QgsComposerMapGrid::BorderSide>& a, const QPair<qreal , QgsComposerMapGrid::BorderSide>& b )
{
return a.first < b.first;
}
@@ -1885,7 +1885,7 @@ QgsComposerMapGrid::BorderSide QgsComposerMapGrid::borderForLineCoord( const QPo
}
//otherwise, guess side based on closest map side to point
- QList< QPair<double, QgsComposerMapGrid::BorderSide > > distanceToSide;
+ QList< QPair<qreal, QgsComposerMapGrid::BorderSide > > distanceToSide;
distanceToSide << qMakePair( p.x(), QgsComposerMapGrid::Left );
distanceToSide << qMakePair( mComposerMap->rect().width() - p.x(), QgsComposerMapGrid::Right );
distanceToSide << qMakePair( p.y(), QgsComposerMapGrid::Top );
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
index 81753c4..ab7281a 100644
--- a/src/core/qgsgeometry.cpp
+++ b/src/core/qgsgeometry.cpp
@@ -4679,7 +4679,7 @@ bool QgsGeometry::convertToMultiType()
void QgsGeometry::transformVertex( QgsWkbPtr &wkbPtr, const QTransform& trans, bool hasZValue )
{
- double x, y, rotated_x, rotated_y;
+ qreal x, y, rotated_x, rotated_y;
QgsWkbPtr tmp = wkbPtr;
tmp >> x >> y;
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
index 46f4a7f..36d23ac 100644
--- a/src/core/qgsgeometry.h
+++ b/src/core/qgsgeometry.h
@@ -686,12 +686,18 @@ class CORE_EXPORT QgsWkbPtr
inline const QgsWkbPtr &operator>>( unsigned int &v ) const { memcpy( &v, mP, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline const QgsWkbPtr &operator>>( char &v ) const { memcpy( &v, mP, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline const QgsWkbPtr &operator>>( QGis::WkbType &v ) const { memcpy( &v, mP, sizeof( v ) ); mP += sizeof( v ); return *this; }
+#ifdef QT_ARCH_ARM
+ inline const QgsWkbPtr &operator>>( qreal &v ) const { double d; memcpy( &d, mP, sizeof( d ) ); mP += sizeof( d ); v=d; return *this; }
+#endif
inline QgsWkbPtr &operator<<( const double &v ) { memcpy( mP, &v, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline QgsWkbPtr &operator<<( const int &v ) { memcpy( mP, &v, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline QgsWkbPtr &operator<<( const unsigned int &v ) { memcpy( mP, &v, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline QgsWkbPtr &operator<<( const char &v ) { memcpy( mP, &v, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline QgsWkbPtr &operator<<( const QGis::WkbType &v ) { memcpy( mP, &v, sizeof( v ) ); mP += sizeof( v ); return *this; }
+#ifdef QT_ARCH_ARM
+ inline QgsWkbPtr &operator<<( const qreal &v ) { double d = v; memcpy( mP, &d, sizeof( d ) ); mP += sizeof( d ); return *this; }
+#endif
inline void operator+=( int n ) { mP += n; }
@@ -710,6 +716,9 @@ class CORE_EXPORT QgsConstWkbPtr
inline const QgsConstWkbPtr &operator>>( unsigned int &v ) const { memcpy( &v, mP, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline const QgsConstWkbPtr &operator>>( char &v ) const { memcpy( &v, mP, sizeof( v ) ); mP += sizeof( v ); return *this; }
inline const QgsConstWkbPtr &operator>>( QGis::WkbType &v ) const { memcpy( &v, mP, sizeof( v ) ); mP += sizeof( v ); return *this; }
+#ifdef QT_ARCH_ARM
+ inline const QgsConstWkbPtr &operator>>( qreal &v ) const { double d; memcpy( &d, mP, sizeof( d ) ); mP += sizeof( d ); v=d; return *this; }
+#endif
inline void operator+=( int n ) { mP += n; }
diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp
index 16ade54..08e06e4 100644
--- a/src/core/qgsmaptopixel.cpp
+++ b/src/core/qgsmaptopixel.cpp
@@ -114,22 +114,18 @@ void QgsMapToPixel::updateMatrix()
mMatrix = QTransform::fromTranslate( cx, cy )
.rotate( rotation )
.scale( 1 / mMapUnitsPerPixel, -1 / mMapUnitsPerPixel )
- .translate( -xCenter, -yCenter )
- ;
+ .translate( -xCenter, -yCenter );
}
-QgsPoint QgsMapToPixel::toMapPoint( double x, double y ) const
+QgsPoint QgsMapToPixel::toMapPoint( qreal x, qreal y ) const
{
bool invertible;
QTransform matrix = mMatrix.inverted( &invertible );
assert( invertible );
- double mx, my;
+ qreal mx, my;
matrix.map( x, y, &mx, &my );
- QgsPoint ret( mx, my );
-
//QgsDebugMsg(QString("XXX toMapPoint x:%1 y:%2 -> x:%3 y:%4").arg(x).arg(y).arg(mx).arg(my));
-
- return ret;
+ return QgsPoint( mx, my );
}
QgsPoint QgsMapToPixel::toMapCoordinates( QPoint p ) const
@@ -232,42 +228,34 @@ QString QgsMapToPixel::showParameters() const
<< " rotation: " << mRotation
<< " size: " << mWidth << "x" << mHeight;
return rep;
-
}
-
-QgsPoint QgsMapToPixel::transform( double x, double y ) const
+QgsPoint QgsMapToPixel::transform( qreal x, qreal y ) const
{
transformInPlace( x, y );
return QgsPoint( x, y );
}
-QgsPoint QgsMapToPixel::transform( const QgsPoint& p ) const
+QgsPoint QgsMapToPixel::transform( const QgsPoint &p ) const
{
- double dx = p.x();
- double dy = p.y();
- transformInPlace( dx, dy );
-
+ qreal x = p.x(), y = p.y();
+ transformInPlace( x, y );
// QgsDebugMsg(QString("Point to pixel...X : %1-->%2, Y: %3 -->%4").arg(p.x()).arg(dx).arg(p.y()).arg(dy));
- return QgsPoint( dx, dy );
+ return QgsPoint( x, y );
}
-void QgsMapToPixel::transform( QgsPoint* p ) const
+void QgsMapToPixel::transform( QgsPoint *p ) const
{
- double x = p->x();
- double y = p->y();
+ qreal x = p->x(), y = p->y();
transformInPlace( x, y );
-
-#ifdef QGISDEBUG
// QgsDebugMsg(QString("Point to pixel...X : %1-->%2, Y: %3 -->%4").arg(p->x()).arg(x).arg(p->y()).arg(y));
-#endif
p->set( x, y );
}
-void QgsMapToPixel::transformInPlace( qreal& x, qreal& y ) const
+void QgsMapToPixel::transformInPlace( qreal &x, qreal &y ) const
{
// Map 2 Pixel
- double mx, my;
+ qreal mx, my;
mMatrix.map( x, y, &mx, &my );
//QgsDebugMsg(QString("XXX transformInPlace X : %1-->%2, Y: %3 -->%4").arg(x).arg(mx).arg(y).arg(my));
x = mx; y = my;
diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h
index c11fb90..081e5d1 100644
--- a/src/core/qgsmaptopixel.h
+++ b/src/core/qgsmaptopixel.h
@@ -74,7 +74,7 @@ class CORE_EXPORT QgsMapToPixel
* @param y y coordinate of point to transform
* @return QgsPoint in device coordinates
*/
- QgsPoint transform( double x, double y ) const;
+ QgsPoint transform( qreal x, qreal y ) const;
/*! Transform device coordinates to map (world) coordinates
* @param x x coordinate of point to be converted to map cooordinates
* @param y y coordinate of point to be converted to map cooordinates
@@ -110,7 +110,7 @@ class CORE_EXPORT QgsMapToPixel
*/
QgsPoint toMapCoordinates( QPoint p ) const;
- QgsPoint toMapPoint( double x, double y ) const;
+ QgsPoint toMapPoint( qreal x, qreal y ) const;
/*! Set map units per pixel
* @param mapUnitsPerPixel Map units per pixel
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
index 768a511..b5ecc8c 100644
--- a/src/core/qgspallabeling.cpp
+++ b/src/core/qgspallabeling.cpp
@@ -2105,7 +2105,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
QTransform t = QTransform::fromTranslate( center.x(), center.y() );
t.rotate( -m2p.mapRotation() );
t.translate( -center.x(), -center.y() );
- double xPosR, yPosR;
+ qreal xPosR, yPosR;
t.map( xPos, yPos, &xPosR, &yPosR );
xPos = xPosR; yPos = yPosR;
}
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
index 534e7da..4bea360 100644
--- a/src/core/qgspointlocator.cpp
+++ b/src/core/qgspointlocator.cpp
@@ -268,6 +268,8 @@ struct _CohenSutherland
y = y0 + ( y1 - y0 ) * ( mRect.xMinimum() - x0 ) / ( x1 - x0 );
x = mRect.xMinimum();
}
+ else
+ break;
// Now we move outside point to intersection point to clip
// and get ready for next pass.
@@ -536,13 +538,13 @@ class QgsPointLocator_DumpTree : public SpatialIndex::IQueryStrategy
if ( !n )
return;
- qDebug( "NODE: %ld", n->getIdentifier() );
+ QgsDebugMsg( QString( "NODE: %1" ).arg( n->getIdentifier() ) );
if ( n->getLevel() > 0 )
{
// inner nodes
for ( uint32_t cChild = 0; cChild < n->getChildrenCount(); cChild++ )
{
- qDebug( "- CH: %ld", n->getChildIdentifier( cChild ) );
+ QgsDebugMsg( QString( "- CH: %1" ).arg( n->getChildIdentifier( cChild ) ) );
ids.push( n->getChildIdentifier( cChild ) );
}
}
@@ -551,7 +553,7 @@ class QgsPointLocator_DumpTree : public SpatialIndex::IQueryStrategy
// leaves
for ( uint32_t cChild = 0; cChild < n->getChildrenCount(); cChild++ )
{
- qDebug( "- L: %ld", n->getChildIdentifier( cChild ) );
+ QgsDebugMsg( QString( "- L: %1" ).arg( n->getChildIdentifier( cChild ) ) );
}
}
diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp
index 73b4f22..6e114ca 100644
--- a/src/core/symbology-ng/qgsrendererv2.cpp
+++ b/src/core/symbology-ng/qgsrendererv2.cpp
@@ -39,10 +39,7 @@ const unsigned char* QgsFeatureRendererV2::_getPoint( QPointF& pt, QgsRenderCont
{
QgsConstWkbPtr wkbPtr( wkb + 1 );
unsigned int wkbType;
- wkbPtr >> wkbType;
-
- double x, y;
- wkbPtr >> x >> y;
+ wkbPtr >> wkbType >> pt.rx() >> pt.ry();
if ( wkbType == QGis::WKBPoint25D )
wkbPtr += sizeof( double );
@@ -50,12 +47,11 @@ const unsigned char* QgsFeatureRendererV2::_getPoint( QPointF& pt, QgsRenderCont
if ( context.coordinateTransform() )
{
double z = 0; // dummy variable for coordiante transform
- context.coordinateTransform()->transformInPlace( x, y, z );
+ context.coordinateTransform()->transformInPlace( pt.rx(), pt.ry(), z );
}
- context.mapToPixel().transformInPlace( x, y );
+ context.mapToPixel().transformInPlace( pt.rx(), pt.ry() );
- pt = QPointF( x, y );
return wkbPtr;
}
@@ -65,7 +61,7 @@ const unsigned char* QgsFeatureRendererV2::_getLineString( QPolygonF& pts, QgsRe
unsigned int wkbType, nPoints;
wkbPtr >> wkbType >> nPoints;
- bool hasZValue = ( wkbType == QGis::WKBLineString25D );
+ bool hasZValue = wkbType == QGis::WKBLineString25D;
double x, y;
const QgsCoordinateTransform* ct = context.coordinateTransform();
diff --git a/src/gui/qgsmapcanvasitem.cpp b/src/gui/qgsmapcanvasitem.cpp
index c0dd3ec..763f340 100644
--- a/src/gui/qgsmapcanvasitem.cpp
+++ b/src/gui/qgsmapcanvasitem.cpp
@@ -63,7 +63,7 @@ QgsPoint QgsMapCanvasItem::toMapCoordinates( const QPoint& point ) const
QPointF QgsMapCanvasItem::toCanvasCoordinates( const QgsPoint& point ) const
{
- double x = point.x(), y = point.y();
+ qreal x = point.x(), y = point.y();
mMapCanvas->getCoordinateTransform()->transformInPlace( x, y );
return QPointF( x, y ) + mPanningOffset;
}
diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp
index 463a07a..4fd0f4c 100644
--- a/src/gui/qgsmaptool.cpp
+++ b/src/gui/qgsmaptool.cpp
@@ -68,7 +68,7 @@ QgsRectangle QgsMapTool::toLayerCoordinates( QgsMapLayer* layer, const QgsRectan
QPoint QgsMapTool::toCanvasCoordinates( const QgsPoint& point )
{
- double x = point.x(), y = point.y();
+ qreal x = point.x(), y = point.y();
mCanvas->getCoordinateTransform()->transformInPlace( x, y );
return QPoint( qRound( x ), qRound( y ) );
}
diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp
index 77022ac..88618ef 100644
--- a/src/providers/wcs/qgswcsprovider.cpp
+++ b/src/providers/wcs/qgswcsprovider.cpp
@@ -516,7 +516,7 @@ void QgsWcsProvider::readBlock( int bandNo, QgsRectangle const & viewExtent, in
// TODO: set block to null values, move that to function and call only if fails
memset( block, 0, pixelWidth * pixelHeight * QgsRasterBlock::typeSize( dataType( bandNo ) ) );
- // Requested extent must at least partialy overlap coverage extent, otherwise
+ // Requested extent must at least partially overlap coverage extent, otherwise
// server gives error. QGIS usually does not request blocks outside raster extent
// (higher level checks) but it is better to do check here as well
if ( !viewExtent.intersects( mCoverageExtent ) )
diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp
index 1a26cc2..4b94bfb 100644
--- a/tests/src/core/testqgsatlascomposition.cpp
+++ b/tests/src/core/testqgsatlascomposition.cpp
@@ -308,13 +308,13 @@ void TestQgsAtlasComposition::predefinedscales_render()
mAtlasMap->setAtlasDriven( true );
mAtlasMap->setAtlasScalingMode( QgsComposerMap::Predefined );
- QVector<double> scales;
- scales << 1800000;
- scales << 5000000;
+ QVector<qreal> scales;
+ scales << 1800000.0;
+ scales << 5000000.0;
mAtlas->setPredefinedScales( scales );
{
- const QVector<double>& setScales = mAtlas->predefinedScales();
+ const QVector<qreal> &setScales = mAtlas->predefinedScales();
for ( int i = 0; i < setScales.size(); i++ )
{
QVERIFY( setScales[i] == scales[i] );

2
qgis-mime.xml
View File

@ -6,6 +6,7 @@
<comment xml:lang="de">QGIS-Projekt</comment> <comment xml:lang="de">QGIS-Projekt</comment>
<sub-class-of type="application/xml"/> <sub-class-of type="application/xml"/>
<alias type="application/x-qgis"/> <alias type="application/x-qgis"/>
<icon name="qgis-mime"/>
<magic priority="50"> <magic priority="50">
<match type="string" offset="0" value="&lt;!DOCTYPE qgis"> <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
<match type="string" offset="0:256" value="&lt;qgis projectname"/> <match type="string" offset="0:256" value="&lt;qgis projectname"/>
@ -18,6 +19,7 @@
<comment>QGIS layer settings</comment> <comment>QGIS layer settings</comment>
<comment xml:lang="de">QGIS Layer Einstellungen</comment> <comment xml:lang="de">QGIS Layer Einstellungen</comment>
<sub-class-of type="application/xml"/> <sub-class-of type="application/xml"/>
<icon name="qgis-mime"/>
<magic priority="50"> <magic priority="50">
<match type="string" offset="0" value="&lt;!DOCTYPE qgis"> <match type="string" offset="0" value="&lt;!DOCTYPE qgis">
<match type="string" offset="0:256" value="&lt;qgis version"/> <match type="string" offset="0:256" value="&lt;qgis version"/>

435
qgis.spec
View File

@ -1,3 +1,5 @@
#TODO: Fix error message with processing plug-in in regards to pyspatialite
# Shared lib calls exit # Shared lib calls exit
# https://hub.qgis.org/issues/2854 # https://hub.qgis.org/issues/2854
@ -12,7 +14,7 @@
#TODO: Run test suite (see debian/rules) #TODO: Run test suite (see debian/rules)
Name: qgis Name: qgis
Version: 2.8.4 Version: 2.14.1
Release: 1%{?dist} Release: 1%{?dist}
Summary: A user friendly Open Source Geographic Information System Summary: A user friendly Open Source Geographic Information System
Group: Applications/Engineering Group: Applications/Engineering
@ -33,12 +35,6 @@ Source4: %{name}-server-README.fedora
# Based on debian/qgis.xml but excluding already defined or proprietary types # Based on debian/qgis.xml but excluding already defined or proprietary types
Source5: %{name}-mime.xml Source5: %{name}-mime.xml
# Fix detection problem for GRASS libraries
Patch0: %{name}-2.4.0-grass.patch
# https://github.com/qgis/QGIS/commit/1aff7335d004bc410eb61e1436ee7648716f9319
Patch1: %{name}-2.8.1-arm.patch
# Some plug-ins need Pyspatialite (bundled) # Some plug-ins need Pyspatialite (bundled)
# The license is not totally clear, see: # The license is not totally clear, see:
# http://code.google.com/p/pyspatialite/issues/detail?id=3 # http://code.google.com/p/pyspatialite/issues/detail?id=3
@ -73,10 +69,12 @@ BuildRequires: PyQt4-devel
BuildRequires: PyQwt-devel BuildRequires: PyQwt-devel
%endif %endif
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: qca-devel
BuildRequires: qextserialport-devel BuildRequires: qextserialport-devel
BuildRequires: qscintilla-devel BuildRequires: qscintilla-devel
BuildRequires: qscintilla-python-devel BuildRequires: qscintilla-python-devel
BuildRequires: qt4-devel BuildRequires: qt4-devel
#BuildRequires: qt-mobility-devel
BuildRequires: qt4-webkit-devel BuildRequires: qt4-webkit-devel
BuildRequires: qwt-devel BuildRequires: qwt-devel
BuildRequires: qwtpolar-devel BuildRequires: qwtpolar-devel
@ -96,13 +94,11 @@ Requires: gpsbabel
# We don't want to provide private Python extension libs # We don't want to provide private Python extension libs
%if (0%{?fedora} || 0%{?rhel} > 6) %if (0%{?fedora} || 0%{?rhel} > 6)
%global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ %global __provides_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%global __requires_exclude_from ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%endif %endif
%if 0%{?rhel} == 6 %if 0%{?rhel} == 6
%{?filter_setup: %{?filter_setup:
%filter_provides_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$ %filter_provides_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%filter_requires_in ^(%{python_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
%filter_setup %filter_setup
} }
%endif %endif
@ -135,7 +131,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
# WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though # WARNING: Rebuild QGIS whenever a new version of GRASS is shipped! Even though
# the soname might stay the same, it won't work anymore. # the soname might stay the same, it won't work anymore.
#http://hub.qgis.org/issues/5274 #http://hub.qgis.org/issues/5274
Requires: grass = 6.4.4 Requires: grass => 7.0.3
%description grass %description grass
GRASS plugin for QGIS required to interface with the GRASS system. GRASS plugin for QGIS required to interface with the GRASS system.
@ -153,6 +149,7 @@ Requires: python-OWSLib
Requires: python-psycopg2 Requires: python-psycopg2
Requires: python-pygments Requires: python-pygments
Requires: python-six Requires: python-six
Requires: PyYAML
Requires: qscintilla-python Requires: qscintilla-python
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
@ -177,8 +174,6 @@ Please refer to %{name}-server-README.fedora for details!
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .grass~
%patch1 -p1 -b .arm~
# Remove executable permissions from source code files # Remove executable permissions from source code files
find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+ find . \( -name "*.cpp" -o -name "*.h" \) -type f -perm /111 -execdir chmod -x {} \+
@ -204,6 +199,7 @@ gzip ChangeLog
# Necessary for the test suite # Necessary for the test suite
#export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib} #export LD_LIBRARY_PATH=%{_builddir}%{name}-%{version}/output/%{_lib}
#TODO: If for EPEL (osgearth, touch)
#Info: TOUCH needs Qt >= 4.5 #Info: TOUCH needs Qt >= 4.5
%cmake \ %cmake \
%{_cmake_skip_rpath} \ %{_cmake_skip_rpath} \
@ -212,6 +208,8 @@ gzip ChangeLog
-D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \ -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
-D WITH_BINDINGS:BOOL=TRUE \ -D WITH_BINDINGS:BOOL=TRUE \
-D MAPSERVER_SKIP_ECW=TRUE \ -D MAPSERVER_SKIP_ECW=TRUE \
-D WITH_GRASS:BOOL=TRUE \
-D WITH_GRASS7:BOOL=TRUE \
-D GRASS_PREFIX=%{_libdir}/grass \ -D GRASS_PREFIX=%{_libdir}/grass \
-D WITH_MAPSERVER:BOOL=TRUE \ -D WITH_MAPSERVER:BOOL=TRUE \
-D WITH_CUSTOM_WIDGETS:BOOL=TRUE \ -D WITH_CUSTOM_WIDGETS:BOOL=TRUE \
@ -227,15 +225,15 @@ gzip ChangeLog
-D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \ -D WITH_INTERNAL_QEXTSERIALPORT:BOOL=FALSE \
-D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \ -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
-D WITH_INTERNAL_SIX:BOOL=FALSE \ -D WITH_INTERNAL_SIX:BOOL=FALSE \
-D WITH_INTERNAL_YAML:BOOL=FALSE \
-D WITH_PYSPATIALITE:BOOL=FALSE \ -D WITH_PYSPATIALITE:BOOL=FALSE \
-D WITH_SERVER:BOOL=TRUE \ -D WITH_SERVER:BOOL=TRUE \
-D WITH_TOUCH:BOOL=TRUE \ -D WITH_TOUCH:BOOL=TRUE \
%{configure_with_spatialite} \ %{configure_with_spatialite} \
. .
#-D WITH_QTMOBILITY:BOOL=TRUE \ #-D WITH_QTMOBILITY:BOOL=TRUE \
# Doesn't build, see above! # Doesn't build, as of 2.10, known issue
#-D WITH_GLOBE:BOOL=TRUE #-D WITH_GLOBE:BOOL=TRUE
# Globe requires osgearth, which is still not packaged
make %{?_smp_mflags} make %{?_smp_mflags}
@ -264,25 +262,27 @@ install -pm0644 %{SOURCE5} \
%{buildroot}%{_datadir}/mime/packages/%{name}.xml %{buildroot}%{_datadir}/mime/packages/%{name}.xml
# Install application and MIME icons # Install application and MIME icons
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128 192x192 256x256 512x512; do
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/apps
install -pm0644 debian/%{name}-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qgis.png
install -pm0644 debian/qbrowser-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/qbrowser.png
done
for size in 8x8 16x16 22x22 24x24 32x32 36x36 42x42 48x48 64x64 72x72 80x80 96x96 128x128; do
install -pd %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes
install -pm0644 debian/qgis-mime-icon$size.png %{buildroot}%{_datadir}/icons/hicolor/$size/mimetypes/qgis-mime.png
done
install -pd %{buildroot}%{_datadir}/pixmaps install -pd %{buildroot}%{_datadir}/pixmaps
install -pd %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps install -pd %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
install -pd %{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes
install -pm0644 \ install -pm0644 images/icons/%{name}-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
%{buildroot}%{_datadir}/%{name}/images/icons/%{name}-icon.png \ install -pm0644 images/icons/qbrowser-icon.png %{buildroot}%{_datadir}/pixmaps/qbrowser.png
%{buildroot}%{_datadir}/pixmaps/%{name}.png install -pm0644 images/icons/%{name}-mime-icon.png %{buildroot}%{_datadir}/pixmaps/%{name}-mime.png
install -pm0644 \ install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
images/icons/%{name}-icon-16x16.png \ install -pm0644 images/icons/qbrowser_icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/qbrowser.svg
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/%{name}.png install -pm0644 images/icons/%{name}_icon.svg %{buildroot}%{_datadir}/pixmaps/%{name}.svg
install -pm0644 \ install -pm0644 images/icons/qbrowser_icon.svg %{buildroot}%{_datadir}/pixmaps/qbrowser.svg
images/icons/%{name}_icon.svg \
%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
install -pm0644 \
%{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \
%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png
install -pm0644 \
%{buildroot}%{_datadir}/%{name}/images/icons/%{name}-mime-icon.png \
%{buildroot}%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-project.png
# Install basic QGIS Mapserver configuration for Apache # Install basic QGIS Mapserver configuration for Apache
install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d install -pd %{buildroot}%{_sysconfdir}/httpd/conf.d
@ -337,19 +337,20 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%postun python -p /sbin/ldconfig %postun python -p /sbin/ldconfig
%files -f %{name}.lang %files -f %{name}.lang
%doc BUGS CODING NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz %doc BUGS NEWS Exception_to_GPL_for_Qt.txt ChangeLog.gz
# QGIS shows the following files in the GUI, including the license text # QGIS shows the following files in the GUI, including the license text
%doc %{_datadir}/%{name}/doc/ %doc %{_datadir}/%{name}/doc/
%dir %{_datadir}/%{name}/i18n/ %dir %{_datadir}/%{name}/i18n/
%lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm %lang(zh-Hans) %{_datadir}/%{name}/i18n/%{name}_zh-Hans.qm
%lang(zh-Hant) %{_datadir}/%{name}/i18n/%{name}_zh-Hant.qm
%if 0%{?rhel} %if 0%{?rhel}
%lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm %lang(sr@latin) %{_datadir}/%{name}/i18n/%{name}_sr@latin.qm
%endif %endif
%{_libdir}/lib%{name}_app.so.*
%{_libdir}/lib%{name}_analysis.so.* %{_libdir}/lib%{name}_analysis.so.*
%{_libdir}/lib%{name}_core.so.* %{_libdir}/lib%{name}_core.so.*
%{_libdir}/lib%{name}_gui.so.* %{_libdir}/lib%{name}_gui.so.*
%{_libdir}/lib%{name}_networkanalysis.so.* %{_libdir}/lib%{name}_networkanalysis.so.*
%{_libdir}/lib%{name}_server.so.*
%{_libdir}/%{name}/ %{_libdir}/%{name}/
%{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so %{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so
%{_bindir}/%{name} %{_bindir}/%{name}
@ -358,20 +359,18 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_mandir}/man1/qbrowser.1* %{_mandir}/man1/qbrowser.1*
%dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/
%{_datadir}/mime/packages/qgis.xml %{_datadir}/mime/packages/qgis.xml
%{_datadir}/pixmaps/%{name}.png %{_datadir}/pixmaps/
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png %{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-project.png %{_datadir}/icons/hicolor/*/mimetypes/*
%{_datadir}/icons/hicolor/128x128/mimetypes/application-x-qgis-layer-settings.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/applications/*%{name}.desktop %{_datadir}/applications/*%{name}.desktop
%{_datadir}/applications/qbrowser.desktop %{_datadir}/applications/qbrowser.desktop
%{_datadir}/%{name}/images/ %{_datadir}/%{name}/images/
%{_datadir}/%{name}/resources/ %{_datadir}/%{name}/resources/
%{_datadir}/%{name}/svg/ %{_datadir}/%{name}/svg/
%exclude %{_libdir}/libqgisgrass.so.* %exclude %{_libdir}/libqgisgrass*.so.*
%exclude %{_libdir}/%{name}/plugins/libgrassprovider.so %exclude %{_libdir}/%{name}/plugins/libgrassprovider*.so
%exclude %{_libdir}/%{name}/plugins/libgrassrasterprovider.so %exclude %{_libdir}/%{name}/plugins/libgrassrasterprovider*.so
%exclude %{_libdir}/%{name}/plugins/libgrassplugin.so %exclude %{_libdir}/%{name}/plugins/libgrassplugin*.so
%exclude %{_libdir}/%{name}/grass/ %exclude %{_libdir}/%{name}/grass/
%files devel %files devel
@ -381,10 +380,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{?_qt4_plugindir}/designer/libqgis_customwidgets.so* %{?_qt4_plugindir}/designer/libqgis_customwidgets.so*
%files grass %files grass
%{_libdir}/lib%{name}grass.so.* %{_libdir}/lib%{name}grass*.so.*
%{_libdir}/%{name}/plugins/libgrassprovider.so %{_libdir}/%{name}/plugins/libgrassprovider*.so
%{_libdir}/%{name}/plugins/libgrassrasterprovider.so %{_libdir}/%{name}/plugins/libgrassrasterprovider*.so
%{_libdir}/%{name}/plugins/libgrassplugin.so %{_libdir}/%{name}/plugins/libgrassplugin*.so
%{_libdir}/%{name}/grass/ %{_libdir}/%{name}/grass/
%{_datadir}/%{name}/grass/ %{_datadir}/%{name}/grass/
@ -393,24 +392,82 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
%{_datadir}/%{name}/python/ %{_datadir}/%{name}/python/
%{python_sitearch}/%{name}/ %{python_sitearch}/%{name}/
%{python_sitearch}/PyQt4/uic/widget-plugins/ %{python_sitearch}/PyQt4/uic/widget-plugins/
%exclude %{python_sitearch}/%{name}/server/
%exclude %{python_sitearch}/%{name}/_server.so
%files server %files server
%doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora %doc src/server/admin.sld src/server/wms_metadata.xml %{name}-server-README.fedora
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-server.conf
%{_libdir}/lib%{name}_server.so.*
%{_libexecdir}/%{name}/ %{_libexecdir}/%{name}/
%{python_sitearch}/%{name}/server/
%{python_sitearch}/%{name}/_server.so
%changelog %changelog
* Mon Nov 30 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.4-1 * Sun Mar 27 2016 Volker Froehlich <volker27@gmx.at> - 2.14.1-1
- New upstream release
- Resolve the false sub-package dependency of python on server
* Fri Mar 25 2016 Devrim Gündüz <devrim@gunduz.org> - 2.14.0-5
- Depend exclusively against GRASS => 7.0.3
* Thu Mar 17 2016 Devrim Gündüz <devrim@gunduz.org> - 2.14.0-4
- Rebuild for GRASS 7.0.3
* Wed Mar 16 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-3
- Build with Grass 7
- Remove Requires-filtering, hiding the dependency on libgsl
* Wed Mar 9 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-2
- Add patch for upstream issue #14402 (MSSQL)
* Sat Feb 27 2016 Volker Froehlich <volker27@gmx.at> - 2.14.0-1
- New upstream release
- Add PyYAML as BR and disable the use of the bundled version
- Be more explicit about the supported version of grass
- Install proper icons (BZ #1166977)
- Break the dependency of the base package on the python sub-package
- Add a new locale not found by find_lang
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sat Jan 23 2016 Volker Froehlich <volker27@gmx.at> - 2.12.3-1
- New upstream release - New upstream release
* Wed Sep 23 2015 Volker Froehlich <volker27@gmx.at> - 2.8.3-2 * Sat Dec 19 2015 Volker Froehlich <volker27@gmx.at> - 2.12.2-1
- New upstream release
* Fri Nov 27 2015 Volker Froehlich <volker27@gmx.at> - 2.12.1-1
- New upstream release
* Mon Oct 26 2015 Volker Froehlich <volker27@gmx.at> - 2.12.0-2
- Fix ARM build
* Sat Oct 24 2015 Volker Froehlich <volker27@gmx.at> - 2.12.0-1
- New upstream release
- Add qca BR
* Sun Jul 26 2015 Volker Froehlich <volker27@gmx.at> - 2.10.1-3
- Correct conditionals for spatialite support on PPC and Fedora - Correct conditionals for spatialite support on PPC and Fedora
(Thanks to Rafael Fonseca) (Thanks to Rafael Fonseca)
* Wed Aug 19 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.3-1 * Sun Jul 26 2015 Volker Froehlich <volker27@gmx.at> - 2.10.1-2
- Rebuild for GDAL 2.0
* Tue Jul 21 2015 Volker Fröhlich <volker27@gmx.at> - 2.10.1-1
- New upstream release - New upstream release
* Wed Jul 8 2015 Volker Fröhlich <volker27@gmx.at> - 2.10.0-1
- New upstream release
- Drop obsolete Grass CMake patch
- Add ARM build fix; Thanks again, Sandro Mani!
- Truncate the changelog a bit
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Jun 3 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.2-1 * Wed Jun 3 2015 Volker Fröhlich <volker27@gmx.at> - 2.8.2-1
- New upstream release - New upstream release
@ -660,283 +717,3 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
- Add conditional for GRASS and EPEL - Add conditional for GRASS and EPEL
- Delete bundled libspatialite before building - Delete bundled libspatialite before building
- Removed glob from /usr/bin/qgis in files section - Removed glob from /usr/bin/qgis in files section
* Thu Nov 11 2010 Volker Fröhlich <volker27@gmx.at> - 1.6.0-2
- Disabled smp-flags again
* Thu Nov 11 2010 Volker Fröhlich <volker27@gmx.at> - 1.6.0-1
- Avoid rpaths in the first place
- Dropped superfluid QWT and SIP patches
- Dropped test section
- Added dependency for fcgi-devel
- Abbreviated syntax for setup macro
- Qt translations are no longer shipped
* Wed Sep 29 2010 jkeating - 1.5.0-6
- Rebuilt for gcc bug 634757
* Mon Sep 13 2010 Volker Fröhlich <volker27@gmx.at> - 1.5.0-5
- Added workaround patch for SIP 4.11, see http://trac.osgeo.org/qgis/ticket/2985
* Thu Sep 09 2010 Rex Dieter <rdieter@fedoraproject.org> 1.5.0-4
- rebuild (sip)
- BR: qt4-devel
* Fri Jul 30 2010 Volker Fröhlich <volker27@gmx.at> - 1.5.0-3
- Added dependency for gdal-python to fulfill standard plugins' requirements
* Tue Jul 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.5.0-2.py27
- one more time for python27, with feeling
* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
* Sat Jul 17 2010 Volker Fröhlich <volker27@gmx.at> - 1.5.0-1
- Updated for 1.5.0
- Added support for qwt
* Wed Jul 14 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-9
- Re-added missing dependency of PyQt4 and sip for python sub-package
* Fri Jul 09 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-8
- Further completed qt47 patch
* Fri Jul 09 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-7
- Further completed qt47 patch
* Fri Jul 09 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-6
- Added patch to remove redundant ::QVariant in function-style cast
* Fri Jul 09 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-5
- Removed smp_mflags because of race conditions
- Simplified member initializer syntax in qt47 patch
* Wed Jul 07 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-4
- Added preliminary patch for Qt 4.7 -- still won't build for Rawhide because of https://bugzilla.redhat.com/show_bug.cgi?id=587707
- Put version variable in filelist for GRASS
- Added qt-webkit as build require, removed gettext
- Corrected erroneous dependency on GRASS subpackage
* Thu Jul 01 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-3
- Changed license to reflect exception for Qt; packaged exception file
- Added find_lang and excluded qt-translations
- Added ownership for directory in share
- Dropped docdir statement
- Changed description for the subpackages python and grass
* Wed Jun 23 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-2
- Grouped corresponding entries for description and package macro
- Corrected swapped summaries for python- and grass-subpackage
- Set theme subpackages as obsolete
- Removed nonsensical build-requires statements from subpackages
- Dropped redundant definition of GRASS_PREFIX
- Removed verbose-option from make
- Removed unnecessary chmod-command
- Removed nonsensical ldconfig for devel-subpackage
- Made the file list more elegant
- Removed unnecessary call for chrpath
* Thu Jun 17 2010 Volker Fröhlich <volker27@gmx.at> - 1.4.0-1
- Updated for 1.4.0
- Dropped theme packages
* Wed Feb 10 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.0.2-6
- rebuild for sip 4.10
- fix sip version check so it works with sip 4.10 (#553713)
* Wed Jan 13 2010 Devrim GÜNDÜZ <devrim@gunduz.org> - 1.0.2-5
- Rebuild against new GEOS.
* Wed Dec 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-4
- qgis rebuild for sip-4.9.x (#538119)
* Fri Dec 04 2009 Devrim GÜNDÜZ <devrim@gunduz.org> - 1.0.2-3
- Rebuild for new Geos.
* Tue Nov 17 2009 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-2
- -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api (#538119)
* Thu Oct 22 2009 Alex Lancaster <alexlan[AT] fedoraproject org> - 1.0.2-1.1
- Rebuilt to fix python problem (#518121)
* Thu Jul 30 2009 Douglas E. Warner <silfreed@silfreed.net> 1.0.2-1
- updating for 1.0.2
- moving libqgispython.so to python subpackage for bug#507381
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Feb 18 2009 Douglas E. Warner <silfreed@silfreed.net> 1.0.1-1
- updating for 1.0.1
* Mon Dec 22 2008 Douglas E. Warner <silfreed@silfreed.net> 1.0.0-1
- updating for 1.0.0
- added gis theme and quick print plugin
- added requirement for gpsbabel
* Mon Dec 22 2008 Douglas E. Warner <silfreed@silfreed.net> - 0.11.0-8
- cleaning up patch
* Mon Dec 22 2008 Douglas E. Warner <silfreed@silfreed.net> - 0.11.0-7
- bump to add patch
* Thu Dec 18 2008 Douglas E. Warner <silfreed@silfreed.net> - 0.11.0-6
- adding patch to fix typedef problems in python build
* Thu Dec 18 2008 Douglas E. Warner <silfreed@silfreed.net> - 0.11.0-5
- Rebuild for Python 2.6
* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.11.0-4
- Rebuild for Python 2.6
* Sun Oct 19 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.11.0-3
- Rebuild for new geos, fixes broken deps
* Mon Aug 11 2008 Douglas E. Warner <silfreed@silfreed.net> 0.11.0-2
- building against blas and lapack instead of atlas and blas to fix missing
library calls
* Wed Jul 16 2008 Douglas E. Warner <silfreed@silfreed.net> 0.11.0-1
- update to metis 0.11.0
- remove python patch
- enabling python subpackage
- fixed executable perms on new headers/source
- stripping rpath with chrpath
- making python libs executable to get files stripped
* Fri Mar 28 2008 Douglas E. Warner <silfreed@silfreed.net> 0.10.0-2
- added patch to support cmake 2.6
* Fri Mar 28 2008 Balint Cristian <rezso@rdsor.ro> - 0.10.0-1
- upgraded to 0.10.0 release candidate
- removed gcc 4.3 patches
- adding devel package since libraries are now versioned
* Fri Mar 28 2008 Balint Cristian <rezso@rdsor.ro> - 0.9.1-5
- fix build by adding more gcc43 patches
- rebuild against grass63
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.9.1-4
- Autorebuild for GCC 4.3
* Mon Feb 18 2008 Douglas E. Warner <silfreed@silfreed.net> 0.9.1-4
- adding gcc43-INT_MAX-qgis-0.9.1.patch
- adding gcc43-duplicate_function_param-qgis-0.9.1.patch
- adding gcc43-memcpy-qgis-0.9.1.patch
- adding gcc43-memcpy-strtod-qgis-0.9.1.patch
* Mon Feb 18 2008 Douglas E. Warner <silfreed@silfreed.net> 0.9.1-3
- adding Requires sip, PyQt4 for python bindings support
* Mon Jan 28 2008 Douglas E. Warner <silfreed@silfreed.net> 0.9.1-2
- defining lib path in build
- installing python bindings globally
- adding patch to determine python site packages dir correctly
* Mon Dec 17 2007 Douglas E. Warner <silfreed@silfreed.net> 0.9.1-1
- update to 0.9.1
- removing lib64 and man instal path patches (included upstream)
- enabling python integration
* Fri Oct 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.9.0-2
- enabling build for PPC64 (bug#247152)
* Wed Sep 26 2007 Douglas E. Warner <silfreed@silfreed.net> 0.9.0-1
- update to 0.9.0
- remove settings-include-workdir.patch
- updated man-install-share.patch to man-install-share-0.9.0.patch
- updated lib64-suffix.patch to lib64-suffix-0.9.0.patch
- enabled python to support msexport tool
- added Requires: grass to grass subpackage
* Tue Aug 28 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-13
- bump for expat 2.0 rebuild bug#195888
* Thu Aug 02 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-12
- updated License from GPL to GPLv2+
* Tue Jul 10 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-11
- allowing docs to be installed by qgis so they can be referenced by internal
help system (bug#241403)
- updated lib64 patch (bug#247549) to try to get plugins found on x86_64
* Thu Jul 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-10
- updated lib64 patch for core and grass libraries
* Thu Jul 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-9
- updated lib64 patch
* Thu Jul 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-8
- adding ExcludeArch: ppc64 for bug#247152 (lrelease segfault)
* Thu Jul 05 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-7
- adding patch for lib64 support through lib_suffix
* Thu Jun 28 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-6
- fixed date of changelog entry for 0.8.1-5 from Wed Jun 27 2007 to
Thu Jun 28 2007
- linking icon to included png instead of packaging it again
* Thu Jun 28 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-5
- adding comment on why grass is required in addition to grass-devel for BR
- fixing typo
* Wed Jun 27 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-4
- adding contributors to doc
- adding desktop file and icon
* Mon Jun 25 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-3
- updating detection of grass libraries to not use RPM call
- disabling building of -devel package due to shared libraries not being
versioned and having no other packages that compile against qgis
(see bug #241403)
- removing chmod of test_export.py due to lack of python requirement
- removing msexport and share/python directory due to removal of python
* Fri Jun 22 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-2
- added BuildRequires: cmake
- updated build to use cmake macro and make verbose
* Mon Jun 18 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.1-1
- updating version
- removed BuildRequires: python-devel due to lack of PyQt4 bindings
- updated build for use of cmake instead of autotools
- added patch for setting WORKDIR in settings.pro file
- added patch for fixing install path of man pages
- updated library names
* Tue May 29 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-6
- adding BuildRequires bison, flex
* Tue May 29 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-5
- fixing more directory owernship (themes, themes-default)
- fixing qt4 hardcoded lib path
- removing Requires ldconfig
- adding BuildRequires sqlite-devel
- adding patch for supporting python 2.5 in configure script
* Sat May 26 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-4
- moving all BuildRequires to main section
- dropping use of makeinstall macro
- making sure directories are owned by this package
- removing *.a and *.la files
- disabled stripping of libraries and binaries to allow debuginfo package
to be built
- fixing macros in changelog
- removing executable bits on source files
* Wed May 16 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-3
- fixing Requires statements for sub-packages
* Tue May 15 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-2
- added devel dependancy on qgis
- moved qgis-config to devel package
- moving doc directory
- removed zero-length NEWS doc
- added postin/postun ldconfig calls
- split packages up to reduce package size and split out dependancies
grass, theme-nkids
* Mon May 14 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-1
- Initial RPM release.

2
sources
View File

@ -1 +1 @@
f84d524fe187623f87d9ee28853f5096 qgis-2.8.4.tar.bz2 60e0708650303f28fdfe84b555c41c18 qgis-2.14.1.tar.bz2