Revision: 111832 https://trac.macports.org/changeset/111832 Author: vince@macports.org Date: 2013-10-02 23:40:22 -0700 (Wed, 02 Oct 2013) Log Message: ----------- Bump to version 2.0.1 Modified Paths: -------------- trunk/dports/gis/qgis/Portfile trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff Added Paths: ----------- trunk/dports/gis/qgis/files/patch-qgsattributedialog_h.diff trunk/dports/gis/qgis/files/patch-qgsfieldvalidator_sip.diff trunk/dports/gis/qgis/files/patch-qgsmessagelogviewer_h.diff Modified: trunk/dports/gis/qgis/Portfile =================================================================== --- trunk/dports/gis/qgis/Portfile 2013-10-03 06:05:25 UTC (rev 111831) +++ trunk/dports/gis/qgis/Portfile 2013-10-03 06:40:22 UTC (rev 111832) @@ -6,7 +6,7 @@ PortGroup qt4 1.0 name qgis -version 1.8.0 +version 2.0.1 categories gis maintainers vince description QGIS is a user-friendly GIS based on Qt 4 @@ -25,17 +25,18 @@ master_sites http://qgis.org/downloads/ use_bzip2 yes -checksums md5 1d60520f81d7763c026d0af887ac9a05 \ - sha1 99c0d716acbe0dd70ad0774242d01e9251c5a130 \ - rmd160 93138574da56fee232ba006d8d8943e16a2a9959 +checksums md5 3822c7dd70e2d893a0f1baa9c72316d2 \ + sha1 20854740bc17bae530cbbcefc7a2c7df6ebb5f30 \ + rmd160 230c311a2a95598c12b974aae2da55eca2046efd +patchfiles patch-qgsmapcanvas_h.diff \ + patch-qgsmaplayerregistry_h.diff \ + patch-qgsfieldvalidator_sip.diff \ + patch-qgsattributedialog_h.diff \ + patch-qgsmessagelogviewer_h.diff + worksrcdir ${name}-${version} -patchfiles patch-conversions_sip.diff \ - patch-CMakeLists_txt.diff \ - patch-qgsmapcanvas_h.diff \ - patch-qgsmaplayerregistry_h.diff - depends_lib-append port:libiconv \ port:expat \ port:openssl \ @@ -52,7 +53,7 @@ port:ld64 post-extract { - system "cd ${worksrcpath} && mkdir build && mkdir Python.framework" + system -W ${worksrcpath} "mkdir build" } # Overrides default @@ -61,80 +62,66 @@ default_variants +postgis2 } -if {![variant_isset python25] && ![variant_isset python26] && - ![variant_isset python27]} { +if {![variant_isset python26] && ![variant_isset python27]} { default_variants +python27 } -if {![variant_isset postgresql90] && ![variant_isset postgresql91] && \ - ![variant_isset postgresql92]} { +if {![variant_isset postgresql91] && ![variant_isset postgresql92] && \ + ![variant_isset postgresql93]} { - default_variants +postgresql91 + default_variants +postgresql92 } -set Py_own_FRM ${worksrcpath}/Python.framework - # Python related stuff -variant python25 conflicts universal python26 python27 \ - description use Python 2.5 { - - depends_lib-append port:py25-pyqt4 - depends_build-append port:py25-sip - depends_run-append port:py25-psycopg2 \ - port:py25-spatialite - - - configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.5" - configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.5" - configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.5" - configure.args-append \ - "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.5/bin/sip" -} - -variant python26 conflicts python25 python27 \ +variant python26 conflicts python27 \ description use Python 2.6 { - depends_lib-append port:py26-pyqt4 + depends_lib-append port:py26-pyqt4-devel \ + port:py26-qscintilla depends_build-append port:py26-sip depends_run-append port:py26-psycopg2 \ port:py26-spatialite - + set Py_FRM ${frameworks_dir}/Python.framework/Versions/2.6 + configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6" configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.6" configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.6" - configure.args-append \ - "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.6/bin/sip" + configure.args-append "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}" + configure.args-append "-DSIP_BINARY_PATH=${Py_FRM}/bin/sip-2.6" + + pre-configure { + reinplace -E "s|Versions/Current|Versions/2.6|" \ + ${worksrcpath}/cmake/FindPythonLibrary.cmake + } } -variant python27 conflicts python25 python26 \ +variant python27 conflicts python26 \ description use Python 2.7 { - depends_lib-append port:py27-pyqt4 + depends_lib-append port:py27-pyqt4-devel \ + port:py27-qscintilla depends_build-append port:py27-sip depends_run-append port:py27-psycopg2 \ port:py27-spatialite + set Py_FRM ${frameworks_dir}/Python.framework/Versions/2.7 + configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7" configure.args-append "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7" configure.args-append "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7" - configure.args-append \ - "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.7/bin/sip" + configure.args-append "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}" + configure.args-append "-DSIP_BINARY_PATH=${prefix}/bin/sip-2.7" + pre-configure { + reinplace -E "s|Versions/Current|Versions/2.7|" \ + ${worksrcpath}/cmake/FindPythonLibrary.cmake + } } -variant postgresql90 conflicts postgresql91 postgresql92 \ - description "Use postgresql 9.0" { - - depends_lib-append port:postgresql90 - set PGSQL_DIR ${prefix}/lib/postgresql90 - configure.args-append \ - "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config" -} - -variant postgresql91 conflicts postgresql90 postgresql92 \ +variant postgresql91 conflicts postgresql92 postgresql93 \ description "Use postgresql 9.1" { depends_lib-append port:postgresql91 @@ -143,8 +130,8 @@ "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config" } -variant postgresql92 conflicts postgresql90 postgresql91 \ - description "Use postgresql 9.1" { +variant postgresql92 conflicts postgresql91 postgresql93 \ + description "Use postgresql 9.2" { depends_lib-append port:postgresql92 set PGSQL_DIR ${prefix}/lib/postgresql92 @@ -152,28 +139,25 @@ "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config" } -variant postgis description "Build postgis 1.x support" \ +variant postgresql93 conflicts postgresql91 postgresql92 \ + description "Use postgresql 9.3" { + + depends_lib-append port:postgresql93 + set PGSQL_DIR ${prefix}/lib/postgresql93 + configure.args-append \ + "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config" +} + +variant postgis description "Build postgis 1.x support" \ conflicts postgis2 { depends_lib-append port:postgis - - if {![variant_isset postgresql90] && - ![variant_isset postgresql91] && - ![variant_isset postgresql92]} { - return -code error "Please also select a postgresql variant" - } } variant postgis2 description "Build postgis 2.x support" \ conflicts postgis { depends_lib-append port:postgis2 - - if {![variant_isset postgresql90] && - ![variant_isset postgresql91] && - ![variant_isset postgresql92]} { - return -code error "Please also select a postgresql variant" - } } variant grass description "Build Grass (6.42) plugin" { @@ -200,47 +184,10 @@ configure.args-append "-DGSL_CONFIG=${prefix}/bin/gsl-config" configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/include" configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib" -configure.args-append "-DWITH_SPATIALITE:BOOL=NO" configure.args-append \ "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib" -configure.args-append "-DPYTHON_INCLUDE_PATH=${Py_own_FRM}/Headers" -configure.args-append \ - "'-DPYTHON_LIBRARY=-F${Py_own_FRM} -framework Python'" -configure.args-append "-DSIP_INCLUDE_DIR=${Py_own_FRM}/Headers" configure.args-append "-DCMAKE_BUILD_TYPE=Release" -configure.args-append "-DQGIS_MACAPP_DEV_PREFIX=${frameworks_dir}" -# Patch for proper linking of our own Python framework -post-configure { - reinplace -E "s|(^\[^ \]*)|\\1 -F${worksrcpath}|" \ - ${worksrcpath}/build/src/python/CMakeFiles/qgispython.dir/link.txt - - # Setup Python stuff in order to gracefully link - # against -framework Python - - set variantlist [split ${portvariants} "+"] - set Pyversion [string replace [lindex ${variantlist} \ - [lsearch $variantlist "python*"]] 0 5] - set Pyverpath [join [split ${Pyversion} ""] .] - - # Set up a fake framework in ${worksrcpath}/Python.framework - set Py_sys_FRM \ - "${frameworks_dir}/Python.framework/Versions/${Pyverpath}" - - system \ - "cd ${Py_own_FRM} ; \ - rm -f Headers Python Resources ; \ - ln -s ${Py_sys_FRM}/include/python${Pyverpath} Headers ; \ - ln -s ${Py_sys_FRM}/Python . ; \ - ln -s ${Py_sys_FRM}/Resources . ;" - - # Workaround a bug in some clang version - system \ - "cd ${worksrcpath}/build/src/crssync/CMakeFiles/crssync.dir ; \ - cat link.txt ${filespath}/patch_link_txt > link.txt.tmp ; \ - mv link.txt.tmp link.txt ;" -} - use_parallel_build yes build.dir ${worksrcpath}/build destroot.target install Added: trunk/dports/gis/qgis/files/patch-qgsattributedialog_h.diff =================================================================== --- trunk/dports/gis/qgis/files/patch-qgsattributedialog_h.diff (rev 0) +++ trunk/dports/gis/qgis/files/patch-qgsattributedialog_h.diff 2013-10-03 06:40:22 UTC (rev 111832) @@ -0,0 +1,14 @@ +--- src/gui/qgsattributedialog.h.orig 2013-09-26 16:22:07.000000000 +0200 ++++ src/gui/qgsattributedialog.h 2013-09-26 16:22:37.000000000 +0200 +@@ -59,9 +59,10 @@ + + void dialogDestroyed(); + +- private: ++ protected: + bool eventFilter( QObject *obj, QEvent *event ); + ++ private: + QDialog *mDialog; + QString mSettingsPath; + // Used to sync multiple widgets for the same field Added: trunk/dports/gis/qgis/files/patch-qgsfieldvalidator_sip.diff =================================================================== --- trunk/dports/gis/qgis/files/patch-qgsfieldvalidator_sip.diff (rev 0) +++ trunk/dports/gis/qgis/files/patch-qgsfieldvalidator_sip.diff 2013-10-03 06:40:22 UTC (rev 111832) @@ -0,0 +1,13 @@ +--- python/gui/qgsfieldvalidator.sip ++++ python/gui/qgsfieldvalidator.sip +@@ -9,6 +9,8 @@ class QgsFieldValidator : QValidator + QgsFieldValidator( QObject *parent, const QgsField &field, QString dateFormat = "yyyy-MM-dd" ); + ~QgsFieldValidator(); + +- virtual State validate( QString &, int & ) const; +- virtual void fixup( QString & ) const; ++ virtual State validate(QString & /In,Out/, int & /In,Out/) const = 0 /API=QString:2 - /; ++ virtual State validate(QString & /Constrained/, int & /In,Out/) const = 0 /API=QString: - 2/; ++ virtual void fixup(QString &input /In,Out/) const /API=QString:2 - /; ++ virtual void fixup(QString & /Constrained/) const /API=QString: - 2/; + }; Modified: trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff =================================================================== --- trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff 2013-10-03 06:05:25 UTC (rev 111831) +++ trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff 2013-10-03 06:40:22 UTC (rev 111832) @@ -1,25 +1,24 @@ ---- src/core/qgsmaplayerregistry.h.orig 2013-09-05 10:40:28.000000000 +0200 -+++ src/core/qgsmaplayerregistry.h 2013-09-05 10:40:45.000000000 +0200 -@@ -164,17 +164,17 @@ - //! protected constructor +--- src/core/qgsmaplayerregistry.h.old 2013-09-25 10:23:55.000000000 +0200 ++++ src/core/qgsmaplayerregistry.h 2013-09-25 10:24:24.000000000 +0200 +@@ -238,6 +238,10 @@ + protected: + //! protected constructor QgsMapLayerRegistry( QObject * parent = 0 ); - + /** debugging member + invoked when a connect() is made to this object + */ + void connectNotify( const char * signal ); -+ + private: - static QgsMapLayerRegistry* mInstance; - +@@ -246,10 +250,6 @@ QMap<QString, QgsMapLayer*> mMapLayers; + QSet<QgsMapLayer*> mOwnedLayers; - /** debugging member - invoked when a connect() is made to this object - */ - void connectNotify( const char * signal ); -- - }; // class QgsMapLayerRegistry + }; // class QgsMapLayerRegistry Added: trunk/dports/gis/qgis/files/patch-qgsmessagelogviewer_h.diff =================================================================== --- trunk/dports/gis/qgis/files/patch-qgsmessagelogviewer_h.diff (rev 0) +++ trunk/dports/gis/qgis/files/patch-qgsmessagelogviewer_h.diff 2013-10-03 06:40:22 UTC (rev 111832) @@ -0,0 +1,15 @@ +--- src/gui/qgsmessagelogviewer.h.orig 2013-09-26 16:24:23.000000000 +0200 ++++ src/gui/qgsmessagelogviewer.h 2013-09-26 16:24:50.000000000 +0200 +@@ -42,10 +42,11 @@ + public slots: + void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level ); + +- private: ++ protected: + void showEvent( QShowEvent * ); + void hideEvent( QHideEvent * ); + ++ private: + QToolButton *mButton; + int mCount; +