update package, fix bugs, clean up

3 files changed, 13 insertions, 130 deletions

diff --git a/.SRCINFO b/.SRCINFO
index edf7bfe98dcc..1b6634e1250a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = qgis-git
 	pkgdesc = Geographic Information System (GIS) that supports vector, raster & database formats - Development master
-	pkgver = 3.9.0_master.r54615.7f95991edf
+	pkgver = 3.99_master.r69399.14e5c6094df
 	pkgrel = 1
 	url = http://qgis.org/
 	arch = i686
@@ -24,7 +24,6 @@ pkgbase = qgis-git
 	depends = python-owslib
 	depends = python-future
 	depends = python-sip
-	depends = python-sip-pyqt5
 	depends = python-psycopg2
 	depends = python-yaml
 	depends = python-numpy
@@ -36,67 +35,17 @@ pkgbase = qgis-git
 	depends = spatialindex
 	depends = gsl
 	depends = libzip
-	depends = sip
-	depends = exiv2
-	depends = qt5-xmlpatterns
-	depends = ocl-icd
-	optdepends = grass: for GRASS providers and plugin (6 or 7)
-	optdepends = postgresql: for postgis and SPIT support
-	optdepends = gpsbabel: for gps plugin
-	optdepends = fcgi: for qgis mapserver
-	optdepends = ocilib: oracle provider
-	source = qgis::git://github.com/qgis/QGIS.git
-	md5sums = SKIP
-
-pkgname = qgis-git
-
-pkgbase = qgis-git
-	pkgdesc = Geographic Information System (GIS) that supports vector, raster & database formats - Development master
-	pkgver = 3.10.0_master.r58226.f69d7f8f83
-	pkgrel = 1
-	url = http://qgis.org/
-	arch = i686
-	arch = x86_64
-	license = GPL
-	makedepends = git
-	makedepends = cmake
-	makedepends = txt2tags
-	depends = qt5-tools
-	depends = qt5-script
-	depends = qtkeychain
-	depends = qca-qt5
-	depends = qt5-webkit
-	depends = qt5-3d
-	depends = qt5-serialport
-	depends = proj
-	depends = geos
-	depends = sqlite
-	depends = python-pyqt5
-	depends = python-gdal
-	depends = python-owslib
-	depends = python-future
-	depends = python-sip
-	depends = python-sip-pyqt5
-	depends = python-psycopg2
-	depends = python-yaml
-	depends = python-numpy
-	depends = python-jinja
-	depends = python-pygments
-	depends = qwtpolar
-	depends = expat
-	depends = python-qscintilla-qt5
-	depends = spatialindex
-	depends = gsl
-	depends = libzip
-	depends = sip
+	depends = sip4
 	depends = exiv2
 	depends = qt5-xmlpatterns
 	depends = ocl-icd
+	depends = protobuf
 	optdepends = grass: for GRASS providers and plugin (6 or 7)
 	optdepends = postgresql: for postgis and SPIT support
 	optdepends = gpsbabel: for gps plugin
 	optdepends = fcgi: for qgis mapserver
 	optdepends = ocilib: oracle provider
+	provides = qgis
 	source = qgis::git://github.com/qgis/QGIS.git
 	md5sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ca4a29b2a62..51e99637e0ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer: gaelic <gaelic@luchmhor.net>
 #             Fincer <fincer@example.com>
+#             qs9rx <qs9rx.aur@enjoys.it>
 
 # Previous Maintainer: scimmia, XavierCLL, SaultDon, Lantald, Thomas Dziedzic, dibblethewrecker, Gerardo Exequiel Pozzi, Eric Forgeot
 
 pkgname=qgis-git
 _pkgname=qgis
-pkgver=3.10.0_master.r58226.f69d7f8f83
-
-_pkgver=3.10.0_master
+pkgver=3.99_master.r69399.14e5c6094df
+_pkgver=3.99_master  # fake pkgver prefix for the name
 pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats - Development master'
 url='http://qgis.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('qt5-tools' 'qt5-script' 'qtkeychain' 'qca-qt5' 'qt5-webkit' 'qt5-3d' 'qt5-serialport' 'proj' 'geos' 'sqlite' 'python-pyqt5' 'python-gdal' 'python-owslib' 'python-future' 'python-sip' 'python-sip-pyqt5' 'python-psycopg2' 'python-yaml' 'python-numpy' 'python-jinja' 'python-pygments' 'qwtpolar' 'expat' 'python-qscintilla-qt5' 'spatialindex' 'gsl' 'libzip' 'sip' 'exiv2' 'qt5-xmlpatterns' 'ocl-icd')
