Index: head/graphics/qgis/Makefile =================================================================== --- head/graphics/qgis/Makefile (revision 498379) +++ head/graphics/qgis/Makefile (revision 498380) @@ -1,143 +1,143 @@ # Created by: Laurent Courty # $FreeBSD$ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_6_0 -PORTREVISION= 5 +DISTVERSION= 3_6_1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de COMMENT= Free and Open Source Geographic Information System LICENSE= GPLv2 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.7.3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ libgeos.so:graphics/geos \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf \ libproj.so:graphics/proj \ libqca-qt5.so:devel/qca \ libqjson-qt5.so:devel/qjson \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libqt5keychain.so:security/qtkeychain \ libqwt6.so:x11-toolkits/qwt6 \ libspatialindex.so:devel/spatialindex \ libspatialite.so:databases/spatialite \ libxerces-c.so:textproc/xerces-c3 \ libzip.so:archivers/libzip ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features cpe desktop-file-utils \ fortran gmake pgsql pyqt:5 python:3.6+ qt:5 shebangfix \ sqlite:3 USE_QT= 3d buildtools_build core concurrent dbus declarative \ designer doc gui linguist_build location network \ printsupport qmake_build script serialport \ sql sql-pgsql sql-sqlite3 svg testlib uitools \ webengine widgets webkit xml -USE_PYQT= core gui network qml qscintilla2 sip sql svg xml webkit_run +USE_PYQT= core gui network qml qscintilla2 sip sql svg xml \ + webkit_run webkitwidgets_run USE_LDCONFIG= yes CONFLICTS_INSTALL= qgis-ltr USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so CMAKE_ON= BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \ WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS .endif SHEBANG_FILES= src/plugins/grass/scripts/*.py OPTIONS_DEFINE= GRASS SERVER -OPTIONS_DEFAULT= GRASS +OPTIONS_DEFAULT= GRASS SERVER NO_OPTIONS_SORT= yes OPTIONS_SUB= yes SERVER_DESC= Enable QGIS server 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 PLIST_SUB= DISTVERSION=${PORTVERSION} post-patch: @${REINPLACE_CMD} -e 's|markupsafe ||g' \ ${WRKSRC}/python/ext-libs/CMakeLists.txt pre-configure: ${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3 post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak @${RM} /tmp/srs.db check: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Index: head/graphics/qgis/distinfo =================================================================== --- head/graphics/qgis/distinfo (revision 498379) +++ head/graphics/qgis/distinfo (revision 498380) @@ -1,3 +1,3 @@ -TIMESTAMP = 1550852779 -SHA256 (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 4e50a3ea3bd4b38b6255c0ca6533528c5507863e9bcb50491e5f6038ebe15d9b -SIZE (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 92695815 +TIMESTAMP = 1554299268 +SHA256 (qgis-QGIS-final-3_6_1_GH0.tar.gz) = e5d891c5d00f3fbfa2a251d4916ce8e2be51534fde23cec5e68f4a351d27b0d3 +SIZE (qgis-QGIS-final-3_6_1_GH0.tar.gz) = 93023810 Index: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py =================================================================== --- head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py (revision 498379) +++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py (nonexistent) @@ -1,55 +0,0 @@ ---- python/plugins/processing/algs/saga/SagaUtils.py.orig 2018-11-23 12:08:36 UTC -+++ python/plugins/processing/algs/saga/SagaUtils.py -@@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya' - __revision__ = '564579199220ae06abd248f0dc80b7ff57b80128' - - import os -+import platform - import stat - import subprocess - import time -@@ -59,7 +60,7 @@ def sagaBatchJobFilename(): - - def findSagaFolder(): - folder = None -- if isMac(): -+ if isMac() or platform.system() == 'FreeBSD': - testfolder = os.path.join(QgsApplication.prefixPath(), 'bin') - if os.path.exists(os.path.join(testfolder, 'saga_cmd')): - folder = testfolder -@@ -84,7 +85,7 @@ def findSagaFolder(): - - - def sagaPath(): -- if not isWindows() and not isMac(): -+ if not isWindows() and not isMac() and not platform.system() == 'FreeBSD': - return '' - - folder = findSagaFolder() -@@ -102,7 +103,7 @@ def createSagaBatchJobFileFromSagaCommands(commands): - fout.write('set SAGA=' + sagaPath() + '\n') - fout.write('set SAGA_MLB=' + os.path.join(sagaPath(), 'modules') + '\n') - fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n') -- elif isMac(): -+ elif isMac() or platform.system() == 'FreeBSD': - fout.write('export SAGA_MLB=' + os.path.join(sagaPath(), '../lib/saga') + '\n') - fout.write('export PATH=' + sagaPath() + ':$PATH\n') - else: -@@ -129,7 +130,7 @@ def getInstalledVersion(runSaga=False): - - if isWindows(): - commands = [os.path.join(sagaPath(), "saga_cmd.exe"), "-v"] -- elif isMac(): -+ elif isMac() or platform.system() == 'FreeBSD': - commands = [os.path.join(sagaPath(), "saga_cmd -v")] - else: - # for Linux use just one string instead of separated parameters as the list -@@ -145,7 +146,7 @@ def getInstalledVersion(runSaga=False): - stderr=subprocess.STDOUT, - universal_newlines=True, - ) as proc: -- if isMac(): # This trick avoids having an uninterrupted system call exception if SAGA is not installed -+ if isMac() or platform.system() == 'FreeBSD': # This trick avoids having an uninterrupted system call exception if SAGA is not installed - time.sleep(1) - try: - lines = proc.stdout.readlines() Property changes on: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/qgis/files/patch-src_app_main.cpp =================================================================== --- head/graphics/qgis/files/patch-src_app_main.cpp (revision 498379) +++ head/graphics/qgis/files/patch-src_app_main.cpp (nonexistent) @@ -1,20 +0,0 @@ ---- src/app/main.cpp.orig 2018-11-23 12:08:36 UTC -+++ src/app/main.cpp -@@ -1025,7 +1025,7 @@ int main( int argc, char *argv[] ) - QCoreApplication::addLibraryPath( QApplication::applicationDirPath() - + QDir::separator() + "qtplugins" ); - #endif --#ifdef Q_OS_MAC -+#if defined(Q_OS_MAC) || defined(Q_OS_UNIX) - // Resulting libraryPaths has critical QGIS plugin paths first, then any Qt plugin paths, then - // any dev-defined paths (in app's qt.conf) and/or user-defined paths (QT_PLUGIN_PATH env var). - // -@@ -1033,7 +1033,7 @@ int main( int argc, char *argv[] ) - // built against a different Qt/QGIS, while still allowing custom C++ plugins to load. - QStringList libPaths( QCoreApplication::libraryPaths() ); - -- QgsDebugMsgLevel( QStringLiteral( "Initial macOS QCoreApplication::libraryPaths: %1" ) -+ QgsDebugMsgLevel( QStringLiteral( "Initial macOS or UNIX QCoreApplication::libraryPaths: %1" ) - .arg( libPaths.join( " " ) ), 4 ); - - // Strip all critical paths that should always be prepended Property changes on: head/graphics/qgis/files/patch-src_app_main.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py =================================================================== --- head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py (revision 498379) +++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py (revision 498380) @@ -1,11 +1,20 @@ ---- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2018-11-23 12:08:36 UTC +--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2019-03-02 02:07:46 UTC +++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py +@@ -82,7 +82,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 >= REQUIRED_VERSION: + return True + return False + @@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider): self.tr('Processing'), Qgis.Critical) return - if not version.startswith(REQUIRED_VERSION): -+ if version < '2.3': ++ if version < REQUIRED_VERSION: QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION), self.tr('Processing'), Qgis.Critical)