Date: Tuesday, December 11, 2018 @ 17:54:33 Author: bgyorgy Revision: 415469
upgpkg: qgis 3.4.2-1 Update to new version Modified: qgis/trunk/PKGBUILD Deleted: qgis/trunk/qgis-3.2.1-fix-sip-name.patch -------------------------------+ PKGBUILD | 58 +++++-------------------------------- qgis-3.2.1-fix-sip-name.patch | 62 ---------------------------------------- 2 files changed, 8 insertions(+), 112 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-12-11 17:49:08 UTC (rev 415468) +++ PKGBUILD 2018-12-11 17:54:33 UTC (rev 415469) @@ -9,13 +9,14 @@ # Contributor: Eric Forgeot < http://esclinux.tk > pkgname=qgis -pkgver=3.2.3 +pkgver=3.4.2 pkgrel=1 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats' url='https://qgis.org/' license=(GPL) arch=(x86_64) -depends=(gdal hicolor-icon-theme libzip python-qscintilla-qt5 qca qextserialport qt5-3d qt5-webkit qtkeychain qwtpolar spatialindex python-sip) +depends=(desktop-file-utils gdal hicolor-icon-theme libzip python-qscintilla-qt5 qca qt5-3d + qt5-serialport qt5-webkit qt5-xmlpatterns qtkeychain qwtpolar spatialindex python-sip) makedepends=(cmake fcgi gsl python-six qt5-tools txt2tags sip) optdepends=('fcgi: Map server' 'gpsbabel: GPS Tools plugin' @@ -27,71 +28,28 @@ 'python-pygments: MetaSearch plugin' 'python-numpy: Processing plugin' 'python-yaml: Processing plugin') -source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2" - "qgis-3.2.1-fix-sip-name.patch") -sha256sums=('c91383185fb20ccdc7c009955aa1855df1d2722d4359bf7f241727c5680ef720' - 'd53899c59c358d4cffb8a498db4cf431b83880e2a7f26e30b3e784088e68b699') +source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2") +sha256sums=('6a7f304985940048046074ad7724da44cbaf857a72e2228163d25153be3e6273') prepare() { - cd $pkgname-$pkgver - - # Find Qt5ExtSerialPort - sed -e '/include$/ s/$/\/qt/' \ - -e 's/qextserialport-1.2/Qt5ExtSerialPort/' \ - -i cmake/FindQextserialport.cmake - - # Find osgQt - sed -e 's/osgQt5 osgQt/osgQt/' \ - -e 's/osgQt5d osgQtd/osgQt/' \ - -i src/plugins/globe/CMakeModules/FindOSG.cmake - - # Remove mime types already defined by freedesktop.org - sed -e '/type="image\/tiff"/,/<\/mime-type>/d' \ - -e '/type="image\/jpeg"/,/<\/mime-type>/d' \ - -e '/type="image\/jp2"/,/<\/mime-type>/d' \ - -e '/type="application\/x-adobe-mif"/,/<\/mime-type>/d' \ - -i debian/qgis.xml - - # Fix build - patch -Np1 -i ../qgis-3.2.1-fix-sip-name.patch - [[ -d build ]] || mkdir build } build() { - cd $pkgname-$pkgver/build - - cmake -G "Unix Makefiles" ../ \ + cd build + cmake -G "Unix Makefiles" ../$pkgname-$pkgver/ \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_3D=TRUE \ -DWITH_SERVER=TRUE \ -DWITH_CUSTOM_WIDGETS=TRUE \ - -DWITH_INTERNAL_QEXTSERIALPORT=FALSE \ -DBINDINGS_GLOBAL_INSTALL=TRUE \ -DQGIS_MANUAL_SUBDIR=share/man \ -DWITH_QWTPOLAR=TRUE \ -DWITH_INTERNAL_QWTPOLAR=FALSE - make - - # Rebuild srs database, QGIS distributes an old, buggy one - LD_LIBRARY_PATH="$PWD/output/lib/" make synccrsdb - mv /tmp/srs.db ../resources/ } package() { - cd $pkgname-$pkgver/build + cd build make DESTDIR="$pkgdir" install - - cd "$srcdir/$pkgname-$pkgver" - - # install desktop file and icon - install -Dm644 debian/qgis.desktop "$pkgdir/usr/share/applications/qgis.desktop" - install -Dm644 images/icons/qgis_icon.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/qgis.svg" - - # install mime information and icons - install -Dm644 debian/qgis.xml -t "$pkgdir/usr/share/mime/packages/" - for _type in qgs qlr qml qpt; do - install -Dm644 images/icons/qgis_${_type}_icon.svg "$pkgdir/usr/share/icons/hicolor/scalable/mimetypes/qgis-$_type.svg" - done } Deleted: qgis-3.2.1-fix-sip-name.patch =================================================================== --- qgis-3.2.1-fix-sip-name.patch 2018-12-11 17:49:08 UTC (rev 415468) +++ qgis-3.2.1-fix-sip-name.patch 2018-12-11 17:54:33 UTC (rev 415469) @@ -1,62 +0,0 @@ ---- qgis-3.2.1/python/CMakeLists.txt.orig 2018-07-28 21:05:44.650275372 +0100 -+++ qgis-3.2.1/python/CMakeLists.txt 2018-07-28 21:06:31.702276533 +0100 -@@ -174,7 +174,7 @@ FILE(GLOB_RECURSE sip_files_core core/*. - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core}) - SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.core.api) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) -- SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) -+ SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n PyQt5.sip) - ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) - SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_core.pyi) -@@ -198,7 +198,7 @@ IF (WITH_GUI) - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_gui}) - SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.gui.api) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) -- SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) -+ SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n PyQt5.sip) - ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) - SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi) -@@ -227,7 +227,7 @@ IF (WITH_SERVER AND WITH_SERVER_PLUGINS) - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_server}) - SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.server.api) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) -- SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) -+ SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n PyQt5.sip) - ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) - SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_server.pyi) -@@ -257,7 +257,7 @@ FILE(GLOB_RECURSE sip_files_analysis ana - SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis}) - SET(SIP_EXTRA_OPTIONS ${PYQT_SIP_FLAGS} -g -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) -- SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n sip) -+ SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -n PyQt5.sip) - ENDIF((${SIP_VERSION_STR} VERSION_EQUAL 4.19.11) OR (${SIP_VERSION_STR} VERSION_GREATER 4.19.11)) - IF((${SIP_VERSION_STR} VERSION_EQUAL 4.18) OR (${SIP_VERSION_STR} VERSION_GREATER 4.18)) - SET(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -y ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_analysis.pyi) -diff -rup qgis-3.2.1.orig/python/plugins/processing/gui/NumberInputPanel.py qgis-3.2.1/python/plugins/processing/gui/NumberInputPanel.py ---- qgis-3.2.1.orig/python/plugins/processing/gui/NumberInputPanel.py 2018-07-20 13:00:05.000000000 +0100 -+++ qgis-3.2.1/python/plugins/processing/gui/NumberInputPanel.py 2018-07-29 06:01:51.016024892 +0100 -@@ -27,7 +27,7 @@ __revision__ = '1edf372fb80f2a35c77b128d - - import os - import math --import sip -+import PyQt5.sip as sip - import warnings - - from qgis.PyQt import uic -diff -rup qgis-3.2.1.orig/src/python/qgspythonutilsimpl.cpp qgis-3.2.1/src/python/qgspythonutilsimpl.cpp ---- qgis-3.2.1.orig/src/python/qgspythonutilsimpl.cpp 2018-07-20 13:00:05.000000000 +0100 -+++ qgis-3.2.1/src/python/qgspythonutilsimpl.cpp 2018-07-29 06:03:57.048028001 +0100 -@@ -104,7 +104,7 @@ bool QgsPythonUtilsImpl::checkSystemImpo - runString( "sys.path = [" + newpaths.join( QStringLiteral( "," ) ) + "] + sys.path" ); - - // import SIP -- if ( !runString( QStringLiteral( "import sip" ), -+ if ( !runString( QStringLiteral( "import PyQt5.sip as sip" ), - QObject::tr( "Couldn't load SIP module." ) + '\n' + QObject::tr( "Python support will be disabled." ) ) ) - { - return false;