Changeset 111832


Ignore:
Timestamp:
Oct 3, 2013, 6:40:22 AM (7 years ago)
Author:
vince@…
Message:

Bump to version 2.0.1

Location:
trunk/dports/gis/qgis
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/gis/qgis/Portfile

    r110754 r111832  
    77
    88name                qgis
    9 version             1.8.0
     9version             2.0.1
    1010categories          gis
    1111maintainers         vince
     
    2626use_bzip2           yes
    2727
    28 checksums           md5     1d60520f81d7763c026d0af887ac9a05 \
    29                     sha1    99c0d716acbe0dd70ad0774242d01e9251c5a130 \
    30                     rmd160  93138574da56fee232ba006d8d8943e16a2a9959
     28checksums           md5     3822c7dd70e2d893a0f1baa9c72316d2 \
     29                    sha1    20854740bc17bae530cbbcefc7a2c7df6ebb5f30 \
     30                    rmd160  230c311a2a95598c12b974aae2da55eca2046efd
     31
     32patchfiles          patch-qgsmapcanvas_h.diff \
     33                    patch-qgsmaplayerregistry_h.diff \
     34                                        patch-qgsfieldvalidator_sip.diff \
     35                                        patch-qgsattributedialog_h.diff \
     36                                        patch-qgsmessagelogviewer_h.diff
    3137
    3238worksrcdir          ${name}-${version}
    33 
    34 patchfiles          patch-conversions_sip.diff \
    35                     patch-CMakeLists_txt.diff \
    36                     patch-qgsmapcanvas_h.diff \
    37                     patch-qgsmaplayerregistry_h.diff
    3839
    3940depends_lib-append  port:libiconv \
     
    5354
    5455post-extract {
    55     system "cd ${worksrcpath} && mkdir build && mkdir Python.framework"
     56    system -W ${worksrcpath} "mkdir build"
    5657}
    5758
     
    6263}
    6364
    64 if {![variant_isset python25] && ![variant_isset python26] &&
    65     ![variant_isset python27]} {
     65if {![variant_isset python26] && ![variant_isset python27]} {
    6666   
    6767    default_variants    +python27
    6868}
    6969
    70 if {![variant_isset postgresql90] && ![variant_isset postgresql91] && \
    71     ![variant_isset postgresql92]} {
     70if {![variant_isset postgresql91] && ![variant_isset postgresql92] && \
     71    ![variant_isset postgresql93]} {
    7272
    73     default_variants    +postgresql91
     73    default_variants    +postgresql92
    7474}
    75 
    76 set Py_own_FRM  ${worksrcpath}/Python.framework
    7775
    7876# Python related stuff
    7977
    80 variant python25    conflicts universal python26 python27 \
    81                     description use Python 2.5 {   
    82 
    83     depends_lib-append      port:py25-pyqt4
    84     depends_build-append    port:py25-sip
    85     depends_run-append      port:py25-psycopg2 \
    86                             port:py25-spatialite
    87 
    88    
    89     configure.args-append  "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.5"
    90     configure.args-append  "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.5"
    91     configure.args-append  "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.5"
    92     configure.args-append  \
    93                 "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.5/bin/sip"
    94 }
    95 
    96 variant python26    conflicts python25 python27 \
     78variant python26    conflicts python27 \
    9779                    description use Python 2.6 {
    9880
    99     depends_lib-append      port:py26-pyqt4
     81    depends_lib-append      port:py26-pyqt4-devel \
     82                            port:py26-qscintilla
    10083    depends_build-append    port:py26-sip
    10184    depends_run-append      port:py26-psycopg2 \
    10285                            port:py26-spatialite
    10386
    104    
     87        set Py_FRM                              ${frameworks_dir}/Python.framework/Versions/2.6
     88 
    10589    configure.args-append  "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.6"
    10690    configure.args-append  "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.6"
    10791    configure.args-append  "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.6"
    108     configure.args-append  \
    109                 "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.6/bin/sip"
     92        configure.args-append  "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
     93    configure.args-append  "-DSIP_BINARY_PATH=${Py_FRM}/bin/sip-2.6"
     94   
     95    pre-configure {
     96                reinplace -E "s|Versions/Current|Versions/2.6|" \
     97                        ${worksrcpath}/cmake/FindPythonLibrary.cmake
     98        }
    11099}
    111100
    112 variant python27    conflicts python25 python26 \
     101variant python27    conflicts python26 \
    113102                    description use Python 2.7 {
    114103
    115     depends_lib-append      port:py27-pyqt4
     104    depends_lib-append      port:py27-pyqt4-devel \
     105                            port:py27-qscintilla
    116106    depends_build-append    port:py27-sip
    117107    depends_run-append      port:py27-psycopg2 \
    118108                            port:py27-spatialite
    119109
     110        set Py_FRM                              ${frameworks_dir}/Python.framework/Versions/2.7
     111
    120112    configure.args-append  "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
    121113    configure.args-append  "-DPYUIC4_PROGRAM=${prefix}/bin/pyuic4-2.7"
    122114    configure.args-append  "-DPYRCC4_PROGRAM=${prefix}/bin/pyrcc4-2.7"
    123     configure.args-append  \
    124                 "-DSIP_BINARY_PATH=${Py_own_FRM}/Versions/2.7/bin/sip"
     115        configure.args-append  "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
     116    configure.args-append  "-DSIP_BINARY_PATH=${prefix}/bin/sip-2.7"
    125117
     118        pre-configure {
     119                reinplace -E "s|Versions/Current|Versions/2.7|" \
     120                        ${worksrcpath}/cmake/FindPythonLibrary.cmake
     121        }
    126122}
    127123
    128 variant postgresql90    conflicts postgresql91 postgresql92 \
    129                         description "Use postgresql 9.0" {
    130 
    131     depends_lib-append      port:postgresql90
    132     set PGSQL_DIR           ${prefix}/lib/postgresql90
    133     configure.args-append   \
    134                 "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
    135 }
    136 
    137 variant postgresql91    conflicts postgresql90 postgresql92 \
     124variant postgresql91    conflicts postgresql92 postgresql93 \
    138125                        description "Use postgresql 9.1" {
    139126
     
    144131}
    145132
    146 variant postgresql92    conflicts postgresql90 postgresql91 \
    147                         description "Use postgresql 9.1" {
     133variant postgresql92    conflicts postgresql91 postgresql93 \
     134                        description "Use postgresql 9.2" {
    148135
    149136    depends_lib-append      port:postgresql92
     
    153140}
    154141
    155 variant postgis            description "Build postgis 1.x support" \
     142variant postgresql93    conflicts postgresql91 postgresql92 \
     143                        description "Use postgresql 9.3" {
     144
     145    depends_lib-append      port:postgresql93
     146    set PGSQL_DIR           ${prefix}/lib/postgresql93
     147    configure.args-append   \
     148                "-DPOSTGRES_CONFIG=${PGSQL_DIR}/bin/pg_config"
     149}
     150
     151variant postgis         description "Build postgis 1.x support" \
    156152                        conflicts postgis2 {
    157153
    158154    depends_lib-append      port:postgis
    159 
    160     if {![variant_isset postgresql90] &&
    161         ![variant_isset postgresql91] &&
    162         ![variant_isset postgresql92]} {
    163         return -code error "Please also select a postgresql variant"
    164     }
    165155}
    166156
     
    169159   
    170160    depends_lib-append      port:postgis2
    171 
    172     if {![variant_isset postgresql90] &&
    173         ![variant_isset postgresql91] &&
    174         ![variant_isset postgresql92]} {
    175         return -code error "Please also select a postgresql variant"
    176     }
    177161}
    178162
     
    201185configure.args-append  "-DPROJ_INCLUDE_DIR=${prefix}/include"
    202186configure.args-append  "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
    203 configure.args-append  "-DWITH_SPATIALITE:BOOL=NO"
    204187configure.args-append  \
    205188        "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
    206 configure.args-append  "-DPYTHON_INCLUDE_PATH=${Py_own_FRM}/Headers"
    207 configure.args-append  \
    208         "'-DPYTHON_LIBRARY=-F${Py_own_FRM} -framework Python'"
    209 configure.args-append  "-DSIP_INCLUDE_DIR=${Py_own_FRM}/Headers"
    210189configure.args-append  "-DCMAKE_BUILD_TYPE=Release"
    211 configure.args-append  "-DQGIS_MACAPP_DEV_PREFIX=${frameworks_dir}"
    212190   
    213 # Patch for proper linking of our own Python framework
    214 post-configure {
    215     reinplace -E "s|(^\[^ \]*)|\\1 -F${worksrcpath}|" \
    216       ${worksrcpath}/build/src/python/CMakeFiles/qgispython.dir/link.txt
    217 
    218     # Setup Python stuff in order to gracefully link
    219     # against -framework Python
    220 
    221     set variantlist [split ${portvariants} "+"]
    222     set Pyversion   [string replace [lindex ${variantlist} \
    223                         [lsearch $variantlist "python*"]] 0 5]
    224     set Pyverpath   [join [split ${Pyversion} ""] .]
    225 
    226     # Set up a fake framework in ${worksrcpath}/Python.framework
    227     set Py_sys_FRM  \
    228         "${frameworks_dir}/Python.framework/Versions/${Pyverpath}"
    229 
    230     system \
    231         "cd ${Py_own_FRM} ; \
    232          rm -f Headers Python Resources ; \
    233          ln -s ${Py_sys_FRM}/include/python${Pyverpath} Headers ; \
    234          ln -s ${Py_sys_FRM}/Python . ; \
    235          ln -s ${Py_sys_FRM}/Resources . ;"
    236          
    237     # Workaround a bug in some clang version
    238     system \
    239         "cd ${worksrcpath}/build/src/crssync/CMakeFiles/crssync.dir ; \
    240          cat link.txt ${filespath}/patch_link_txt > link.txt.tmp ; \
    241          mv link.txt.tmp link.txt ;"
    242 }
    243 
    244191use_parallel_build          yes
    245192build.dir                   ${worksrcpath}/build
  • trunk/dports/gis/qgis/files/patch-qgsmaplayerregistry_h.diff

    r110754 r111832  
    1 --- src/core/qgsmaplayerregistry.h.orig 2013-09-05 10:40:28.000000000 +0200
    2 +++ src/core/qgsmaplayerregistry.h      2013-09-05 10:40:45.000000000 +0200
    3 @@ -164,17 +164,17 @@
    4  //! protected constructor
     1--- src/core/qgsmaplayerregistry.h.old  2013-09-25 10:23:55.000000000 +0200
     2+++ src/core/qgsmaplayerregistry.h      2013-09-25 10:24:24.000000000 +0200
     3@@ -238,6 +238,10 @@
     4   protected:
     5     //! protected constructor
    56     QgsMapLayerRegistry( QObject * parent = 0 );
    6  
    77+    /** debugging member
    88+        invoked when a connect() is made to this object
    99+    */
    1010+    void connectNotify( const char * signal );
    11 +
     11 
    1212   private:
    1313 
    14      static QgsMapLayerRegistry* mInstance;
    15  
     14@@ -246,10 +250,6 @@
    1615     QMap<QString, QgsMapLayer*> mMapLayers;
     16     QSet<QgsMapLayer*> mOwnedLayers;
    1717 
    1818-    /** debugging member
     
    2020-    */
    2121-    void connectNotify( const char * signal );
    22 -
     22 
    2323 
    2424 }; // class QgsMapLayerRegistry
    25  
Note: See TracChangeset for help on using the changeset viewer.