--- qgis/Makefile 2019-03-17 07:56:58.561613000 +0100 +++ qgis/Makefile 2019-04-03 15:43:08.067418000 +0200 @@ -3,8 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_6_0 -PORTREVISION= 5 +DISTVERSION= 3_6_1 CATEGORIES= graphics geography MAINTAINER= rhurlin@gwdg.de @@ -84,7 +83,8 @@ 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 @@ -110,7 +110,7 @@ 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 --- qgis/distinfo 2019-02-27 18:19:20.228524000 +0100 +++ qgis/distinfo 2019-04-03 15:47:48.216461000 +0200 @@ -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 --- qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py 2019-01-16 08:12:08.875136000 +0100 +++ qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py 2019-03-02 10:48:33.702697000 +0100 @@ -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) --- qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py 2019-01-16 08:12:08.875342000 +0100 +++ qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py 1970-01-01 01:00:00.000000000 +0100 @@ -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() --- qgis/files/patch-src_app_main.cpp 2019-01-16 08:12:08.875538000 +0100 +++ qgis/files/patch-src_app_main.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -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