[arch-commits] Commit in qgis/trunk (3 files)

[Balló György]

    Date: Tuesday, June 30, 2020 @ 15:05:19
  Author: bgyorgy
Revision: 657169

upgpkg: qgis 3.14.0-1: Update to new version

Modified:
  qgis/trunk/PKGBUILD
Deleted:
  qgis/trunk/qgis-pyqt-5.15.patch
  qgis/trunk/qgis-pyqt5-sip5.patch

-----------------------+
 PKGBUILD              |   25 ++++----------
 qgis-pyqt-5.15.patch  |   82 ------------------------------------------------
 qgis-pyqt5-sip5.patch |   22 ------------
 3 files changed, 7 insertions(+), 122 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-30 14:55:02 UTC (rev 657168)
+++ PKGBUILD	2020-06-30 15:05:19 UTC (rev 657169)
@@ -9,15 +9,15 @@
 # Contributor: Eric Forgeot < http://esclinux.tk >
 
 pkgname=qgis
-pkgver=3.12.3
-pkgrel=2
+pkgver=3.14.0
+pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
 url='https://qgis.org/'
 license=(GPL)
 arch=(x86_64)
-depends=(exiv2 gdal hicolor-icon-theme libzip python-qscintilla-qt5 qca qt5-3d
-         qt5-serialport qt5-webkit qtkeychain qwtpolar spatialindex python-sip)
-makedepends=(cmake fcgi gsl python-six qt5-tools txt2tags sip python-setuptools)
+depends=(exiv2 gdal hicolor-icon-theme libzip protobuf python-qscintilla-qt5 python-sip qca qt5-3d
+         qt5-serialport qt5-webkit qtkeychain qwtpolar spatialindex)
+makedepends=(cmake fcgi gsl python-setuptools python-six qt5-tools txt2tags sip)
 optdepends=('fcgi: Map server'
             'gpsbabel: GPS Tools plugin'
             'gsl: Georeferencer plugin'
@@ -28,22 +28,11 @@
             'python-pygments: MetaSearch plugin'
             'python-numpy: Processing plugin'
             'python-yaml: Processing plugin')
-source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
-         qgis-pyqt5-sip5.patch
-         qgis-qt-5.15.patch::"https://github.com/qgis/QGIS/commit/31f586ec.patch"
-         qgis-pyqt-5.15.patch)
-sha256sums=('c2b53815f9b994e1662995d1f25f90628156b996758f5471bffb74ab29a95220'
-            '47fdab75c94ecf5b61a41b334e23714226e895cef507c35a3bc4b46c7d307981'
-            '8c4280b7cb39f8a4bc7d6f3ba70b7a7f3dc4da593f1336429caf90773d401508'
-            'ff82eb1fd6a18993a8318c8bd0f45498598c8e5e544fb1f622d4ba0673213351')
+source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
+sha256sums=('1b76c5278def0c447c3d354149a2afe2562ac26cf0bcbe69b9e0528356d407b8')
 
 prepare() {
   [[ -d build ]] || mkdir build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../qgis-pyqt5-sip5.patch # Use new pyqt sip file location
-  patch -p1 -i ../qgis-qt-5.15.patch # Fix build with Qt 5.15
-  patch -p1 -i ../qgis-pyqt-5.15.patch # Remove MappedType already defined in PyQt 5.15
 }
 
 build() {

Deleted: qgis-pyqt-5.15.patch
===================================================================
--- qgis-pyqt-5.15.patch	2020-06-30 14:55:02 UTC (rev 657168)
+++ qgis-pyqt-5.15.patch	2020-06-30 15:05:19 UTC (rev 657169)
@@ -1,82 +0,0 @@
---- qgis-3.12.1/python/core/conversions.sip.orig	2020-06-04 08:42:00.097929859 +0000
-+++ qgis-3.12.1/python/core/conversions.sip	2020-06-04 08:44:29.763486480 +0000
-@@ -1435,79 +1435,6 @@
- %End
- };
- 
--template <TYPE>
--%MappedType QVector< TYPE* >
--{
--%TypeHeaderCode
--#include <QVector>
--%End
--
--%ConvertFromTypeCode
--    // Create the list
--    PyObject *l = PyList_New(sipCpp->size());
--
--    if (!l)
--        return NULL;
--
--    // Set the dictionary elements.
--    for( int i = 0; i < sipCpp->size(); i++ )
--    {
--        TYPE *t = sipCpp->at(i);
--        PyObject *tobj = sipConvertFromType(t, sipType_TYPE, sipTransferObj);
--
--        if (tobj == NULL || PyList_SetItem(l, i, tobj) < 0)
--        {
--            Py_DECREF(tobj);
--            Py_DECREF(l);
--            return NULL;
--        }
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--      if (!PyList_Check(sipPy))
--        return 0;
--
--      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--      {
--        if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, SIP_NOT_NONE))
--          return 0;
--      }
--
--      return 1;
--    }
--
--    QVector<TYPE*> *v = new QVector<TYPE*>( PyList_GET_SIZE(sipPy) );
--
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--      int state;
--
--      TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
--
--      if (*sipIsErr)
--      {
--        sipReleaseType(t, sipType_TYPE, state);
--        delete v;
--        return 0;
--      }
--
--      v->replace( i, t );
--
--      sipReleaseType(t, sipType_TYPE, state);
--    }
--
--    *sipCppPtr = v;
--
--    return sipGetState(sipTransferObj);
--%End
--};
--
- %MappedType QMap<qint64, QgsFeature*>
- {
- %TypeHeaderCode

Deleted: qgis-pyqt5-sip5.patch
===================================================================
--- qgis-pyqt5-sip5.patch	2020-06-30 14:55:02 UTC (rev 657168)
+++ qgis-pyqt5-sip5.patch	2020-06-30 15:05:19 UTC (rev 657169)
@@ -1,22 +0,0 @@
-diff --git a/cmake/FindPyQt5.py b/cmake/FindPyQt5.py
-index 6a55a0f801..ba46441059 100644
---- a/cmake/FindPyQt5.py
-+++ b/cmake/FindPyQt5.py
-@@ -37,7 +37,7 @@ except ImportError:
-     import PyQt5.QtCore
-     import sipconfig # won't work for SIP v5
-     import os.path
--    import sys
-+    import sys, site
-     cfg = sipconfig.Configuration()
-     sip_dir = cfg.default_sip_dir
-     if sys.platform.startswith('freebsd'):
-@@ -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': os.path.join(site.getsitepackages()[0], "PyQt5", "bindings"),
-         'pyqt_bin_dir': cfg.default_bin_dir,
-     }
-     pyqtcfg = sipconfig.Configuration([cfg])