<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6f2febf1f767c358e21b1908bd06ef662ec64480">https://github.com/macports/macports-ports/commit/6f2febf1f767c358e21b1908bd06ef662ec64480</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6f2febf1f76 qgis: obsolete port Closes: https://trac.macports.org/ticket/63836
</span>6f2febf1f76 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f2febf1f767c358e21b1908bd06ef662ec64480
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Jan 1 14:10:23 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> qgis: obsolete port
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63836
</span>---
gis/qgis/Portfile | 166 +------------------
gis/qgis/files/patch-PyQtMacros.diff | 15 --
gis/qgis/files/patch-app_info_plist_in.diff | 24 ---
.../files/patch-python_core_conversions_sip.diff | 182 ---------------------
4 files changed, 5 insertions(+), 382 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/Portfile b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c0ae263349..8ee505e4852 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,168 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup qgis QGIS 2_18_17 final-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span> name qgis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version [string map {_ .} ${github.version}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.18.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 10
</span> categories gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {vince @Veence}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description QGIS is a user-friendly GIS based on Qt 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description QGIS is an alternative to commercial GIS such as ESRI products.\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It can read, write and process almost every sort of geodata. It can\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- also serve as a front-end to other open source GIS such as Grass or Saga\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and has an extensive repository of plug-ins written in Python 2.7.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.qgis.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1b17a258c053e4114e2569e9465312c55dd0a566 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 608f82ea128dabaeeba494da465edf4f69aad873d45b6fdbab8f6761de318cb2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 99355862
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:libiconv \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:expat \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:geos \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gdal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fcgi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:spatialite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:spatialindex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:postgis2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bison \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ld64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-app_info_plist_in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-PyQtMacros.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python_core_conversions_sip.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|@PREFIX@|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/mac/app.info.plist.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reinplace -E "s|Clang|AppleClang|" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set Py_FRM ${frameworks_dir}/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.install_prefix ${applications_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#configure.args-append "--trace"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_GRASS=OFF"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_GRASS7=OFF"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_QWTPOLAR=FALSE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DENABLE_QT5=OFF"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPYTHON_EXECUTABLE=${prefix}/bin/python2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPYTHON_CUSTOM_FRAMEWORK=${Py_FRM}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DSIP_BINARY_PATH=${prefix}/bin/sip-2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPYUIC_PROGRAM=${prefix}/bin/pyuic4-2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPYRCC_PROGRAM=${prefix}/bin/pyrcc4-2.7"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_SERVER=TRUE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DWITH_SERVER_PLUGINS=TRUE"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DQWT_INCLUDE_DIR=${prefix}/libexec/qt4/Library/Frameworks/qwt.framework/Versions/Current/Headers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQWT_LIBRARY=${prefix}/libexec/qt4/lib/libqwt.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQCA_INCLUDE_DIR=${prefix}/libexec/qt4/include/QtCrypto"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQCA_LIBRARY=${prefix}/libexec/qt4/lib/libqca.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQT_LRELEASE_EXECUTABLE=${prefix}/libexec/qt4/bin/lrelease"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQSCINTILLA_INCLUDE_DIR=${prefix}/libexec/qt4/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQSCINTILLA_LIBRARY=${prefix}/libexec/qt4/lib/libqscintilla2_qt4.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQJSON_DIR=${prefix}/lib/cmake/qjson"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DEXPAT_INCLUDE_DIR=${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DQGIS_MACAPP_BUNDLE=0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DGDAL_CONFIG=${prefix}/bin/gdal-config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DGDAL_INCLUDE_DIR=${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DGDAL_LIBRARY=${prefix}/lib/libgdal.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DGEOS_CONFIG=${prefix}/bin/geos-config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DGEOS_INCLUDE_DIR=${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DGSL_CONFIG=${prefix}/bin/gsl-config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/lib/proj49/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/proj49/lib/libproj.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-pyqt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-gdal \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-qscintilla-qt4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qt4-mac-sqlite3-plugin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qca-ossl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qwt61 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qjson
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:py27-sip4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:py27-psycopg2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-spatialite \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-requests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E "s|Versions/Current|Versions/2.7|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/cmake/FindPythonLibrary.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# QT5 is no longer supported. Use QGIS 3 instead
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt5 description "Build with Qt5" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Qt5 option is deprecated. Please use the qgis3 port instead"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {95 96 10}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set portsgresql_variants {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend portsgresql_variants postgresql${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set p postgresql${s}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set i [lsearch -exact ${portsgresql_variants} ${p}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set c [lreplace ${portsgresql_variants} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Enable PostgreSQL ${v} support" conflicts {*}${c} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${p}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \"-DPOSTGRES_CONFIG=${prefix}/lib/${p}/bin/pg_config\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# postgresql default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgd "if {"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set pgd "${pgd}!\[variant_isset postgresql${s}\] && "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgd [string range ${pgd} 0 end-4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgd "${pgd}} { default_variants +postgresql10 }"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-eval ${pgd}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# GRASS 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant grass description "Build Grass 7 plugin" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:grass7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global grass_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set grass_version 7.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@GRASS_VERSION@|${grass_version}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/mac/app.info.plist.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete "-DWITH_GRASS7=OFF"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append "-DWITH_GRASS7=ON"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DGRASS_PREFIX7=${prefix}/share/grass-${grass_version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Obsolete Date: 2022-01-01
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by qgis3
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/files/patch-PyQtMacros.diff b/gis/qgis/files/patch-PyQtMacros.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c4d720a1707..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/files/patch-PyQtMacros.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/PyQtMacros.cmake.old 2016-03-09 10:31:17.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/PyQtMacros.cmake 2016-03-09 10:31:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,9 +9,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(PYUIC_PROG_NAMES pyuic5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(PYRCC_PROG_NAME pyrcc5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ELSE(ENABLE_QT5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(PYUIC_PROG_NAME pyuic4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(PYUIC_PROG_NAMES python2-pyuic4 pyuic4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(PYRCC_PROG_NAME pyrcc4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(PYUIC_PROG_NAME pyuic4-2.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(PYUIC_PROG_NAMES python2-pyuic4 pyuic4-2.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(PYRCC_PROG_NAME pyrcc4-2.7)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(ENABLE_QT5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT PYUIC_PROGRAM)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/files/patch-app_info_plist_in.diff b/gis/qgis/files/patch-app_info_plist_in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6a48d899aa3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/files/patch-app_info_plist_in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mac/app.info.plist.in.orig 2014-04-10 11:12:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mac/app.info.plist.in 2014-04-10 11:14:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>6.0</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CSResourcesFileMapped</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <true/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>LSEnvironment</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>PATH</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>/bin:/usr/bin:/usr/sbin:@PREFIX@/bin:@PREFIX@/sbin</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>GRASS_SH</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>/bin/sh</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>GRASS_PROJSHARE</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@PREFIX@/lib/proj47/share/proj</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>GRASS_VERSION</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@GRASS_VERSION@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>GRASS_LD_LIBRARY_PATH</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@PREFIX@/share/grass-@GRASS_VERSION@/lib</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <key>GRASS_PERL</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <string>@PREFIX@/bin/perl</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleDocumentTypes</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dict>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/files/patch-python_core_conversions_sip.diff b/gis/qgis/files/patch-python_core_conversions_sip.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a26e8e9263..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/files/patch-python_core_conversions_sip.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,182 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- python/core/conversions.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ python/core/conversions.sip
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2041,3 +2041,178 @@ register_from_qvariant_convertor = (void (*)(FromQVariantConvertorFn))sipImportS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- register_from_qvariant_convertor(null_from_qvariant_convertor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// QList<QVariant> is implemented as a Python list.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%MappedType QList<QVariant> /TypeHintIn="Sequence[QVariant]", TypeHintOut="List[QVariant]", TypeHintValue="[]"/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%TypeHeaderCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <qlist.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%ConvertFromTypeCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Create the list.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((l = PyList_New(sipCpp->size())) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Set the list elements.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 0; i < sipCpp->size(); ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QVariant *t = new QVariant(sipCpp->at(i));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *tobj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((tobj = sipConvertFromNewType(t, sipType_QVariant, sipTransferObj)) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(l);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyList_SET_ITEM(l, i, tobj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%ConvertToTypeCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SIP_SSIZE_T len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Check the type if that is all that is required.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sipIsErr == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *itm = PySequence_ITEM(sipPy, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool ok = (itm && sipCanConvertToType(itm, sipType_QVariant, SIP_NOT_NONE));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_XDECREF(itm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!ok)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QList<QVariant> *ql = new QList<QVariant>;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = PySequence_Size(sipPy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *itm = PySequence_ITEM(sipPy, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QVariant *t = reinterpret_cast<QVariant *>(sipConvertToType(itm, sipType_QVariant, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(itm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*sipIsErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sipReleaseType(t, sipType_QVariant, state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete ql;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ql->append(*t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sipReleaseType(t, sipType_QVariant, state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *sipCppPtr = ql;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return sipGetState(sipTransferObj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// QList<QPolygonF> is implemented as a Python list.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%MappedType QList<QPolygonF> /TypeHintIn="Sequence[QPolygonF]", TypeHintOut="List[QPolygonF]", TypeHintValue="[]"/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%TypeHeaderCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <qlist.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%ConvertFromTypeCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Create the list.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((l = PyList_New(sipCpp->size())) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Set the list elements.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (int i = 0; i < sipCpp->size(); ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QPolygonF *t = new QPolygonF(sipCpp->at(i));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *tobj;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((tobj = sipConvertFromNewType(t, sipType_QPolygonF, sipTransferObj)) == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(l);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyList_SET_ITEM(l, i, tobj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return l;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%ConvertToTypeCode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SIP_SSIZE_T len;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Check the type if that is all that is required.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sipIsErr == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PySequence_Check(sipPy) || (len = PySequence_Size(sipPy)) < 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *itm = PySequence_ITEM(sipPy, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool ok = (itm && sipCanConvertToType(itm, sipType_QPolygonF, SIP_NOT_NONE));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_XDECREF(itm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!ok)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QList<QPolygonF> *ql = new QList<QPolygonF>;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ len = PySequence_Size(sipPy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (SIP_SSIZE_T i = 0; i < len; ++i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyObject *itm = PySequence_ITEM(sipPy, i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QPolygonF *t = reinterpret_cast<QPolygonF *>(sipConvertToType(itm, sipType_QPolygonF, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(itm);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*sipIsErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sipReleaseType(t, sipType_QPolygonF, state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ delete ql;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ql->append(*t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sipReleaseType(t, sipType_QPolygonF, state);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *sipCppPtr = ql;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return sipGetState(sipTransferObj);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%End
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>