svn commit: r490430 - in head: . graphics/qgis graphics/qgis/files
Tobias C. Berner
tcberner at FreeBSD.org
Tue Jan 15 21:30:22 UTC 2019
Author: tcberner
Date: Tue Jan 15 21:30:15 2019
New Revision: 490430
URL: https://svnweb.freebsd.org/changeset/ports/490430
Log:
graphics/qgis: update to 3.4.3
QGIS 3.4 LTR, the first long-term release (LTR) of QGIS 3.
This is a major upgrade and users should consult the UPDATING entry
provided for further information on how to progress.
http://changelog.qgis.org/en/qgis/version/3.4-LTR/
PR: 233726
Submitted by: Rainer Hurling <rhurlin at gwdg.de> (maintainer)
Added:
head/graphics/qgis/files/patch-cmake_FindPyQt5.py (contents, props changed)
head/graphics/qgis/files/patch-src_app_main.cpp (contents, props changed)
head/graphics/qgis/files/patch-src_core_qgsproject.cpp (contents, props changed)
Deleted:
head/graphics/qgis/files/patch-debian_qgis.desktop
head/graphics/qgis/files/patch-src_plugins_grass_qtermwidget_kpty.cpp
Modified:
head/UPDATING
head/graphics/qgis/Makefile
head/graphics/qgis/distinfo
head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py
head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt
head/graphics/qgis/pkg-descr
head/graphics/qgis/pkg-plist
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Tue Jan 15 21:30:11 2019 (r490429)
+++ head/UPDATING Tue Jan 15 21:30:15 2019 (r490430)
@@ -6,6 +6,32 @@ You should get into the habit of checking this file fo
you update your ports collection, before attempting any port upgrades.
20190114:
+ AFFECTS: users of graphics/qgis
+ AUTHOR: rhurlin at gwdg.de
+
+ GIS 3.4 LTR, the first long-term release (LTR) of QGIS 3, has landed
+ in the FreeBSD ports tree. It will also replace the previous 2.18 LTR
+ in the QGIS package repositories in February 2019 [1].
+
+ Beside, the latest QT4 version 4.8.7 has been EOL since December 2015
+ and its expiration date on FreeBSD is set to March, 15th 2019.
+ Because QGIS 2 is based on QT4 and Python2, it was decided to not create
+ a legacy port for QGIS 2, after graphics/qgis changed to QGIS 3.
+
+ For users moving over from the 2.18 LTR there is a huge list of new
+ features and impactful changes in this new 3.4 LTR version. Most notably
+ 3.x plugins are incompatible with 2.x plugins, so please review your
+ plugin usage carefully. Before moving over, if you have not already
+ done so, take a look at the changelogs from versions 3.0, 3.2, and
+ 3.4 [2][3][4] to understand the full scope of changes in the 3.x release.
+
+
+ [1] https://qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule
+ [2] http://changelog.qgis.org/en/qgis/version/3.0.0/
+ [3] http://changelog.qgis.org/en/qgis/version/3.2.0/
+ [4] http://changelog.qgis.org/en/qgis/version/3.4-LTR/
+
+20190114:
AFFECTS: x11-wm/sway
AUTHOR: jbeich at FreeBSD.org
Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile Tue Jan 15 21:30:11 2019 (r490429)
+++ head/graphics/qgis/Makefile Tue Jan 15 21:30:15 2019 (r490430)
@@ -3,196 +3,133 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
-DISTVERSION= 2_18_26
-PORTREVISION= 1
+DISTVERSION= 3_4_3
CATEGORIES= graphics geography
MAINTAINER= rhurlin at gwdg.de
-COMMENT= Geographical Information System (GIS) data viewer
+COMMENT= Free and Open Source Geographic Information System
LICENSE= GPLv2
-DEPRECATED= Qt4 has been EOL since december 2015
-EXPIRATION_DATE= 2019-03-15
-
-BUILD_DEPENDS= txt2tags:textproc/txt2tags
+BUILD_DEPENDS= gpsbabel>=1.5.3:astro/gpsbabel \
+ txt2tags:textproc/txt2tags \
+ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS= astyle:devel/astyle \
+ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
LIB_DEPENDS= libexpat.so:textproc/expat2 \
+ libfcgi.so:www/fcgi \
libgdal.so:graphics/gdal \
libgeos.so:graphics/geos \
libgsl.so:math/gsl \
+ libhdf5.so:science/hdf5 \
+ libnetcdf.so:science/netcdf \
libproj.so:graphics/proj \
- libqca.so:devel/qca at qt4 \
- libqjson.so:devel/qjson at qt4 \
- libqscintilla2_qt4.so:devel/qscintilla2 \
- libqwt6.so:x11-toolkits/qwt6 at qt4 \
+ libqca-qt5.so:devel/qca at qt5 \
+ libqjson-qt5.so:devel/qjson at qt5 \
+ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
+ libqt5keychain.so:security/qtkeychain at qt5 \
+ libqwt6.so:x11-toolkits/qwt6 at qt5 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \
- libxerces-c.so:textproc/xerces-c3
+ libxerces-c.so:textproc/xerces-c3 \
+ libzip.so:archivers/libzip
+### Fortran is needed by numpy, GRASS, etc.
USES= bison cmake compiler:features cpe desktop-file-utils \
- fortran gmake pyqt:4 python:2.7 qt:4 sqlite:3
+ fortran gmake pgsql pyqt:5 python:3.6+ qt:5 shebangfix \
+ sqlite:3
+USE_QT= 3d buildtools_build core concurrent dbus declarative \
+ designer doc gui linguist_build location network \
+ printsupport qmake_build script serialport \
+ sql sql-pgsql sql-sqlite3 svg testlib uitools \
+ webengine widgets webkit xml
+USE_PYQT= core gui network qml qscintilla2 sip sql svg xml webkit_run
+USE_LDCONFIG= yes
+
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME:tu}
-USE_PYQT= core gui network qscintilla2 sip sql svg xml webkit_run
-USE_QT= corelib designer doc gui linguist_build moc_build \
- network qmake_build rcc_build script sql sql-pgsql \
- sql-sqlite3 svg testlib uic_build webkit xml
-USE_LDCONFIG= yes
-BINARY_ALIAS= pyrcc4=pyrcc4-${PYTHON_VER}
-ICON_SIZES= 8 16 22 24 32 36 42 48 64 72 80 96 128 192 256 512
+CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
+ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
+ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
+ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
+ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so
+CMAKE_ON= BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \
+ WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL
+CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR
-OPTIONS_DEFINE= PYTHON POSTGIS GRASS SERVER
-OPTIONS_GROUP= DEVELOPER
-OPTIONS_GROUP_DEVELOPER= CUSTOMWIDGETS ASTYLE TESTS DEBUG
-OPTIONS_DEFAULT= PYTHON POSTGIS
-NO_OPTIONS_SORT= yes
-OPTIONS_SUB= yes
-ASTYLE_DESC= Enable AStyle for QGis
-CUSTOMWIDGETS_DESC= Enable QT4/QGis Custom Widgets
-DEBUG_DESC= Write Debugging Output to Console
-SERVER_DESC= Enable QGIS server
-TESTS_DESC= Run the test suite after build process
-
-CMAKE_ARGS+= -DENABLE_QT5=OFF
-CMAKE_ARGS+= -DENABLE_PYTHON3=OFF
-# cmake script fails to find it without PYUIC_PROGRAM
-CMAKE_ARGS+= -DPYUIC_PROGRAM:STRING="${LOCALBASE}/bin/pyuic4"
-CMAKE_ARGS+= -DQWT_INCLUDE_DIR:PATH="${LOCALBASE}/include/qt4/qwt6/"
-CMAKE_ARGS+= -DQWT_LIBRARY:FILEPATH="${LOCALBASE}/lib/qt4/libqwt6.so"
-CMAKE_ARGS+= -DWITH_QWTPOLAR=ON
-CMAKE_ARGS+= -DWITH_ORACLE:BOOL=FALSE
-CMAKE_ARGS+= -DWITH_GLOBE:BOOL=FALSE
-
.if !defined(MAINTAINER_MODE)
CMAKE_ARGS+= -Wno-dev
-CMAKE_ARGS+= -DSUPPRESS_SIP_WARNINGS=OFF -DSUPPRESS_QT_WARNINGS=OFF
-CMAKE_ARGS+= -DWITH_INTERNAL_DATEUTIL=FALSE
-CMAKE_ARGS+= -DWITH_INTERNAL_FUTURE=FALSE
-CMAKE_ARGS+= -DWITH_INTERNAL_NOSE2=FALSE
-CMAKE_ARGS+= -DWITH_INTERNAL_PYTZ=FALSE
-CMAKE_ARGS+= -DWITH_INTERNAL_SIX=FALSE
-CMAKE_ARGS+= -DWITH_INTERNAL_YAML=FALSE
+CMAKE_OFF+= SUPPRESS_QT_WARNINGS
.endif
-ASTYLE_RUN_DEPENDS= astyle:devel/astyle
-ASTYLE_CMAKE_ON= -DWITH_ASTYLE:BOOL=TRUE
-ASTYLE_CMAKE_OFF= -DWITH_ASTYLE:BOOL=FALSE
+SHEBANG_FILES= src/plugins/grass/scripts/*.py
-CUSTOMWIDGETS_CMAKE_ON= -DWITH_CUSTOM_WIDGETS:BOOL=TRUE
-CUSTOMWIDGETS_CMAKE_OFF= -DWITH_CUSTOM_WIDGETS:BOOL=FALSE
+OPTIONS_DEFINE= GRASS SERVER
+OPTIONS_DEFAULT= GRASS
+NO_OPTIONS_SORT= yes
-DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug
-DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release
+OPTIONS_SUB= yes
+SERVER_DESC= Enable QGIS server
GRASS_BUILD_DEPENDS= grass74:databases/grass7
-GRASS_RUN_DEPENDS= grass74:databases/grass7
-GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.4.0
+GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS}
+GRASS_CMAKE_BOOL= WITH_GRASS7
GRASS_FORCE_MAKE_JOBS= NO
-GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE
-POSTGIS_USES= pgsql
-#POSTGIS_LIB_DEPENDS= liblwgeom.so:databases/postgis22
-POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE
-POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE
-
-PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
-PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
-PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE
-PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE
-
SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi
-SERVER_CMAKE_ON= -DWITH_SERVER:BOOL=TRUE
-SERVER_CMAKE_OFF= -DWITH_SERVER:BOOL=FALSE
+SERVER_CMAKE_BOOL= WITH_SERVER
-TESTS_CMAKE_ON= -DENABLE_TESTS=TRUE
-TESTS_CMAKE_OFF= -DENABLE_TESTS=FALSE
+PLIST_SUB= DISTVERSION=${PORTVERSION}
-pre-patch:
- @${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \
- ${WRKSRC}/src/app/qgisapp.cpp
-# [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23
-# 'Hide shared library symbols by default on GCC and Clang',
-# some layer properties are not visible on FreeBSD > 9.x
- @${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|#SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|' \
- ${WRKSRC}/CMakeLists.txt
-
post-patch:
- @${REINPLACE_CMD} -e 's|/usr/bin/qgis|${LOCALBASE}/bin/qgis|g' \
- ${WRKSRC}/debian/${PORTNAME}.desktop
- @${REINPLACE_CMD} -e 's|Icon=qgis|Icon=qgis-icon|' \
- ${WRKSRC}/debian/${PORTNAME}.desktop
- @${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
- ${WRKSRC}/python/ext-libs/pytz/tzfile.py \
- ${WRKSRC}/scripts/generate_test_mask_image.py \
- ${WRKSRC}/scripts/random_vector.py \
- ${WRKSRC}/scripts/widgets_tree.py \
- ${WRKSRC}/src/plugins/grass/qgis_grass_test.py \
- ${WRKSRC}/src/plugins/grass/scripts/qgis.v.kernel.rast.py \
- ${WRKSRC}/src/plugins/grass/scripts/v.out.ogr.pg.py \
- ${WRKSRC}/src/plugins/grass/scripts/qgis.v.upgrade.py \
- ${WRKSRC}/src/plugins/grass/scripts/r.external.all.py \
- ${WRKSRC}/src/plugins/grass/scripts/db.connect-login.pg.py
@${REINPLACE_CMD} -e 's|markupsafe ||g' \
${WRKSRC}/python/ext-libs/CMakeLists.txt
+pre-configure:
+ ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
+
post-install:
@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
- ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \
- ${STAGEDIR}${PREFIX}/share/applications/
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor
-.for SZ in ${ICON_SIZES}
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
- ${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \
- ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
-.endfor
-
-post-install-TESTS-on:
@${RM} /tmp/srs.db
check:
Modified: head/graphics/qgis/distinfo
==============================================================================
--- head/graphics/qgis/distinfo Tue Jan 15 21:30:11 2019 (r490429)
+++ head/graphics/qgis/distinfo Tue Jan 15 21:30:15 2019 (r490430)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543089824
-SHA256 (qgis-QGIS-final-2_18_26_GH0.tar.gz) = 08109f3d32e70bd04c396ded4eb979013ce2590b66793648e97132d18b7af915
-SIZE (qgis-QGIS-final-2_18_26_GH0.tar.gz) = 99575234
+TIMESTAMP = 1545994756
+SHA256 (qgis-QGIS-final-3_4_3_GH0.tar.gz) = 47dcda95b3b64057a428d8e50c3e8cdf5dabb0618de02e9e637f442e964c4d47
+SIZE (qgis-QGIS-final-3_4_3_GH0.tar.gz) = 89093146
Added: head/graphics/qgis/files/patch-cmake_FindPyQt5.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/qgis/files/patch-cmake_FindPyQt5.py Tue Jan 15 21:30:15 2019 (r490430)
@@ -0,0 +1,11 @@
+--- cmake/FindPyQt5.py.orig 2019-01-02 08:42:18 UTC
++++ cmake/FindPyQt5.py
+@@ -54,7 +54,7 @@ except ImportError:
+ 'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
+ 'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
+ 'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
+- 'pyqt_sip_dir': sip_dir,
++ 'pyqt_sip_dir': sip_dir.replace('PyQtsip', 'PyQt5'),
+ 'pyqt_bin_dir': cfg.default_bin_dir,
+ }
+ pyqtcfg = sipconfig.Configuration([cfg])
Modified: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py
==============================================================================
--- head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Tue Jan 15 21:30:11 2019 (r490429)
+++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Tue Jan 15 21:30:15 2019 (r490430)
@@ -1,11 +1,11 @@
---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2017-10-27 12:00:21 UTC
+--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2018-11-23 12:08:36 UTC
+++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
-@@ -73,7 +73,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
- self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'))
+@@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
+ self.tr('Processing'), Qgis.Critical)
return
-- if not version.startswith('2.3.'):
-+ if version < '2.3.':
- ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
- self.tr('Problem with SAGA installation: unsupported SAGA version found.'))
- return
+- if not version.startswith(REQUIRED_VERSION):
++ if version < '2.3':
+ QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION),
+ self.tr('Processing'),
+ Qgis.Critical)
Modified: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py
==============================================================================
--- head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py Tue Jan 15 21:30:11 2019 (r490429)
+++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py Tue Jan 15 21:30:15 2019 (r490430)
@@ -1,14 +1,14 @@
---- python/plugins/processing/algs/saga/SagaUtils.py.orig 2017-10-27 12:00:21 UTC
+--- python/plugins/processing/algs/saga/SagaUtils.py.orig 2018-11-23 12:08:36 UTC
+++ python/plugins/processing/algs/saga/SagaUtils.py
@@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
- __revision__ = '$Format:%H$'
+ __revision__ = '564579199220ae06abd248f0dc80b7ff57b80128'
import os
+import platform
import stat
import subprocess
import time
-@@ -57,7 +58,7 @@ def sagaBatchJobFilename():
+@@ -59,7 +60,7 @@ def sagaBatchJobFilename():
def findSagaFolder():
folder = None
@@ -17,7 +17,7 @@
testfolder = os.path.join(QgsApplication.prefixPath(), 'bin')
if os.path.exists(os.path.join(testfolder, 'saga_cmd')):
folder = testfolder
-@@ -82,7 +83,7 @@ def findSagaFolder():
+@@ -84,7 +85,7 @@ def findSagaFolder():
def sagaPath():
@@ -26,16 +26,16 @@
return ''
folder = findSagaFolder()
-@@ -101,7 +102,7 @@ def createSagaBatchJobFileFromSagaCommands(commands):
- fout.write('set SAGA_MLB=' + sagaPath() + os.sep +
- 'modules' + '\n')
- fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n')
-- elif isMac():
-+ elif isMac() or platform.system() == 'FreeBSD':
- fout.write('export SAGA_MLB=' + sagaPath() +
- '/../lib/saga\n')
- fout.write('export PATH=' + sagaPath() + ':$PATH\n')
-@@ -130,7 +131,7 @@ def getSagaInstalledVersion(runSaga=False):
+@@ -102,7 +103,7 @@ def createSagaBatchJobFileFromSagaCommands(commands):
+ fout.write('set SAGA=' + sagaPath() + '\n')
+ fout.write('set SAGA_MLB=' + os.path.join(sagaPath(), 'modules') + '\n')
+ fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n')
+- elif isMac():
++ elif isMac() or platform.system() == 'FreeBSD':
+ fout.write('export SAGA_MLB=' + os.path.join(sagaPath(), '../lib/saga') + '\n')
+ fout.write('export PATH=' + sagaPath() + ':$PATH\n')
+ else:
+@@ -129,7 +130,7 @@ def getInstalledVersion(runSaga=False):
if isWindows():
commands = [os.path.join(sagaPath(), "saga_cmd.exe"), "-v"]
@@ -44,12 +44,12 @@
commands = [os.path.join(sagaPath(), "saga_cmd -v")]
else:
# for Linux use just one string instead of separated parameters as the list
-@@ -146,7 +147,7 @@ def getSagaInstalledVersion(runSaga=False):
+@@ -145,7 +146,7 @@ def getInstalledVersion(runSaga=False):
stderr=subprocess.STDOUT,
universal_newlines=True,
- ).stdout
-- if isMac(): # This trick avoids having an uninterrupted system call exception if SAGA is not installed
-+ if isMac() or platform.system() == 'FreeBSD': # This trick avoids having an uninterrupted system call exception if SAGA is not installed
- time.sleep(1)
- try:
- lines = proc.readlines()
+ ) as proc:
+- if isMac(): # This trick avoids having an uninterrupted system call exception if SAGA is not installed
++ if isMac() or platform.system() == 'FreeBSD': # This trick avoids having an uninterrupted system call exception if SAGA is not installed
+ time.sleep(1)
+ try:
+ lines = proc.stdout.readlines()
Added: head/graphics/qgis/files/patch-src_app_main.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/qgis/files/patch-src_app_main.cpp Tue Jan 15 21:30:15 2019 (r490430)
@@ -0,0 +1,20 @@
+--- src/app/main.cpp.orig 2018-11-23 12:08:36 UTC
++++ src/app/main.cpp
+@@ -1025,7 +1025,7 @@ int main( int argc, char *argv[] )
+ QCoreApplication::addLibraryPath( QApplication::applicationDirPath()
+ + QDir::separator() + "qtplugins" );
+ #endif
+-#ifdef Q_OS_MAC
++#if defined(Q_OS_MAC) || defined(Q_OS_UNIX)
+ // Resulting libraryPaths has critical QGIS plugin paths first, then any Qt plugin paths, then
+ // any dev-defined paths (in app's qt.conf) and/or user-defined paths (QT_PLUGIN_PATH env var).
+ //
+@@ -1033,7 +1033,7 @@ int main( int argc, char *argv[] )
+ // built against a different Qt/QGIS, while still allowing custom C++ plugins to load.
+ QStringList libPaths( QCoreApplication::libraryPaths() );
+
+- QgsDebugMsgLevel( QStringLiteral( "Initial macOS QCoreApplication::libraryPaths: %1" )
++ QgsDebugMsgLevel( QStringLiteral( "Initial macOS or UNIX QCoreApplication::libraryPaths: %1" )
+ .arg( libPaths.join( " " ) ), 4 );
+
+ // Strip all critical paths that should always be prepended
Added: head/graphics/qgis/files/patch-src_core_qgsproject.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/qgis/files/patch-src_core_qgsproject.cpp Tue Jan 15 21:30:15 2019 (r490430)
@@ -0,0 +1,11 @@
+--- src/core/qgsproject.cpp.orig 2018-11-23 12:08:36 UTC
++++ src/core/qgsproject.cpp
+@@ -1867,7 +1867,7 @@ bool QgsProject::writeProjectFile( const QString &file
+ }
+
+ QFileInfo fi( fileName() );
+- struct utimbuf tb = { fi.lastRead().toTime_t(), fi.lastModified().toTime_t() };
++ struct utimbuf tb = { static_cast<time_t>( fi.lastRead().toSecsSinceEpoch() ), static_cast<time_t>( fi.lastModified().toSecsSinceEpoch() ) };
+ utime( backupFile.fileName().toUtf8().constData(), &tb );
+ }
+
Modified: head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt
==============================================================================
--- head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt Tue Jan 15 21:30:11 2019 (r490429)
+++ head/graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt Tue Jan 15 21:30:15 2019 (r490430)
@@ -1,6 +1,6 @@
---- src/plugins/grass/CMakeLists.txt.orig 2017-10-27 12:00:21 UTC
+--- src/plugins/grass/CMakeLists.txt.orig 2018-11-23 12:08:36 UTC
+++ src/plugins/grass/CMakeLists.txt
-@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
+@@ -211,6 +211,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
qgis_app
qgis_gui
${OPENPTY_LIBRARY}
Modified: head/graphics/qgis/pkg-descr
==============================================================================
--- head/graphics/qgis/pkg-descr Tue Jan 15 21:30:11 2019 (r490429)
+++ head/graphics/qgis/pkg-descr Tue Jan 15 21:30:15 2019 (r490430)
@@ -11,4 +11,4 @@ Some of the major features include:
- GRASS Digitizing
- Feature labeling
-WWW: https://www.qgis.org/en/site/
+WWW: https://qgis.org/en/site/
Modified: head/graphics/qgis/pkg-plist
==============================================================================
--- head/graphics/qgis/pkg-plist Tue Jan 15 21:30:11 2019 (r490429)
+++ head/graphics/qgis/pkg-plist Tue Jan 15 21:30:15 2019 (r490430)
@@ -1,58 +1,78 @@
%%SERVER%%bin/admin.sld
-bin/qbrowser
bin/qgis
-%%TESTS%%bin/qgis_bench
+bin/qgis_bench
%%SERVER%%bin/qgis_mapserv.fcgi
-%%SERVER%%bin/schemaExtension.xsd
%%SERVER%%bin/wms_metadata.xml
include/qgis/Bezier3D.h
include/qgis/CloughTocherInterpolator.h
include/qgis/DualEdgeTriangulation.h
include/qgis/HalfEdge.h
include/qgis/LinTriangleInterpolator.h
-include/qgis/Line3D.h
-include/qgis/Node.h
+include/qgis/MathUtils.h
include/qgis/NormVecDecorator.h
include/qgis/ParametricLine.h
-include/qgis/Point3D.h
include/qgis/TriDecorator.h
include/qgis/TriangleInterpolator.h
include/qgis/Triangulation.h
include/qgis/Vector3D.h
include/qgis/characterwidget.h
-include/qgis/qextserialenumerator.h
-include/qgis/qextserialport.h
+include/qgis/mersenne-twister.h
include/qgis/qgis.h
-%%CUSTOMWIDGETS%%include/qgis/qgiscustomwidgets.h
-include/qgis/qgisgui.h
+include/qgis/qgis_3d.h
+include/qgis/qgis_analysis.h
+include/qgis/qgis_core.h
+include/qgis/qgis_customwidgets.h
+include/qgis/qgis_gui.h
+include/qgis/qgis_native.h
+include/qgis/qgis_sip.h
+include/qgis/qgiscustomwidgets.h
include/qgis/qgisinterface.h
include/qgis/qgisplugin.h
include/qgis/qgs25drenderer.h
include/qgis/qgs25drendererwidget.h
-include/qgis/qgsabstractgeometryv2.h
+include/qgis/qgs3dmapscene.h
+include/qgis/qgs3dmapsettings.h
+include/qgis/qgs3drendererregistry.h
+include/qgis/qgs3dtypes.h
+include/qgis/qgs3dutils.h
+include/qgis/qgsaabb.h
+include/qgis/qgsabstract3dengine.h
+include/qgis/qgsabstract3drenderer.h
+include/qgis/qgsabstract3dsymbol.h
+include/qgis/qgsabstractdatasourcewidget.h
+include/qgis/qgsabstractgeometry.h
+include/qgis/qgsabstractlayoutiterator.h
+include/qgis/qgsabstractmetadatabase.h
+include/qgis/qgsabstractreportsection.h
include/qgis/qgsaction.h
include/qgis/qgsactionmanager.h
include/qgis/qgsactionmenu.h
-include/qgis/qgsaddremoveitemcommand.h
-include/qgis/qgsaddremovemultiframecommand.h
+include/qgis/qgsactionscope.h
+include/qgis/qgsactionscoperegistry.h
include/qgis/qgsadvanceddigitizingdockwidget.h
include/qgis/qgsaggregatecalculator.h
+include/qgis/qgsaggregatetoolbutton.h
+include/qgis/qgsalgorithmimportphotos.h
include/qgis/qgsalignraster.h
+include/qgis/qgsanalysis.h
+include/qgis/qgsanimatedicon.h
include/qgis/qgsannotation.h
-include/qgis/qgsannotationitem.h
+include/qgis/qgsannotationmanager.h
+include/qgis/qgsannotationregistry.h
include/qgis/qgsapplication.h
-include/qgis/qgsarcproperter.h
+include/qgis/qgsarchive.h
include/qgis/qgsarrowsymbollayerwidget.h
include/qgis/qgsaspectfilter.h
-include/qgis/qgsatlascomposition.h
-include/qgis/qgsattributeaction.h
include/qgis/qgsattributedialog.h
-include/qgis/qgsattributeeditor.h
include/qgis/qgsattributeeditorcontext.h
+include/qgis/qgsattributeeditorelement.h
include/qgis/qgsattributeform.h
include/qgis/qgsattributeformeditorwidget.h
include/qgis/qgsattributeforminterface.h
include/qgis/qgsattributeformlegacyinterface.h
+include/qgis/qgsattributeformrelationeditorwidget.h
+include/qgis/qgsattributeformwidget.h
+include/qgis/qgsattributes.h
include/qgis/qgsattributetableconfig.h
include/qgis/qgsattributetabledelegate.h
include/qgis/qgsattributetablefiltermodel.h
@@ -82,50 +102,69 @@ include/qgis/qgsauthmethodedit.h
include/qgis/qgsauthmethodmetadata.h
include/qgis/qgsauthmethodregistry.h
include/qgis/qgsauthserverseditor.h
+include/qgis/qgsauthsettingswidget.h
include/qgis/qgsauthsslconfigwidget.h
include/qgis/qgsauthsslerrorsdialog.h
include/qgis/qgsauthsslimportdialog.h
include/qgis/qgsauthtrustedcasdialog.h
+include/qgis/qgsauxiliarystorage.h
include/qgis/qgsbearingutils.h
include/qgis/qgsbilinearrasterresampler.h
include/qgis/qgsblendmodecombobox.h
include/qgis/qgsblureffect.h
+include/qgis/qgsbox3d.h
include/qgis/qgsbrightnesscontrastfilter.h
+include/qgis/qgsbrowserdockwidget.h
+include/qgis/qgsbrowserdockwidget_p.h
include/qgis/qgsbrowsermodel.h
+include/qgis/qgsbrowserproxymodel.h
include/qgis/qgsbrowsertreeview.h
include/qgis/qgsbrushstylecombobox.h
include/qgis/qgsbusyindicatordialog.h
include/qgis/qgscachedfeatureiterator.h
include/qgis/qgscacheindex.h
include/qgis/qgscacheindexfeatureid.h
-include/qgis/qgscategorizedsymbolrendererv2.h
-include/qgis/qgscategorizedsymbolrendererv2widget.h
-include/qgis/qgscharacterselectdialog.h
+include/qgis/qgscadutils.h
+include/qgis/qgscameracontroller.h
+include/qgis/qgscamerapose.h
+include/qgis/qgscategorizedsymbolrenderer.h
+include/qgis/qgscategorizedsymbolrendererwidget.h
+include/qgis/qgscharacterselectordialog.h
+include/qgis/qgscheckablecombobox.h
+include/qgis/qgscheckablecomboboxplugin.h
include/qgis/qgscheckboxconfigdlg.h
include/qgis/qgscheckboxsearchwidgetwrapper.h
include/qgis/qgscheckboxwidgetfactory.h
include/qgis/qgscheckboxwidgetwrapper.h
-include/qgis/qgscircularstringv2.h
+include/qgis/qgschunkedentity_p.h
+include/qgis/qgschunklist_p.h
+include/qgis/qgschunkloader_p.h
+include/qgis/qgschunknode_p.h
+include/qgis/qgschunkqueuejob_p.h
+include/qgis/qgscircle.h
+include/qgis/qgscircularstring.h
include/qgis/qgsclassificationwidgetwrapper.h
include/qgis/qgsclassificationwidgetwrapperfactory.h
include/qgis/qgsclipper.h
include/qgis/qgscliptominmaxenhancement.h
include/qgis/qgscodeeditor.h
include/qgis/qgscodeeditorcss.h
+include/qgis/qgscodeeditorexpression.h
include/qgis/qgscodeeditorhtml.h
include/qgis/qgscodeeditorpython.h
include/qgis/qgscodeeditorsql.h
include/qgis/qgscollapsiblegroupbox.h
-%%CUSTOMWIDGETS%%include/qgis/qgscollapsiblegroupboxplugin.h
+include/qgis/qgscollapsiblegroupboxplugin.h
+include/qgis/qgscolorbrewercolorrampdialog.h
include/qgis/qgscolorbrewerpalette.h
include/qgis/qgscolorbutton.h
-%%CUSTOMWIDGETS%%include/qgis/qgscolorbuttonplugin.h
-include/qgis/qgscolorbuttonv2.h
-%%CUSTOMWIDGETS%%include/qgis/qgscolorbuttonv2plugin.h
+include/qgis/qgscolorbuttonplugin.h
include/qgis/qgscolordialog.h
include/qgis/qgscoloreffect.h
-include/qgis/qgscolorrampcombobox.h
+include/qgis/qgscolorramp.h
+include/qgis/qgscolorrampbutton.h
include/qgis/qgscolorrampshader.h
+include/qgis/qgscolorrampshaderwidget.h
include/qgis/qgscolorscheme.h
include/qgis/qgscolorschemelist.h
include/qgis/qgscolorschemeregistry.h
@@ -133,119 +172,87 @@ include/qgis/qgscolorswatchgrid.h
include/qgis/qgscolorwidgetfactory.h
include/qgis/qgscolorwidgets.h
include/qgis/qgscolorwidgetwrapper.h
-include/qgis/qgscomposerarrow.h
-include/qgis/qgscomposerattributetable.h
-include/qgis/qgscomposerattributetablemodel.h
-include/qgis/qgscomposerattributetablemodelv2.h
-include/qgis/qgscomposerattributetablev2.h
-include/qgis/qgscomposereffect.h
-include/qgis/qgscomposerframe.h
-include/qgis/qgscomposerhtml.h
-include/qgis/qgscomposeritem.h
-include/qgis/qgscomposeritemcombobox.h
-include/qgis/qgscomposeritemcommand.h
-include/qgis/qgscomposeritemgroup.h
-include/qgis/qgscomposerlabel.h
-include/qgis/qgscomposerlegend.h
-include/qgis/qgscomposerlegenditem.h
-include/qgis/qgscomposerlegendstyle.h
-include/qgis/qgscomposermap.h
-include/qgis/qgscomposermapgrid.h
-include/qgis/qgscomposermapitem.h
-include/qgis/qgscomposermapoverview.h
-include/qgis/qgscomposermodel.h
-include/qgis/qgscomposermousehandles.h
-include/qgis/qgscomposermultiframe.h
-include/qgis/qgscomposermultiframecommand.h
-include/qgis/qgscomposernodesitem.h
-include/qgis/qgscomposerobject.h
-include/qgis/qgscomposerpicture.h
-include/qgis/qgscomposerpolygon.h
-include/qgis/qgscomposerpolyline.h
-include/qgis/qgscomposerruler.h
-include/qgis/qgscomposerscalebar.h
-include/qgis/qgscomposershape.h
-include/qgis/qgscomposertable.h
-include/qgis/qgscomposertablecolumn.h
-include/qgis/qgscomposertablev2.h
-include/qgis/qgscomposertexttable.h
-include/qgis/qgscomposerview.h
-include/qgis/qgscomposition.h
+include/qgis/qgscompositionconverter.h
include/qgis/qgscompoundcolorwidget.h
-include/qgis/qgscompoundcurvev2.h
+include/qgis/qgscompoundcurve.h
include/qgis/qgsconditionalstyle.h
include/qgis/qgsconfig.h
include/qgis/qgsconfigureshortcutsdialog.h
include/qgis/qgsconnectionpool.h
-include/qgis/qgscontexthelp.h
include/qgis/qgscontrastenhancement.h
include/qgis/qgscontrastenhancementfunction.h
+include/qgis/qgscoordinateformatter.h
include/qgis/qgscoordinatereferencesystem.h
-include/qgis/qgscoordinatereferencesystem_p.h
include/qgis/qgscoordinatetransform.h
+include/qgis/qgscoordinatetransformcontext.h
include/qgis/qgscoordinateutils.h
include/qgis/qgscptcityarchive.h
-include/qgis/qgscptcitycolorrampv2dialog.h
+include/qgis/qgscptcitycolorrampdialog.h
include/qgis/qgscredentialdialog.h
include/qgis/qgscredentials.h
-include/qgis/qgscrscache.h
-include/qgis/qgscsexception.h
include/qgis/qgscubicrasterresampler.h
-include/qgis/qgscursors.h
-include/qgis/qgscurvepolygonv2.h
-include/qgis/qgscurvev2.h
+include/qgis/qgscurve.h
+include/qgis/qgscurveeditorwidget.h
+include/qgis/qgscurvepolygon.h
+include/qgis/qgscustomdrophandler.h
include/qgis/qgscustomlayerorderwidget.h
include/qgis/qgsdartmeasurement.h
include/qgis/qgsdashspacedialog.h
-include/qgis/qgsdatadefined.h
-include/qgis/qgsdatadefined_p.h
-include/qgis/qgsdatadefinedbutton.h
-%%CUSTOMWIDGETS%%include/qgis/qgsdatadefinedbuttonplugin.h
-include/qgis/qgsdatadefinedsymboldialog.h
+include/qgis/qgsdatadefinedsizelegend.h
+include/qgis/qgsdatadefinedsizelegendwidget.h
include/qgis/qgsdataitem.h
include/qgis/qgsdataitemprovider.h
include/qgis/qgsdataitemproviderregistry.h
include/qgis/qgsdataprovider.h
+include/qgis/qgsdatasourcemanagerdialog.h
include/qgis/qgsdatasourceuri.h
include/qgis/qgsdatetimeedit.h
include/qgis/qgsdatetimeeditconfig.h
include/qgis/qgsdatetimeeditfactory.h
-%%CUSTOMWIDGETS%%include/qgis/qgsdatetimeeditplugin.h
+include/qgis/qgsdatetimeeditplugin.h
include/qgis/qgsdatetimeeditwrapper.h
+include/qgis/qgsdatetimefieldformatter.h
include/qgis/qgsdatetimesearchwidgetwrapper.h
include/qgis/qgsdatetimestatisticalsummary.h
+include/qgis/qgsdatumtransform.h
include/qgis/qgsdatumtransformdialog.h
-include/qgis/qgsdatumtransformstore.h
include/qgis/qgsdbfilterproxymodel.h
include/qgis/qgsdefaultsearchwidgetwrapper.h
+include/qgis/qgsdefaultvalue.h
+include/qgis/qgsdemterraingenerator.h
+include/qgis/qgsdemterraintilegeometry_p.h
+include/qgis/qgsdemterraintileloader_p.h
include/qgis/qgsderivativefilter.h
include/qgis/qgsdetaileditemdata.h
include/qgis/qgsdetaileditemdelegate.h
include/qgis/qgsdetaileditemwidget.h
include/qgis/qgsdiagram.h
-include/qgis/qgsdiagramrendererv2.h
+include/qgis/qgsdiagramrenderer.h
include/qgis/qgsdial.h
include/qgis/qgsdialog.h
-include/qgis/qgsdistancearcproperter.h
include/qgis/qgsdistancearea.h
include/qgis/qgsdockwidget.h
-%%CUSTOMWIDGETS%%include/qgis/qgsdockwidgetplugin.h
-include/qgis/qgsdoubleboxscalebarstyle.h
+include/qgis/qgsdockwidgetplugin.h
+include/qgis/qgsdoubleboxscalebarrenderer.h
include/qgis/qgsdoublespinbox.h
-%%CUSTOMWIDGETS%%include/qgis/qgsdoublespinboxplugin.h
+include/qgis/qgsdoublespinboxplugin.h
include/qgis/qgsdualview.h
include/qgis/qgsdummyconfigdlg.h
+include/qgis/qgsdxfexport.h
include/qgis/qgseditformconfig.h
include/qgis/qgseditorconfigwidget.h
-include/qgis/qgseditorwidgetconfig.h
+include/qgis/qgseditorwidgetautoconf.h
include/qgis/qgseditorwidgetfactory.h
include/qgis/qgseditorwidgetregistry.h
+include/qgis/qgseditorwidgetsetup.h
include/qgis/qgseditorwidgetwrapper.h
include/qgis/qgseffectdrawmodecombobox.h
include/qgis/qgseffectstack.h
include/qgis/qgseffectstackpropertieswidget.h
-include/qgis/qgsellipsesymbollayerv2.h
-include/qgis/qgsellipsesymbollayerv2widget.h
+include/qgis/qgsellipse.h
+include/qgis/qgsellipsesymbollayer.h
+include/qgis/qgsellipsesymbollayerwidget.h
+include/qgis/qgsellipsoidutils.h
include/qgis/qgsencodingfiledialog.h
include/qgis/qgsenumerationwidgetfactory.h
include/qgis/qgsenumerationwidgetwrapper.h
@@ -255,87 +262,140 @@ include/qgis/qgsexception.h
include/qgis/qgsexpression.h
include/qgis/qgsexpressionbuilderdialog.h
include/qgis/qgsexpressionbuilderwidget.h
-%%CUSTOMWIDGETS%%include/qgis/qgsexpressionbuilderwidgetplugin.h
+include/qgis/qgsexpressionbuilderwidgetplugin.h
include/qgis/qgsexpressioncontext.h
+include/qgis/qgsexpressioncontextgenerator.h
+include/qgis/qgsexpressioncontextscopegenerator.h
include/qgis/qgsexpressionfieldbuffer.h
+include/qgis/qgsexpressionfunction.h
include/qgis/qgsexpressionhighlighter.h
include/qgis/qgsexpressionlineedit.h
+include/qgis/qgsexpressionnode.h
+include/qgis/qgsexpressionnodeimpl.h
include/qgis/qgsexpressionselectiondialog.h
include/qgis/qgsextentgroupbox.h
-%%CUSTOMWIDGETS%%include/qgis/qgsextentgroupboxplugin.h
+include/qgis/qgsextentgroupboxplugin.h
include/qgis/qgsexternalresourceconfigdlg.h
include/qgis/qgsexternalresourcewidget.h
include/qgis/qgsexternalresourcewidgetfactory.h
-%%CUSTOMWIDGETS%%include/qgis/qgsexternalresourcewidgetplugin.h
+include/qgis/qgsexternalresourcewidgetplugin.h
include/qgis/qgsexternalresourcewidgetwrapper.h
+include/qgis/qgsfallbackfieldformatter.h
include/qgis/qgsfeature.h
-include/qgis/qgsfeature_p.h
+include/qgis/qgsfeaturefiltermodel.h
+include/qgis/qgsfeaturefiltermodel_p.h
include/qgis/qgsfeaturefilterprovider.h
+include/qgis/qgsfeatureid.h
include/qgis/qgsfeatureiterator.h
+include/qgis/qgsfeaturelistcombobox.h
include/qgis/qgsfeaturelistmodel.h
include/qgis/qgsfeaturelistview.h
include/qgis/qgsfeaturelistviewdelegate.h
include/qgis/qgsfeaturemodel.h
+include/qgis/qgsfeaturepool.h
include/qgis/qgsfeaturerequest.h
include/qgis/qgsfeatureselectiondlg.h
include/qgis/qgsfeatureselectionmodel.h
+include/qgis/qgsfeaturesink.h
+include/qgis/qgsfeaturesource.h
include/qgis/qgsfeaturestore.h
include/qgis/qgsfeedback.h
include/qgis/qgsfield.h
include/qgis/qgsfield_p.h
include/qgis/qgsfieldcombobox.h
-%%CUSTOMWIDGETS%%include/qgis/qgsfieldcomboboxplugin.h
+include/qgis/qgsfieldcomboboxplugin.h
include/qgis/qgsfieldconditionalformatwidget.h
+include/qgis/qgsfieldconstraints.h
include/qgis/qgsfieldexpressionwidget.h
-%%CUSTOMWIDGETS%%include/qgis/qgsfieldexpressionwidgetplugin.h
+include/qgis/qgsfieldexpressionwidgetplugin.h
+include/qgis/qgsfieldformatter.h
+include/qgis/qgsfieldformatterregistry.h
include/qgis/qgsfieldmodel.h
include/qgis/qgsfieldproxymodel.h
+include/qgis/qgsfields.h
include/qgis/qgsfieldvalidator.h
+include/qgis/qgsfieldvalueslineedit.h
include/qgis/qgsfiledownloader.h
-include/qgis/qgsfiledropedit.h
-include/qgis/qgsfilenamewidgetfactory.h
-include/qgis/qgsfilenamewidgetwrapper.h
+include/qgis/qgsfiledownloaderdialog.h
+include/qgis/qgsfileutils.h
include/qgis/qgsfilewidget.h
-%%CUSTOMWIDGETS%%include/qgis/qgsfilewidgetplugin.h
-include/qgis/qgsfillsymbollayerv2.h
+include/qgis/qgsfilewidgetplugin.h
+include/qgis/qgsfillsymbollayer.h
include/qgis/qgsfilterlineedit.h
-%%CUSTOMWIDGETS%%include/qgis/qgsfilterlineeditplugin.h
+include/qgis/qgsfilterlineeditplugin.h
+include/qgis/qgsfloatingwidget.h
include/qgis/qgsfocuswatcher.h
+include/qgis/qgsfontbutton.h
+include/qgis/qgsfontbuttonplugin.h
include/qgis/qgsfontutils.h
-include/qgis/qgsformannotationitem.h
+include/qgis/qgsformannotation.h
include/qgis/qgsgenericfeatureselectionmanager.h
-include/qgis/qgsgenericprojectionselector.h
include/qgis/qgsgeometry.h
-include/qgis/qgsgeometryanalyzer.h
-include/qgis/qgsgeometrycache.h
-include/qgis/qgsgeometrycollectionv2.h
+include/qgis/qgsgeometryanglecheck.h
+include/qgis/qgsgeometryareacheck.h
+include/qgis/qgsgeometrycheckcontext.h
+include/qgis/qgsgeometrychecker.h
+include/qgis/qgsgeometrycheckerror.h
+include/qgis/qgsgeometrycheckerutils.h
+include/qgis/qgsgeometrycheckfactory.h
+include/qgis/qgsgeometrycheckregistry.h
+include/qgis/qgsgeometrycollection.h
+include/qgis/qgsgeometrycontainedcheck.h
+include/qgis/qgsgeometrydanglecheck.h
+include/qgis/qgsgeometrydegeneratepolygoncheck.h
+include/qgis/qgsgeometryduplicatecheck.h
+include/qgis/qgsgeometryduplicatenodescheck.h
include/qgis/qgsgeometryeditutils.h
include/qgis/qgsgeometryengine.h
include/qgis/qgsgeometryfactory.h
-include/qgis/qgsgeometrygeneratorsymbollayerv2.h
+include/qgis/qgsgeometryfollowboundariescheck.h
+include/qgis/qgsgeometrygeneratorsymbollayer.h
+include/qgis/qgsgeometryholecheck.h
+include/qgis/qgsgeometryisvalidcheck.h
+include/qgis/qgsgeometrylineintersectioncheck.h
+include/qgis/qgsgeometrylinelayerintersectioncheck.h
+include/qgis/qgsgeometrymultipartcheck.h
+include/qgis/qgsgeometryoptions.h
+include/qgis/qgsgeometryoverlapcheck.h
+include/qgis/qgsgeometrypointcoveredbylinecheck.h
+include/qgis/qgsgeometrypointinpolygoncheck.h
+include/qgis/qgsgeometryrubberband.h
+include/qgis/qgsgeometrysegmentlengthcheck.h
+include/qgis/qgsgeometryselfcontactcheck.h
+include/qgis/qgsgeometryselfintersectioncheck.h
+include/qgis/qgsgeometrysimplifier.h
+include/qgis/qgsgeometrysliverpolygoncheck.h
+include/qgis/qgsgeometrysnapper.h
+include/qgis/qgsgeometrysnappersinglesource.h
+include/qgis/qgsgeometrytypecheck.h
include/qgis/qgsgeometryutils.h
include/qgis/qgsgeometryvalidator.h
+include/qgis/qgsgeonodeconnection.h
+include/qgis/qgsgeonoderequest.h
include/qgis/qgsgeos.h
include/qgis/qgsgloweffect.h
include/qgis/qgsgml.h
include/qgis/qgsgmlschema.h
include/qgis/qgsgpsconnection.h
+include/qgis/qgsgpsconnectionregistry.h
include/qgis/qgsgpsdconnection.h
include/qgis/qgsgpsdetector.h
+include/qgis/qgsgradientcolorrampdialog.h
include/qgis/qgsgradientstopeditor.h
include/qgis/qgsgraduatedhistogramwidget.h
-include/qgis/qgsgraduatedsymbolrendererv2.h
-include/qgis/qgsgraduatedsymbolrendererv2widget.h
+include/qgis/qgsgraduatedsymbolrenderer.h
+include/qgis/qgsgraduatedsymbolrendererwidget.h
include/qgis/qgsgraph.h
include/qgis/qgsgraphanalyzer.h
include/qgis/qgsgraphbuilder.h
-include/qgis/qgsgraphbuilderintr.h
-include/qgis/qgsgraphdirector.h
+include/qgis/qgsgraphbuilderinterface.h
include/qgis/qgsgridfilewriter.h
-include/qgis/qgsgroupungroupitemscommand.h
include/qgis/qgsgroupwmsdatadialog.h
+include/qgis/qgsgui.h
+include/qgis/qgsguiutils.h
include/qgis/qgsheatmaprenderer.h
include/qgis/qgsheatmaprendererwidget.h
+include/qgis/qgshelp.h
include/qgis/qgshiddenwidgetfactory.h
include/qgis/qgshiddenwidgetwrapper.h
include/qgis/qgshighlight.h
@@ -345,8 +405,9 @@ include/qgis/qgshillshaderendererwidget.h
include/qgis/qgshistogram.h
include/qgis/qgshistogramdiagram.h
include/qgis/qgshistogramwidget.h
-include/qgis/qgshtmlannotationitem.h
-include/qgis/qgshttptransaction.h
+include/qgis/qgshstoreutils.h
+include/qgis/qgshtmlannotation.h
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list