diff --git a/.gitignore b/.gitignore index 4e8dd1f..748bea5 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ qgis_1.5.0.tar.gz /qgis-2.0.1.tar.bz2 /qgis-2.2.0.tar.bz2 /qgis-2.4.0.tar.bz2 +/qgis-2.6.0.tar.bz2 diff --git a/qgis-2.2.0-sip.patch b/qgis-2.2.0-sip.patch deleted file mode 100644 index 7e282b3..0000000 --- a/qgis-2.2.0-sip.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt -index 044f65e..824ad54 100644 ---- a/python/CMakeLists.txt -+++ b/python/CMakeLists.txt -@@ -82,7 +82,7 @@ ENDIF(PYQT4_VERSION_NUM LESS 264196) - # core module - FILE(GLOB_RECURSE sip_files_core core/*.sip) - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) --SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api) -+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.core.api) - ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core) - - # additional gui includes -@@ -97,7 +97,7 @@ INCLUDE_DIRECTORIES( - # gui module - FILE(GLOB_RECURSE sip_files_gui gui/*.sip) - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui}) --SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api) -+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api) - - IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984) - SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS}) -@@ -126,13 +126,13 @@ FILE(GLOB sip_files_analysis - analysis/interpolation/*.sip - ) - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis}) --SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api) -+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api) - ADD_SIP_PYTHON_MODULE(qgis.analysis analysis/analysis.sip qgis_core qgis_analysis) - - # network-analysis module - FILE(GLOB_RECURSE sip_files_network_analysis analysis/network/*.sip) - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_network_analysis}) --SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api) -+SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.networkanalysis.api) - ADD_SIP_PYTHON_MODULE(qgis.networkanalysis analysis/network/networkanalysis.sip qgis_core qgis_networkanalysis) - - SET(QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis) diff --git a/qgis-2.4.0-qreal.patch b/qgis-2.4.0-qreal.patch deleted file mode 100644 index bbef41a..0000000 --- a/qgis-2.4.0-qreal.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -rupN qgis-2.4.0/python/core/composer/qgsatlascomposition.sip qgis-2.4.0-new/python/core/composer/qgsatlascomposition.sip ---- qgis-2.4.0/python/core/composer/qgsatlascomposition.sip 2014-06-27 14:00:08.000000000 +0200 -+++ qgis-2.4.0-new/python/core/composer/qgsatlascomposition.sip 2014-07-27 00:10:44.629582944 +0200 -@@ -155,7 +155,7 @@ public: - * @see setPredefinedScales - * @see QgsComposerMap::atlasScalingMode - */ -- const QVector& predefinedScales() const; -+ const QVector& predefinedScales() const; - - /**Sets the list of predefined scales for the atlas. This is used - * for maps which are set to the predefined atlas scaling mode. -@@ -163,7 +163,7 @@ public: - * @see predefinedScales - * @see QgsComposerMap::atlasScalingMode - */ -- void setPredefinedScales( const QVector& scales ); -+ void setPredefinedScales( const QVector& scales ); - - /** Begins the rendering. Returns true if successful, false if no matching atlas - features found.*/ -diff -rupN qgis-2.4.0/src/app/composer/qgscomposer.cpp qgis-2.4.0-new/src/app/composer/qgscomposer.cpp ---- qgis-2.4.0/src/app/composer/qgscomposer.cpp 2014-06-27 14:00:08.000000000 +0200 -+++ qgis-2.4.0-new/src/app/composer/qgscomposer.cpp 2014-07-27 00:10:29.977583595 +0200 -@@ -3594,7 +3594,7 @@ void QgsComposer::loadAtlasPredefinedSca - return; - } - QgsAtlasComposition& atlasMap = mComposition->atlasComposition(); -- QVector pScales; -+ QVector pScales; - // first look at project's scales - QStringList scales( QgsProject::instance()->readListEntry( "Scales", "/ScalesList" ) ); - bool hasProjectScales( QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" ) ); -diff -rupN qgis-2.4.0/src/core/composer/qgsatlascomposition.cpp qgis-2.4.0-new/src/core/composer/qgsatlascomposition.cpp ---- qgis-2.4.0/src/core/composer/qgsatlascomposition.cpp 2014-06-27 14:00:08.000000000 +0200 -+++ qgis-2.4.0-new/src/core/composer/qgsatlascomposition.cpp 2014-07-27 00:10:32.027583504 +0200 -@@ -491,7 +491,7 @@ void QgsAtlasComposition::prepareMap( Qg - // choose one of the predefined scales - double newWidth = mOrigExtent.width(); - double newHeight = mOrigExtent.height(); -- const QVector& scales = mPredefinedScales; -+ const QVector& scales = mPredefinedScales; - for ( int i = 0; i < scales.size(); i++ ) - { - double ratio = scales[i] / originalScale; -@@ -747,7 +747,7 @@ bool QgsAtlasComposition::evalFeatureFil - return true; - } - --void QgsAtlasComposition::setPredefinedScales( const QVector& scales ) -+void QgsAtlasComposition::setPredefinedScales( const QVector& scales ) - { - mPredefinedScales = scales; - // make sure the list is sorted -diff -rupN qgis-2.4.0/src/core/composer/qgsatlascomposition.h qgis-2.4.0-new/src/core/composer/qgsatlascomposition.h ---- qgis-2.4.0/src/core/composer/qgsatlascomposition.h 2014-06-27 14:00:08.000000000 +0200 -+++ qgis-2.4.0-new/src/core/composer/qgsatlascomposition.h 2014-07-27 00:10:33.057583458 +0200 -@@ -183,7 +183,7 @@ class CORE_EXPORT QgsAtlasComposition : - * @see setPredefinedScales - * @see QgsComposerMap::atlasScalingMode - */ -- const QVector& predefinedScales() const { return mPredefinedScales; } -+ const QVector& predefinedScales() const { return mPredefinedScales; } - - /**Sets the list of predefined scales for the atlas. This is used - * for maps which are set to the predefined atlas scaling mode. -@@ -191,7 +191,7 @@ class CORE_EXPORT QgsAtlasComposition : - * @see predefinedScales - * @see QgsComposerMap::atlasScalingMode - */ -- void setPredefinedScales( const QVector& scales ); -+ void setPredefinedScales( const QVector& scales ); - - /** Begins the rendering. Returns true if successful, false if no matching atlas - features found.*/ -@@ -320,7 +320,7 @@ class CORE_EXPORT QgsAtlasComposition : - void computeExtent( QgsComposerMap *map ); - - //list of predefined scales -- QVector mPredefinedScales; -+ QVector mPredefinedScales; - }; - - #endif -diff -rupN qgis-2.4.0/src/gui/qgscomposerview.cpp qgis-2.4.0-new/src/gui/qgscomposerview.cpp ---- qgis-2.4.0/src/gui/qgscomposerview.cpp 2014-06-27 14:00:08.000000000 +0200 -+++ qgis-2.4.0-new/src/gui/qgscomposerview.cpp 2014-07-26 21:40:14.809984197 +0200 -@@ -869,7 +869,7 @@ void QgsComposerView::mouseReleaseEvent( - else - { - QgsComposerAttributeTable* newTable = new QgsComposerAttributeTable( composition() ); -- newTable->setSceneRect( QRectF( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), qMax( mRubberBandItem->rect().height(), 15.0 ) ) ); -+ newTable->setSceneRect( QRectF( mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), qMax( mRubberBandItem->rect().height(), qreal(15.0) ) ) ); - QList mapItemList = composition()->composerMapItems(); - if ( mapItemList.size() > 0 ) - { diff --git a/qgis-2.4.0-sip.patch b/qgis-2.6.0-sip.patch similarity index 85% rename from qgis-2.4.0-sip.patch rename to qgis-2.6.0-sip.patch index 68e9093..009bb26 100644 --- a/qgis-2.4.0-sip.patch +++ b/qgis-2.6.0-sip.patch @@ -1,8 +1,8 @@ diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt -index 0c94c94..772494a 100644 +index 5223038..099d881 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt -@@ -128,7 +128,7 @@ ENDIF(PYQT4_VERSION_NUM LESS 264196) +@@ -132,7 +132,7 @@ ENDIF(NOT PYQT4_VERSION_NUM LESS 264453) # core module FILE(GLOB_RECURSE sip_files_core core/*.sip) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) @@ -11,16 +11,16 @@ index 0c94c94..772494a 100644 ADD_SIP_PYTHON_MODULE(qgis._core core/core.sip qgis_core) # additional gui includes -@@ -143,7 +143,7 @@ INCLUDE_DIRECTORIES( +@@ -147,7 +147,7 @@ INCLUDE_DIRECTORIES( # gui module FILE(GLOB_RECURSE sip_files_gui gui/*.sip) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui}) -SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api) +SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api) - - IF(UNIX AND NOT SIP_VERSION_NUM LESS 265984) - SET(SIP_EXTRA_OPTIONS -P ${SIP_EXTRA_OPTIONS}) -@@ -172,13 +172,13 @@ FILE(GLOB sip_files_analysis + IF(QSCI_SIP_DIR) + SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) + ELSE(QSCI_SIP_DIR) +@@ -182,13 +182,13 @@ FILE(GLOB sip_files_analysis analysis/interpolation/*.sip ) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis}) diff --git a/qgis.spec b/qgis.spec index d64a4cb..37ad2d9 100644 --- a/qgis.spec +++ b/qgis.spec @@ -16,8 +16,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 2.4.0 -Release: 7%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System Group: Applications/Engineering @@ -41,26 +41,7 @@ Source5: %{name}-mime.xml Patch0: %{name}-2.4.0-grass.patch # Drop -o option from SIP, as versions older than 4.10 don't have it -Patch1: %{name}-2.4.0-sip.patch - -# Restore ARM build -# Thanks to Sandro Mani for supplying this patch: -#>This patch should not cause any problems for other arches, since qreal is double for those, hence no change. -#> -#>The patch is not upstream yet. The part with the -#> -#>qMax( mRubberBandItem->rect().height(), qreal(15.0) ) -#> -#>is clean and ok and can be upstreamed. The rest is all because sip errors out in core/composer/qgsatlascomposition.sip on -#> -#>const QVector& predefinedScales() -#> -#>with the error -#> -#>unsupported function return type - provide %MethodCode and a C++ signature. -#> -#>I'm not really sure why this is the case though, since double exists on ARM, it is just qreal which is not typedefed for double but for float. -Patch2: %{name}-2.4.0-qreal.patch +Patch1: %{name}-2.6.0-sip.patch # Some plug-ins need Pyspatialite (bundled) # The license is not totally clear, see: @@ -196,7 +177,6 @@ Please refer to %{name}-mapserver-README.fedora for details! %setup -q %patch0 -p1 -b .grass~ %patch1 -p1 -b .sip~ -%patch2 -p1 -b .qreal~ # Solved for releases after 2.4.0 chmod -x src/gui/qgscolorbutton.cpp src/core/composer/qgscomposershape.h \ @@ -361,7 +341,6 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_libdir}/lib%{name}_analysis.so.* %{_libdir}/lib%{name}_core.so.* %{_libdir}/lib%{name}_gui.so.* -%{_libdir}/lib%{name}sqlanyconnection.so.* %{_libdir}/lib%{name}_networkanalysis.so.* %{_libdir}/%{name}/ %{_qt4_prefix}/plugins/sqldrivers/libqsqlspatialite.so @@ -414,6 +393,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sun Nov 2 2014 Volker Fröhlich - 2.6.0-1 +- New upstream release, drop obsolete patch, update the sip patch + * Sun Aug 17 2014 Fedora Release Engineering - 2.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 7b3bba8..a1ea370 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c509ae14d34bf35456ee95c71b909172 qgis-2.4.0.tar.bz2 +5540e0648caf261a264c2370be484163 qgis-2.6.0.tar.bz2