mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-29 10:18:30 +00:00
Update to upstream version 2.18.14
PR: 223887 Submitted by: rhurlin@gwdg.de (maintainer)
This commit is contained in:
parent
456a8b4320
commit
a4b0e0582a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=455872
@ -3,8 +3,7 @@
|
||||
|
||||
PORTNAME= qgis
|
||||
DISTVERSIONPREFIX= final-
|
||||
DISTVERSION= 2_18_12
|
||||
PORTREVISION= 1
|
||||
DISTVERSION= 2_18_14
|
||||
CATEGORIES= graphics geography
|
||||
|
||||
MAINTAINER= rhurlin@gwdg.de
|
||||
@ -80,7 +79,7 @@ DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
GRASS_BUILD_DEPENDS= grass72:databases/grass7
|
||||
GRASS_RUN_DEPENDS= grass72:databases/grass7
|
||||
GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.1
|
||||
GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.2.2
|
||||
GRASS_FORCE_MAKE_JOBS= NO
|
||||
GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE
|
||||
|
||||
@ -107,6 +106,7 @@ PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY
|
||||
${PYTHON_PKGNAMEPREFIX}requests>=2.11.1:www/py-requests@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
|
||||
PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.0:devel/py-dateutil@${PY_FLAVOR} \
|
||||
@ -130,6 +130,7 @@ PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_F
|
||||
${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.13:databases/py-sqlite3@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common@${PY_FLAVOR} \
|
||||
${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR}
|
||||
PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE
|
||||
PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE
|
||||
@ -184,6 +185,7 @@ post-install:
|
||||
${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \
|
||||
${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
|
||||
.endfor
|
||||
${RM} /tmp/srs.db
|
||||
|
||||
check:
|
||||
(cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check)
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1503130352
|
||||
SHA256 (qgis-QGIS-final-2_18_12_GH0.tar.gz) = 154920b5c79f587589f04b9da6f52ddbb8b6acace61f665aa79f6681d5fb5346
|
||||
SIZE (qgis-QGIS-final-2_18_12_GH0.tar.gz) = 99289641
|
||||
TIMESTAMP = 1511094312
|
||||
SHA256 (qgis-QGIS-final-2_18_14_GH0.tar.gz) = f8912cddca6673b54fcbea8b418d877b51d7229ebd4caec07bdb5fbfda6851e4
|
||||
SIZE (qgis-QGIS-final-2_18_14_GH0.tar.gz) = 99324977
|
||||
|
@ -1,4 +1,4 @@
|
||||
--- debian/qgis.desktop.orig 2016-10-21 12:14:02 UTC
|
||||
--- debian/qgis.desktop.orig 2017-10-27 12:00:21 UTC
|
||||
+++ debian/qgis.desktop
|
||||
@@ -1,7 +1,9 @@
|
||||
[Desktop Entry]
|
||||
@ -10,3 +10,16 @@
|
||||
GenericName=Geographic Information System
|
||||
GenericName[ar]=نظام المعلومات الجغرافي
|
||||
GenericName[az]=Coğrafi informasiya sistemi
|
||||
@@ -47,9 +49,9 @@ GenericName[th]=ระบบสารสนเทศà¸
|
||||
GenericName[tr]=CoÄŸrafi bilgi sistemi
|
||||
GenericName[uk]=Геоінформаційна Ñ<EFBFBD>иÑ<EFBFBD>тема
|
||||
GenericName[uz]=Geografik axborot tizimi
|
||||
-Icon=qgis
|
||||
-TryExec=/usr/bin/qgis
|
||||
-Exec=/usr/bin/qgis %F
|
||||
+Icon=qgis-icon
|
||||
+TryExec=/usr/local/bin/qgis
|
||||
+Exec=/usr/local/bin/qgis %F
|
||||
Terminal=false
|
||||
StartupNotify=false
|
||||
Categories=Qt;Education;Science;Geography;
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2017-10-27 12:00:21 UTC
|
||||
+++ python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
|
||||
@@ -73,7 +73,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
|
||||
self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'))
|
||||
return
|
||||
|
||||
- if not version.startswith('2.3.'):
|
||||
+ if version < '2.3.':
|
||||
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
|
||||
self.tr('Problem with SAGA installation: unsupported SAGA version found.'))
|
||||
return
|
@ -0,0 +1,55 @@
|
||||
--- python/plugins/processing/algs/saga/SagaUtils.py.orig 2017-10-27 12:00:21 UTC
|
||||
+++ python/plugins/processing/algs/saga/SagaUtils.py
|
||||
@@ -26,6 +26,7 @@ __copyright__ = '(C) 2012, Victor Olaya'
|
||||
__revision__ = '$Format:%H$'
|
||||
|
||||
import os
|
||||
+import platform
|
||||
import stat
|
||||
import subprocess
|
||||
import time
|
||||
@@ -57,7 +58,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
|
||||
@@ -82,7 +83,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()
|
||||
@@ -101,7 +102,7 @@ def createSagaBatchJobFileFromSagaCommands(commands):
|
||||
fout.write('set SAGA_MLB=' + sagaPath() + os.sep +
|
||||
'modules' + '\n')
|
||||
fout.write('PATH=%PATH%;%SAGA%;%SAGA_MLB%\n')
|
||||
- elif isMac():
|
||||
+ elif isMac() or platform.system() == 'FreeBSD':
|
||||
fout.write('export SAGA_MLB=' + sagaPath() +
|
||||
'/../lib/saga\n')
|
||||
fout.write('export PATH=' + sagaPath() + ':$PATH\n')
|
||||
@@ -130,7 +131,7 @@ def getSagaInstalledVersion(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
|
||||
@@ -146,7 +147,7 @@ def getSagaInstalledVersion(runSaga=False):
|
||||
stderr=subprocess.STDOUT,
|
||||
universal_newlines=True,
|
||||
).stdout
|
||||
- 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.readlines()
|
@ -1,6 +1,6 @@
|
||||
--- src/plugins/grass/CMakeLists.txt.orig 2016-10-21 12:14:02 UTC
|
||||
--- src/plugins/grass/CMakeLists.txt.orig 2017-10-27 12:00:21 UTC
|
||||
+++ src/plugins/grass/CMakeLists.txt
|
||||
@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSIO
|
||||
@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
|
||||
qgis_app
|
||||
qgis_gui
|
||||
${OPENPTY_LIBRARY}
|
||||
|
@ -758,21 +758,21 @@ include/qgis/ui_qgsquerybuilderbase.h
|
||||
include/qgis/ui_qgssqlcomposerdialogbase.h
|
||||
include/qgis/ui_qgssublayersdialogbase.h
|
||||
lib/libqgis_analysis.so
|
||||
lib/libqgis_analysis.so.2.18.12
|
||||
lib/libqgis_analysis.so.2.18.14
|
||||
lib/libqgis_app.so
|
||||
lib/libqgis_app.so.2.18.12
|
||||
lib/libqgis_app.so.2.18.14
|
||||
lib/libqgis_core.so
|
||||
lib/libqgis_core.so.2.18.12
|
||||
lib/libqgis_core.so.2.18.14
|
||||
lib/libqgis_gui.so
|
||||
lib/libqgis_gui.so.2.18.12
|
||||
lib/libqgis_gui.so.2.18.14
|
||||
lib/libqgis_networkanalysis.so
|
||||
lib/libqgis_networkanalysis.so.2.18.12
|
||||
lib/libqgis_networkanalysis.so.2.18.14
|
||||
%%SERVER%%lib/libqgis_server.so
|
||||
%%SERVER%%lib/libqgis_server.so.2.18.12
|
||||
%%SERVER%%lib/libqgis_server.so.2.18.14
|
||||
%%GRASS%%lib/libqgisgrass7.so
|
||||
%%GRASS%%lib/libqgisgrass7.so.2.18.12
|
||||
%%GRASS%%lib/libqgisgrass7.so.2.18.14
|
||||
%%PYTHON%%lib/libqgispython.so
|
||||
%%PYTHON%%lib/libqgispython.so.2.18.12
|
||||
%%PYTHON%%lib/libqgispython.so.2.18.14
|
||||
%%PYTHON%%%%CUSTOMWIDGETS%%%%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qgis_customwidgets.py
|
||||
lib/qgis/crssync
|
||||
%%GRASS%%lib/qgis/grass/bin/qgis.g.browser7
|
||||
@ -821,7 +821,7 @@ lib/qgis/plugins/libwmsprovider.so
|
||||
lib/qgis/plugins/libzonalstatisticsplugin.so
|
||||
lib/qgis/qgis_help
|
||||
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so
|
||||
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.12
|
||||
%%CUSTOMWIDGETS%%%%QT_PLUGINDIR%%/designer/libqgis_customwidgets.so.2.18.14
|
||||
man/man1/qbrowser.1.gz
|
||||
man/man1/qgis.1.gz
|
||||
share/applications/qgis.desktop
|
||||
@ -2541,7 +2541,6 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.vi.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/i.zc.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/m.cogo.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/nviz.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.aspect.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.basins.fill.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/description/r.blend.combine.txt
|
||||
@ -2928,7 +2927,6 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_rast_points.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/ext/v_what_vect.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/grass7.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/grass7/nviz7.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/__init__.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/qgis.yaml
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/help/saga.yaml
|
||||
@ -4211,6 +4209,7 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtentFromLayer.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByAttribute.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByExpression.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractByLocation.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/ExtractNodes.py
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/qgis/FieldPyculator.py
|
||||
@ -4405,14 +4404,12 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiffusiveHillslopeEvolution(FTCS).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalAverage.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DirectionalStatisticsforSingleGrid.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Distance(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DistanceMatrix.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiurnalAnisotropicHeating.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DiversityOfCategories.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/DownslopeDistanceGradient.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EarthsOrbitalParameters.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeContamination.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EdgeDetection(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EffectiveAirFlowHeights.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnhancedVegetationIndex.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/EnumerateTableField.txt
|
||||
@ -4436,10 +4433,6 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowAccumulation(Top-Down).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowPathLength.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FlowWidthandSpecificCatchmentArea.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierFilter(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(RealViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransform(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformInverse(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/FourierTransformation(OpenCV).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Alternative).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Fragmentation(Standard).txt
|
||||
@ -4529,7 +4522,6 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/ModifiedQuadraticShepard.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MonthlyGlobalbyLatitude.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(OpenCV).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphologicalFilter.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricFeatures.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/MorphometricProtectionIndex.txt
|
||||
@ -4590,7 +4582,6 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RadiusofVariance(Grid).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomField.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestClassification(OpenCV).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomForestPresencePrediction(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrain.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RandomTerrainGeneration.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/RankFilter.txt
|
||||
@ -4631,7 +4622,6 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Slope,Aspect,Curvature.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLength.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SlopeLimitedFlowAccumulation.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/Smoothing(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoGrid.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoLines.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/SnapPointstoPoints.txt
|
||||
@ -4692,7 +4682,6 @@ share/icons/hicolor/96x96/apps/qgis.png
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WarpingShapes.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WaterRetentionCapacity.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedBasins.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation(ViGrA).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WatershedSegmentation.txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindEffect(WindwardLeewardIndex).txt
|
||||
%%PYTHON%%%%DATADIR%%/python/plugins/processing/algs/saga/description/WindExpositionIndex.txt
|
||||
|
Loading…
Reference in New Issue
Block a user