1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

graphics/qgis: update to 3.4.3

QGIS 3.4 LTR, the first long-term release (LTR) of QGIS 3.

This is a major upgrade and users should consult the UPDATING entry
provided for further information on how to progress.

http://changelog.qgis.org/en/qgis/version/3.4-LTR/

PR:		233726
Submitted by:	Rainer Hurling <rhurlin@gwdg.de> (maintainer)
This commit is contained in:
Tobias C. Berner 2019-01-15 21:30:15 +00:00
parent 5a4d9e71b8
commit ab8649dc2b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=490430
13 changed files with 2240 additions and 3582 deletions

View File

@ -5,6 +5,32 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20190114:
AFFECTS: users of graphics/qgis
AUTHOR: rhurlin@gwdg.de
GIS 3.4 LTR, the first long-term release (LTR) of QGIS 3, has landed
in the FreeBSD ports tree. It will also replace the previous 2.18 LTR
in the QGIS package repositories in February 2019 [1].
Beside, the latest QT4 version 4.8.7 has been EOL since December 2015
and its expiration date on FreeBSD is set to March, 15th 2019.
Because QGIS 2 is based on QT4 and Python2, it was decided to not create
a legacy port for QGIS 2, after graphics/qgis changed to QGIS 3.
For users moving over from the 2.18 LTR there is a huge list of new
features and impactful changes in this new 3.4 LTR version. Most notably
3.x plugins are incompatible with 2.x plugins, so please review your
plugin usage carefully. Before moving over, if you have not already
done so, take a look at the changelogs from versions 3.0, 3.2, and
3.4 [2][3][4] to understand the full scope of changes in the 3.x release.
[1] https://qgis.org/en/site/getinvolved/development/roadmap.html#release-schedule
[2] http://changelog.qgis.org/en/qgis/version/3.0.0/
[3] http://changelog.qgis.org/en/qgis/version/3.2.0/
[4] http://changelog.qgis.org/en/qgis/version/3.4-LTR/
20190114:
AFFECTS: x11-wm/sway
AUTHOR: jbeich@FreeBSD.org

View File

