Date: Sun, 27 Sep 2020 11:35:59 +0000 (UTC) From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r550267 - head/graphics/qgis-ltr Message-ID: <202009271135.08RBZxmm043085@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rhurlin Date: Sun Sep 27 11:35:59 2020 New Revision: 550267 URL: https://svnweb.freebsd.org/changeset/ports/550267 Log: graphics/qgis-ltr: Update to 3.10.10 This is a minor update for QGIS from 3.10.9 to 3.10.10. It fixes several problems and brings some new features. - Enabling OpenCL features - Update some Python deps under BUILD_DEPENDS - Add devel/protobuf in LIB_DEPENDS - Reorder USES part - Delete __pycache__ via post-install target - Update distinfo Approved by: tcberner (mentor) Relnotes: https://github.com/qgis/QGIS/compare/final-3_10_9...final-3_10_10 Differential Revision: https://reviews.freebsd.org/D26563 Modified: head/graphics/qgis-ltr/Makefile head/graphics/qgis-ltr/distinfo head/graphics/qgis-ltr/pkg-plist Modified: head/graphics/qgis-ltr/Makefile ============================================================================== --- head/graphics/qgis-ltr/Makefile Sun Sep 27 11:32:55 2020 (r550266) +++ head/graphics/qgis-ltr/Makefile Sun Sep 27 11:35:59 2020 (r550267) @@ -3,15 +3,10 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_10_9 +DISTVERSION= 3_10_10 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 33192f38bc7d.patch:-p1 \ - 12203f0ce527.patch:-p1 \ - 6e9d42d70099.patch:-p1 - MAINTAINER= rhurlin@FreeBSD.org COMMENT= Free and Open Source Geographic Information System @@ -19,6 +14,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/LICENSE BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ + opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \ @@ -33,11 +29,11 @@ BUILD_DEPENDS= gpsbabel>=1.5.4:astro/gpsbabel \ ${PYTHON_PKGNAMEPREFIX}plotly>=3.0.2:graphics/py-plotly@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=2.5.2:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2019.1:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.21.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.12.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.6.8:databases/py-sqlite3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}six>=1.14.0:devel/py-six@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>=3.7.7:databases/py-sqlite3@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1:devel/py-yaml@${PY_FLAVOR} LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libexpat.so:textproc/expat2 \ libgdal.so:graphics/gdal \ @@ -45,7 +41,9 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ libnetcdf.so:science/netcdf \ + libOpenCL.so:devel/ocl-icd \ libproj.so:graphics/proj \ + libprotobuf-lite.so:devel/protobuf \ libqjson-qt5.so:devel/qjson \ libqscintilla2_qt5.so:devel/qscintilla2-qt5 \ libqt5keychain.so:security/qtkeychain \ @@ -56,6 +54,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libxerces-c.so:textproc/xerces-c3 \ libzip.so:archivers/libzip RUN_DEPENDS= astyle:devel/astyle \ + opencl>=0:devel/opencl \ ${PYTHON_PKGNAMEPREFIX}black>=19.10:devel/py-black@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>=2.8.1:devel/py-dateutil@${PY_FLAVOR} \ @@ -96,22 +95,25 @@ RUN_DEPENDS= astyle:devel/astyle \ ### Fortran is needed by numpy, GRASS, etc. USES= bison cmake compiler:features cpe desktop-file-utils \ - fortran gmake gl gnome pgsql pyqt:5 python:3.6+ qca qt:5 \ + fortran gl gmake gnome pgsql pyqt:5 python:3.6+ qca qt:5 \ shebangfix sqlite:3 +USE_LDCONFIG= yes USE_GITHUB= yes GH_PROJECT= ${PORTNAME:tu} -USE_GL= gl USE_GNOME= libxml2 -INSTALLS_ICONS= yes -USE_LDCONFIG= yes -USE_PYQT= core gui network qml quickwidgets qscintilla2 \ - sip sql svg webkit_run webkitwidgets_run xml +USE_GL= gl USE_QT= 3d buildtools_build core concurrent dbus declarative \ designer doc gamepad 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 quickwidgets qscintilla2 \ + sip sql svg webkit_run webkitwidgets_run xml +CONFLICTS_INSTALL= qgis + +INSTALLS_ICONS= yes + SHEBANG_FILES= src/plugins/grass/scripts/*.py CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ @@ -120,17 +122,12 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \ -DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \ -DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so \ - -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \ - -DUSE_OPENCL:BOOL=FALSE -CMAKE_ON= BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \ + -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW +CMAKE_ON= BUILD_TESTING ENABLE_TESTS USE_OPENCL WITH_3D WITH_ASTYLE \ WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_INTERNAL_MDAL \ WITH_POSTGRESQL CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR -CONFLICTS_INSTALL= qgis - -PLIST_SUB= DISTVERSION=${PORTVERSION} - .if !defined(MAINTAINER_MODE) CMAKE_ARGS+= -Wno-dev CMAKE_OFF+= SUPPRESS_QT_WARNINGS @@ -149,6 +146,8 @@ GRASS_CMAKE_BOOL= WITH_GRASS7 SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi SERVER_CMAKE_BOOL= WITH_SERVER WITH_SERVER_PLUGINS WITH_QSPATIALITE +PLIST_SUB= DISTVERSION=${PORTVERSION} + .include <bsd.port.pre.mk> post-patch: @@ -158,7 +157,6 @@ post-patch: @${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \ ${WRKSRC}/src/core/CMakeLists.txt .endif - @${REINPLACE_CMD} -e 's|%%PYQT_SIPDIR%%|${PYQT_SIPDIR}|' \ ${WRKSRC}/cmake/FindPyQt5.py \ ${WRKSRC}/cmake/FindSIP.py @@ -168,6 +166,7 @@ pre-configure: post-install: @${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak + @${FIND} ${STAGEDIR}${LOCALBASE} -name "__pycache__" -delete @${RM} /tmp/srs.db check: Modified: head/graphics/qgis-ltr/distinfo ============================================================================== --- head/graphics/qgis-ltr/distinfo Sun Sep 27 11:32:55 2020 (r550266) +++ head/graphics/qgis-ltr/distinfo Sun Sep 27 11:35:59 2020 (r550267) @@ -1,9 +1,3 @@ -TIMESTAMP = 1598608287 -SHA256 (qgis-QGIS-final-3_10_9_GH0.tar.gz) = bb7cf7e83dbfac13ebe33336ac825e6b07282a9def4b9159ebce77500a4e28b3 -SIZE (qgis-QGIS-final-3_10_9_GH0.tar.gz) = 121338519 -SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b -SIZE (33192f38bc7d.patch) = 12604 -SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235 -SIZE (12203f0ce527.patch) = 2452 -SHA256 (6e9d42d70099.patch) = 44c3ecc27c839492d9eae2d352e0ea9f37c11a419fb3f8862350b1e52cb359a6 -SIZE (6e9d42d70099.patch) = 1513 +TIMESTAMP = 1600928608 +SHA256 (qgis-QGIS-final-3_10_10_GH0.tar.gz) = 08528b8e73b80950e3d45c625ad2cff9d5c50fbb6fc5e8925b505a4e6cdf6b57 +SIZE (qgis-QGIS-final-3_10_10_GH0.tar.gz) = 121426541 Modified: head/graphics/qgis-ltr/pkg-plist ============================================================================== --- head/graphics/qgis-ltr/pkg-plist Sun Sep 27 11:32:55 2020 (r550266) +++ head/graphics/qgis-ltr/pkg-plist Sun Sep 27 11:35:59 2020 (r550267) @@ -746,6 +746,7 @@ include/qgis/qgsogrutils.h include/qgis/qgsonlineterraingenerator.h include/qgis/qgsopacitywidget.h include/qgis/qgsopacitywidgetplugin.h +include/qgis/qgsopenclutils.h include/qgis/qgsoptional.h include/qgis/qgsoptionalexpression.h include/qgis/qgsoptionsdialogbase.h @@ -5102,6 +5103,14 @@ share/metainfo/org.qgis.qgis.appdata.xml %%DATADIR%%/resources/metadata-ISO/licenses.csv %%DATADIR%%/resources/metadata-ISO/md_scope_codes.csv %%DATADIR%%/resources/metadata-ISO/mime.csv +%%DATADIR%%/resources/opencl_programs/aspect.cl +%%DATADIR%%/resources/opencl_programs/aspect_renderer.cl +%%DATADIR%%/resources/opencl_programs/calcfirstder.cl +%%DATADIR%%/resources/opencl_programs/hillshade.cl +%%DATADIR%%/resources/opencl_programs/hillshade_renderer.cl +%%DATADIR%%/resources/opencl_programs/ruggedness.cl +%%DATADIR%%/resources/opencl_programs/slope.cl +%%DATADIR%%/resources/opencl_programs/slope_renderer.cl %%DATADIR%%/resources/palettes/new_layer_colors.gpl %%DATADIR%%/resources/qgis.db %%DATADIR%%/resources/qgis_global_settings.ini
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009271135.08RBZxmm043085>