Updated to version 1.5.0
This commit is contained in:
parent
b3d1105e8f
commit
294ea77be6
|
@ -1 +1 @@
|
||||||
qgis_1.4.0.tar.gz
|
qgis_1.5.0.tar.gz
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- qgis-1.4.0/src/app/composer/qgscomposer.cpp 2010-07-08 02:11:17.760602369 +0200
|
|
||||||
+++ qgis-1.4.0-QVariant/src/app/composer/qgscomposer.cpp 2010-07-09 09:32:38.158621669 +0200
|
|
||||||
@@ -1030,7 +1030,7 @@
|
|
||||||
QSettings settings;
|
|
||||||
restoreGeometry( settings.value( "/Composer/geometry" ).toByteArray() );
|
|
||||||
QVariant splitterState = settings.value( "/Composer/splitterState" );
|
|
||||||
- if ( splitterState != QVariant::QVariant() )
|
|
||||||
+ if ( splitterState != QVariant() )
|
|
||||||
{
|
|
||||||
//mSplitter->restoreState(settings.value("/Composer/splitterState").toByteArray());
|
|
||||||
}
|
|
|
@ -1,41 +0,0 @@
|
||||||
Index: /trunk/qgis/src/core/qgscoordinatereferencesystem.cpp
|
|
||||||
===================================================================
|
|
||||||
--- qgis-1.4.0/src/core/qgscoordinatereferencesystem.cpp (revision 13307)
|
|
||||||
+++ /trunk/qgis/src/core/qgscoordinatereferencesystem.cpp (revision 13508)
|
|
||||||
@@ -32,5 +32,4 @@
|
|
||||||
#include "qgis.h" //const vals declared here
|
|
||||||
|
|
||||||
-#include <cassert>
|
|
||||||
#include <sqlite3.h>
|
|
||||||
|
|
||||||
@@ -1146,5 +1145,5 @@
|
|
||||||
sqlite3_close( db );
|
|
||||||
|
|
||||||
- //assert(myProjString.length() > 0);
|
|
||||||
+ //Q_ASSERT(myProjString.length() > 0);
|
|
||||||
return myProjString;
|
|
||||||
}
|
|
||||||
@@ -1260,10 +1259,8 @@
|
|
||||||
if ( myResult != SQLITE_OK )
|
|
||||||
{
|
|
||||||
- QgsDebugMsg( QString( "Can't open database: %1 \n please notify QGIS developers of this error \n %2 (file name) " )
|
|
||||||
- .arg( sqlite3_errmsg( myDatabase ) )
|
|
||||||
- .arg( QgsApplication::qgisUserDbFilePath() ) );
|
|
||||||
- // XXX This will likely never happen since on open, sqlite creates the
|
|
||||||
- // database if it does not exist.
|
|
||||||
- assert( myResult == SQLITE_OK );
|
|
||||||
+ QgsDebugMsg( QString( "Can't open or create database %1: %2" )
|
|
||||||
+ .arg( QgsApplication::qgisUserDbFilePath() )
|
|
||||||
+ .arg( sqlite3_errmsg( myDatabase ) ) );
|
|
||||||
+ return false;
|
|
||||||
}
|
|
||||||
QgsDebugMsg( QString( "Update or insert sql \n%1" ).arg( mySql ) );
|
|
||||||
@@ -1286,7 +1283,5 @@
|
|
||||||
{
|
|
||||||
QgsDebugMsg( QString( "Can't open database: %1" ).arg( sqlite3_errmsg( myDatabase ) ) );
|
|
||||||
- // XXX This will likely never happen since on open, sqlite creates the
|
|
||||||
- // database if it does not exist.
|
|
||||||
- assert( myResult == SQLITE_OK );
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
|
|
|
@ -1,45 +0,0 @@
|
||||||
--- /src/core/qgscoordinatereferencesystem.cpp 2010-06-07 21:40:15.448733536 +0200
|
|
||||||
+++ qgscoordinatereferencesystem.cpp.patched 2010-06-07 22:05:03.340736906 +0200
|
|
||||||
@@ -31,7 +31,6 @@
|
|
||||||
#include "qgsmessageoutput.h"
|
|
||||||
#include "qgis.h" //const vals declared here
|
|
||||||
|
|
||||||
-#include <cassert>
|
|
||||||
#include <sqlite3.h>
|
|
||||||
|
|
||||||
//gdal and ogr includes (needed for == operator)
|
|
||||||
@@ -1127,7 +1126,7 @@
|
|
||||||
// close the database
|
|
||||||
sqlite3_close( db );
|
|
||||||
|
|
||||||
- //assert(myProjString.length() > 0);
|
|
||||||
+ //Q_ASSERT(myProjString.length() > 0);
|
|
||||||
return myProjString;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1238,10 +1237,10 @@
|
|
||||||
myResult = sqlite3_open( QgsApplication::qgisUserDbFilePath().toUtf8().data(), &myDatabase );
|
|
||||||
if ( myResult != SQLITE_OK )
|
|
||||||
{
|
|
||||||
- QgsDebugMsg( QString( "Can't open database: %1 \n please notify QGIS developers of this error \n %2 (file name) " ).arg( sqlite3_errmsg( myDatabase ) ).arg( QgsApplication::qgisUserDbFilePath() ) );
|
|
||||||
- // XXX This will likely never happen since on open, sqlite creates the
|
|
||||||
- // database if it does not exist.
|
|
||||||
- assert( myResult == SQLITE_OK );
|
|
||||||
+ QgsDebugMsg( QString( "Can't open or create database %1: %2" )
|
|
||||||
+ .arg( QgsApplication::qgisUserDbFilePath() )
|
|
||||||
+ .arg( sqlite3_errmsg( myDatabase ) ) );
|
|
||||||
+ return false;
|
|
||||||
}
|
|
||||||
QgsDebugMsg( QString( "Update or insert sql \n%1" ).arg( mySql ) );
|
|
||||||
myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(), mySql.toUtf8().length(), &myPreparedStatement, &myTail );
|
|
||||||
@@ -1263,9 +1262,7 @@
|
|
||||||
if ( myResult != SQLITE_OK )
|
|
||||||
{
|
|
||||||
QgsDebugMsg( QString( "Can't open database: %1" ).arg( sqlite3_errmsg( myDatabase ) ) );
|
|
||||||
- // XXX This will likely never happen since on open, sqlite creates the
|
|
||||||
- // database if it does not exist.
|
|
||||||
- assert( myResult == SQLITE_OK );
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
// Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
|
|
||||||
QString mySql = "select count(*) from tbl_srs";
|
|
|
@ -1,35 +0,0 @@
|
||||||
Index: /trunk/qgis/src/app/qgsfieldcalculator.cpp
|
|
||||||
===================================================================
|
|
||||||
--- qgis-1.4.0/src/app/qgsfieldcalculator.cpp (revision 12551)
|
|
||||||
+++ /trunk/qgis/src/app/qgsfieldcalculator.cpp (revision 13046)
|
|
||||||
@@ -25,4 +25,9 @@
|
|
||||||
setupUi( this );
|
|
||||||
|
|
||||||
+ if ( !vl )
|
|
||||||
+ {
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
populateFields();
|
|
||||||
populateOutputFieldTypes();
|
|
||||||
@@ -32,5 +37,5 @@
|
|
||||||
mOutputFieldPrecisionSpinBox->setValue( 3 );
|
|
||||||
|
|
||||||
- mUpdateExistingFieldCheckBox->setCheckState( Qt::Checked );
|
|
||||||
+
|
|
||||||
|
|
||||||
//disable ok button until there is text for output field and expression
|
|
||||||
@@ -40,7 +45,13 @@
|
|
||||||
if ( !( vl->dataProvider()->capabilities() & QgsVectorDataProvider::AddAttributes ) )
|
|
||||||
{
|
|
||||||
+ mUpdateExistingFieldCheckBox->setCheckState( Qt::Checked );
|
|
||||||
mUpdateExistingFieldCheckBox->setEnabled( false ); // must stay checked
|
|
||||||
mNewFieldGroupBox->setEnabled( false );
|
|
||||||
mNewFieldGroupBox->setTitle( mNewFieldGroupBox->title() + tr( " (not supported by provider)" ) );
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ( vl->selectedFeaturesIds().size() > 0 )
|
|
||||||
+ {
|
|
||||||
+ mOnlyUpdateSelectedCheckBox->setChecked( true );
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,149 +0,0 @@
|
||||||
diff -uNr qgis-1.4.0/src/core/qgscoordinatereferencesystem.cpp qgis-1.4.0-qt47/src/core/qgscoordinatereferencesystem.cpp
|
|
||||||
--- qgis-1.4.0/src/core/qgscoordinatereferencesystem.cpp 2010-07-08 02:11:17.653725525 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/core/qgscoordinatereferencesystem.cpp 2010-07-08 02:57:33.313600187 +0200
|
|
||||||
@@ -47,7 +47,7 @@
|
|
||||||
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem()
|
|
||||||
: mMapUnits( QGis::UnknownUnit ),
|
|
||||||
mIsValidFlag( 0 ),
|
|
||||||
- mValidationHint( 0 )
|
|
||||||
+ mValidationHint()
|
|
||||||
{
|
|
||||||
mCRS = OSRNewSpatialReference( NULL );
|
|
||||||
}
|
|
||||||
@@ -55,7 +55,7 @@
|
|
||||||
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( QString theWkt )
|
|
||||||
: mMapUnits( QGis::UnknownUnit ),
|
|
||||||
mIsValidFlag( 0 ),
|
|
||||||
- mValidationHint( 0 )
|
|
||||||
+ mValidationHint()
|
|
||||||
{
|
|
||||||
mCRS = OSRNewSpatialReference( NULL );
|
|
||||||
createFromWkt( theWkt );
|
|
||||||
@@ -65,7 +65,7 @@
|
|
||||||
QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const long theId, CrsType theType )
|
|
||||||
: mMapUnits( QGis::UnknownUnit ),
|
|
||||||
mIsValidFlag( 0 ),
|
|
||||||
- mValidationHint( 0 )
|
|
||||||
+ mValidationHint()
|
|
||||||
{
|
|
||||||
mCRS = OSRNewSpatialReference( NULL );
|
|
||||||
createFromId( theId, theType );
|
|
||||||
diff -uNr qgis-1.4.0/src/core/qgshttptransaction.cpp qgis-1.4.0-qt47/src/core/qgshttptransaction.cpp
|
|
||||||
--- qgis-1.4.0/src/core/qgshttptransaction.cpp 2010-07-08 02:11:17.634633912 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/core/qgshttptransaction.cpp 2010-07-08 02:08:03.768600629 +0200
|
|
||||||
@@ -45,10 +45,10 @@
|
|
||||||
QNetworkProxy::ProxyType proxyType,
|
|
||||||
QString userName,
|
|
||||||
QString password )
|
|
||||||
- : httpresponsecontenttype( 0 ),
|
|
||||||
+ : httpresponsecontenttype(),
|
|
||||||
httpurl( uri ),
|
|
||||||
httphost( proxyHost ),
|
|
||||||
- mError( 0 )
|
|
||||||
+ mError()
|
|
||||||
{
|
|
||||||
QSettings s;
|
|
||||||
mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt();
|
|
||||||
diff -uNr qgis-1.4.0/src/core/qgsmessageoutput.cpp qgis-1.4.0-qt47/src/core/qgsmessageoutput.cpp
|
|
||||||
--- qgis-1.4.0/src/core/qgsmessageoutput.cpp 2010-07-08 02:11:17.628600247 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/core/qgsmessageoutput.cpp 2010-07-08 02:08:40.298600356 +0200
|
|
||||||
@@ -44,7 +44,7 @@
|
|
||||||
// QgsMessageOutputConsole
|
|
||||||
|
|
||||||
QgsMessageOutputConsole::QgsMessageOutputConsole()
|
|
||||||
- : mMessage( NULL )
|
|
||||||
+ : mMessage()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
diff -uNr qgis-1.4.0/src/core/qgsvectorlayer.h qgis-1.4.0-qt47/src/core/qgsvectorlayer.h
|
|
||||||
--- qgis-1.4.0/src/core/qgsvectorlayer.h 2010-07-08 02:11:17.615600358 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/core/qgsvectorlayer.h 2010-07-08 02:22:35.046600640 +0200
|
|
||||||
@@ -91,8 +91,8 @@
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Constructor */
|
|
||||||
- QgsVectorLayer( QString path = 0, QString baseName = 0,
|
|
||||||
- QString providerLib = 0, bool loadDefaultStyleFlag = true );
|
|
||||||
+ QgsVectorLayer( QString path = QString(), QString baseName = QString(),
|
|
||||||
+ QString providerLib = QString(), bool loadDefaultStyleFlag = true );
|
|
||||||
|
|
||||||
/** Destructor */
|
|
||||||
virtual ~QgsVectorLayer();
|
|
||||||
@@ -107,7 +107,7 @@
|
|
||||||
QString dataComment() const;
|
|
||||||
|
|
||||||
/** Set the primary display field to be used in the identify results dialog */
|
|
||||||
- void setDisplayField( QString fldName = 0 );
|
|
||||||
+ void setDisplayField( QString fldName = QString() );
|
|
||||||
|
|
||||||
/** Returns the primary display field name used in the identify results dialog */
|
|
||||||
const QString displayField() const;
|
|
||||||
diff -uNr qgis-1.4.0/src/plugins/grass/qgsgrassmapcalc.h qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmapcalc.h
|
|
||||||
--- qgis-1.4.0/src/plugins/grass/qgsgrassmapcalc.h 2010-07-08 02:11:18.125600853 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmapcalc.h 2010-07-09 12:34:31.686962175 +0200
|
|
||||||
@@ -219,8 +219,8 @@
|
|
||||||
|
|
||||||
QgsGrassMapcalcFunction() {};
|
|
||||||
QgsGrassMapcalcFunction( int type, QString name, int count = 2,
|
|
||||||
- QString description = 0, QString label = 0,
|
|
||||||
- QString labels = 0, bool drawLabel = true );
|
|
||||||
+ QString description = QString(), QString label = QString(),
|
|
||||||
+ QString labels = QString(), bool drawLabel = true );
|
|
||||||
~QgsGrassMapcalcFunction() {};
|
|
||||||
|
|
||||||
QString name() { return mName; }
|
|
||||||
@@ -331,7 +331,7 @@
|
|
||||||
~QgsGrassMapcalcObject();
|
|
||||||
|
|
||||||
// Set map name, constant value or function/operator
|
|
||||||
- void setValue( QString val, QString lab = 0 );
|
|
||||||
+ void setValue( QString val, QString lab = QString() );
|
|
||||||
|
|
||||||
// Set function
|
|
||||||
void setFunction( QgsGrassMapcalcFunction f );
|
|
||||||
diff -uNr qgis-1.4.0/src/plugins/grass/qgsgrassmodule.cpp qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmodule.cpp
|
|
||||||
--- qgis-1.4.0/src/plugins/grass/qgsgrassmodule.cpp 2010-07-08 02:11:17.914600309 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/plugins/grass/qgsgrassmodule.cpp 2010-07-09 13:27:12.574961370 +0200
|
|
||||||
@@ -1946,7 +1946,7 @@
|
|
||||||
QWidget * parent )
|
|
||||||
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ),
|
|
||||||
mModuleStandardOptions( options ),
|
|
||||||
- mGeometryTypeOption( 0 ), mVectorLayerOption( 0 ),
|
|
||||||
+ mGeometryTypeOption( QString() ), mVectorLayerOption( QString() ),
|
|
||||||
mRegionButton( 0 ), mUpdate( false ), mRequired( false )
|
|
||||||
{
|
|
||||||
QgsDebugMsg( "called." );
|
|
||||||
@@ -2581,7 +2581,7 @@
|
|
||||||
QgsGrassModule *module, int type, QString key, QDomElement &qdesc,
|
|
||||||
QDomElement &gdesc, QDomNode &gnode, QWidget * parent )
|
|
||||||
: QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ),
|
|
||||||
- mType( type ), mOgrLayerOption( 0 ), mOgrWhereOption( 0 )
|
|
||||||
+ mType( type ), mOgrLayerOption( QString() ), mOgrWhereOption( QString() )
|
|
||||||
{
|
|
||||||
if ( mTitle.isEmpty() )
|
|
||||||
{
|
|
||||||
diff -uNr qgis-1.4.0/src/providers/wms/qgswmsprovider.cpp qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.cpp
|
|
||||||
--- qgis-1.4.0/src/providers/wms/qgswmsprovider.cpp 2010-07-08 02:11:18.200725039 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.cpp 2010-07-09 02:13:01.258782364 +0200
|
|
||||||
@@ -60,7 +60,7 @@
|
|
||||||
cachedPixelHeight( 0 ),
|
|
||||||
mCoordinateTransform( 0 ),
|
|
||||||
extentDirty( TRUE ),
|
|
||||||
- mGetFeatureInfoUrlBase( 0 ),
|
|
||||||
+ mGetFeatureInfoUrlBase(),
|
|
||||||
mLayerCount( -1 )
|
|
||||||
|
|
||||||
{
|
|
||||||
diff -uNr qgis-1.4.0/src/providers/wms/qgswmsprovider.h qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.h
|
|
||||||
--- qgis-1.4.0/src/providers/wms/qgswmsprovider.h 2010-07-08 02:11:18.200725039 +0200
|
|
||||||
+++ qgis-1.4.0-qt47/src/providers/wms/qgswmsprovider.h 2010-07-08 10:49:46.516564676 +0200
|
|
||||||
@@ -341,7 +341,7 @@
|
|
||||||
* otherwise we contact the host directly.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
- QgsWmsProvider( QString const & uri = 0 );
|
|
||||||
+ QgsWmsProvider( QString const & uri = QString() );
|
|
||||||
|
|
||||||
//! Destructor
|
|
||||||
virtual ~QgsWmsProvider();
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,13 +0,0 @@
|
||||||
--- qgis-1.4.0/cmake/Python.cmake 2009-08-19 21:09:10.000000000 +0200
|
|
||||||
+++ ../../qgis-1.4.0-sip410/cmake/Python.cmake 2010-05-12 20:46:28.884661938 +0200
|
|
||||||
@@ -148,8 +148,8 @@
|
|
||||||
IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR)
|
|
||||||
# check for SIP version
|
|
||||||
# minimal version is 4.7 (to support universal builds)
|
|
||||||
- SET (SIP_MIN_VERSION 040700)
|
|
||||||
- TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION)
|
|
||||||
+ SET (SIP_MIN_VERSION 263936) # 0x040700
|
|
||||||
+ TRY_RUN_PYTHON (RES "import sip\nprint '%d' % sip.SIP_VERSION" SIP_VERSION)
|
|
||||||
IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
|
|
||||||
SET (SIP_IS_GOOD TRUE)
|
|
||||||
ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}")
|
|
|
@ -1,22 +0,0 @@
|
||||||
Index: /trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp
|
|
||||||
===================================================================
|
|
||||||
--- qgis-1.4.0/src/providers/gpx/qgsgpxprovider.cpp (revision 12601)
|
|
||||||
+++ /trunk/qgis/src/providers/gpx/qgsgpxprovider.cpp (revision 13425)
|
|
||||||
@@ -851,5 +851,5 @@
|
|
||||||
QgsCoordinateReferenceSystem QgsGPXProvider::crs()
|
|
||||||
{
|
|
||||||
- return QgsCoordinateReferenceSystem(); // use default CRS - it's WGS84
|
|
||||||
+ return QgsCoordinateReferenceSystem( GEOSRID, QgsCoordinateReferenceSystem::PostgisCrsId ); // use WGS84
|
|
||||||
}
|
|
||||||
|
|
||||||
Index: /trunk/qgis/src/providers/osm/osmprovider.cpp
|
|
||||||
===================================================================
|
|
||||||
--- qgis-1.4.0/src/providers/osm/osmprovider.cpp (revision 12591)
|
|
||||||
+++ /trunk/qgis/src/providers/osm/osmprovider.cpp (revision 13425)
|
|
||||||
@@ -938,5 +938,5 @@
|
|
||||||
QgsCoordinateReferenceSystem QgsOSMDataProvider::crs()
|
|
||||||
{
|
|
||||||
- return QgsCoordinateReferenceSystem(); // use default CRS - it's WGS84
|
|
||||||
+ return QgsCoordinateReferenceSystem( GEOSRID, QgsCoordinateReferenceSystem::PostgisCrsId ); // use WGS84
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- qgis-1.4.0/cmake/FindGRASS.cmake 2009-11-28 17:02:15.000000000 +0100
|
--- qgis-1.5.0/cmake/FindGRASS.cmake 2010-06-20 19:09:21.151964000 +0200
|
||||||
+++ qgis-1.4.0-grass/cmake/FindGRASS.cmake 2010-06-09 00:45:47.444614774 +0200
|
+++ qgis-1.5.0-grass/cmake/FindGRASS.cmake 2010-07-12 09:31:16.551002521 +0200
|
||||||
@@ -12,7 +12,7 @@
|
@@ -17,7 +17,7 @@
|
||||||
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
|
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
|
||||||
|
|
||||||
SET(LIB_PATH NOTFOUND)
|
SET(LIB_PATH NOTFOUND)
|
10
qgis-1.5.0-qwt.patch
Normal file
10
qgis-1.5.0-qwt.patch
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
--- qgis-1.5.0-qwt/cmake/FindQWT.cmake 2010-07-03 01:46:21.423273337 +0200
|
||||||
|
+++ qgis-1.5.0/cmake/FindQWT.cmake 2010-07-03 02:24:07.850647802 +0200
|
||||||
|
@@ -17,6 +17,7 @@
|
||||||
|
#MESSAGE("Searching for QWT")
|
||||||
|
FIND_PATH(QWT_INCLUDE_DIR qwt.h
|
||||||
|
/usr/include
|
||||||
|
+ /usr/include/qwt
|
||||||
|
/usr/include/qwt-qt4
|
||||||
|
/usr/local/include
|
||||||
|
"$ENV{LIB_DIR}/include"
|
52
qgis.spec
52
qgis.spec
|
@ -3,8 +3,8 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: qgis
|
Name: qgis
|
||||||
Version: 1.4.0
|
Version: 1.5.0
|
||||||
Release: 9%{?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
|
||||||
|
@ -13,26 +13,10 @@ URL: http://www.qgis.org/
|
||||||
Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
|
Source0: http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
|
||||||
Source1: %{name}.desktop
|
Source1: %{name}.desktop
|
||||||
|
|
||||||
# Fix sip version, so it works with sip 4.10
|
|
||||||
# Already fixed in upcoming version http://trac.osgeo.org/qgis/ticket/2446
|
|
||||||
Patch0: qgis-1.4.0-sip410.patch
|
|
||||||
|
|
||||||
# Fix detection problem for GRASS libraries
|
# Fix detection problem for GRASS libraries
|
||||||
Patch1: qgis-1.4.0-grass.patch
|
# Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863
|
||||||
Patch2: qgis-1.4.0-qt47.patch
|
Patch0: qgis-1.5.0-grass.patch
|
||||||
|
Patch1: qgis-1.5.0-qwt.patch
|
||||||
# Already fixed in upcoming version https://trac.osgeo.org/qgis/ticket/2879
|
|
||||||
Patch3: qgis-1.4.0-QVariant.patch
|
|
||||||
|
|
||||||
## Upstream patches
|
|
||||||
# http://trac.osgeo.org/qgis/ticket/2542
|
|
||||||
Patch100: qgis-1.4.0-fieldcalc.patch
|
|
||||||
|
|
||||||
# http://trac.osgeo.org/qgis/ticket/2661
|
|
||||||
Patch101: qgis-1.4.0-vectorcrs.patch
|
|
||||||
|
|
||||||
# http://trac.osgeo.org/qgis/ticket/2670
|
|
||||||
Patch102: qgis-1.4.0-asslibqgisv.patch
|
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: flex bison
|
BuildRequires: flex bison
|
||||||
|
@ -47,6 +31,8 @@ BuildRequires: sqlite-devel
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: qt-devel
|
BuildRequires: qt-devel
|
||||||
|
BuildRequires: qwt-devel
|
||||||
|
BuildRequires: PyQwt-devel
|
||||||
BuildRequires: sip-devel > 4.7
|
BuildRequires: sip-devel > 4.7
|
||||||
BuildRequires: python-devel
|
BuildRequires: python-devel
|
||||||
BuildRequires: PyQt4-devel
|
BuildRequires: PyQt4-devel
|
||||||
|
@ -99,25 +85,12 @@ Python integration and plugins for QGIS.
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q -n %{name}-%{version}
|
||||||
|
|
||||||
%patch0 -p1 -b .sip410
|
%patch0 -p1 -b .grass
|
||||||
%patch1 -p1 -b .grass
|
%patch1 -p1 -b .qwt
|
||||||
%patch2 -p1 -b .qt47
|
|
||||||
%patch3 -p1 -b .QVariant
|
|
||||||
%patch100 -p1 -b .fieldcalc
|
|
||||||
%patch101 -p1 -b .vectorcrs
|
|
||||||
%patch102 -p1 -b .asslibqgis
|
|
||||||
|
|
||||||
# Encode man-file to utf-8
|
# Encode man-file to utf-8
|
||||||
iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.conv qgis_help.1
|
iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.conv qgis_help.1
|
||||||
|
|
||||||
# Fix spurious executable bits
|
|
||||||
# Already fixed in upcoming version
|
|
||||||
chmod -x \
|
|
||||||
./src/app/legend/qgslegend.h \
|
|
||||||
./src/app/legend/qgslegend.cpp \
|
|
||||||
./src/core/composer/qgscomposershape.h \
|
|
||||||
./src/core/composer/qgscomposershape.cpp
|
|
||||||
|
|
||||||
# Remove obsolete translations
|
# Remove obsolete translations
|
||||||
#/usr/bin/lupdate-qt4 -noobsolete -ts i18n/qgis_*.ts
|
#/usr/bin/lupdate-qt4 -noobsolete -ts i18n/qgis_*.ts
|
||||||
|
|
||||||
|
@ -215,10 +188,12 @@ rm -rf %{buildroot}
|
||||||
%{_datadir}/%{name}/themes
|
%{_datadir}/%{name}/themes
|
||||||
%exclude %{_libdir}/libqgisgrass.so.%{version}
|
%exclude %{_libdir}/libqgisgrass.so.%{version}
|
||||||
%exclude %{_libdir}/%{name}/libgrassprovider.so
|
%exclude %{_libdir}/%{name}/libgrassprovider.so
|
||||||
|
%exclude %{_libdir}/%{name}/libgrassrasterprovider.so
|
||||||
%exclude %{_libdir}/%{name}/libgrassplugin.so
|
%exclude %{_libdir}/%{name}/libgrassplugin.so
|
||||||
%exclude %{_datadir}/%{name}/themes/default/grass
|
%exclude %{_datadir}/%{name}/themes/default/grass
|
||||||
%exclude %{_datadir}/%{name}/themes/gis/grass
|
%exclude %{_datadir}/%{name}/themes/gis/grass
|
||||||
%exclude %{_datadir}/%{name}/themes/classic/grass
|
%exclude %{_datadir}/%{name}/themes/classic/grass
|
||||||
|
%exclude %{_libdir}/%{name}/grass
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
|
@ -231,7 +206,9 @@ rm -rf %{buildroot}
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/lib%{name}grass.so.%{version}
|
%{_libdir}/lib%{name}grass.so.%{version}
|
||||||
%{_libdir}/%{name}/libgrassprovider.so
|
%{_libdir}/%{name}/libgrassprovider.so
|
||||||
|
%{_libdir}/%{name}/libgrassrasterprovider.so
|
||||||
%{_libdir}/%{name}/libgrassplugin.so
|
%{_libdir}/%{name}/libgrassplugin.so
|
||||||
|
%{_libdir}/%{name}/grass
|
||||||
%{_datadir}/%{name}/grass
|
%{_datadir}/%{name}/grass
|
||||||
%{_datadir}/%{name}/themes/default/grass
|
%{_datadir}/%{name}/themes/default/grass
|
||||||
%{_datadir}/%{name}/themes/gis/grass
|
%{_datadir}/%{name}/themes/gis/grass
|
||||||
|
@ -244,6 +221,9 @@ rm -rf %{buildroot}
|
||||||
%{python_sitearch}/%{name}
|
%{python_sitearch}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* 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
|
- Re-added missing dependency of PyQt4 and sip for python sub-package
|
||||||
|
|
Reference in New Issue
Block a user