From owner-svn-ports-head@freebsd.org Mon Apr 8 16:02:42 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CDCF015526B4; Mon, 8 Apr 2019 16:02:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6891777667; Mon, 8 Apr 2019 16:02:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A6B725A7E; Mon, 8 Apr 2019 16:02:41 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x38G2fou078168; Mon, 8 Apr 2019 16:02:41 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x38G2eU7078165; Mon, 8 Apr 2019 16:02:40 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201904081602.x38G2eU7078165@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 8 Apr 2019 16:02:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498380 - in head/graphics/qgis: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/graphics/qgis: . files X-SVN-Commit-Revision: 498380 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 6891777667 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.959,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Apr 2019 16:02:42 -0000 Author: swills Date: Mon Apr 8 16:02:40 2019 New Revision: 498380 URL: https://svnweb.freebsd.org/changeset/ports/498380 Log: graphics/qgis: Update to 3.6.1 PR: 237025 Submitted by: Rainer Hurling (maintainer) Deleted: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaUtils.py head/graphics/qgis/files/patch-src_app_main.cpp Modified: head/graphics/qgis/Makefile (contents, props changed) head/graphics/qgis/distinfo (contents, props changed) head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py (contents, props changed) Modified: head/graphics/qgis/Makefile ============================================================================== --- head/graphics/qgis/Makefile Mon Apr 8 15:30:20 2019 (r498379) +++ head/graphics/qgis/Makefile Mon Apr 8 16:02:40 2019 (r498380) @@ -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 @@ USE_QT= 3d buildtools_build core concurrent dbus decl 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 @@ CMAKE_OFF+= SUPPRESS_QT_WARNINGS 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 Modified: head/graphics/qgis/distinfo ============================================================================== --- head/graphics/qgis/distinfo Mon Apr 8 15:30:20 2019 (r498379) +++ head/graphics/qgis/distinfo Mon Apr 8 16:02:40 2019 (r498380) @@ -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 Modified: head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py ============================================================================== --- head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Mon Apr 8 15:30:20 2019 (r498379) +++ head/graphics/qgis/files/patch-python_plugins_processing_algs_saga_SagaAlgorithmProvider.py Mon Apr 8 16:02:40 2019 (r498380) @@ -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)