Index: databases/grass7/Makefile =================================================================== --- databases/grass7/Makefile +++ databases/grass7/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= grass -PORTVERSION= 7.6.1 -PORTREVISION= 12 +PORTVERSION= 7.8.2 CATEGORIES= databases geography MASTER_SITES= https://grass.osgeo.org/%SUBDIR%/ \ http://grass.cict.fr/%SUBDIR%/ \ @@ -27,7 +26,8 @@ BROKEN_sparc64= Does not configure on sparc64 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}numpy>=1.2:math/py-numpy@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_NUMPY} \ + ${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} LIB_DEPENDS= libgdal.so:graphics/gdal \ libpng.so:graphics/png \ libproj.so:graphics/proj \ @@ -36,11 +36,11 @@ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgeos.so:graphics/geos -RUN_DEPENDS= bash:shells/bash +RUN_DEPENDS= ${PY_NUMPY} \ + ${PYTHON_SITELIBDIR}/six.py:devel/py-six@${PY_FLAVOR} -USES= blaslapack fortran gmake gl gnome \ - iconv jpeg perl5 pkgconfig python:2.7 \ - readline shebangfix tk xorg +USES= blaslapack compiler:openmp fortran gl gmake gnome iconv \ + jpeg perl5 pkgconfig python:3.6+ readline shebangfix tk xorg SHEBANG_LANG= nviz nviz_OLD_CMD= nviz nviz_CMD= ${PREFIX}/${GRASS_INST_DIR}/bin/nviz @@ -49,7 +49,6 @@ USE_GNOME= cairo USE_WX= 3.0 WX_COMPS= wx:build python:run -USE_GCC= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-includes=${LOCALBASE}/include \ @@ -67,9 +66,12 @@ --with-proj-share=${LOCALBASE}/share/proj \ --with-geos=${LOCALBASE}/bin/geos-config \ --with-gdal=${LOCALBASE}/bin/gdal-config \ - --with-pthread=yes - #--with-openmp + --with-pthread=yes \ + --with-openmp +SUB_FILES= pkg-message +SUB_LIST= PYTHON_CMD=${PYTHON_CMD} +BINARY_ALIAS= python3=${PYTHON_CMD} ALL_TARGET= default USE_LDCONFIG= ${PREFIX}/${GRASS_INST_DIR}/lib MAKE_ENV+= TARGET="${CONFIGURE_TARGET}" @@ -97,8 +99,6 @@ LAS_DESC= Enable LiDAR modules PDAL_DESC= Enable points cloud data modules DB_DESC= Database support -NLS_CONFIGURE_WITH= nls -NLS_USES= gettext LAS_CONFIGURE_ON= --with-liblas=yes LAS_LIB_DEPENDS= liblas.so:devel/liblas \ libboost_program_options.so:devel/boost-libs \ @@ -110,14 +110,16 @@ --with-mysql-libs=${LOCALBASE}/lib/mysql NETCDF_CONFIGURE_ON= --with-netcdf=${LOCALBASE}/bin/nc-config NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf +NLS_CONFIGURE_WITH= nls +NLS_USES= gettext ODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -ODBC_CONFIGURE_ON= --with-odbc +ODBC_CONFIGURE_WITH= odbc PDAL_CONFIGURE_ON= --with-pdal=${LOCALBASE}/bin/pdal-config PDAL_LIB_DEPENDS= libpdal_base.so:math/pdal PGSQL_USES= pgsql -PGSQL_CONFIGURE_ON= --with-postgres +PGSQL_CONFIGURE_WITH= postgres SQLITE_USES= sqlite -SQLITE_CONFIGURE_ON= --with-sqlite +SQLITE_CONFIGURE_WITH= sqlite SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} ZSTD_CONFIGURE_WITH= zstd ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd @@ -147,7 +149,7 @@ /^$$(INST_DIR)\//s|$$(INST_DIR)|$${DESTDIR}$${INST_DIR}|g ; \ s|> $$(INST_DIR)|> $${DESTDIR}$${INST_DIR}|' ${WRKSRC}/include/Make/Install.make ${REINPLACE_CMD} \ - 's|= python|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in + 's|= python3|= ${PYTHON_CMD:T}|' ${WRKSRC}/include/Make/Platform.make.in ${REINPLACE_CMD} \ "s|'make'|'gmake'|g" ${WRKSRC}/scripts/g.extension/g.extension.py ${REINPLACE_CMD} \ @@ -158,39 +160,51 @@ ${REINPLACE_CMD} 's|GRASS_PYTHON=python|GRASS_PYTHON=${PYTHON_CMD}|g' \ ${WRKSRC}/lib/init/grass.sh ${REINPLACE_CMD} \ - "s|environ\['GRASS_PYTHON'\] = "'"python"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \ + "s|environ\['GRASS_PYTHON'\] = "'"python3"'"|environ['GRASS_PYTHON'] = "'"${PYTHON_CMD}"'"|g" \ ${WRKSRC}/lib/python/script/setup.py cd ${WRKSRC}; \ for i in `${FIND} . -type f -print`; do \ ${REINPLACE_CMD} \ - 's|#!/usr/bin/env python|#!/usr/bin/env ${PYTHON_CMD}|' $$i; \ + 's|#!/usr/bin/env python3|#!/usr/bin/env ${PYTHON_CMD}|' $$i; \ done post-install: +# remove useless files + ${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/db.test/ ${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/demolocation/PERMANENT/.tmp/ ${RM} -rf ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/docs/html/colortables/*bak.png - ${MKDIR} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/ -.for file in i_atcorr_B02_atcorr.png \ - i_ortho_photo_step1.png \ - i_ortho_photo_step5.png \ - i_ortho_photo_step6.png \ - i_ortho_photo_step7.png \ - i_ortho_photo_step8.png \ - r.viewshed.png \ - rterraflow_accumulation.png \ - rterraflow_dir2.png \ - rterraflow_dir3.png \ - sweep1.png \ - sweep2.png - ${TOUCH} ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html/${file} + +# fix pkg-plist issues +# poudriere testport, poudriere bulk -t and make ports can create different pkg-plist + for i in `${FIND} ${WRKSRC}/scripts -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done + for i in `${FIND} ${WRKSRC}/gui/wxpython -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done + for i in `${FIND} ${WRKSRC}/raster -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done + for i in `${FIND} ${WRKSRC}/imagery -type f \( -name *jpg -o -name *png -o -name *gxm \) -print`; do \ + ${INSTALL_DATA} $$i ${STAGEDIR}${LOCALBASE}/${PORTNAME}${VER}/docs/html; \ + done +.for file in wms_base.py wms_drv.py wms_gdal_drv.py wms_cap_parsers.py srs.py + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/r.in.wms/${file} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/r.in.wms/${file} .endfor + ${INSTALL_SCRIPT} ${WRKSRC}/scripts/wxpyimgview/wxpyimgview_gui.py ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/wxpyimgview_gui.py + ${MKDIR} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar + ${INSTALL_DATA} ${WRKSRC}/scripts/d.polar/ps_defs.eps ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/d.polar + +# STRIP PART ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/bin/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/driver/db/* -.for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram +.for i in clean_temp current_time_s_ms echo i.find lock run r.watershed/seg r.watershed/ram lister/vector lister/cell ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/${i} .endfor - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/etc/lister/* ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/tools/g.echo + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${GRASS_INST_DIR}/lib/* + +# symlink grass7 ${LN} -sf ${PORTNAME}${VER} \ ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} .include Index: databases/grass7/distinfo =================================================================== --- databases/grass7/distinfo +++ databases/grass7/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1553326217 -SHA256 (grass-7.6.1.tar.gz) = 9e25c99cafd16ed8f5e2dca75b5a10dc2af0568dbedf3fc39f1c5a0a9c840b0b -SIZE (grass-7.6.1.tar.gz) = 59952303 +TIMESTAMP = 1583004075 +SHA256 (grass-7.8.2.tar.gz) = 33576f7078f805b39ca20c2fa416ac79c64260c0581072a6dc7d813f53aa9abb +SIZE (grass-7.8.2.tar.gz) = 60563736 Index: databases/grass7/files/pkg-message.in =================================================================== --- databases/grass7/files/pkg-message.in +++ databases/grass7/files/pkg-message.in @@ -3,18 +3,18 @@ message: <=1.5.4:astro/gpsbabel \ +BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ txt2tags:textproc/txt2tags \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.0:devel/py-dateutil@${PY_FLAVOR} \ @@ -24,7 +21,7 @@ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.1.1:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.2.4:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.1:graphics/py-OWSLib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.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}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ @@ -85,16 +82,17 @@ ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features cpe desktop-file-utils \ - fortran gmake gnome pgsql pyqt:5 python:3.6+ qca qt:5 \ + fortran gmake gl gnome pgsql pyqt:5 python:3.6+ qca qt:5 \ shebangfix sqlite:3 USE_GNOME= libxml2 +USE_GL= gl USE_QT= 3d buildtools_build core concurrent dbus declarative \ designer doc gamepad 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 webkitwidgets_run +USE_PYQT= core gui network qml quickwidgets qscintilla2 \ + sip sql svg webkit_run webkitwidgets_run xml USE_LDCONFIG= yes CONFLICTS_INSTALL= qgis @@ -108,9 +106,11 @@ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \ - -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW + -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \ + -DUSE_OPENCL:BOOL=FALSE CMAKE_ON= BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \ - WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL + WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_INTERNAL_MDAL \ + WITH_POSTGRESQL CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR .if !defined(MAINTAINER_MODE) @@ -130,23 +130,20 @@ GRASS_BUILD_DEPENDS= grass7:databases/grass7 GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS} GRASS_CMAKE_BOOL= WITH_GRASS7 -GRASS_FORCE_MAKE_JOBS= NO - SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi -SERVER_CMAKE_BOOL= WITH_SERVER +SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE PLIST_SUB= DISTVERSION=${PORTVERSION} .include -# make describe needs them here, after bsd.port.pre.mk -CPP= clang-cpp${LLVM_DEFAULT} -CC= clang${LLVM_DEFAULT} -CXX= clang++${LLVM_DEFAULT} - post-patch: - @${REINPLACE_CMD} -e 's|markupsafe ||g' \ - ${WRKSRC}/python/ext-libs/CMakeLists.txt +# On i386, '-mllvm -inline-threshold=128' does not build under all circumstances +# See bugs 242557 and 241687. +.if ${OPSYS} == FreeBSD && ${ARCH} == "i386" + @${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \ + ${WRKSRC}/src/core/CMakeLists.txt +.endif pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 Index: graphics/qgis-ltr/distinfo =================================================================== --- graphics/qgis-ltr/distinfo +++ graphics/qgis-ltr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566752734 -SHA256 (qgis-QGIS-final-3_4_11_GH0.tar.gz) = 839c279c6c97f9e61495666293bd0b70701ef77b7ef4eb8f43754719d0dd8fd2 -SIZE (qgis-QGIS-final-3_4_11_GH0.tar.gz) = 91011251 +TIMESTAMP = 1585054158 +SHA256 (qgis-QGIS-final-3_10_4_GH0.tar.gz) = ef900da2108d9b10069587e7eeed8f42c07f2af50e7552d938ffa9418cb55961 +SIZE (qgis-QGIS-final-3_10_4_GH0.tar.gz) = 120683329 Index: graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake =================================================================== --- graphics/qgis-ltr/files/patch-cmake_FindGRASS.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/FindGRASS.cmake.orig 2020-01-30 11:41:47 UTC -+++ cmake/FindGRASS.cmake -@@ -161,9 +161,7 @@ IF (UNIX) - IF (GRASS_FIND_VERSION EQUAL 7) - IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - FOREACH (VERSION_MINOR 0 1 2 3 4 5 6) -- FOREACH (VERSION_BUILD 0 1 2 3 4 5 6) -- LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD}) -- ENDFOREACH (VERSION_BUILD) -+ LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) - ENDFOREACH(VERSION_MINOR) - ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - FOREACH (PATH /usr/lib64 /usr/lib) Index: graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py =================================================================== --- graphics/qgis-ltr/files/patch-cmake_FindPyQt5.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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]) Index: graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake =================================================================== --- graphics/qgis-ltr/files/patch-cmake_Txt2Tags.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/Txt2Tags.cmake.orig 2019-08-16 12:03:55 UTC -+++ cmake/Txt2Tags.cmake -@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) - ADD_CUSTOM_COMMAND( - OUTPUT ${_out} - COMMAND ${TXT2TAGS_EXECUTABLE} -- ARGS --encoding=utf-8 -o${_out} -t txt ${_in} -+ ARGS -o${_out} -t txt ${_in} - DEPENDS ${_in} - COMMENT "Building ${_out} from ${_in}" - ) -@@ -50,7 +50,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) - ADD_CUSTOM_COMMAND( - OUTPUT ${_out}.html - COMMAND ${TXT2TAGS_EXECUTABLE} -- ARGS --encoding=utf-8 -o${_out}.html -t html ${_in} -+ ARGS -o${_out}.html -t html ${_in} - DEPENDS ${_in} - COMMENT "Building ${_out}.html from ${_in}" - ) Index: graphics/qgis-ltr/files/patch-doc_INSTALL.html =================================================================== --- graphics/qgis-ltr/files/patch-doc_INSTALL.html +++ /dev/null @@ -1,9 +0,0 @@ ---- doc/INSTALL.html.orig 2019-08-16 12:03:55 UTC -+++ doc/INSTALL.html -@@ -3113,5 +3113,5 @@ The following people have contributed to this document - - - -- -+ - Index: graphics/qgis-ltr/files/patch-doc_INSTALL.t2t =================================================================== --- graphics/qgis-ltr/files/patch-doc_INSTALL.t2t +++ /dev/null @@ -1,28 +0,0 @@ ---- doc/INSTALL.t2t.orig 2019-08-16 12:03:55 UTC -+++ doc/INSTALL.t2t -@@ -4,14 +4,14 @@ Building QGIS from source - step by step - - %! target : html - %! style : style.css --%! Options : --toc --toc-level 2 --enum-title --css-sugar --css-inside -+%! Options : --toc --toc-level 2 --enum-title - %! preproc : TUT_URL https://qgis.org - %! PostProc(html): '(?i)(
)' '
\1'
- %! PostProc(html): '(?i)(
)' '\1' - %! PostProc(html): \(R\) ® - % Next line will replace tabs with 2 spaces in txt generated outputs - %! PostProc(txt): '(?i)(\t)' ' ' --%! encoding: iso-8859-1 -+%! encoding: utf-8 - % - % Tex processing - % -@@ -36,7 +36,7 @@ Building QGIS from source - step by step - %! PostProc(tex): NEWPAGE '\\newpage' - % Give alternating table rows different colors and use a smaller font in tables (\tiny) - %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}' --%! encoding: iso-8859-1 -+%! encoding: utf-8 - - %! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png' - % These are comments and will not be generated in any output Index: graphics/qgis-ltr/files/patch-doc_news.html =================================================================== --- graphics/qgis-ltr/files/patch-doc_news.html +++ /dev/null @@ -1,9 +0,0 @@ ---- doc/news.html.orig 2019-08-16 12:03:55 UTC -+++ doc/news.html -@@ -3447,5 +3447,5 @@ July 6, 2002 - - - -- -+ - Index: graphics/qgis-ltr/files/patch-doc_news.t2t =================================================================== --- graphics/qgis-ltr/files/patch-doc_news.t2t +++ /dev/null @@ -1,18 +0,0 @@ ---- doc/news.t2t.orig 2019-08-16 12:03:55 UTC -+++ doc/news.t2t -@@ -4,13 +4,13 @@ Change history for the QGIS Project - - %! target : html - %! style : style.css --%! Options : --toc --toc-level 1 --enum-title --css-sugar --css-inside -+%! Options : --toc --toc-level 1 --enum-title - %! preproc : TUT_URL https://qgis.org - %! PostProc(html): '(?i)(
)' '
\1'
- %! PostProc(html): '(?i)(
)' '\1' - % Next line will replace tabs with 2 spaces in txt generated outputs - %! PostProc(txt): '(?i)(\t)' ' ' --%! encoding: iso-8859-1 -+%! encoding: utf-8 - % - % These are comments and will not be generated in any output - % ------------------- Index: graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py =================================================================== --- graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py +++ graphics/qgis-ltr/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py @@ -1,19 +1,19 @@ ---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-03-02 02:07:46 UTC +--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2020-03-27 05:50:09 UTC +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py -@@ -82,7 +82,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): +@@ -79,7 +79,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): def canBeActivated(self): version = SagaUtils.getInstalledVersion(True) -- if version is not None and version.startswith(REQUIRED_VERSION): +- if version is not None and (version.startswith(REQUIRED_VERSION) or version.startswith(BETA_SUPPORT_VERSION)): + if version is not None and version >= REQUIRED_VERSION: return True return False -@@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): +@@ -96,7 +96,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): self.tr('Processing'), Qgis.Critical) return -- if not version.startswith(REQUIRED_VERSION): +- if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION): + if version < REQUIRED_VERSION: QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), self.tr('Processing'), Index: graphics/qgis-ltr/files/patch-scripts_release.pl =================================================================== --- graphics/qgis-ltr/files/patch-scripts_release.pl +++ /dev/null @@ -1,13 +0,0 @@ ---- scripts/release.pl.orig 2019-08-16 12:03:55 UTC -+++ scripts/release.pl -@@ -183,8 +183,8 @@ run( "cp debian/changelog /tmp", "backup changelog fai - unless( $dopoint ) { - run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr; - run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr; -- run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); -- run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); -+ run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); -+ run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); - - run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" ); - run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" ); Index: graphics/qgis-ltr/files/patch-scripts_update-news.pl =================================================================== --- graphics/qgis-ltr/files/patch-scripts_update-news.pl +++ /dev/null @@ -1,13 +0,0 @@ ---- scripts/update-news.pl.orig 2019-08-16 12:03:55 UTC -+++ scripts/update-news.pl -@@ -61,8 +61,8 @@ close $in; - - copy($tempfile, "doc/news.t2t"); - --system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t"; --system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t"; -+system "txt2tags -odoc/news.html -t html doc/news.t2t"; -+system "txt2tags -oNEWS -t txt doc/news.t2t"; - - =head1 NAME - Index: graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt =================================================================== --- /dev/null +++ graphics/qgis-ltr/files/patch-src_core_CMakeLists.txt @@ -0,0 +1,10 @@ +--- src/core/CMakeLists.txt.orig 2019-10-28 04:34:30 UTC ++++ src/core/CMakeLists.txt +@@ -889,6 +889,7 @@ ELSE(MSVC) + SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) + IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)) + SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1") ++ SET_SOURCE_FILES_PROPERTIES(qgscoordinatereferencesystem.cpp PROPERTIES COMPILE_FLAGS "-mllvm -inline-threshold=128") + ENDIF () + ENDIF(MSVC) + Index: graphics/qgis-ltr/files/patch-src_core_qgsproject.cpp =================================================================== --- graphics/qgis-ltr/files/patch-src_core_qgsproject.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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( fi.lastRead().toSecsSinceEpoch() ), static_cast( fi.lastModified().toSecsSinceEpoch() ) }; - utime( backupFile.fileName().toUtf8().constData(), &tb ); - } - Index: graphics/qgis-ltr/files/patch-src_plugins_grass_CMakeLists.txt =================================================================== --- graphics/qgis-ltr/files/patch-src_plugins_grass_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/plugins/grass/CMakeLists.txt.orig 2018-11-23 12:08:36 UTC -+++ src/plugins/grass/CMakeLists.txt -@@ -211,6 +211,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION) - qgis_app - qgis_gui - ${OPENPTY_LIBRARY} -+ -lulog - ) - - IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") Index: graphics/qgis-ltr/pkg-plist =================================================================== --- graphics/qgis-ltr/pkg-plist +++ graphics/qgis-ltr/pkg-plist @@ -16,7 +16,7 @@ include/qgis/Triangulation.h include/qgis/Vector3D.h include/qgis/characterwidget.h -include/qgis/mersenne-twister.h +include/qgis/json_fwd.hpp include/qgis/qgis.h include/qgis/qgis_3d.h include/qgis/qgis_analysis.h @@ -30,6 +30,7 @@ include/qgis/qgisplugin.h include/qgis/qgs25drenderer.h include/qgis/qgs25drendererwidget.h +include/qgis/qgs3danimationsettings.h include/qgis/qgs3dmapscene.h include/qgis/qgs3dmapsettings.h include/qgis/qgs3drendererregistry.h @@ -39,20 +40,27 @@ include/qgis/qgsabstract3dengine.h include/qgis/qgsabstract3drenderer.h include/qgis/qgsabstract3dsymbol.h +include/qgis/qgsabstractcontentcache.h +include/qgis/qgsabstractdatabaseproviderconnection.h include/qgis/qgsabstractdatasourcewidget.h include/qgis/qgsabstractgeometry.h +include/qgis/qgsabstractgeopdfexporter.h include/qgis/qgsabstractlayoutiterator.h include/qgis/qgsabstractmetadatabase.h +include/qgis/qgsabstractproviderconnection.h include/qgis/qgsabstractreportsection.h +include/qgis/qgsabstractvaliditycheck.h include/qgis/qgsaction.h include/qgis/qgsactionmanager.h include/qgis/qgsactionmenu.h include/qgis/qgsactionscope.h include/qgis/qgsactionscoperegistry.h include/qgis/qgsadvanceddigitizingdockwidget.h +include/qgis/qgsadvanceddigitizingfloater.h include/qgis/qgsaggregatecalculator.h include/qgis/qgsaggregatetoolbutton.h include/qgis/qgsalgorithmimportphotos.h +include/qgis/qgsalignmentcombobox.h include/qgis/qgsalignraster.h include/qgis/qgsanalysis.h include/qgis/qgsanimatedicon.h @@ -61,6 +69,7 @@ include/qgis/qgsannotationregistry.h include/qgis/qgsapplication.h include/qgis/qgsarchive.h +include/qgis/qgsarrowsymbollayer.h include/qgis/qgsarrowsymbollayerwidget.h include/qgis/qgsaspectfilter.h include/qgis/qgsattributedialog.h @@ -89,6 +98,7 @@ include/qgis/qgsauthconfigeditor.h include/qgis/qgsauthconfigidedit.h include/qgis/qgsauthconfigselect.h +include/qgis/qgsauthconfigselectplugin.h include/qgis/qgsauthcrypto.h include/qgis/qgsautheditorwidgets.h include/qgis/qgsauthguiutils.h @@ -110,12 +120,18 @@ include/qgis/qgsauxiliarystorage.h include/qgis/qgsbearingutils.h include/qgis/qgsbilinearrasterresampler.h +include/qgis/qgsbinarywidgetfactory.h +include/qgis/qgsbinarywidgetwrapper.h include/qgis/qgsblendmodecombobox.h +include/qgis/qgsblockingnetworkrequest.h include/qgis/qgsblureffect.h +include/qgis/qgsbookmarkmanager.h +include/qgis/qgsbookmarkmodel.h include/qgis/qgsbox3d.h include/qgis/qgsbrightnesscontrastfilter.h include/qgis/qgsbrowserdockwidget.h include/qgis/qgsbrowserdockwidget_p.h +include/qgis/qgsbrowserguimodel.h include/qgis/qgsbrowsermodel.h include/qgis/qgsbrowserproxymodel.h include/qgis/qgsbrowsertreeview.h @@ -125,6 +141,9 @@ include/qgis/qgscacheindex.h include/qgis/qgscacheindexfeatureid.h include/qgis/qgscadutils.h +include/qgis/qgscallout.h +include/qgis/qgscalloutsregistry.h +include/qgis/qgscalloutwidget.h include/qgis/qgscameracontroller.h include/qgis/qgscamerapose.h include/qgis/qgscategorizedsymbolrenderer.h @@ -133,6 +152,7 @@ include/qgis/qgscheckablecombobox.h include/qgis/qgscheckablecomboboxplugin.h include/qgis/qgscheckboxconfigdlg.h +include/qgis/qgscheckboxfieldformatter.h include/qgis/qgscheckboxsearchwidgetwrapper.h include/qgis/qgscheckboxwidgetfactory.h include/qgis/qgscheckboxwidgetwrapper.h @@ -143,6 +163,15 @@ include/qgis/qgschunkqueuejob_p.h include/qgis/qgscircle.h include/qgis/qgscircularstring.h +include/qgis/qgsclassificationcustom.h +include/qgis/qgsclassificationequalinterval.h +include/qgis/qgsclassificationjenks.h +include/qgis/qgsclassificationlogarithmic.h +include/qgis/qgsclassificationmethod.h +include/qgis/qgsclassificationmethodregistry.h +include/qgis/qgsclassificationprettybreaks.h +include/qgis/qgsclassificationquantile.h +include/qgis/qgsclassificationstandarddeviation.h include/qgis/qgsclassificationwidgetwrapper.h include/qgis/qgsclassificationwidgetwrapperfactory.h include/qgis/qgsclipper.h @@ -181,6 +210,7 @@ include/qgis/qgsconnectionpool.h include/qgis/qgscontrastenhancement.h include/qgis/qgscontrastenhancementfunction.h +include/qgis/qgscoordinateboundspreviewmapwidget.h include/qgis/qgscoordinateformatter.h include/qgis/qgscoordinatereferencesystem.h include/qgis/qgscoordinatetransform.h @@ -201,10 +231,13 @@ include/qgis/qgsdatadefinedsizelegend.h include/qgis/qgsdatadefinedsizelegendwidget.h include/qgis/qgsdataitem.h +include/qgis/qgsdataitemguiprovider.h +include/qgis/qgsdataitemguiproviderregistry.h include/qgis/qgsdataitemprovider.h include/qgis/qgsdataitemproviderregistry.h include/qgis/qgsdataprovider.h include/qgis/qgsdatasourcemanagerdialog.h +include/qgis/qgsdatasourceselectdialog.h include/qgis/qgsdatasourceuri.h include/qgis/qgsdatetimeedit.h include/qgis/qgsdatetimeeditconfig.h @@ -259,6 +292,7 @@ include/qgis/qgserror.h include/qgis/qgserrordialog.h include/qgis/qgsexception.h +include/qgis/qgsexiftools.h include/qgis/qgsexpression.h include/qgis/qgsexpressionbuilderdialog.h include/qgis/qgsexpressionbuilderwidget.h @@ -266,6 +300,7 @@ include/qgis/qgsexpressioncontext.h include/qgis/qgsexpressioncontextgenerator.h include/qgis/qgsexpressioncontextscopegenerator.h +include/qgis/qgsexpressioncontextutils.h include/qgis/qgsexpressionfieldbuffer.h include/qgis/qgsexpressionfunction.h include/qgis/qgsexpressionhighlighter.h @@ -282,6 +317,7 @@ include/qgis/qgsexternalresourcewidgetwrapper.h include/qgis/qgsfallbackfieldformatter.h include/qgis/qgsfeature.h +include/qgis/qgsfeature3dhandler_p.h include/qgis/qgsfeaturefiltermodel.h include/qgis/qgsfeaturefiltermodel_p.h include/qgis/qgsfeaturefilterprovider.h @@ -315,6 +351,7 @@ include/qgis/qgsfields.h include/qgis/qgsfieldvalidator.h include/qgis/qgsfieldvalueslineedit.h +include/qgis/qgsfilecontentsourcelineedit.h include/qgis/qgsfiledownloader.h include/qgis/qgsfiledownloaderdialog.h include/qgis/qgsfileutils.h @@ -323,12 +360,18 @@ include/qgis/qgsfillsymbollayer.h include/qgis/qgsfilterlineedit.h include/qgis/qgsfilterlineeditplugin.h +include/qgis/qgsfindfilesbypatternwidget.h include/qgis/qgsfloatingwidget.h include/qgis/qgsfocuswatcher.h include/qgis/qgsfontbutton.h include/qgis/qgsfontbuttonplugin.h include/qgis/qgsfontutils.h include/qgis/qgsformannotation.h +include/qgis/qgsgdaldataitems.h +include/qgis/qgsgdalguiprovider.h +include/qgis/qgsgdalprovider.h +include/qgis/qgsgdalsourceselect.h +include/qgis/qgsgdalutils.h include/qgis/qgsgenericfeatureselectionmanager.h include/qgis/qgsgeometry.h include/qgis/qgsgeometryanglecheck.h @@ -372,6 +415,13 @@ include/qgis/qgsgeometryvalidator.h include/qgis/qgsgeonodeconnection.h include/qgis/qgsgeonoderequest.h +include/qgis/qgsgeopackagedataitems.h +include/qgis/qgsgeopackageitemguiprovider.h +include/qgis/qgsgeopackageprojectstorage.h +include/qgis/qgsgeopackageprojectstoragedialog.h +include/qgis/qgsgeopackageprojectstorageguiprovider.h +include/qgis/qgsgeopackageproviderconnection.h +include/qgis/qgsgeopackagerasterwritertask.h include/qgis/qgsgeos.h include/qgis/qgsgloweffect.h include/qgis/qgsgml.h @@ -408,10 +458,12 @@ include/qgis/qgshstoreutils.h include/qgis/qgshtmlannotation.h include/qgis/qgshtmlutils.h +include/qgis/qgshtmlwidgetwrapper.h include/qgis/qgshuesaturationfilter.h include/qgis/qgsidentifymenu.h include/qgis/qgsidwinterpolator.h include/qgis/qgsifeatureselectionmanager.h +include/qgis/qgsimagecache.h include/qgis/qgsimageoperation.h include/qgis/qgsindexedfeature.h include/qgis/qgsinternalgeometryengine.h @@ -428,6 +480,7 @@ include/qgis/qgslabelfeature.h include/qgis/qgslabelingengine.h include/qgis/qgslabelingenginesettings.h +include/qgis/qgslabelinggui.h include/qgis/qgslabelsearchtree.h include/qgis/qgslayerdefinition.h include/qgis/qgslayermetadata.h @@ -453,11 +506,13 @@ include/qgis/qgslayout.h include/qgis/qgslayoutaligner.h include/qgis/qgslayoutatlas.h +include/qgis/qgslayoutcombobox.h include/qgis/qgslayoutcustomdrophandler.h include/qgis/qgslayoutdesignerinterface.h include/qgis/qgslayouteffect.h include/qgis/qgslayoutexporter.h include/qgis/qgslayoutframe.h +include/qgis/qgslayoutgeopdfexporter.h include/qgis/qgslayoutgridsettings.h include/qgis/qgslayoutguidecollection.h include/qgis/qgslayoutitem.h @@ -533,9 +588,11 @@ include/qgis/qgsline3dsymbol_p.h include/qgis/qgslinearminmaxenhancement.h include/qgis/qgslinearminmaxenhancementwithclip.h +include/qgis/qgslinematerial_p.h include/qgis/qgslinesegment.h include/qgis/qgslinestring.h include/qgis/qgslinesymbollayer.h +include/qgis/qgslinevertexdata_p.h include/qgis/qgslinuxnative.h include/qgis/qgslistfieldformatter.h include/qgis/qgslistwidget.h @@ -546,6 +603,7 @@ include/qgis/qgslocatorcontext.h include/qgis/qgslocatorfilter.h include/qgis/qgslocatormodel.h +include/qgis/qgslocatormodelbridge.h include/qgis/qgslocatorwidget.h include/qgis/qgslogger.h include/qgis/qgslonglongvalidator.h @@ -582,6 +640,7 @@ include/qgis/qgsmaprendererjob.h include/qgis/qgsmaprendererparalleljob.h include/qgis/qgsmaprenderersequentialjob.h +include/qgis/qgsmaprendererstagedrenderjob.h include/qgis/qgsmaprenderertask.h include/qgis/qgsmapsettings.h include/qgis/qgsmapsettingsutils.h @@ -590,6 +649,7 @@ include/qgis/qgsmaptool.h include/qgis/qgsmaptooladvanceddigitizing.h include/qgis/qgsmaptoolcapture.h +include/qgis/qgsmaptooldigitizefeature.h include/qgis/qgsmaptooledit.h include/qgis/qgsmaptoolemitpoint.h include/qgis/qgsmaptoolextent.h @@ -607,13 +667,21 @@ include/qgis/qgsmemoryprovider.h include/qgis/qgsmemoryproviderutils.h include/qgis/qgsmenuheader.h +include/qgis/qgsmesh3dsymbol.h +include/qgis/qgsmesh3dsymbol_p.h +include/qgis/qgsmeshcalcnode.h +include/qgis/qgsmeshcalculator.h +include/qgis/qgsmeshcalcutils.h include/qgis/qgsmeshdataprovider.h include/qgis/qgsmeshlayer.h +include/qgis/qgsmeshlayer3drenderer.h include/qgis/qgsmeshlayerinterpolator.h include/qgis/qgsmeshlayerrenderer.h include/qgis/qgsmeshlayerutils.h include/qgis/qgsmeshmemorydataprovider.h include/qgis/qgsmeshrenderersettings.h +include/qgis/qgsmeshspatialindex.h +include/qgis/qgsmeshtimesettings.h include/qgis/qgsmeshvectorrenderer.h include/qgis/qgsmessagebar.h include/qgis/qgsmessagebaritem.h @@ -639,6 +707,7 @@ include/qgis/qgsnetworkcontentfetchertask.h include/qgis/qgsnetworkdiskcache.h include/qgis/qgsnetworkdistancestrategy.h +include/qgis/qgsnetworkreply.h include/qgis/qgsnetworkreplyparser.h include/qgis/qgsnetworkspeedstrategy.h include/qgis/qgsnetworkstrategy.h @@ -649,6 +718,8 @@ include/qgis/qgsnewmemorylayerdialog.h include/qgis/qgsnewnamedialog.h include/qgis/qgsnewogrconnection.h +include/qgis/qgsnewsfeedmodel.h +include/qgis/qgsnewsfeedparser.h include/qgis/qgsnewvectorlayerdialog.h include/qgis/qgsninecellfilter.h include/qgis/qgsnmeaconnection.h @@ -659,7 +730,19 @@ include/qgis/qgsofflineediting.h include/qgis/qgsoffscreen3dengine.h include/qgis/qgsogcutils.h +include/qgis/qgsogrconnpool.h +include/qgis/qgsogrdataitems.h +include/qgis/qgsogrdbconnection.h +include/qgis/qgsogrdbsourceselect.h +include/qgis/qgsogrdbtablemodel.h +include/qgis/qgsogrguiprovider.h include/qgis/qgsogrhelperfunctions.h +include/qgis/qgsogritemguiprovider.h +include/qgis/qgsogrprovider.h +include/qgis/qgsogrsourceselect.h +include/qgis/qgsogrtransaction.h +include/qgis/qgsogrutils.h +include/qgis/qgsonlineterraingenerator.h include/qgis/qgsopacitywidget.h include/qgis/qgsopacitywidgetplugin.h include/qgis/qgsoptional.h @@ -702,11 +785,13 @@ include/qgis/qgspointdisplacementrenderer.h include/qgis/qgspointdisplacementrendererwidget.h include/qgis/qgspointdistancerenderer.h +include/qgis/qgspointlightsettings.h include/qgis/qgspointlocator.h include/qgis/qgspointxy.h include/qgis/qgspolygon.h include/qgis/qgspolygon3dsymbol.h include/qgis/qgspolygon3dsymbol_p.h +include/qgis/qgspostgresstringutils.h include/qgis/qgspresetcolorrampdialog.h include/qgis/qgsprevieweffect.h include/qgis/qgsprintlayout.h @@ -720,6 +805,7 @@ include/qgis/qgsprocessingfeedback.h include/qgis/qgsprocessinggui.h include/qgis/qgsprocessingguiregistry.h +include/qgis/qgsprocessingmaplayercombobox.h include/qgis/qgsprocessingmatrixparameterdialog.h include/qgis/qgsprocessingmodelalgorithm.h include/qgis/qgsprocessingmodelchildalgorithm.h @@ -728,7 +814,9 @@ include/qgis/qgsprocessingmodelerparameterwidget.h include/qgis/qgsprocessingmodeloutput.h include/qgis/qgsprocessingmodelparameter.h +include/qgis/qgsprocessingmultipleselectiondialog.h include/qgis/qgsprocessingoutputs.h +include/qgis/qgsprocessingparameterdefinitionwidget.h include/qgis/qgsprocessingparameters.h include/qgis/qgsprocessingparametertype.h include/qgis/qgsprocessingparametertypeimpl.h @@ -750,9 +838,14 @@ include/qgis/qgsprojectmetadata.h include/qgis/qgsprojectproperty.h include/qgis/qgsprojectstorage.h +include/qgis/qgsprojectstorageguiprovider.h +include/qgis/qgsprojectstorageguiregistry.h include/qgis/qgsprojectstorageregistry.h +include/qgis/qgsprojectstylealgorithms.h include/qgis/qgsprojecttranslator.h include/qgis/qgsprojectversion.h +include/qgis/qgsprojectviewsettings.h +include/qgis/qgsprojutils.h include/qgis/qgsproperty.h include/qgis/qgsproperty_p.h include/qgis/qgspropertyassistantwidget.h @@ -760,6 +853,8 @@ include/qgis/qgspropertyoverridebutton.h include/qgis/qgspropertyoverridebuttonplugin.h include/qgis/qgspropertytransformer.h +include/qgis/qgsproviderguimetadata.h +include/qgis/qgsproviderguiregistry.h include/qgis/qgsprovidermetadata.h include/qgis/qgsproviderregistry.h include/qgis/qgsproxyprogresstask.h @@ -767,6 +862,7 @@ include/qgis/qgspythonrunner.h include/qgis/qgsqmlwidgetwrapper.h include/qgis/qgsqtlocationconnection.h +include/qgis/qgsquadrilateral.h include/qgis/qgsquerybuilder.h include/qgis/qgsrange.h include/qgis/qgsrangeconfigdlg.h @@ -822,6 +918,7 @@ include/qgis/qgsregularpolygon.h include/qgis/qgsrelation.h include/qgis/qgsrelationaggregatesearchwidgetwrapper.h +include/qgis/qgsrelationcontext.h include/qgis/qgsrelationeditorwidget.h include/qgis/qgsrelationeditorwidgetplugin.h include/qgis/qgsrelationmanager.h @@ -836,8 +933,10 @@ include/qgis/qgsrelief.h include/qgis/qgsrenderchecker.h include/qgis/qgsrendercontext.h +include/qgis/qgsrenderedfeaturehandlerinterface.h include/qgis/qgsrenderer.h include/qgis/qgsrendererpropertiesdialog.h +include/qgis/qgsrendererrange.h include/qgis/qgsrendererrasterpropertieswidget.h include/qgis/qgsrendererregistry.h include/qgis/qgsrendererwidget.h @@ -846,6 +945,7 @@ include/qgis/qgsreportsectionlayout.h include/qgis/qgsrubberband.h include/qgis/qgsruggednessfilter.h +include/qgis/qgsrulebased3drenderer.h include/qgis/qgsrulebasedlabeling.h include/qgis/qgsrulebasedrenderer.h include/qgis/qgsrulebasedrendererwidget.h @@ -900,11 +1000,14 @@ include/qgis/qgssqlstatement.h include/qgis/qgsstatisticalsummary.h include/qgis/qgsstatusbar.h +include/qgis/qgsstoredexpressionmanager.h include/qgis/qgsstringstatisticalsummary.h include/qgis/qgsstringutils.h include/qgis/qgsstyle.h +include/qgis/qgsstyleentityvisitor.h include/qgis/qgsstyleexportimportdialog.h include/qgis/qgsstylegroupselectiondialog.h +include/qgis/qgsstyleitemslistwidget.h include/qgis/qgsstylemanagerdialog.h include/qgis/qgsstylemodel.h include/qgis/qgsstylesavedialog.h @@ -914,7 +1017,6 @@ include/qgis/qgssvgannotation.h include/qgis/qgssvgcache.h include/qgis/qgssvgselectorwidget.h -include/qgis/qgssvgsourcelineedit.h include/qgis/qgssymbol.h include/qgis/qgssymbolbutton.h include/qgis/qgssymbolbuttonplugin.h @@ -931,6 +1033,7 @@ include/qgis/qgstabwidget.h include/qgis/qgstaskmanager.h include/qgis/qgstaskmanagerwidget.h +include/qgis/qgsterraindownloader.h include/qgis/qgsterrainentity_p.h include/qgis/qgsterraingenerator.h include/qgis/qgsterraintexturegenerator_p.h @@ -953,6 +1056,7 @@ include/qgis/qgstextrenderer_p.h include/qgis/qgsthreadingutils.h include/qgis/qgsticksscalebarrenderer.h +include/qgis/qgstilecache.h include/qgis/qgstilingscheme.h include/qgis/qgstininterpolator.h include/qgis/qgstolerance.h @@ -975,6 +1079,9 @@ include/qgis/qgsuserprofilemanager.h include/qgis/qgsuuidwidgetfactory.h include/qgis/qgsuuidwidgetwrapper.h +include/qgis/qgsvaliditycheckcontext.h +include/qgis/qgsvaliditycheckregistry.h +include/qgis/qgsvaliditycheckresultswidget.h include/qgis/qgsvaluemapconfigdlg.h include/qgis/qgsvaluemapfieldformatter.h include/qgis/qgsvaluemapsearchwidgetwrapper.h @@ -1012,6 +1119,7 @@ include/qgis/qgsvectorlayerrenderer.h include/qgis/qgsvectorlayersaveasdialog.h include/qgis/qgsvectorlayerselectionmanager.h +include/qgis/qgsvectorlayerserverproperties.h include/qgis/qgsvectorlayertools.h include/qgis/qgsvectorlayerundocommand.h include/qgis/qgsvectorlayerundopassthroughcommand.h @@ -1033,6 +1141,7 @@ include/qgis/qgsxmlutils.h include/qgis/qgsziputils.h include/qgis/qgszonalstatistics.h +include/qgis/qobjectuniqueptr.h include/qgis/ui_qgsarcgisservicesourceselectbase.h include/qgis/ui_qgsauthauthoritieseditor.h include/qgis/ui_qgsauthcertificateinfo.h @@ -1101,7 +1210,6 @@ lib/qgis/plugins/libdelimitedtextprovider.so lib/qgis/plugins/libesritokenauthmethod.so lib/qgis/plugins/libevis.so -lib/qgis/plugins/libgdalprovider.so lib/qgis/plugins/libgeometrycheckerplugin.so lib/qgis/plugins/libgeonodeprovider.so lib/qgis/plugins/libgeorefplugin.so @@ -1115,7 +1223,6 @@ lib/qgis/plugins/libmssqlprovider.so lib/qgis/plugins/liboauth2authmethod.so lib/qgis/plugins/libofflineeditingplugin.so -lib/qgis/plugins/libogrprovider.so lib/qgis/plugins/libowsprovider.so lib/qgis/plugins/libpkcs12authmethod.so lib/qgis/plugins/libpkipathsauthmethod.so @@ -1129,12 +1236,14 @@ %%SERVER%%lib/qgis/server/libdummy.so %%SERVER%%lib/qgis/server/libwcs.so %%SERVER%%lib/qgis/server/libwfs.so +%%SERVER%%lib/qgis/server/libwfs3.so %%SERVER%%lib/qgis/server/libwms.so %%SERVER%%lib/qgis/server/libwmts.so %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.%%DISTVERSION%% man/man1/qgis.1.gz share/applications/org.qgis.qgis.desktop +share/icons/hicolor/128x128/apps/qgis.png share/icons/hicolor/128x128/mimetypes/qgis-mime.png share/icons/hicolor/128x128/mimetypes/qgis-qgs.png share/icons/hicolor/128x128/mimetypes/qgis-qlr.png @@ -1146,41 +1255,49 @@ share/icons/hicolor/16x16/mimetypes/qgis-qlr.png share/icons/hicolor/16x16/mimetypes/qgis-qml.png share/icons/hicolor/16x16/mimetypes/qgis-qpt.png +share/icons/hicolor/192x192/apps/qgis.png share/icons/hicolor/192x192/mimetypes/qgis-mime.png share/icons/hicolor/192x192/mimetypes/qgis-qgs.png share/icons/hicolor/192x192/mimetypes/qgis-qlr.png share/icons/hicolor/192x192/mimetypes/qgis-qml.png share/icons/hicolor/192x192/mimetypes/qgis-qpt.png +share/icons/hicolor/22x22/apps/qgis.png share/icons/hicolor/22x22/mimetypes/qgis-mime.png share/icons/hicolor/22x22/mimetypes/qgis-qgs.png share/icons/hicolor/22x22/mimetypes/qgis-qlr.png share/icons/hicolor/22x22/mimetypes/qgis-qml.png share/icons/hicolor/22x22/mimetypes/qgis-qpt.png +share/icons/hicolor/24x24/apps/qgis.png share/icons/hicolor/24x24/mimetypes/qgis-mime.png share/icons/hicolor/24x24/mimetypes/qgis-qgs.png share/icons/hicolor/24x24/mimetypes/qgis-qlr.png share/icons/hicolor/24x24/mimetypes/qgis-qml.png share/icons/hicolor/24x24/mimetypes/qgis-qpt.png +share/icons/hicolor/256x256/apps/qgis.png share/icons/hicolor/256x256/mimetypes/qgis-mime.png share/icons/hicolor/256x256/mimetypes/qgis-qgs.png share/icons/hicolor/256x256/mimetypes/qgis-qlr.png share/icons/hicolor/256x256/mimetypes/qgis-qml.png share/icons/hicolor/256x256/mimetypes/qgis-qpt.png +share/icons/hicolor/32x32/apps/qgis.png share/icons/hicolor/32x32/mimetypes/qgis-mime.png share/icons/hicolor/32x32/mimetypes/qgis-qgs.png share/icons/hicolor/32x32/mimetypes/qgis-qlr.png share/icons/hicolor/32x32/mimetypes/qgis-qml.png share/icons/hicolor/32x32/mimetypes/qgis-qpt.png +share/icons/hicolor/36x36/apps/qgis.png share/icons/hicolor/36x36/mimetypes/qgis-mime.png share/icons/hicolor/36x36/mimetypes/qgis-qgs.png share/icons/hicolor/36x36/mimetypes/qgis-qlr.png share/icons/hicolor/36x36/mimetypes/qgis-qml.png share/icons/hicolor/36x36/mimetypes/qgis-qpt.png +share/icons/hicolor/42x42/apps/qgis.png share/icons/hicolor/42x42/mimetypes/qgis-mime.png share/icons/hicolor/42x42/mimetypes/qgis-qgs.png share/icons/hicolor/42x42/mimetypes/qgis-qlr.png share/icons/hicolor/42x42/mimetypes/qgis-qml.png share/icons/hicolor/42x42/mimetypes/qgis-qpt.png +share/icons/hicolor/48x48/apps/qgis.png share/icons/hicolor/48x48/mimetypes/qgis-mime.png share/icons/hicolor/48x48/mimetypes/qgis-qgs.png share/icons/hicolor/48x48/mimetypes/qgis-qlr.png @@ -1192,26 +1309,31 @@ share/icons/hicolor/512x512/mimetypes/qgis-qlr.png share/icons/hicolor/512x512/mimetypes/qgis-qml.png share/icons/hicolor/512x512/mimetypes/qgis-qpt.png +share/icons/hicolor/64x64/apps/qgis.png share/icons/hicolor/64x64/mimetypes/qgis-mime.png share/icons/hicolor/64x64/mimetypes/qgis-qgs.png share/icons/hicolor/64x64/mimetypes/qgis-qlr.png share/icons/hicolor/64x64/mimetypes/qgis-qml.png share/icons/hicolor/64x64/mimetypes/qgis-qpt.png +share/icons/hicolor/72x72/apps/qgis.png share/icons/hicolor/72x72/mimetypes/qgis-mime.png share/icons/hicolor/72x72/mimetypes/qgis-qgs.png share/icons/hicolor/72x72/mimetypes/qgis-qlr.png share/icons/hicolor/72x72/mimetypes/qgis-qml.png share/icons/hicolor/72x72/mimetypes/qgis-qpt.png +share/icons/hicolor/80x80/apps/qgis.png share/icons/hicolor/80x80/mimetypes/qgis-mime.png share/icons/hicolor/80x80/mimetypes/qgis-qgs.png share/icons/hicolor/80x80/mimetypes/qgis-qlr.png share/icons/hicolor/80x80/mimetypes/qgis-qml.png share/icons/hicolor/80x80/mimetypes/qgis-qpt.png +share/icons/hicolor/8x8/apps/qgis.png share/icons/hicolor/8x8/mimetypes/qgis-mime.png share/icons/hicolor/8x8/mimetypes/qgis-qgs.png share/icons/hicolor/8x8/mimetypes/qgis-qlr.png share/icons/hicolor/8x8/mimetypes/qgis-qml.png share/icons/hicolor/8x8/mimetypes/qgis-qpt.png +share/icons/hicolor/96x96/apps/qgis.png share/icons/hicolor/96x96/mimetypes/qgis-mime.png share/icons/hicolor/96x96/mimetypes/qgis-qgs.png share/icons/hicolor/96x96/mimetypes/qgis-qlr.png @@ -1511,6 +1633,9 @@ %%GRASS%%%%DATADIR%%/grass/modules/r.fillnulls.1.png %%GRASS%%%%DATADIR%%/grass/modules/r.fillnulls.2.png %%GRASS%%%%DATADIR%%/grass/modules/r.fillnulls.qgm +%%GRASS%%%%DATADIR%%/grass/modules/r.geomorphon.1.png +%%GRASS%%%%DATADIR%%/grass/modules/r.geomorphon.2.png +%%GRASS%%%%DATADIR%%/grass/modules/r.geomorphon.qgm %%GRASS%%%%DATADIR%%/grass/modules/r.grow.1.png %%GRASS%%%%DATADIR%%/grass/modules/r.grow.2.png %%GRASS%%%%DATADIR%%/grass/modules/r.grow.distance.1.png @@ -2350,16 +2475,17 @@ %%DATADIR%%/i18n/qgis_de.qm %%DATADIR%%/i18n/qgis_el.qm %%DATADIR%%/i18n/qgis_es.qm +%%DATADIR%%/i18n/qgis_et.qm %%DATADIR%%/i18n/qgis_eu.qm %%DATADIR%%/i18n/qgis_fi.qm %%DATADIR%%/i18n/qgis_fr.qm %%DATADIR%%/i18n/qgis_gl.qm +%%DATADIR%%/i18n/qgis_hi.qm %%DATADIR%%/i18n/qgis_hu.qm %%DATADIR%%/i18n/qgis_id.qm %%DATADIR%%/i18n/qgis_is.qm %%DATADIR%%/i18n/qgis_it.qm %%DATADIR%%/i18n/qgis_ja.qm -%%DATADIR%%/i18n/qgis_km.qm %%DATADIR%%/i18n/qgis_ko.qm %%DATADIR%%/i18n/qgis_ky.qm %%DATADIR%%/i18n/qgis_lt.qm @@ -2521,12 +2647,6 @@ %%DATADIR%%/python/plugins/processing/ProcessingPlugin.py %%DATADIR%%/python/plugins/processing/__init__.py %%DATADIR%%/python/plugins/processing/algs/__init__.py -%%DATADIR%%/python/plugins/processing/algs/exampleprovider/CMakeLists.txt -%%DATADIR%%/python/plugins/processing/algs/exampleprovider/ExampleAlgorithm.py -%%DATADIR%%/python/plugins/processing/algs/exampleprovider/ExampleAlgorithmProvider.py -%%DATADIR%%/python/plugins/processing/algs/exampleprovider/ProcessingExampleProviderPlugin.py -%%DATADIR%%/python/plugins/processing/algs/exampleprovider/__init__.py -%%DATADIR%%/python/plugins/processing/algs/exampleprovider/metadata.txt %%DATADIR%%/python/plugins/processing/algs/gdal/AssignProjection.py %%DATADIR%%/python/plugins/processing/algs/gdal/Buffer.py %%DATADIR%%/python/plugins/processing/algs/gdal/ClipRasterByExtent.py @@ -2569,11 +2689,13 @@ %%DATADIR%%/python/plugins/processing/algs/gdal/ogr2ogrtabletopostgislist.py %%DATADIR%%/python/plugins/processing/algs/gdal/ogr2ogrtopostgislist.py %%DATADIR%%/python/plugins/processing/algs/gdal/ogrinfo.py +%%DATADIR%%/python/plugins/processing/algs/gdal/pansharp.py %%DATADIR%%/python/plugins/processing/algs/gdal/pct2rgb.py %%DATADIR%%/python/plugins/processing/algs/gdal/polygonize.py %%DATADIR%%/python/plugins/processing/algs/gdal/proximity.py %%DATADIR%%/python/plugins/processing/algs/gdal/rasterize.py %%DATADIR%%/python/plugins/processing/algs/gdal/rasterize_over.py +%%DATADIR%%/python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py %%DATADIR%%/python/plugins/processing/algs/gdal/rearrange_bands.py %%DATADIR%%/python/plugins/processing/algs/gdal/retile.py %%DATADIR%%/python/plugins/processing/algs/gdal/rgb2pct.py @@ -2658,6 +2780,7 @@ %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.fill.stats.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.fillnulls.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.flow.txt +%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.geomorphon.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.grow.distance.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.grow.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/r.gwflow.txt @@ -2886,6 +3009,7 @@ %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.type.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.univar.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.vect.stats.txt +%%DATADIR%%/python/plugins/processing/algs/grass7/description/v.voronoi.skeleton.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.voronoi.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.what.rast.txt %%DATADIR%%/python/plugins/processing/algs/grass7/description/v.what.vect.txt @@ -2949,7 +3073,6 @@ %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_li_shape_ascii.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_li_simpson.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_li_simpson_ascii.py -%%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_mapcalc.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_mask_rast.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_mask_vect.py %%DATADIR%%/python/plugins/processing/algs/grass7/ext/r_null.py @@ -2994,6 +3117,11 @@ %%DATADIR%%/python/plugins/processing/algs/help/__init__.py %%DATADIR%%/python/plugins/processing/algs/help/qgis.yaml %%DATADIR%%/python/plugins/processing/algs/help/saga.yaml +%%DATADIR%%/python/plugins/processing/algs/otb/OtbAlgorithm.py +%%DATADIR%%/python/plugins/processing/algs/otb/OtbAlgorithmProvider.py +%%DATADIR%%/python/plugins/processing/algs/otb/OtbChoiceWidget.py +%%DATADIR%%/python/plugins/processing/algs/otb/OtbUtils.py +%%DATADIR%%/python/plugins/processing/algs/otb/__init__.py %%DATADIR%%/python/plugins/processing/algs/qgis/AddTableField.py %%DATADIR%%/python/plugins/processing/algs/qgis/Aggregate.py %%DATADIR%%/python/plugins/processing/algs/qgis/Aspect.py @@ -3002,6 +3130,7 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/BoxPlot.py %%DATADIR%%/python/plugins/processing/algs/qgis/Buffer.py %%DATADIR%%/python/plugins/processing/algs/qgis/CheckValidity.py +%%DATADIR%%/python/plugins/processing/algs/qgis/Climb.py %%DATADIR%%/python/plugins/processing/algs/qgis/ConcaveHull.py %%DATADIR%%/python/plugins/processing/algs/qgis/CreateAttributeIndex.py %%DATADIR%%/python/plugins/processing/algs/qgis/CreateConstantRaster.py @@ -3011,7 +3140,6 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/DeleteColumn.py %%DATADIR%%/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py %%DATADIR%%/python/plugins/processing/algs/qgis/DensifyGeometries.py -%%DATADIR%%/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py %%DATADIR%%/python/plugins/processing/algs/qgis/EliminateSelection.py %%DATADIR%%/python/plugins/processing/algs/qgis/ExecuteSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py @@ -3040,7 +3168,6 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py %%DATADIR%%/python/plugins/processing/algs/qgis/Orthogonalize.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointDistance.py -%%DATADIR%%/python/plugins/processing/algs/qgis/PointsAlongGeometry.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointsDisplacement.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointsFromLines.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointsFromPolygons.py @@ -3050,7 +3177,6 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/PolarPlot.py %%DATADIR%%/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py %%DATADIR%%/python/plugins/processing/algs/qgis/Polygonize.py -%%DATADIR%%/python/plugins/processing/algs/qgis/PolygonsToLines.py %%DATADIR%%/python/plugins/processing/algs/qgis/PostGISExecuteAndLoadSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/QgisAlgorithm.py @@ -3091,6 +3217,7 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/StatisticsByCategories.py %%DATADIR%%/python/plugins/processing/algs/qgis/SumLines.py %%DATADIR%%/python/plugins/processing/algs/qgis/TextToFloat.py +%%DATADIR%%/python/plugins/processing/algs/qgis/TilesXYZ.py %%DATADIR%%/python/plugins/processing/algs/qgis/TinInterpolation.py %%DATADIR%%/python/plugins/processing/algs/qgis/TopoColors.py %%DATADIR%%/python/plugins/processing/algs/qgis/TruncateTable.py @@ -3596,6 +3723,7 @@ %%DATADIR%%/python/plugins/processing/modeler/CreateNewModelAction.py %%DATADIR%%/python/plugins/processing/modeler/DeleteModelAction.py %%DATADIR%%/python/plugins/processing/modeler/EditModelAction.py +%%DATADIR%%/python/plugins/processing/modeler/ExportModelAsPythonScriptAction.py %%DATADIR%%/python/plugins/processing/modeler/ModelerAlgorithmProvider.py %%DATADIR%%/python/plugins/processing/modeler/ModelerArrowItem.py %%DATADIR%%/python/plugins/processing/modeler/ModelerDialog.py @@ -3630,15 +3758,23 @@ %%DATADIR%%/python/plugins/processing/script/__init__.py %%DATADIR%%/python/plugins/processing/tests/AlgorithmsTestBase.py %%DATADIR%%/python/plugins/processing/tests/CheckValidityAlgorithm.py -%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsTest.py +%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsGeneralTest.py +%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsRasterTest.py +%%DATADIR%%/python/plugins/processing/tests/GdalAlgorithmsVectorTest.py %%DATADIR%%/python/plugins/processing/tests/Grass7AlgorithmsImageryTest.py %%DATADIR%%/python/plugins/processing/tests/Grass7AlgorithmsRasterTest.py %%DATADIR%%/python/plugins/processing/tests/Grass7AlgorithmsVectorTest.py %%DATADIR%%/python/plugins/processing/tests/GuiTest.py %%DATADIR%%/python/plugins/processing/tests/ModelerTest.py +%%DATADIR%%/python/plugins/processing/tests/OtbAlgorithmsTest.py +%%DATADIR%%/python/plugins/processing/tests/ProcessingGeneralTest.py %%DATADIR%%/python/plugins/processing/tests/ProjectProvider.py %%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest.py +%%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest2.py +%%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest3.py +%%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest4.py %%DATADIR%%/python/plugins/processing/tests/SagaAlgorithmsTest.py +%%DATADIR%%/python/plugins/processing/tests/ScriptUtilsTest.py %%DATADIR%%/python/plugins/processing/tests/TestData.py %%DATADIR%%/python/plugins/processing/tests/ToolsTest.py %%DATADIR%%/python/plugins/processing/tests/__init__.py @@ -3680,10 +3816,13 @@ %%DATADIR%%/python/pyplugin_installer/__init__.py %%DATADIR%%/python/pyplugin_installer/installer.py %%DATADIR%%/python/pyplugin_installer/installer_data.py +%%DATADIR%%/python/pyplugin_installer/plugindependencies.py +%%DATADIR%%/python/pyplugin_installer/qgsplugindependenciesdialog.py %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerfetchingdialog.py %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerinstallingdialog.py %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerpluginerrordialog.py %%DATADIR%%/python/pyplugin_installer/qgsplugininstallerrepositorydialog.py +%%DATADIR%%/python/pyplugin_installer/ui_qgsplugindependenciesdialogbase.py %%DATADIR%%/python/pyplugin_installer/ui_qgsplugininstallerfetchingbase.py %%DATADIR%%/python/pyplugin_installer/ui_qgsplugininstallerinstallingbase.py %%DATADIR%%/python/pyplugin_installer/ui_qgsplugininstallerpluginerrorbase.py @@ -3720,17 +3859,22 @@ %%DATADIR%%/python/qgis/core/additions/__init__.py %%DATADIR%%/python/qgis/core/additions/edit.py %%DATADIR%%/python/qgis/core/additions/fromfunction.py +%%DATADIR%%/python/qgis/core/additions/markerlinesymbollayer.py %%DATADIR%%/python/qgis/core/additions/metaenum.py %%DATADIR%%/python/qgis/core/additions/processing.py %%DATADIR%%/python/qgis/core/additions/projectdirtyblocker.py +%%DATADIR%%/python/qgis/core/additions/providermetadata.py %%DATADIR%%/python/qgis/core/additions/qgsfeature.py %%DATADIR%%/python/qgis/core/additions/qgsfunction.py %%DATADIR%%/python/qgis/core/additions/qgsgeometry.py %%DATADIR%%/python/qgis/core/additions/qgssettings.py %%DATADIR%%/python/qgis/core/additions/qgstaskwrapper.py %%DATADIR%%/python/qgis/core/additions/readwritecontextentercategory.py +%%DATADIR%%/python/qgis/core/additions/validitycheck.py %%DATADIR%%/python/qgis/core/contextmanagers.py %%DATADIR%%/python/qgis/gui/__init__.py +%%DATADIR%%/python/qgis/processing/__init__.py +%%DATADIR%%/python/qgis/processing/algfactory.py %%SERVER%%%%DATADIR%%/python/qgis/server/__init__.py %%DATADIR%%/python/qgis/testing/__init__.py %%DATADIR%%/python/qgis/testing/mocked.py @@ -3752,7 +3896,6 @@ %%DATADIR%%/python/qsci_apis/QScintilla2-2.7.2.api %%DATADIR%%/python/qsci_apis/pyqgis.pap %%DATADIR%%/resources/2to3migration.txt -%%DATADIR%%/resources/compdcs.csv %%DATADIR%%/resources/cpt-city-qgis-min/README-qgis.txt %%DATADIR%%/resources/cpt-city-qgis-min/README.txt %%DATADIR%%/resources/cpt-city-qgis-min/VERSION-parent.xml @@ -4944,19 +5087,15 @@ %%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/DESC.xml %%DATADIR%%/resources/cpt-city-qgis-min/wkp/tubs/nrwc.svg %%DATADIR%%/resources/customization.xml +%%DATADIR%%/resources/data/README_world_map.md %%DATADIR%%/resources/data/contributors.json %%DATADIR%%/resources/data/contributors.qml %%DATADIR%%/resources/data/qgis-hackfests.json %%DATADIR%%/resources/data/qgis-hackfests.qml -%%DATADIR%%/resources/data/world_map.dbf -%%DATADIR%%/resources/data/world_map.prj -%%DATADIR%%/resources/data/world_map.qix -%%DATADIR%%/resources/data/world_map.qml -%%DATADIR%%/resources/data/world_map.shp -%%DATADIR%%/resources/data/world_map.shx -%%DATADIR%%/resources/datum_shift.csv -%%DATADIR%%/resources/gcs.csv -%%DATADIR%%/resources/geoccs.csv +@mode 0666 +%%DATADIR%%/resources/data/world_map.gpkg +%%DATADIR%%/resources/data/world_map_generalize.model3 +@mode %%DATADIR%%/resources/metadata-ISO/LinkPropertyLookupTable.csv %%DATADIR%%/resources/metadata-ISO/country_code_ISO_3166.csv %%DATADIR%%/resources/metadata-ISO/language_codes_ISO_639.csv @@ -4964,13 +5103,48 @@ %%DATADIR%%/resources/metadata-ISO/md_scope_codes.csv %%DATADIR%%/resources/metadata-ISO/mime.csv %%DATADIR%%/resources/palettes/new_layer_colors.gpl -%%DATADIR%%/resources/pcs.csv %%DATADIR%%/resources/qgis.db %%DATADIR%%/resources/qgis_global_settings.ini +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/schema.json +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.css +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.js +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/style.css +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollection.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollections.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/footer.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getApiDescription.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeature.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeatures.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getLandingPage.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getRequirementClasses.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/header.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/leaflet_map.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/links.html %%SERVER%%%%DATADIR%%/resources/server/schemaExtension.xsd %%DATADIR%%/resources/spatialite.db %%DATADIR%%/resources/srs.db %%DATADIR%%/resources/symbology-style.xml +%%DATADIR%%/resources/themes/Blend of Gray/icons/arrow-down.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/arrow-up.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/caret-down.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/caret-right.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/close.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/handle-horizontal.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/handle-vertical.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked-disabled.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-checked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked-disabled.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qcheckbox-unchecked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked-disabled.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-checked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-unchecked-disabled.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/qradiobox-unchecked.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/separator-horizontal.svg +%%DATADIR%%/resources/themes/Blend of Gray/icons/separator-vertical.svg +%%DATADIR%%/resources/themes/Blend of Gray/palette.txt +%%DATADIR%%/resources/themes/Blend of Gray/qscintilla.ini +%%DATADIR%%/resources/themes/Blend of Gray/style.qss +%%DATADIR%%/resources/themes/Blend of Gray/variables.qss %%DATADIR%%/resources/themes/Night Mapping/icons/arrow-down.svg %%DATADIR%%/resources/themes/Night Mapping/icons/arrow-up.svg %%DATADIR%%/resources/themes/Night Mapping/icons/caret-down.svg @@ -4994,7 +5168,6 @@ %%DATADIR%%/resources/themes/Night Mapping/qscintilla.ini %%DATADIR%%/resources/themes/Night Mapping/style.qss %%DATADIR%%/resources/themes/Night Mapping/variables.qss -%%DATADIR%%/resources/vertcs.csv %%DATADIR%%/svg/accommodation/accommodation_alpinehut.svg %%DATADIR%%/svg/accommodation/accommodation_bed_and_breakfast.svg %%DATADIR%%/svg/accommodation/accommodation_camping.svg Index: graphics/qgis/Makefile =================================================================== --- graphics/qgis/Makefile +++ graphics/qgis/Makefile @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_10_1 -PORTREVISION= 3 +DISTVERSION= 3_12_1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -144,8 +143,6 @@ .include post-patch: - @${REINPLACE_CMD} -e 's|markupsafe ||g' \ - ${WRKSRC}/python/ext-libs/CMakeLists.txt # On i386, '-mllvm -inline-threshold=128' does not build under all circumstances # See bugs 242557 and 241687. .if ${OPSYS} == FreeBSD && ${ARCH} == "i386" @@ -158,6 +155,7 @@ post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak + ${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" | ${XARGS} ${RM} -rf @${RM} /tmp/srs.db check: Index: graphics/qgis/distinfo =================================================================== --- graphics/qgis/distinfo +++ graphics/qgis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1575643297 -SHA256 (qgis-QGIS-final-3_10_1_GH0.tar.gz) = 1f63a3010a2ef0faf1098b448dfefb8468912cd688738a7fbf57de5f9a04af07 -SIZE (qgis-QGIS-final-3_10_1_GH0.tar.gz) = 117585660 +TIMESTAMP = 1585054080 +SHA256 (qgis-QGIS-final-3_12_1_GH0.tar.gz) = 29dbb7738180fe16392fc98a4f4d84a1c96252eae1ab0055d414548cd76b3635 +SIZE (qgis-QGIS-final-3_12_1_GH0.tar.gz) = 128867387 Index: graphics/qgis/files/patch-cmake_FindGRASS.cmake =================================================================== --- graphics/qgis/files/patch-cmake_FindGRASS.cmake +++ /dev/null @@ -1,13 +0,0 @@ ---- cmake/FindGRASS.cmake.orig 2020-01-25 06:32:41 UTC -+++ cmake/FindGRASS.cmake -@@ -161,9 +161,7 @@ IF (UNIX) - IF (GRASS_FIND_VERSION EQUAL 7) - IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - FOREACH (VERSION_MINOR 9 8 7 6 5 4 3 2 1 0) -- FOREACH (VERSION_BUILD 9 8 7 6 5 4 3 2 1 0) -- LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD}) -- ENDFOREACH (VERSION_BUILD) -+ LIST (APPEND GRASS_PATHS /usr/local/grass${GRASS_FIND_VERSION}${VERSION_MINOR}) - ENDFOREACH(VERSION_MINOR) - ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") - FOREACH (PATH /usr/lib64 /usr/lib) Index: graphics/qgis/files/patch-cmake_FindPyQt5.py =================================================================== --- graphics/qgis/files/patch-cmake_FindPyQt5.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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]) Index: graphics/qgis/files/patch-cmake_Txt2Tags.cmake =================================================================== --- graphics/qgis/files/patch-cmake_Txt2Tags.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- cmake/Txt2Tags.cmake.orig 2019-12-06 12:02:59 UTC -+++ cmake/Txt2Tags.cmake -@@ -42,7 +42,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) - ADD_CUSTOM_COMMAND( - OUTPUT ${_out} - COMMAND ${TXT2TAGS_EXECUTABLE} -- ARGS --encoding=utf-8 -o${_out} -t txt ${_in} -+ ARGS -o${_out} -t txt ${_in} - DEPENDS ${_in} - COMMENT "Building ${_out} from ${_in}" - ) -@@ -50,7 +50,7 @@ MACRO(ADD_TXT2TAGS_FILES _sources) - ADD_CUSTOM_COMMAND( - OUTPUT ${_out}.html - COMMAND ${TXT2TAGS_EXECUTABLE} -- ARGS --encoding=utf-8 -o${_out}.html -t html ${_in} -+ ARGS -o${_out}.html -t html ${_in} - DEPENDS ${_in} - COMMENT "Building ${_out}.html from ${_in}" - ) Index: graphics/qgis/files/patch-doc_INSTALL.html =================================================================== --- graphics/qgis/files/patch-doc_INSTALL.html +++ /dev/null @@ -1,9 +0,0 @@ ---- doc/INSTALL.html.orig 2019-12-06 12:02:59 UTC -+++ doc/INSTALL.html -@@ -3130,5 +3130,5 @@ The following people have contributed to this document - - - -- -+ - Index: graphics/qgis/files/patch-doc_INSTALL.t2t =================================================================== --- graphics/qgis/files/patch-doc_INSTALL.t2t +++ /dev/null @@ -1,28 +0,0 @@ ---- doc/INSTALL.t2t.orig 2019-12-06 12:02:59 UTC -+++ doc/INSTALL.t2t -@@ -4,14 +4,14 @@ Building QGIS from source - step by step - - %! target : html - %! style : style.css --%! Options : --toc --toc-level 2 --enum-title --css-sugar --css-inside -+%! Options : --toc --toc-level 2 --enum-title - %! preproc : TUT_URL https://qgis.org - %! PostProc(html): '(?i)(
)' '
\1'
- %! PostProc(html): '(?i)(
)' '\1' - %! PostProc(html): \(R\) ® - % Next line will replace tabs with 2 spaces in txt generated outputs - %! PostProc(txt): '(?i)(\t)' ' ' --%! encoding: iso-8859-1 -+%! encoding: utf-8 - % - % Tex processing - % -@@ -36,7 +36,7 @@ Building QGIS from source - step by step - %! PostProc(tex): NEWPAGE '\\newpage' - % Give alternating table rows different colors and use a smaller font in tables (\tiny) - %! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}' --%! encoding: iso-8859-1 -+%! encoding: utf-8 - - %! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png' - % These are comments and will not be generated in any output Index: graphics/qgis/files/patch-doc_news.html =================================================================== --- graphics/qgis/files/patch-doc_news.html +++ /dev/null @@ -1,9 +0,0 @@ ---- doc/news.html.orig 2019-12-06 12:02:59 UTC -+++ doc/news.html -@@ -3651,5 +3651,5 @@ July 6, 2002 - - - -- -+ - Index: graphics/qgis/files/patch-doc_news.t2t =================================================================== --- graphics/qgis/files/patch-doc_news.t2t +++ /dev/null @@ -1,18 +0,0 @@ ---- doc/news.t2t.orig 2019-12-06 12:02:59 UTC -+++ doc/news.t2t -@@ -4,13 +4,13 @@ Change history for the QGIS Project - - %! target : html - %! style : style.css --%! Options : --toc --toc-level 1 --enum-title --css-sugar --css-inside -+%! Options : --toc --toc-level 1 --enum-title - %! preproc : TUT_URL https://qgis.org - %! PostProc(html): '(?i)(
)' '
\1'
- %! PostProc(html): '(?i)(
)' '\1' - % Next line will replace tabs with 2 spaces in txt generated outputs - %! PostProc(txt): '(?i)(\t)' ' ' --%! encoding: iso-8859-1 -+%! encoding: utf-8 - % - % These are comments and will not be generated in any output - % ------------------- Index: graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py =================================================================== --- graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py +++ graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py @@ -1,19 +1,19 @@ ---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-03-02 02:07:46 UTC +--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2020-03-27 05:50:09 UTC +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py -@@ -82,7 +82,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): +@@ -79,7 +79,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): def canBeActivated(self): version = SagaUtils.getInstalledVersion(True) -- if version is not None and version.startswith(REQUIRED_VERSION): +- if version is not None and (version.startswith(REQUIRED_VERSION) or version.startswith(BETA_SUPPORT_VERSION)): + if version is not None and version >= REQUIRED_VERSION: return True return False -@@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): +@@ -96,7 +96,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): self.tr('Processing'), Qgis.Critical) return -- if not version.startswith(REQUIRED_VERSION): +- if not version.startswith(REQUIRED_VERSION) and not version.startswith(BETA_SUPPORT_VERSION): + if version < REQUIRED_VERSION: QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), self.tr('Processing'), Index: graphics/qgis/files/patch-scripts_release.pl =================================================================== --- graphics/qgis/files/patch-scripts_release.pl +++ /dev/null @@ -1,13 +0,0 @@ ---- scripts/release.pl.orig 2019-12-06 12:02:59 UTC -+++ scripts/release.pl -@@ -182,8 +182,8 @@ run( "cp debian/changelog /tmp", "backup changelog fai - unless( $dopoint ) { - run( "perl -i -pe 's/qgis-dev-deps/qgis-ltr-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) if $doltr; - run( "perl -i -pe 's/qgis-dev-deps/qgis-rel-deps/;' doc/msvc.t2t", "could not update osgeo4w deps package" ) unless $doltr; -- run( "txt2tags --encoding=utf-8 -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); -- run( "txt2tags --encoding=utf-8 -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); -+ run( "txt2tags -odoc/INSTALL.html -t html doc/INSTALL.t2t", "could not update INSTALL.html" ); -+ run( "txt2tags -oINSTALL -t txt doc/INSTALL.t2t", "could not update INSTALL" ); - - run( "cp -v images/splash/splash-$newmajor.$newminor.png images/splash/splash.png", "splash png switch failed" ); - run( "convert -resize 164x314 ms-windows/Installer-Files/WelcomeFinishPage-$newmajor.$newminor.png BMP3:ms-windows/Installer-Files/WelcomeFinishPage.bmp", "installer bitmap switch failed" ); Index: graphics/qgis/files/patch-scripts_update-news.pl =================================================================== --- graphics/qgis/files/patch-scripts_update-news.pl +++ /dev/null @@ -1,13 +0,0 @@ ---- scripts/update-news.pl.orig 2019-12-06 12:02:59 UTC -+++ scripts/update-news.pl -@@ -61,8 +61,8 @@ close $in; - - copy($tempfile, "doc/news.t2t"); - --system "txt2tags --encoding=utf-8 -odoc/news.html -t html doc/news.t2t"; --system "txt2tags --encoding=utf-8 -oNEWS -t txt doc/news.t2t"; -+system "txt2tags -odoc/news.html -t html doc/news.t2t"; -+system "txt2tags -oNEWS -t txt doc/news.t2t"; - - =head1 NAME - Index: graphics/qgis/files/patch-src_analysis_interpolation_qgsinterpolator.h =================================================================== --- graphics/qgis/files/patch-src_analysis_interpolation_qgsinterpolator.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/analysis/interpolation/qgsinterpolator.h.orig 2019-07-13 11:21:02 UTC -+++ src/analysis/interpolation/qgsinterpolator.h -@@ -18,6 +18,7 @@ - #ifndef QGSINTERPOLATOR_H - #define QGSINTERPOLATOR_H - -+#include - #include - #include "qgis_sip.h" - #include "qgis_analysis.h" Index: graphics/qgis/files/patch-src_core_CMakeLists.txt =================================================================== --- graphics/qgis/files/patch-src_core_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/core/CMakeLists.txt.orig 2019-10-28 04:34:30 UTC -+++ src/core/CMakeLists.txt -@@ -889,6 +889,7 @@ ELSE(MSVC) - SET_SOURCE_FILES_PROPERTIES(${QGIS_CORE_MOC_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" ) - IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)) - SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/qgsexpression_texts.cpp PROPERTIES COMPILE_FLAGS "-O1") -+ SET_SOURCE_FILES_PROPERTIES(qgscoordinatereferencesystem.cpp PROPERTIES COMPILE_FLAGS "-mllvm -inline-threshold=128") - ENDIF () - ENDIF(MSVC) - Index: graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt =================================================================== --- graphics/qgis/files/patch-src_plugins_grass_CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- src/plugins/grass/CMakeLists.txt.orig 2018-11-23 12:08:36 UTC -+++ src/plugins/grass/CMakeLists.txt -@@ -211,6 +211,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION) - qgis_app - qgis_gui - ${OPENPTY_LIBRARY} -+ -lulog - ) - - IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") Index: graphics/qgis/pkg-plist =================================================================== --- graphics/qgis/pkg-plist +++ graphics/qgis/pkg-plist @@ -2,6 +2,7 @@ bin/qgis bin/qgis_bench %%SERVER%%bin/qgis_mapserv.fcgi +%%SERVER%%bin/qgis_mapserver %%SERVER%%bin/wms_metadata.xml include/qgis/Bezier3D.h include/qgis/CloughTocherInterpolator.h @@ -30,6 +31,7 @@ include/qgis/qgisplugin.h include/qgis/qgs25drenderer.h include/qgis/qgs25drendererwidget.h +include/qgis/qgs3dalgorithms.h include/qgis/qgs3danimationsettings.h include/qgis/qgs3dmapscene.h include/qgis/qgs3dmapsettings.h @@ -50,6 +52,7 @@ include/qgis/qgsabstractproviderconnection.h include/qgis/qgsabstractreportsection.h include/qgis/qgsabstractvaliditycheck.h +include/qgis/qgsabstractvectorlayer3drenderer.h include/qgis/qgsaction.h include/qgis/qgsactionmanager.h include/qgis/qgsactionmenu.h @@ -59,6 +62,7 @@ include/qgis/qgsadvanceddigitizingfloater.h include/qgis/qgsaggregatecalculator.h include/qgis/qgsaggregatetoolbutton.h +include/qgis/qgsalgorithmfiledownloader.h include/qgis/qgsalgorithmimportphotos.h include/qgis/qgsalignmentcombobox.h include/qgis/qgsalignraster.h @@ -118,8 +122,11 @@ include/qgis/qgsauthsslimportdialog.h include/qgis/qgsauthtrustedcasdialog.h include/qgis/qgsauxiliarystorage.h +include/qgis/qgsbasicnumericformat.h +include/qgis/qgsbearingnumericformat.h include/qgis/qgsbearingutils.h include/qgis/qgsbilinearrasterresampler.h +include/qgis/qgsbillboardgeometry.h include/qgis/qgsbinarywidgetfactory.h include/qgis/qgsbinarywidgetwrapper.h include/qgis/qgsblendmodecombobox.h @@ -156,10 +163,7 @@ include/qgis/qgscheckboxsearchwidgetwrapper.h include/qgis/qgscheckboxwidgetfactory.h include/qgis/qgscheckboxwidgetwrapper.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 @@ -212,6 +216,7 @@ include/qgis/qgscontrastenhancementfunction.h include/qgis/qgscoordinateboundspreviewmapwidget.h include/qgis/qgscoordinateformatter.h +include/qgis/qgscoordinateoperationwidget.h include/qgis/qgscoordinatereferencesystem.h include/qgis/qgscoordinatetransform.h include/qgis/qgscoordinatetransformcontext.h @@ -221,6 +226,7 @@ include/qgis/qgscredentialdialog.h include/qgis/qgscredentials.h include/qgis/qgscubicrasterresampler.h +include/qgis/qgscurrencynumericformat.h include/qgis/qgscurve.h include/qgis/qgscurveeditorwidget.h include/qgis/qgscurvepolygon.h @@ -253,8 +259,6 @@ 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 @@ -291,6 +295,7 @@ include/qgis/qgsenumerationwidgetwrapper.h include/qgis/qgserror.h include/qgis/qgserrordialog.h +include/qgis/qgseventtracing.h include/qgis/qgsexception.h include/qgis/qgsexiftools.h include/qgis/qgsexpression.h @@ -308,6 +313,7 @@ include/qgis/qgsexpressionnode.h include/qgis/qgsexpressionnodeimpl.h include/qgis/qgsexpressionselectiondialog.h +include/qgis/qgsexpressionstoredialog.h include/qgis/qgsextentgroupbox.h include/qgis/qgsextentgroupboxplugin.h include/qgis/qgsexternalresourceconfigdlg.h @@ -316,10 +322,9 @@ include/qgis/qgsexternalresourcewidgetplugin.h include/qgis/qgsexternalresourcewidgetwrapper.h include/qgis/qgsfallbackfieldformatter.h +include/qgis/qgsfallbacknumericformat.h include/qgis/qgsfeature.h -include/qgis/qgsfeature3dhandler_p.h include/qgis/qgsfeaturefiltermodel.h -include/qgis/qgsfeaturefiltermodel_p.h include/qgis/qgsfeaturefilterprovider.h include/qgis/qgsfeatureid.h include/qgis/qgsfeatureiterator.h @@ -337,7 +342,6 @@ include/qgis/qgsfeaturestore.h include/qgis/qgsfeedback.h include/qgis/qgsfield.h -include/qgis/qgsfield_p.h include/qgis/qgsfieldcombobox.h include/qgis/qgsfieldcomboboxplugin.h include/qgis/qgsfieldconditionalformatwidget.h @@ -361,6 +365,7 @@ include/qgis/qgsfilterlineedit.h include/qgis/qgsfilterlineeditplugin.h include/qgis/qgsfindfilesbypatternwidget.h +include/qgis/qgsflatterraingenerator.h include/qgis/qgsfloatingwidget.h include/qgis/qgsfocuswatcher.h include/qgis/qgsfontbutton.h @@ -373,15 +378,18 @@ include/qgis/qgsgdalsourceselect.h include/qgis/qgsgdalutils.h include/qgis/qgsgenericfeatureselectionmanager.h +include/qgis/qgsgenericspatialindex.h include/qgis/qgsgeometry.h include/qgis/qgsgeometryanglecheck.h include/qgis/qgsgeometryareacheck.h +include/qgis/qgsgeometrycheck.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/qgsgeometrycheckresolutionmethod.h include/qgis/qgsgeometrycollection.h include/qgis/qgsgeometrycontainedcheck.h include/qgis/qgsgeometrydanglecheck.h @@ -392,11 +400,13 @@ include/qgis/qgsgeometryengine.h include/qgis/qgsgeometryfactory.h include/qgis/qgsgeometryfollowboundariescheck.h +include/qgis/qgsgeometrygapcheck.h include/qgis/qgsgeometrygeneratorsymbollayer.h include/qgis/qgsgeometryholecheck.h include/qgis/qgsgeometryisvalidcheck.h include/qgis/qgsgeometrylineintersectioncheck.h include/qgis/qgsgeometrylinelayerintersectioncheck.h +include/qgis/qgsgeometrymissingvertexcheck.h include/qgis/qgsgeometrymultipartcheck.h include/qgis/qgsgeometryoptions.h include/qgis/qgsgeometryoverlapcheck.h @@ -422,6 +432,7 @@ include/qgis/qgsgeopackageprojectstorageguiprovider.h include/qgis/qgsgeopackageproviderconnection.h include/qgis/qgsgeopackagerasterwritertask.h +include/qgis/qgsgeopdflayertreemodel.h include/qgis/qgsgeos.h include/qgis/qgsgloweffect.h include/qgis/qgsgml.h @@ -439,6 +450,7 @@ include/qgis/qgsgraphanalyzer.h include/qgis/qgsgraphbuilder.h include/qgis/qgsgraphbuilderinterface.h +include/qgis/qgsgraphdirector.h include/qgis/qgsgridfilewriter.h include/qgis/qgsgroupwmsdatadialog.h include/qgis/qgsgui.h @@ -449,6 +461,7 @@ include/qgis/qgshiddenwidgetfactory.h include/qgis/qgshiddenwidgetwrapper.h include/qgis/qgshighlight.h +include/qgis/qgshighlightablecombobox.h include/qgis/qgshillshadefilter.h include/qgis/qgshillshaderenderer.h include/qgis/qgshillshaderendererwidget.h @@ -466,6 +479,7 @@ include/qgis/qgsimagecache.h include/qgis/qgsimageoperation.h include/qgis/qgsindexedfeature.h +include/qgis/qgsinstallgridshiftdialog.h include/qgis/qgsinternalgeometryengine.h include/qgis/qgsinterpolator.h include/qgis/qgsinterval.h @@ -478,10 +492,15 @@ include/qgis/qgskeyvaluewidgetfactory.h include/qgis/qgskeyvaluewidgetwrapper.h include/qgis/qgslabelfeature.h +include/qgis/qgslabeling.h include/qgis/qgslabelingengine.h include/qgis/qgslabelingenginesettings.h include/qgis/qgslabelinggui.h +include/qgis/qgslabelobstaclesettings.h +include/qgis/qgslabelobstaclesettingswidget.h include/qgis/qgslabelsearchtree.h +include/qgis/qgslabelsettingswidgetbase.h +include/qgis/qgslabelthinningsettings.h include/qgis/qgslayerdefinition.h include/qgis/qgslayermetadata.h include/qgis/qgslayermetadataformatter.h @@ -504,8 +523,12 @@ include/qgis/qgslayertreeviewindicator.h include/qgis/qgslayertreeviewitemdelegate.h include/qgis/qgslayout.h +include/qgis/qgslayoutaddpagesdialog.h include/qgis/qgslayoutaligner.h include/qgis/qgslayoutatlas.h +include/qgis/qgslayoutatlaswidget.h +include/qgis/qgslayoutattributeselectiondialog.h +include/qgis/qgslayoutattributetablewidget.h include/qgis/qgslayoutcombobox.h include/qgis/qgslayoutcustomdrophandler.h include/qgis/qgslayoutdesignerinterface.h @@ -515,6 +538,10 @@ include/qgis/qgslayoutgeopdfexporter.h include/qgis/qgslayoutgridsettings.h include/qgis/qgslayoutguidecollection.h +include/qgis/qgslayoutguidewidget.h +include/qgis/qgslayoutguiutils.h +include/qgis/qgslayouthtmlwidget.h +include/qgis/qgslayoutimageexportoptionsdialog.h include/qgis/qgslayoutitem.h include/qgis/qgslayoutitem3dmap.h include/qgis/qgslayoutitemattributetable.h @@ -525,6 +552,7 @@ include/qgis/qgslayoutitemhtml.h include/qgis/qgslayoutitemlabel.h include/qgis/qgslayoutitemlegend.h +include/qgis/qgslayoutitemmanualtable.h include/qgis/qgslayoutitemmap.h include/qgis/qgslayoutitemmapgrid.h include/qgis/qgslayoutitemmapitem.h @@ -537,10 +565,17 @@ include/qgis/qgslayoutitemregistry.h include/qgis/qgslayoutitemscalebar.h include/qgis/qgslayoutitemshape.h +include/qgis/qgslayoutitemslistview.h include/qgis/qgslayoutitemtexttable.h include/qgis/qgslayoutitemundocommand.h include/qgis/qgslayoutitemwidget.h +include/qgis/qgslayoutlabelwidget.h +include/qgis/qgslayoutlegendlayersdialog.h +include/qgis/qgslayoutlegendwidget.h include/qgis/qgslayoutmanager.h +include/qgis/qgslayoutmanualtablewidget.h +include/qgis/qgslayoutmapgridwidget.h +include/qgis/qgslayoutmapwidget.h include/qgis/qgslayoutmeasurement.h include/qgis/qgslayoutmeasurementconverter.h include/qgis/qgslayoutmodel.h @@ -550,15 +585,25 @@ include/qgis/qgslayoutnewitempropertiesdialog.h include/qgis/qgslayoutobject.h include/qgis/qgslayoutpagecollection.h +include/qgis/qgslayoutpagepropertieswidget.h +include/qgis/qgslayoutpdfexportoptionsdialog.h +include/qgis/qgslayoutpicturewidget.h include/qgis/qgslayoutpoint.h +include/qgis/qgslayoutpolygonwidget.h +include/qgis/qgslayoutpolylinewidget.h +include/qgis/qgslayoutpropertieswidget.h +include/qgis/qgslayoutqptdrophandler.h include/qgis/qgslayoutrendercontext.h include/qgis/qgslayoutreportcontext.h include/qgis/qgslayoutreportsectionlabel.h include/qgis/qgslayoutruler.h +include/qgis/qgslayoutscalebarwidget.h include/qgis/qgslayoutserializableobject.h +include/qgis/qgslayoutshapewidget.h include/qgis/qgslayoutsize.h include/qgis/qgslayoutsnapper.h include/qgis/qgslayouttable.h +include/qgis/qgslayouttablebackgroundcolorsdialog.h include/qgis/qgslayouttablecolumn.h include/qgis/qgslayoutundocommand.h include/qgis/qgslayoutundostack.h @@ -585,19 +630,17 @@ include/qgis/qgslegendsymbolitem.h include/qgis/qgslimitedrandomcolorrampdialog.h include/qgis/qgsline3dsymbol.h -include/qgis/qgsline3dsymbol_p.h include/qgis/qgslinearminmaxenhancement.h include/qgis/qgslinearminmaxenhancementwithclip.h -include/qgis/qgslinematerial_p.h include/qgis/qgslinesegment.h include/qgis/qgslinestring.h include/qgis/qgslinesymbollayer.h -include/qgis/qgslinevertexdata_p.h include/qgis/qgslinuxnative.h include/qgis/qgslistfieldformatter.h include/qgis/qgslistwidget.h include/qgis/qgslistwidgetfactory.h include/qgis/qgslistwidgetwrapper.h +include/qgis/qgslocaldefaultsettings.h include/qgis/qgslocalec.h include/qgis/qgslocator.h include/qgis/qgslocatorcontext.h @@ -631,6 +674,7 @@ include/qgis/qgsmaplayerrenderer.h include/qgis/qgsmaplayerstore.h include/qgis/qgsmaplayerstyle.h +include/qgis/qgsmaplayerstyleguiutils.h include/qgis/qgsmaplayerstylemanager.h include/qgis/qgsmaplayerstylemanagerwidget.h include/qgis/qgsmapmouseevent.h @@ -662,16 +706,19 @@ include/qgis/qgsmapunitscale.h include/qgis/qgsmargins.h include/qgis/qgsmarkersymbollayer.h +include/qgis/qgsmaskidprovider.h +include/qgis/qgsmasksymbollayerwidget.h include/qgis/qgsmasterlayoutinterface.h include/qgis/qgsmemoryfeatureiterator.h include/qgis/qgsmemoryprovider.h include/qgis/qgsmemoryproviderutils.h include/qgis/qgsmenuheader.h +include/qgis/qgsmesh3daveraging.h include/qgis/qgsmesh3dsymbol.h -include/qgis/qgsmesh3dsymbol_p.h include/qgis/qgsmeshcalcnode.h include/qgis/qgsmeshcalculator.h include/qgis/qgsmeshcalcutils.h +include/qgis/qgsmeshcontours.h include/qgis/qgsmeshdataprovider.h include/qgis/qgsmeshlayer.h include/qgis/qgsmeshlayer3drenderer.h @@ -681,7 +728,9 @@ include/qgis/qgsmeshmemorydataprovider.h include/qgis/qgsmeshrenderersettings.h include/qgis/qgsmeshspatialindex.h +include/qgis/qgsmeshterraingenerator.h include/qgis/qgsmeshtimesettings.h +include/qgis/qgsmeshtracerenderer.h include/qgis/qgsmeshvectorrenderer.h include/qgis/qgsmessagebar.h include/qgis/qgsmessagebaritem.h @@ -701,6 +750,7 @@ include/qgis/qgsmultirenderchecker.h include/qgis/qgsmultisurface.h include/qgis/qgsnative.h +include/qgis/qgsnativealgorithms.h include/qgis/qgsnetworkaccessmanager.h include/qgis/qgsnetworkcontentfetcher.h include/qgis/qgsnetworkcontentfetcherregistry.h @@ -725,6 +775,11 @@ include/qgis/qgsnmeaconnection.h include/qgis/qgsnullsymbolrenderer.h include/qgis/qgsnullsymbolrendererwidget.h +include/qgis/qgsnumericformat.h +include/qgis/qgsnumericformatguiregistry.h +include/qgis/qgsnumericformatregistry.h +include/qgis/qgsnumericformatselectorwidget.h +include/qgis/qgsnumericformatwidget.h include/qgis/qgsnumericscalebarrenderer.h include/qgis/qgsobjectcustomproperties.h include/qgis/qgsofflineediting.h @@ -771,6 +826,7 @@ include/qgis/qgspasswordlineeditplugin.h include/qgis/qgspathresolver.h include/qgis/qgspenstylecombobox.h +include/qgis/qgspercentagenumericformat.h include/qgis/qgsphongmaterialsettings.h include/qgis/qgspiediagram.h include/qgis/qgspixmaplabel.h @@ -778,8 +834,8 @@ include/qgis/qgspluginlayerregistry.h include/qgis/qgspluginmanagerinterface.h include/qgis/qgspoint.h +include/qgis/qgspoint3dbillboardmaterial.h include/qgis/qgspoint3dsymbol.h -include/qgis/qgspoint3dsymbol_p.h include/qgis/qgspointclusterrenderer.h include/qgis/qgspointclusterrendererwidget.h include/qgis/qgspointdisplacementrenderer.h @@ -787,10 +843,10 @@ include/qgis/qgspointdistancerenderer.h include/qgis/qgspointlightsettings.h include/qgis/qgspointlocator.h +include/qgis/qgspointlocatorinittask.h include/qgis/qgspointxy.h include/qgis/qgspolygon.h include/qgis/qgspolygon3dsymbol.h -include/qgis/qgspolygon3dsymbol_p.h include/qgis/qgspostgresstringutils.h include/qgis/qgspresetcolorrampdialog.h include/qgis/qgsprevieweffect.h @@ -830,6 +886,7 @@ include/qgis/qgsprocessingwidgetwrapperimpl.h include/qgis/qgsproject.h include/qgis/qgsprojectbadlayerhandler.h +include/qgis/qgsprojectdisplaysettings.h include/qgis/qgsprojectfiletransform.h include/qgis/qgsprojectionselectiondialog.h include/qgis/qgsprojectionselectiontreewidget.h @@ -847,7 +904,6 @@ include/qgis/qgsprojectviewsettings.h include/qgis/qgsprojutils.h include/qgis/qgsproperty.h -include/qgis/qgsproperty_p.h include/qgis/qgspropertyassistantwidget.h include/qgis/qgspropertycollection.h include/qgis/qgspropertyoverridebutton.h @@ -888,6 +944,7 @@ include/qgis/qgsrasterinterface.h include/qgis/qgsrasteriterator.h include/qgis/qgsrasterlayer.h +include/qgis/qgsrasterlayerproperties.h include/qgis/qgsrasterlayerrenderer.h include/qgis/qgsrasterlayersaveasdialog.h include/qgis/qgsrastermatrix.h @@ -900,6 +957,7 @@ include/qgis/qgsrasterpyramidsoptionswidget.h include/qgis/qgsrasterrange.h include/qgis/qgsrasterrenderer.h +include/qgis/qgsrasterrendererregistry.h include/qgis/qgsrasterrendererwidget.h include/qgis/qgsrasterresamplefilter.h include/qgis/qgsrasterresampler.h @@ -909,7 +967,6 @@ include/qgis/qgsrastertransparencywidget.h include/qgis/qgsrasterviewport.h include/qgis/qgsratiolockbutton.h -include/qgis/qgsraycastingutils_p.h include/qgis/qgsreadwritecontext.h include/qgis/qgsreadwritelocker.h include/qgis/qgsreclassifyutils.h @@ -918,6 +975,7 @@ include/qgis/qgsregularpolygon.h include/qgis/qgsrelation.h include/qgis/qgsrelationaggregatesearchwidgetwrapper.h +include/qgis/qgsrelationcontext.h include/qgis/qgsrelationeditorwidget.h include/qgis/qgsrelationeditorwidgetplugin.h include/qgis/qgsrelationmanager.h @@ -960,6 +1018,7 @@ include/qgis/qgsscalevisibilitydialog.h include/qgis/qgsscalewidget.h include/qgis/qgsscalewidgetplugin.h +include/qgis/qgsscientificnumericformat.h include/qgis/qgsscrollarea.h include/qgis/qgssearchquerybuilder.h include/qgis/qgssearchwidgettoolbutton.h @@ -988,8 +1047,8 @@ include/qgis/qgssourceselectproviderregistry.h include/qgis/qgsspatialindex.h include/qgis/qgsspatialindexkdbush.h -include/qgis/qgsspatialindexkdbush_p.h include/qgis/qgsspatialindexkdbushdata.h +include/qgis/qgsspatialindexutils.h include/qgis/qgsspatialiteutils.h include/qgis/qgsspinbox.h include/qgis/qgsspinboxplugin.h @@ -997,6 +1056,7 @@ include/qgis/qgssqlexpressioncompiler.h include/qgis/qgssqliteutils.h include/qgis/qgssqlstatement.h +include/qgis/qgsstackedbardiagram.h include/qgis/qgsstatisticalsummary.h include/qgis/qgsstatusbar.h include/qgis/qgsstoredexpressionmanager.h @@ -1020,6 +1080,7 @@ include/qgis/qgssymbolbutton.h include/qgis/qgssymbolbuttonplugin.h include/qgis/qgssymbollayer.h +include/qgis/qgssymbollayerreference.h include/qgis/qgssymbollayerregistry.h include/qgis/qgssymbollayerutils.h include/qgis/qgssymbollayerwidget.h @@ -1027,17 +1088,18 @@ include/qgis/qgssymbolselectordialog.h include/qgis/qgssymbolslistwidget.h include/qgis/qgssymbolwidgetcontext.h +include/qgis/qgstablecell.h +include/qgis/qgstableeditordialog.h +include/qgis/qgstableeditorformattingwidget.h +include/qgis/qgstableeditorwidget.h include/qgis/qgstablewidgetbase.h include/qgis/qgstablewidgetitem.h include/qgis/qgstabwidget.h include/qgis/qgstaskmanager.h include/qgis/qgstaskmanagerwidget.h include/qgis/qgsterraindownloader.h -include/qgis/qgsterrainentity_p.h include/qgis/qgsterraingenerator.h -include/qgis/qgsterraintexturegenerator_p.h -include/qgis/qgsterraintextureimage_p.h -include/qgis/qgsterraintileentity_p.h +include/qgis/qgsterraintileloader_p.h include/qgis/qgstessellatedpolygongeometry.h include/qgis/qgstessellator.h include/qgis/qgstest.h @@ -1052,7 +1114,6 @@ include/qgis/qgstextlabelfeature.h include/qgis/qgstextpreview.h include/qgis/qgstextrenderer.h -include/qgis/qgstextrenderer_p.h include/qgis/qgsthreadingutils.h include/qgis/qgsticksscalebarrenderer.h include/qgis/qgstilecache.h @@ -1111,10 +1172,12 @@ include/qgis/qgsvectorlayerexporter.h include/qgis/qgsvectorlayerfeaturecounter.h include/qgis/qgsvectorlayerfeatureiterator.h +include/qgis/qgsvectorlayerfeaturepool.h include/qgis/qgsvectorlayerjoinbuffer.h include/qgis/qgsvectorlayerjoininfo.h include/qgis/qgsvectorlayerlabeling.h include/qgis/qgsvectorlayerlabelprovider.h +include/qgis/qgsvectorlayerref.h include/qgis/qgsvectorlayerrenderer.h include/qgis/qgsvectorlayersaveasdialog.h include/qgis/qgsvectorlayerselectionmanager.h @@ -1129,9 +1192,9 @@ include/qgis/qgsvirtuallayerdefinitionutils.h include/qgis/qgsvirtuallayertask.h include/qgis/qgsvscrollarea.h +include/qgis/qgsweakrelation.h include/qgis/qgswebpage.h include/qgis/qgswebview.h -include/qgis/qgswidgetstatehelper_p.h include/qgis/qgswidgetwrapper.h include/qgis/qgswindow3dengine.h include/qgis/qgswindowmanagerinterface.h @@ -1141,6 +1204,8 @@ include/qgis/qgsziputils.h include/qgis/qgszonalstatistics.h include/qgis/qobjectuniqueptr.h +include/qgis/ui_qgsadvanceddigitizingdockwidgetbase.h +include/qgis/ui_qgsadvanceddigitizingfloaterbase.h include/qgis/ui_qgsarcgisservicesourceselectbase.h include/qgis/ui_qgsauthauthoritieseditor.h include/qgis/ui_qgsauthcertificateinfo.h @@ -1164,15 +1229,28 @@ include/qgis/ui_qgsauthtrustedcasdialog.h include/qgis/ui_qgscredentialdialog.h include/qgis/ui_qgsdetaileditemwidgetbase.h +include/qgis/ui_qgseffectstackpropertieswidgetbase.h include/qgis/ui_qgsexpressionbuilder.h include/qgis/ui_qgsexpressionbuilderdialogbase.h include/qgis/ui_qgsexpressionselectiondialogbase.h +include/qgis/ui_qgsexpressionstoredialogbase.h +include/qgis/ui_qgsfeaturefilterwidget.h include/qgis/ui_qgsgenericprojectionselectorbase.h +include/qgis/ui_qgslayoutguidewidgetbase.h +include/qgis/ui_qgslayoutimageexportoptions.h +include/qgis/ui_qgslayoutitemwidgetbase.h +include/qgis/ui_qgslayoutnewpagedialog.h +include/qgis/ui_qgslayoutpagepropertieswidget.h +include/qgis/ui_qgslayoutwidgetbase.h include/qgis/ui_qgsmessagelogviewer.h include/qgis/ui_qgsmessageviewer.h include/qgis/ui_qgsowssourceselectbase.h +include/qgis/ui_qgspdfexportoptions.h include/qgis/ui_qgsprojectionselectorbase.h include/qgis/ui_qgsquerybuilderbase.h +include/qgis/ui_qgsrasterlayerpropertiesbase.h +include/qgis/ui_qgsrenderercontainerbase.h +include/qgis/ui_qgsrendererpropsdialogbase.h include/qgis/ui_qgssqlcomposerdialogbase.h include/qgis/ui_qgssublayersdialogbase.h include/qgis/ui_qgstablewidgetuibase.h @@ -1226,6 +1304,7 @@ lib/qgis/plugins/libpkcs12authmethod.so lib/qgis/plugins/libpkipathsauthmethod.so lib/qgis/plugins/libpostgresprovider.so +lib/qgis/plugins/libpostgresrasterprovider.so lib/qgis/plugins/libspatialiteprovider.so lib/qgis/plugins/libtopolplugin.so lib/qgis/plugins/libvirtuallayerprovider.so @@ -1235,12 +1314,12 @@ %%SERVER%%lib/qgis/server/libdummy.so %%SERVER%%lib/qgis/server/libwcs.so %%SERVER%%lib/qgis/server/libwfs.so -lib/qgis/server/libwfs3.so +%%SERVER%%lib/qgis/server/libwfs3.so %%SERVER%%lib/qgis/server/libwms.so %%SERVER%%lib/qgis/server/libwmts.so %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so %%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.%%DISTVERSION%% -%%QT_PLUGINDIR%%/sqldrivers/libqsqlspatialite.so +%%SERVER%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlspatialite.so man/man1/qgis.1.gz share/applications/org.qgis.qgis.desktop share/icons/hicolor/128x128/apps/qgis.png @@ -1353,6 +1432,8 @@ %%DATADIR%%/doc/INSTALL %%DATADIR%%/doc/INSTALL.html %%DATADIR%%/doc/LICENSE +%%DATADIR%%/doc/NEWS +%%DATADIR%%/doc/NEWS.html %%DATADIR%%/doc/SPONSORS %%DATADIR%%/doc/TRANSLATORS %%DATADIR%%/doc/developersmap.html @@ -1394,8 +1475,6 @@ %%DATADIR%%/doc/images/projects/thumbnails/f6379f3083e612fd47917e1f948d795b6951dde9.png.200x100_q85.png %%DATADIR%%/doc/images/qgis-icon-60x60.png %%DATADIR%%/doc/index.html -%%DATADIR%%/doc/news -%%DATADIR%%/doc/news.html %%DATADIR%%/doc/nohelp.html %%DATADIR%%/doc/style.css %%GRASS%%%%DATADIR%%/grass/locations.gml @@ -2478,34 +2557,43 @@ %%DATADIR%%/i18n/qgis_et.qm %%DATADIR%%/i18n/qgis_eu.qm %%DATADIR%%/i18n/qgis_fi.qm +%%DATADIR%%/i18n/qgis_fr.qm %%DATADIR%%/i18n/qgis_gl.qm -%%DATADIR%%/i18n/qgis_hi.qm %%DATADIR%%/i18n/qgis_hu.qm -%%DATADIR%%/i18n/qgis_id.qm %%DATADIR%%/i18n/qgis_is.qm %%DATADIR%%/i18n/qgis_it.qm %%DATADIR%%/i18n/qgis_ja.qm %%DATADIR%%/i18n/qgis_ko.qm %%DATADIR%%/i18n/qgis_ky.qm %%DATADIR%%/i18n/qgis_lt.qm -%%DATADIR%%/i18n/qgis_lv.qm %%DATADIR%%/i18n/qgis_nb.qm %%DATADIR%%/i18n/qgis_nl.qm %%DATADIR%%/i18n/qgis_pl.qm %%DATADIR%%/i18n/qgis_pt_BR.qm +%%DATADIR%%/i18n/qgis_pt_PT.qm %%DATADIR%%/i18n/qgis_ro.qm %%DATADIR%%/i18n/qgis_ru.qm %%DATADIR%%/i18n/qgis_sl.qm +%%DATADIR%%/i18n/qgis_sv.qm %%DATADIR%%/i18n/qgis_tr.qm %%DATADIR%%/i18n/qgis_uk.qm %%DATADIR%%/i18n/qgis_vi.qm %%DATADIR%%/i18n/qgis_zh-Hans.qm +%%DATADIR%%/i18n/qgis_zh-Hant.qm %%DATADIR%%/images/icons/qbrowser-icon.png %%DATADIR%%/images/icons/qgis-icon-16x16.png %%DATADIR%%/images/icons/qgis-icon-512x512.png %%DATADIR%%/images/icons/qgis-icon-60x60.png %%DATADIR%%/images/icons/qgis-icon-macos.png %%DATADIR%%/images/icons/qgis-mime-icon.png +%%DATADIR%%/images/icons/sponsor_medals/2010/bronze_medal_2010.png +%%DATADIR%%/images/icons/sponsor_medals/2010/gold_medal_2010.png +%%DATADIR%%/images/icons/sponsor_medals/2010/platin_medal_2010.png +%%DATADIR%%/images/icons/sponsor_medals/2010/silver_medal_2010.png +%%DATADIR%%/images/icons/sponsor_medals/2011/bronze_medal_2011.png +%%DATADIR%%/images/icons/sponsor_medals/2011/gold_medal_2011.png +%%DATADIR%%/images/icons/sponsor_medals/2011/platin_medal_2011.png +%%DATADIR%%/images/icons/sponsor_medals/2011/silver_medal_2011.png %%DATADIR%%/python/console/__init__.py %%DATADIR%%/python/console/console.py %%DATADIR%%/python/console/console_compile_apis.py @@ -2650,6 +2738,7 @@ %%DATADIR%%/python/plugins/processing/algs/gdal/ClipVectorByExtent.py %%DATADIR%%/python/plugins/processing/algs/gdal/ClipVectorByMask.py %%DATADIR%%/python/plugins/processing/algs/gdal/ColorRelief.py +%%DATADIR%%/python/plugins/processing/algs/gdal/Datasources2Vrt.py %%DATADIR%%/python/plugins/processing/algs/gdal/Dissolve.py %%DATADIR%%/python/plugins/processing/algs/gdal/ExecuteSql.py %%DATADIR%%/python/plugins/processing/algs/gdal/GdalAlgorithm.py @@ -2703,6 +2792,7 @@ %%DATADIR%%/python/plugins/processing/algs/gdal/tri.py %%DATADIR%%/python/plugins/processing/algs/gdal/ui/RasterOptionsWidget.py %%DATADIR%%/python/plugins/processing/algs/gdal/ui/__init__.py +%%DATADIR%%/python/plugins/processing/algs/gdal/viewshed.py %%DATADIR%%/python/plugins/processing/algs/gdal/warp.py %%DATADIR%%/python/plugins/processing/algs/grass7/Grass7Algorithm.py %%DATADIR%%/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py @@ -3118,9 +3208,7 @@ %%DATADIR%%/python/plugins/processing/algs/otb/OtbChoiceWidget.py %%DATADIR%%/python/plugins/processing/algs/otb/OtbUtils.py %%DATADIR%%/python/plugins/processing/algs/otb/__init__.py -%%DATADIR%%/python/plugins/processing/algs/qgis/AddTableField.py %%DATADIR%%/python/plugins/processing/algs/qgis/Aggregate.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Aspect.py %%DATADIR%%/python/plugins/processing/algs/qgis/BarPlot.py %%DATADIR%%/python/plugins/processing/algs/qgis/BasicStatistics.py %%DATADIR%%/python/plugins/processing/algs/qgis/BoxPlot.py @@ -3128,28 +3216,18 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/CheckValidity.py %%DATADIR%%/python/plugins/processing/algs/qgis/Climb.py %%DATADIR%%/python/plugins/processing/algs/qgis/ConcaveHull.py -%%DATADIR%%/python/plugins/processing/algs/qgis/CreateAttributeIndex.py -%%DATADIR%%/python/plugins/processing/algs/qgis/CreateConstantRaster.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Datasources2Vrt.py %%DATADIR%%/python/plugins/processing/algs/qgis/DefineProjection.py %%DATADIR%%/python/plugins/processing/algs/qgis/Delaunay.py %%DATADIR%%/python/plugins/processing/algs/qgis/DeleteColumn.py -%%DATADIR%%/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py -%%DATADIR%%/python/plugins/processing/algs/qgis/DensifyGeometries.py %%DATADIR%%/python/plugins/processing/algs/qgis/EliminateSelection.py %%DATADIR%%/python/plugins/processing/algs/qgis/ExecuteSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py -%%DATADIR%%/python/plugins/processing/algs/qgis/ExtentFromLayer.py -%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractSpecificVertices.py %%DATADIR%%/python/plugins/processing/algs/qgis/FieldPyculator.py %%DATADIR%%/python/plugins/processing/algs/qgis/FieldsCalculator.py %%DATADIR%%/python/plugins/processing/algs/qgis/FieldsMapper.py %%DATADIR%%/python/plugins/processing/algs/qgis/FindProjection.py -%%DATADIR%%/python/plugins/processing/algs/qgis/GeometryByExpression.py %%DATADIR%%/python/plugins/processing/algs/qgis/GeometryConvert.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Grid.py %%DATADIR%%/python/plugins/processing/algs/qgis/Heatmap.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Hillshade.py %%DATADIR%%/python/plugins/processing/algs/qgis/HubDistanceLines.py %%DATADIR%%/python/plugins/processing/algs/qgis/HubDistancePoints.py %%DATADIR%%/python/plugins/processing/algs/qgis/HypsometricCurves.py @@ -3161,62 +3239,40 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/LinesToPolygons.py %%DATADIR%%/python/plugins/processing/algs/qgis/MeanAndStdDevPlot.py %%DATADIR%%/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py -%%DATADIR%%/python/plugins/processing/algs/qgis/NearestNeighbourAnalysis.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Orthogonalize.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointDistance.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointsDisplacement.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointsFromLines.py -%%DATADIR%%/python/plugins/processing/algs/qgis/PointsFromPolygons.py -%%DATADIR%%/python/plugins/processing/algs/qgis/PointsInPolygon.py -%%DATADIR%%/python/plugins/processing/algs/qgis/PointsLayerFromTable.py %%DATADIR%%/python/plugins/processing/algs/qgis/PointsToPaths.py %%DATADIR%%/python/plugins/processing/algs/qgis/PolarPlot.py -%%DATADIR%%/python/plugins/processing/algs/qgis/PoleOfInaccessibility.py %%DATADIR%%/python/plugins/processing/algs/qgis/Polygonize.py %%DATADIR%%/python/plugins/processing/algs/qgis/PostGISExecuteAndLoadSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/PostGISExecuteSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/QgisAlgorithm.py %%DATADIR%%/python/plugins/processing/algs/qgis/QgisAlgorithmProvider.py -%%DATADIR%%/python/plugins/processing/algs/qgis/RandomExtract.py %%DATADIR%%/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py %%DATADIR%%/python/plugins/processing/algs/qgis/RandomPointsAlongLines.py -%%DATADIR%%/python/plugins/processing/algs/qgis/RandomPointsExtent.py %%DATADIR%%/python/plugins/processing/algs/qgis/RandomPointsLayer.py %%DATADIR%%/python/plugins/processing/algs/qgis/RandomPointsPolygons.py %%DATADIR%%/python/plugins/processing/algs/qgis/RandomSelection.py %%DATADIR%%/python/plugins/processing/algs/qgis/RandomSelectionWithinSubsets.py %%DATADIR%%/python/plugins/processing/algs/qgis/RasterCalculator.py %%DATADIR%%/python/plugins/processing/algs/qgis/RasterLayerHistogram.py -%%DATADIR%%/python/plugins/processing/algs/qgis/RasterLayerStatistics.py %%DATADIR%%/python/plugins/processing/algs/qgis/RasterSampling.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Rasterize.py -%%DATADIR%%/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py %%DATADIR%%/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py %%DATADIR%%/python/plugins/processing/algs/qgis/RegularPoints.py %%DATADIR%%/python/plugins/processing/algs/qgis/Relief.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Ruggedness.py %%DATADIR%%/python/plugins/processing/algs/qgis/SelectByAttribute.py %%DATADIR%%/python/plugins/processing/algs/qgis/SelectByExpression.py -%%DATADIR%%/python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py -%%DATADIR%%/python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py -%%DATADIR%%/python/plugins/processing/algs/qgis/SetMValue.py %%DATADIR%%/python/plugins/processing/algs/qgis/SetRasterStyle.py %%DATADIR%%/python/plugins/processing/algs/qgis/SetVectorStyle.py -%%DATADIR%%/python/plugins/processing/algs/qgis/SetZValue.py -%%DATADIR%%/python/plugins/processing/algs/qgis/SingleSidedBuffer.py -%%DATADIR%%/python/plugins/processing/algs/qgis/Slope.py %%DATADIR%%/python/plugins/processing/algs/qgis/SnapGeometries.py -%%DATADIR%%/python/plugins/processing/algs/qgis/SpatialIndex.py -%%DATADIR%%/python/plugins/processing/algs/qgis/SpatialJoin.py %%DATADIR%%/python/plugins/processing/algs/qgis/SpatialJoinSummary.py %%DATADIR%%/python/plugins/processing/algs/qgis/SpatialiteExecuteSQL.py %%DATADIR%%/python/plugins/processing/algs/qgis/StatisticsByCategories.py -%%DATADIR%%/python/plugins/processing/algs/qgis/SumLines.py %%DATADIR%%/python/plugins/processing/algs/qgis/TextToFloat.py %%DATADIR%%/python/plugins/processing/algs/qgis/TilesXYZ.py %%DATADIR%%/python/plugins/processing/algs/qgis/TinInterpolation.py %%DATADIR%%/python/plugins/processing/algs/qgis/TopoColors.py -%%DATADIR%%/python/plugins/processing/algs/qgis/TruncateTable.py %%DATADIR%%/python/plugins/processing/algs/qgis/UniqueValues.py %%DATADIR%%/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py %%DATADIR%%/python/plugins/processing/algs/qgis/VectorLayerHistogram.py @@ -3224,7 +3280,6 @@ %%DATADIR%%/python/plugins/processing/algs/qgis/VectorLayerScatterplot3D.py %%DATADIR%%/python/plugins/processing/algs/qgis/VectorSplit.py %%DATADIR%%/python/plugins/processing/algs/qgis/VoronoiPolygons.py -%%DATADIR%%/python/plugins/processing/algs/qgis/ZonalStatistics.py %%DATADIR%%/python/plugins/processing/algs/qgis/__init__.py %%DATADIR%%/python/plugins/processing/algs/qgis/ui/AddNewExpressionDialog.ui %%DATADIR%%/python/plugins/processing/algs/qgis/ui/AggregatesPanel.py @@ -3454,7 +3509,6 @@ %%DATADIR%%/python/plugins/processing/algs/saga/description/MetricConversions.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/MinimumDistanceAnalysis.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/MirrorGrid.txt -%%DATADIR%%/python/plugins/processing/algs/saga/description/ModifedQuadraticShepard.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/ModifiedQuadraticShepard.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(OpenCV).txt @@ -3516,6 +3570,9 @@ %%DATADIR%%/python/plugins/processing/algs/saga/description/RankFilter.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/RealSurfaceArea.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/ReclassifyGridValues.txt +%%DATADIR%%/python/plugins/processing/algs/saga/description/ReclassifyGridValuesRange.txt +%%DATADIR%%/python/plugins/processing/algs/saga/description/ReclassifyGridValuesSingle.txt +%%DATADIR%%/python/plugins/processing/algs/saga/description/ReclassifyGridValuesTable.txt %%DATADIR%%/python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsGrid).txt %%DATADIR%%/python/plugins/processing/algs/saga/description/RegressionAnalysis(PointsandPredictorGrid).txt %%DATADIR%%/python/plugins/processing/algs/saga/description/RegressionKriging.txt @@ -3679,7 +3736,6 @@ %%DATADIR%%/python/plugins/processing/gui/matrixmodelerwidget.py %%DATADIR%%/python/plugins/processing/gui/menus.py %%DATADIR%%/python/plugins/processing/gui/wrappers.py -%%DATADIR%%/python/plugins/processing/gui/wrappers_map_theme.py %%DATADIR%%/python/plugins/processing/gui/wrappers_postgis.py %%DATADIR%%/python/plugins/processing/images/delete.svg %%DATADIR%%/python/plugins/processing/images/dem.png @@ -3765,7 +3821,7 @@ %%DATADIR%%/python/plugins/processing/tests/OtbAlgorithmsTest.py %%DATADIR%%/python/plugins/processing/tests/ProcessingGeneralTest.py %%DATADIR%%/python/plugins/processing/tests/ProjectProvider.py -%%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest.py +%%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest1.py %%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest2.py %%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest3.py %%DATADIR%%/python/plugins/processing/tests/QgisAlgorithmsTest4.py @@ -3855,7 +3911,6 @@ %%DATADIR%%/python/qgis/core/additions/__init__.py %%DATADIR%%/python/qgis/core/additions/edit.py %%DATADIR%%/python/qgis/core/additions/fromfunction.py -%%DATADIR%%/python/qgis/core/additions/markerlinesymbollayer.py %%DATADIR%%/python/qgis/core/additions/metaenum.py %%DATADIR%%/python/qgis/core/additions/processing.py %%DATADIR%%/python/qgis/core/additions/projectdirtyblocker.py @@ -5101,21 +5156,21 @@ %%DATADIR%%/resources/palettes/new_layer_colors.gpl %%DATADIR%%/resources/qgis.db %%DATADIR%%/resources/qgis_global_settings.ini -%%DATADIR%%/resources/server/api/ogc/schema.json -%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.css -%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.js -%%DATADIR%%/resources/server/api/ogc/static/style.css -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollection.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollections.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/footer.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getApiDescription.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeature.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeatures.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getLandingPage.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getRequirementClasses.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/header.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/leaflet_map.html -%%DATADIR%%/resources/server/api/ogc/templates/wfs3/links.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/schema.json +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.css +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/jsonFormatter.min.js +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/static/style.css +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollection.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/describeCollections.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/footer.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getApiDescription.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeature.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getFeatures.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getLandingPage.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/getRequirementClasses.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/header.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/leaflet_map.html +%%SERVER%%%%DATADIR%%/resources/server/api/ogc/templates/wfs3/links.html %%SERVER%%%%DATADIR%%/resources/server/schemaExtension.xsd %%DATADIR%%/resources/spatialite.db %%DATADIR%%/resources/srs.db Index: math/saga/Makefile =================================================================== --- math/saga/Makefile +++ math/saga/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= saga -PORTVERSION= 7.5.0 -PORTREVISION= 2 +PORTVERSION= 7.6.2 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -24,6 +23,7 @@ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv-core \ libopencv_ml.so:graphics/opencv \ + libpdal_base.so:math/pdal \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libtbb.so:devel/tbb \ @@ -33,7 +33,7 @@ USES= autoreconf compiler:c++11-lib dos2unix gnome \ iconv:wchar_t libtool localbase pkgconfig python USE_LDCONFIG= yes -USE_WX= 3.1+ +USE_WX= 3.0+ CONFIGURE_ARGS= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ --enable-python --with-system-svm @@ -56,7 +56,7 @@ VIGRA_DESC= Enable 'Vision with Generic Algorithms' Library OPENMP_CONFIGURE_ENABLE= openmp -PGSQL_CONFIGURE_WITH= pg +PGSQL_CONFIGURE_WITH= postgresql PGSQL_USES= pgsql VIGRA_BUILD_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra VIGRA_RUN_DEPENDS= ${LOCALBASE}/lib/libvigraimpex.so:graphics/vigra @@ -84,6 +84,7 @@ ${WRKSRC}/src/tools/io/io_grid_image/Makefile.am \ ${WRKSRC}/src/tools/io/io_shapes/Makefile.am \ ${WRKSRC}/src/tools/io/io_virtual/Makefile.am \ + ${WRKSRC}/src/tools/io/io_webservices/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_tools/Makefile.am \ ${WRKSRC}/src/tools/pointcloud/pointcloud_viewer/Makefile.am \ ${WRKSRC}/src/tools/statistics/statistics_kriging/Makefile.am \ Index: math/saga/distinfo =================================================================== --- math/saga/distinfo +++ math/saga/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578949425 -SHA256 (saga-7.5.0.tar.gz) = d95c1cba60586916608fd6b262bf75a795a47d6a9b44c2c59a9477015049a168 -SIZE (saga-7.5.0.tar.gz) = 4994149 +TIMESTAMP = 1584819828 +SHA256 (saga-7.6.2.tar.gz) = a02e9f0e605ad7bc1e73513c4bc76d7786e62a4844e10984f1027b559faa4526 +SIZE (saga-7.6.2.tar.gz) = 5019078 Index: math/saga/files/patch-configure.ac =================================================================== --- math/saga/files/patch-configure.ac +++ math/saga/files/patch-configure.ac @@ -1,4 +1,4 @@ ---- configure.ac.orig 2019-04-09 17:14:15 UTC +--- configure.ac.orig 2020-02-09 11:18:36 UTC +++ configure.ac @@ -20,7 +20,7 @@ AC_PROG_LIBTOOL AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,) @@ -6,10 +6,10 @@ AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,) -AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,) +AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,) + AC_CHECK_LIB([pdal], [versionString], PDALFOUND=1,,) AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,) AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC \(libodbc\) library not found]) - # PROJ4 has projects.h and old API function: -@@ -30,8 +30,8 @@ AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h] +@@ -31,8 +31,8 @@ AC_CHECK_HEADER([projects.h],[AC_CHECK_HEADER([proj.h] # PROJ6 has dropped projects.h in favour of proj.h and has new API function: AC_CHECK_HEADER([proj.h],[AC_CHECK_LIB([proj], [proj_info], PROJ6FOUND=1,,)]) AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,) @@ -20,3 +20,12 @@ PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0]) PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0) LIBCURL_CHECK_CONFIG([yes], [7.7.2],,) +@@ -168,7 +168,7 @@ AC_ARG_ENABLE(openmp, + else + if test -n "$GOMPFOUND" ; then + AC_MSG_RESULT([ Building with OpenMP support using libgomp]) +- GOMPFLAGS="-fopenmp -lgomp" ++ GOMPFLAGS="-fopenmp -lomp" + else + AC_MSG_RESULT([ libgomp not found, OpenMP support disabled]) + GOMPFLAGS="" Index: math/saga/pkg-plist =================================================================== --- math/saga/pkg-plist +++ math/saga/pkg-plist @@ -75,6 +75,7 @@ lib/saga/libio_shapes_las.so lib/saga/libio_table.so lib/saga/libio_virtual.so +lib/saga/libio_webservices.so lib/saga/libpj_georeference.so lib/saga/libpj_proj4.so lib/saga/libpointcloud_tools.so