+depends=('qt5-tools' 'qt5-script' 'qtkeychain' 'qca-qt5' 'qt5-webkit' 'qt5-3d' 'qt5-serialport' 'proj' 'geos' 'sqlite' 'python-pyqt5' 'python-gdal' 'python-owslib' 'python-future' 'python-sip' 'python-psycopg2' 'python-yaml' 'python-numpy' 'python-jinja' 'python-pygments' 'qwtpolar' 'expat' 'python-qscintilla-qt5' 'spatialindex' 'gsl' 'libzip' 'sip4' 'exiv2' 'qt5-xmlpatterns' 'ocl-icd' 'protobuf')
 
 makedepends=('git' 'cmake' 'txt2tags')
 optdepends=('grass: for GRASS providers and plugin (6 or 7)'
@@ -23,10 +23,9 @@ optdepends=('grass: for GRASS providers and plugin (6 or 7)'
             'fcgi: for qgis mapserver'
             'ocilib: oracle provider')
 
-#install="$_pkgname.install"
 source=("${_pkgname}::git://github.com/qgis/QGIS.git")
 md5sums=('SKIP')
-#conflicts=('qgis')
+provides=('qgis')
 
 pkgver(){
   cd "$_pkgname"
@@ -37,13 +36,11 @@ prepare() {
   cd $_pkgname
 
   # Fix desktop file for /usr/bin/qgis-github
-  
-#  sed -e 's/\/usr\/bin\/qgis/\/usr\/bin\/qgis-git/g' \
-
+#   sed -e 's/\/usr\/bin\/qgis/\/usr\/bin\/qgis-git/g' \
    sed -e 's/Exec=qgis/Exec=qgis-git/g' \
   		-e 's/Icon=qgis/Icon=qgis-git/g' \
   		-i linux/org.qgis.qgis.desktop.in
-  #cp linux/org.qgis.qgis.desktop.in linux/org.qgis.qgis-git.desktop
+#   cp linux/org.qgis.qgis.desktop.in linux/org.qgis.qgis-git.desktop
 
   # Remove mime types already defined by freedesktop.org
   sed -e '/type="image\/tiff"/,/<\/mime-type>/d' \
@@ -57,7 +54,7 @@ prepare() {
 
 build() {
   cd $_pkgname/build
-  
+
   cmake -G "Unix Makefiles" ../ \
     -DCMAKE_INSTALL_PREFIX=/opt/$pkgname \
     -DQGIS_MANUAL_SUBDIR=share/man \
@@ -89,7 +86,6 @@ package() {
   ln -s /opt/$pkgname/bin/qgis "$pkgdir/usr/bin/qgis-git"
   
   # install desktop files and icons
-#  install -Dm644 linux/org.qgis.qgis-git.desktop -t "$pkgdir/usr/share/applications/"
   install -Dm644 build/org.qgis.qgis.desktop "$pkgdir/usr/share/applications/org.qgis.qgis-git.desktop"
   for resolution in `ls /usr/share/icons/hicolor/|egrep '[0-9]'`; do
   	if [ -e debian/icons/qgis-icon{$resolution}.png ]
@@ -100,7 +96,6 @@ package() {
 	install -Dm644 images/icons/qgis_icon.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
 	
   # install mime information and icon
-  
   install -Dm644 debian/qgis.xml "$pkgdir/usr/share/mime/packages/qgis-git.xml"
   for resolution in `ls /usr/share/icons/hicolor/|egrep '[0-9]'`; do
   	if [ -e debian/icons/qgis-mime-icon{$resolution}.png ]
@@ -129,3 +124,4 @@ package() {
   install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
   echo '/opt/qgis-git/lib' > "${pkgdir}"/etc/ld.so.conf.d/qgis-git.conf
 }
+
diff --git a/qgis-3-fix-sip-name.patch b/qgis-3-fix-sip-name.patch
deleted file mode 100644
index 12618d218345..000000000000
--- a/qgis-3-fix-sip-name.patch
+++ /dev/null
@@ -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;