View | Details | Raw Unified | Return to bug 237025
Collapse All | Expand All

(-)qgis/Makefile (-4 / +4 lines)
Lines 3-10 Link Here
3
3
4
PORTNAME=	qgis
4
PORTNAME=	qgis
5
DISTVERSIONPREFIX=	final-
5
DISTVERSIONPREFIX=	final-
6
DISTVERSION=	3_6_0
6
DISTVERSION=	3_6_1
7
PORTREVISION=	5
8
CATEGORIES=	graphics geography
7
CATEGORIES=	graphics geography
9
8
10
MAINTAINER=	rhurlin@gwdg.de
9
MAINTAINER=	rhurlin@gwdg.de
Lines 84-90 Link Here
84
		printsupport qmake_build script serialport \
83
		printsupport qmake_build script serialport \
85
		sql sql-pgsql sql-sqlite3 svg testlib uitools \
84
		sql sql-pgsql sql-sqlite3 svg testlib uitools \
86
		webengine widgets webkit xml
85
		webengine widgets webkit xml
87
USE_PYQT=	core gui network qml qscintilla2 sip sql svg xml webkit_run
86
USE_PYQT=	core gui network qml qscintilla2 sip sql svg xml \
87
		webkit_run webkitwidgets_run
88
USE_LDCONFIG=	yes
88
USE_LDCONFIG=	yes
89
89
90
CONFLICTS_INSTALL=	qgis-ltr
90
CONFLICTS_INSTALL=	qgis-ltr
Lines 110-116 Link Here
110
SHEBANG_FILES=	src/plugins/grass/scripts/*.py
110
SHEBANG_FILES=	src/plugins/grass/scripts/*.py
111
111
112
OPTIONS_DEFINE=		GRASS SERVER
112
OPTIONS_DEFINE=		GRASS SERVER
113
OPTIONS_DEFAULT=	GRASS
113
OPTIONS_DEFAULT=	GRASS SERVER
114
NO_OPTIONS_SORT=	yes
114
NO_OPTIONS_SORT=	yes
115
115
116
OPTIONS_SUB=		yes
116
OPTIONS_SUB=		yes
(-)qgis/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1550852779
1
TIMESTAMP = 1554299268
2
SHA256 (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 4e50a3ea3bd4b38b6255c0ca6533528c5507863e9bcb50491e5f6038ebe15d9b
2
SHA256 (qgis-QGIS-final-3_6_1_GH0.tar.gz) = e5d891c5d00f3fbfa2a251d4916ce8e2be51534fde23cec5e68f4a351d27b0d3
3
SIZE (qgis-QGIS-final-3_6_0_GH0.tar.gz) = 92695815
3
SIZE (qgis-QGIS-final-3_6_1_GH0.tar.gz) = 93023810
(-)qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py (-2 / +11 lines)
Lines 1-11 Link Here
1
--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig	2018-11-23 12:08:36 UTC
1
--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig	2019-03-02 02:07:46 UTC
2
+++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
2
+++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
3
@@ -82,7 +82,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
4
 
5
     def canBeActivated(self):
6
         version = SagaUtils.getInstalledVersion(True)
7
-        if version is not None and version.startswith(REQUIRED_VERSION):
8
+        if version is not None and version >= REQUIRED_VERSION:
9
             return True
10
         return False
11
 
3
@@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
12
@@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
4
                                      self.tr('Processing'), Qgis.Critical)
13
                                      self.tr('Processing'), Qgis.Critical)
5
             return
14
             return
6
 
15
 
7
-        if not version.startswith(REQUIRED_VERSION):
16
-        if not version.startswith(REQUIRED_VERSION):
8
+        if version < '2.3':
17
+        if version < REQUIRED_VERSION:
9
             QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION),
18
             QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION),
10
                                      self.tr('Processing'),
19
                                      self.tr('Processing'),
11
                                      Qgis.Critical)
20
                                      Qgis.Critical)
(-)qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py (-55 lines)
Lines 1-55 Link Here
1
--- python/plugins/processing/algs/saga/SagaUtils.py.orig	2018-11-23 12:08:36 UTC
2
+++ python/plugins/processing/algs/saga/SagaUtils.py
3
@@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
4
 __revision__ = '564579199220ae06abd248f0dc80b7ff57b80128'
5
 
6
 import os
7
+import platform
8
 import stat
9
 import subprocess
10
 import time
11
@@ -59,7 +60,7 @@ def sagaBatchJobFilename():
12
 
13
 def findSagaFolder():
14
     folder = None
15
-    if isMac():
16
+    if isMac() or platform.system() == 'FreeBSD':
17
         testfolder = os.path.join(QgsApplication.prefixPath(), 'bin')
18
         if os.path.exists(os.path.join(testfolder, 'saga_cmd')):
19
             folder = testfolder
20
@@ -84,7 +85,7 @@ def findSagaFolder():
21
 
22
 
23
 def sagaPath():
24
-    if not isWindows() and not isMac():
25
+    if not isWindows() and not isMac() and not platform.system() == 'FreeBSD':
26
         return ''
27
 
28
     folder = findSagaFolder()
29
@@ -102,7 +103,7 @@ def createSagaBatchJobFileFromSagaCommands(commands):
30
             fout.write('set SAGA=' + sagaPath() + '\n')
31
             fout.write('set SAGA_MLB=' + os.path.join(sagaPath(), 'modules') + '\n')
32
             fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n')
33
-        elif isMac():
34
+        elif isMac() or platform.system() == 'FreeBSD':
35
             fout.write('export SAGA_MLB=' + os.path.join(sagaPath(), '../lib/saga') + '\n')
36
             fout.write('export PATH=' + sagaPath() + ':$PATH\n')
37
         else:
38
@@ -129,7 +130,7 @@ def getInstalledVersion(runSaga=False):
39
 
40
     if isWindows():
41
         commands = [os.path.join(sagaPath(), "saga_cmd.exe"), "-v"]
42
-    elif isMac():
43
+    elif isMac() or platform.system() == 'FreeBSD':
44
         commands = [os.path.join(sagaPath(), "saga_cmd -v")]
45
     else:
46
         # for Linux use just one string instead of separated parameters as the list
47
@@ -145,7 +146,7 @@ def getInstalledVersion(runSaga=False):
48
             stderr=subprocess.STDOUT,
49
             universal_newlines=True,
50
         ) as proc:
51
-            if isMac():  # This trick avoids having an uninterrupted system call exception if SAGA is not installed
52
+            if isMac() or platform.system() == 'FreeBSD':  # This trick avoids having an uninterrupted system call exception if SAGA is not installed
53
                 time.sleep(1)
54
             try:
55
                 lines = proc.stdout.readlines()
(-)qgis/files/patch-src_app_main.cpp (-20 lines)
Lines 1-20 Link Here
1
--- src/app/main.cpp.orig	2018-11-23 12:08:36 UTC
2
+++ src/app/main.cpp
3
@@ -1025,7 +1025,7 @@ int main( int argc, char *argv[] )
4
   QCoreApplication::addLibraryPath( QApplication::applicationDirPath()
5
                                     + QDir::separator() + "qtplugins" );
6
 #endif
7
-#ifdef Q_OS_MAC
8
+#if defined(Q_OS_MAC) || defined(Q_OS_UNIX)
9
   // Resulting libraryPaths has critical QGIS plugin paths first, then any Qt plugin paths, then
10
   // any dev-defined paths (in app's qt.conf) and/or user-defined paths (QT_PLUGIN_PATH env var).
11
   //
12
@@ -1033,7 +1033,7 @@ int main( int argc, char *argv[] )
13
   //       built against a different Qt/QGIS, while still allowing custom C++ plugins to load.
14
   QStringList libPaths( QCoreApplication::libraryPaths() );
15
 
16
-  QgsDebugMsgLevel( QStringLiteral( "Initial macOS QCoreApplication::libraryPaths: %1" )
17
+  QgsDebugMsgLevel( QStringLiteral( "Initial macOS or UNIX QCoreApplication::libraryPaths: %1" )
18
                     .arg( libPaths.join( " " ) ), 4 );
19
 
20
   // Strip all critical paths that should always be prepended

Return to bug 237025