@ -3,196 +3,133 @@
PORTNAME= qgis
DISTVERSIONPREFIX= final-
DISTVERSION= 2_18_26
PORTREVISION= 1
DISTVERSION= 3_4_3
CATEGORIES= graphics geography
MAINTAINER= rhurlin@gwdg.de
COMMENT= Geographical Information System (GIS) data viewer
COMMENT= Free and Open Source Geographic Information System
LICENSE= GPLv2
DEPRECATED= Qt4 has been EOL since december 2015
EXPIRATION_DATE= 2019-03-15
BUILD_DEPENDS= txt2tags:textproc/txt2tags
BUILD_DEPENDS= gpsbabel>=1.5.3:astro/gpsbabel \
txt2tags:textproc/txt2tags \
${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.17.1:devel/py-future@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}OWSLib>=0.17.0:graphics/py-OWSLib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
LIB_DEPENDS= libexpat.so:textproc/expat2 \
libfcgi.so:www/fcgi \
libgdal.so:graphics/gdal \
libgeos.so:graphics/geos \
libgsl.so:math/gsl \
libhdf5.so:science/hdf5 \
libnetcdf.so:science/netcdf \
libproj.so:graphics/proj \
libqca.so:devel/qca@qt4 \
libqjson.so:devel/qjson@qt4 \
libqscintilla2_qt4.so:devel/qscintilla2 \
libqwt6.so:x11-toolkits/qwt6@qt4 \
libqca-qt5.so:devel/qca@qt5 \
libqjson-qt5.so:devel/qjson@qt5 \
libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
libqt5keychain.so:security/qtkeychain@qt5 \
libqwt6.so:x11-toolkits/qwt6@qt5 \
libspatialindex.so:devel/spatialindex \
libspatialite.so:databases/spatialite \
libxerces-c.so:textproc/xerces-c3
libxerces-c.so:textproc/xerces-c3 \
libzip.so:archivers/libzip
### Fortran is needed by numpy, GRASS, etc.
USES= bison cmake compiler:features cpe desktop-file-utils \
fortran gmake pyqt:4 python:2.7 qt:4 sqlite:3
fortran gmake pgsql pyqt:5 python:3.6+ qt:5 shebangfix \
sqlite:3
USE_QT= 3d buildtools_build core concurrent dbus declarative \
designer doc 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 qscintilla2 sip sql svg xml webkit_run
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_PROJECT= ${PORTNAME:tu}
USE_PYQT= core gui network qscintilla2 sip sql svg xml webkit_run
USE_QT= corelib designer doc gui linguist_build moc_build \
network qmake_build rcc_build script sql sql-pgsql \
sql-sqlite3 svg testlib uic_build webkit xml
USE_LDCONFIG= yes
BINARY_ALIAS= pyrcc4=pyrcc4-${PYTHON_VER}
ICON_SIZES= 8 16 22 24 32 36 42 48 64 72 80 96 128 192 256 512
OPTIONS_DEFINE= PYTHON POSTGIS GRASS SERVER
OPTIONS_GROUP= DEVELOPER
OPTIONS_GROUP_DEVELOPER= CUSTOMWIDGETS ASTYLE TESTS DEBUG
OPTIONS_DEFAULT= PYTHON POSTGIS
NO_OPTIONS_SORT= yes
OPTIONS_SUB= yes
ASTYLE_DESC= Enable AStyle for QGis
CUSTOMWIDGETS_DESC= Enable QT4/QGis Custom Widgets
DEBUG_DESC= Write Debugging Output to Console
SERVER_DESC= Enable QGIS server
TESTS_DESC= Run the test suite after build process
CMAKE_ARGS+= -DENABLE_QT5=OFF
CMAKE_ARGS+= -DENABLE_PYTHON3=OFF
# cmake script fails to find it without PYUIC_PROGRAM
CMAKE_ARGS+= -DPYUIC_PROGRAM:STRING="${LOCALBASE}/bin/pyuic4"
CMAKE_ARGS+= -DQWT_INCLUDE_DIR:PATH="${LOCALBASE}/include/qt4/qwt6/"
CMAKE_ARGS+= -DQWT_LIBRARY:FILEPATH="${LOCALBASE}/lib/qt4/libqwt6.so"
CMAKE_ARGS+= -DWITH_QWTPOLAR=ON
CMAKE_ARGS+= -DWITH_ORACLE:BOOL=FALSE
CMAKE_ARGS+= -DWITH_GLOBE:BOOL=FALSE
CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \
-DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \
-DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
-DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \
-DQWT_INCLUDE_DIR:PATH=${LOCALBASE}/include/qt5/qwt6 \
-DQWT_LIBRARY:FILEPATH=${LOCALBASE}/lib/qt5/libqwt6.so
CMAKE_ON= BUILD_TESTING ENABLE_TESTS WITH_3D WITH_ASTYLE \
WITH_BINDINGS WITH_CUSTOM_WIDGETS WITH_POSTGRESQL
CMAKE_OFF= WITH_GLOBE WITH_QWTPOLAR
.if !defined(MAINTAINER_MODE)
CMAKE_ARGS+= -Wno-dev
CMAKE_ARGS+= -DSUPPRESS_SIP_WARNINGS=OFF -DSUPPRESS_QT_WARNINGS=OFF
CMAKE_ARGS+= -DWITH_INTERNAL_DATEUTIL=FALSE
CMAKE_ARGS+= -DWITH_INTERNAL_FUTURE=FALSE
CMAKE_ARGS+= -DWITH_INTERNAL_NOSE2=FALSE
CMAKE_ARGS+= -DWITH_INTERNAL_PYTZ=FALSE
CMAKE_ARGS+= -DWITH_INTERNAL_SIX=FALSE
CMAKE_ARGS+= -DWITH_INTERNAL_YAML=FALSE
CMAKE_OFF+= SUPPRESS_QT_WARNINGS
.endif
ASTYLE_RUN_DEPENDS= astyle:devel/astyle
ASTYLE_CMAKE_ON= -DWITH_ASTYLE:BOOL=TRUE
ASTYLE_CMAKE_OFF= -DWITH_ASTYLE:BOOL=FALSE
SHEBANG_FILES= src/plugins/grass/scripts/*.py
CUSTOMWIDGETS_CMAKE_ON= -DWITH_CUSTOM_WIDGETS:BOOL=TRUE
CUSTOMWIDGETS_CMAKE_OFF= -DWITH_CUSTOM_WIDGETS:BOOL=FALSE
OPTIONS_DEFINE= GRASS SERVER
OPTIONS_DEFAULT= GRASS
NO_OPTIONS_SORT= yes
DEBUG_CMAKE_ON= -DCMAKE_BUILD_TYPE=Debug
DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release
OPTIONS_SUB= yes
SERVER_DESC= Enable QGIS server
GRASS_BUILD_DEPENDS= grass74:databases/grass7
GRASS_RUN_DEPENDS= grass74:databases/grass7
GRASS_CMAKE_ON= -DWITH_GRASS7:BOOL=TRUE -DGRASS_PREFIX7=${LOCALBASE}/grass-7.4.0
GRASS_RUN_DEPENDS= ${GRASS_BUILD_DEPENDS}
GRASS_CMAKE_BOOL= WITH_GRASS7
GRASS_FORCE_MAKE_JOBS= NO
GRASS_CMAKE_OFF= -DWITH_GRASS7:BOOL=FALSE
POSTGIS_USES= pgsql
#POSTGIS_LIB_DEPENDS= liblwgeom.so:databases/postgis22
POSTGIS_CMAKE_ON= -DWITH_POSTGRESQL:BOOL=TRUE
POSTGIS_CMAKE_OFF= -DWITH_POSTGRESQL:BOOL=FALSE
PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15:databases/py-sqlite3@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wxPython-common>=3.0.2.0:x11-toolkits/py-wxPython-common@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}yaml>=3.13:devel/py-yaml@${PY_FLAVOR}
PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cycler>=0.10.0:devel/py-cycler@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}dateutil>=2.7.3:devel/py-dateutil@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}functools32>=3.2.3:devel/py-functools32@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}gdal>=2.2.4:graphics/py-gdal@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}httplib2>=0.11.3:www/py-httplib2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}MarkupSafe>=1.0:textproc/py-MarkupSafe@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>=2.1.2:math/py-matplotlib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=2.0.0:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}numpy>=1.11.2,1:math/py-numpy@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pip>=9.0.3:devel/py-pip@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}psycopg2>=2.7.6.1:databases/py-psycopg2@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=2.2.0:textproc/py-pygments@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.5.1:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyspatialite>=3.0.1:databases/pyspatialite@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2018.7:devel/py-pytz@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.18.4:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}six>=1.11.0:devel/py-six@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.15: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.13:devel/py-yaml@${PY_FLAVOR}
PYTHON_CMAKE_ON= -DWITH_BINDINGS:BOOL=TRUE
PYTHON_CMAKE_OFF= -DWITH_BINDINGS:BOOL=FALSE
SERVER_LIB_DEPENDS= libfcgi.so:www/fcgi
SERVER_CMAKE_ON= -DWITH_SERVER:BOOL=TRUE
SERVER_CMAKE_OFF= -DWITH_SERVER:BOOL=FALSE
SERVER_CMAKE_BOOL= WITH_SERVER
TESTS_CMAKE_ON= -DENABLE_TESTS=TRUE
TESTS_CMAKE_OFF= -DENABLE_TESTS=FALSE
pre-patch:
@${REINPLACE_CMD} -e 's|tr( "QGIS code revision" ) + QString( "</td><td><a href=\\"https://github.com/qgis/QGIS/commit/%1\\">%1</a></td>" ).arg( QGis::QGIS_DEV_VERSION )|tr( "QGIS code revision" ) + "</td><td>" + tr( "${GH_TAGNAME}" ) + "</td>"|g' \
${WRKSRC}/src/app/qgisapp.cpp
# [Ugly workaround!] Because of GitHub #76aa035 from 2015-05-23
# 'Hide shared library symbols by default on GCC and Clang',
# some layer properties are not visible on FreeBSD > 9.x
@${REINPLACE_CMD} -e 's|SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|#SET(CMAKE_CXX_VISIBILITY_PRESET hidden)|' \
${WRKSRC}/CMakeLists.txt
PLIST_SUB= DISTVERSION=${PORTVERSION}
post-patch:
@${REINPLACE_CMD} -e 's|/usr/bin/qgis|${LOCALBASE}/bin/qgis|g' \
${WRKSRC}/debian/${PORTNAME}.desktop
@${REINPLACE_CMD} -e 's|Icon=qgis|Icon=qgis-icon|' \
${WRKSRC}/debian/${PORTNAME}.desktop
@${REINPLACE_CMD} -e 's|env python|env ${PYTHON_VERSION}|g' \
${WRKSRC}/python/ext-libs/pytz/tzfile.py \
${WRKSRC}/scripts/generate_test_mask_image.py \
${WRKSRC}/scripts/random_vector.py \
${WRKSRC}/scripts/widgets_tree.py \
${WRKSRC}/src/plugins/grass/qgis_grass_test.py \
${WRKSRC}/src/plugins/grass/scripts/qgis.v.kernel.rast.py \
${WRKSRC}/src/plugins/grass/scripts/v.out.ogr.pg.py \
${WRKSRC}/src/plugins/grass/scripts/qgis.v.upgrade.py \
${WRKSRC}/src/plugins/grass/scripts/r.external.all.py \
${WRKSRC}/src/plugins/grass/scripts/db.connect-login.pg.py
@${REINPLACE_CMD} -e 's|markupsafe ||g' \
${WRKSRC}/python/ext-libs/CMakeLists.txt
pre-configure:
${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
post-install:
@${RM} ${STAGEDIR}${DATADIR}/python/pytz/tzfile.py.bak
@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}.desktop \
${STAGEDIR}${PREFIX}/share/applications/
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor
.for SZ in ${ICON_SIZES}
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}
@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
${INSTALL_DATA} ${WRKSRC}/debian/${PORTNAME}-icon${SZ}x${SZ}.png \
${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${PORTNAME}.png
.endfor
post-install-TESTS-on:
@${RM} /tmp/srs.db
check:

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1543089824
SHA256 (qgis-QGIS-final-2_18_26_GH0.tar.gz) = 08109f3d32e70bd04c396ded4eb979013ce2590b66793648e97132d18b7af915
SIZE (qgis-QGIS-final-2_18_26_GH0.tar.gz) = 99575234
TIMESTAMP = 1545994756
SHA256 (qgis-QGIS-final-3_4_3_GH0.tar.gz) = 47dcda95b3b64057a428d8e50c3e8cdf5dabb0618de02e9e637f442e964c4d47
SIZE (qgis-QGIS-final-3_4_3_GH0.tar.gz) = 89093146

View File

@ -0,0 +1,11 @@
--- cmake/FindPyQt5.py.orig 2019-01-02 08:42:18 UTC
+++ cmake/FindPyQt5.py
@@ -54,7 +54,7 @@ except ImportError:
'pyqt_version_str': PyQt5.QtCore.PYQT_VERSION_STR,
'pyqt_sip_flags': PyQt5.QtCore.PYQT_CONFIGURATION['sip_flags'],
'pyqt_mod_dir': os.path.join(cfg.default_mod_dir, "PyQt5"),
- 'pyqt_sip_dir': sip_dir,
+ 'pyqt_sip_dir': sip_dir.replace('PyQtsip', 'PyQt5'),
'pyqt_bin_dir': cfg.default_bin_dir,
}
pyqtcfg = sipconfig.Configuration([cfg])

View File

@ -1,25 +0,0 @@
--- debian/qgis.desktop.orig 2017-10-27 12:00:21 UTC
+++ debian/qgis.desktop
@@ -1,7 +1,9 @@
[Desktop Entry]
+Encoding=UTF-8
Type=Application
Name=QGIS Desktop
Version=1.0
+Comment=Quantum GIS Desktop
GenericName=Geographic Information System
GenericName[ar]=Ùظا٠اÙÙعÙÙˆÙات اÙجغراÙ<EFBFBD>ÙŠ
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;

View File

@ -1,11 +1,11 @@
--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2017-10-27 12:00:21 UTC
--- python/plugins/processing/algs/saga/SagaAlgorithmProvider.py.orig 2018-11-23 12:08:36 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'))
@@ -93,7 +93,7 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
self.tr('Processing'), Qgis.Critical)
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
- if not version.startswith(REQUIRED_VERSION):
+ if version < '2.3':
QgsMessageLog.logMessage(self.tr('Problem with SAGA installation: unsupported SAGA version (found: {}, required: {}).').format(version, REQUIRED_VERSION),
self.tr('Processing'),
Qgis.Critical)

View File

@ -1,14 +1,14 @@
--- python/plugins/processing/algs/saga/SagaUtils.py.orig 2017-10-27 12:00:21 UTC
--- 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__ = '$Format:%H$'
__revision__ = '564579199220ae06abd248f0dc80b7ff57b80128'
import os
+import platform
import stat
import subprocess
import time
@@ -57,7 +58,7 @@ def sagaBatchJobFilename():
@@ -59,7 +60,7 @@ def sagaBatchJobFilename():
def findSagaFolder():
folder = None
@ -17,7 +17,7 @@
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():
@@ -84,7 +85,7 @@ def findSagaFolder():
def sagaPath():
@ -26,16 +26,16 @@
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):
@@ -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"]
@ -44,12 +44,12 @@
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):
@@ -145,7 +146,7 @@ def getInstalledVersion(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()
) 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()

View File

@ -0,0 +1,20 @@
--- 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

View File

@ -0,0 +1,11 @@
--- src/core/qgsproject.cpp.orig 2018-11-23 12:08:36 UTC
+++ src/core/qgsproject.cpp
@@ -1867,7 +1867,7 @@ bool QgsProject::writeProjectFile( const QString &file
}
QFileInfo fi( fileName() );
- struct utimbuf tb = { fi.lastRead().toTime_t(), fi.lastModified().toTime_t() };
+ struct utimbuf tb = { static_cast<time_t>( fi.lastRead().toSecsSinceEpoch() ), static_cast<time_t>( fi.lastModified().toSecsSinceEpoch() ) };
utime( backupFile.fileName().toUtf8().constData(), &tb );
}

View File

@ -1,6 +1,6 @@
--- src/plugins/grass/CMakeLists.txt.orig 2017-10-27 12:00:21 UTC
--- src/plugins/grass/CMakeLists.txt.orig 2018-11-23 12:08:36 UTC
+++ src/plugins/grass/CMakeLists.txt
@@ -202,6 +202,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
@@ -211,6 +211,7 @@ MACRO(ADD_GRASSPLUGIN GRASS_BUILD_VERSION)
qgis_app
qgis_gui
${OPENPTY_LIBRARY}

View File

@ -1,11 +0,0 @@
--- src/plugins/grass/qtermwidget/kpty.cpp.orig 2016-10-21 12:14:02 UTC
+++ src/plugins/grass/qtermwidget/kpty.cpp
@@ -28,6 +28,8 @@
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#define HAVE_UTEMPTER
+#define HAVE_UTMPX
#define HAVE_LOGIN
#define HAVE_LIBUTIL_H
#endif

View File

@ -11,4 +11,4 @@ Some of the major features include:
- GRASS Digitizing
- Feature labeling
WWW: https://www.qgis.org/en/site/
WWW: https://qgis.org/en/site/

File diff suppressed because it is too large Load Diff