[arch-commits] Commit in qgis/repos/community-x86_64 (5 files)
Antonio Rojas
arojas at archlinux.org
Thu Jun 4 09:39:15 UTC 2020
Date: Thursday, June 4, 2020 @ 09:39:15
Author: arojas
Revision: 638879
archrelease: copy trunk to community-x86_64
Added:
qgis/repos/community-x86_64/PKGBUILD
(from rev 638878, qgis/trunk/PKGBUILD)
qgis/repos/community-x86_64/qgis-pyqt-5.15.patch
(from rev 638878, qgis/trunk/qgis-pyqt-5.15.patch)
qgis/repos/community-x86_64/qgis-pyqt5-sip5.patch
(from rev 638878, qgis/trunk/qgis-pyqt5-sip5.patch)
Deleted:
qgis/repos/community-x86_64/PKGBUILD
qgis/repos/community-x86_64/qgis-pyqt5-sip5.patch
-----------------------+
PKGBUILD | 126 +++++++++++++++++++++++++-----------------------
qgis-pyqt-5.15.patch | 82 +++++++++++++++++++++++++++++++
qgis-pyqt5-sip5.patch | 44 ++++++++--------
3 files changed, 170 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-04 09:34:42 UTC (rev 638878)
+++ PKGBUILD 2020-06-04 09:39:15 UTC (rev 638879)
@@ -1,60 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Doug Newgard <scimmia at archlinux dot org>
-# Contributor: XavierCLL <xavier.corredor.llano (a) gmail.com>
-# Contributor: SaultDon <sault.don gmail>
-# Contributor: Lantald < lantald at gmx.com >
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
-# Contributor: Eric Forgeot < http://esclinux.tk >
-
-pkgname=qgis
-pkgver=3.12.3
-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)
-optdepends=('fcgi: Map server'
- 'gpsbabel: GPS Tools plugin'
- 'gsl: Georeferencer plugin'
- 'python-gdal: DB Manager plugin; Processing plugin'
- 'python-jinja: MetaSearch plugin'
- 'python-owslib: MetaSearch plugin'
- 'python-psycopg2: DB Manager plugin; Processing plugin'
- '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)
-sha256sums=('c2b53815f9b994e1662995d1f25f90628156b996758f5471bffb74ab29a95220'
- '47fdab75c94ecf5b61a41b334e23714226e895cef507c35a3bc4b46c7d307981')
-
-prepare() {
- [[ -d build ]] || mkdir build
-
- cd $pkgname-$pkgver
- patch -p1 -i ../qgis-pyqt5-sip5.patch # Use new pyqt sip file location
-}
-
-build() {
- cd build
- cmake -G "Unix Makefiles" ../$pkgname-$pkgver/ \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_3D=TRUE \
- -DWITH_SERVER=TRUE \
- -DWITH_CUSTOM_WIDGETS=TRUE \
- -DBINDINGS_GLOBAL_INSTALL=TRUE \
- -DQGIS_MANUAL_SUBDIR=share/man \
- -DWITH_QWTPOLAR=TRUE \
- -DWITH_INTERNAL_QWTPOLAR=FALSE
- make
-}
-
-package() {
- cd build
- make DESTDIR="$pkgdir" install
-}
Copied: qgis/repos/community-x86_64/PKGBUILD (from rev 638878, qgis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-04 09:39:15 UTC (rev 638879)
@@ -0,0 +1,66 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Doug Newgard <scimmia at archlinux dot org>
+# Contributor: XavierCLL <xavier.corredor.llano (a) gmail.com>
+# Contributor: SaultDon <sault.don gmail>
+# Contributor: Lantald < lantald at gmx.com >
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
+# Contributor: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
+# Contributor: Eric Forgeot < http://esclinux.tk >
+
+pkgname=qgis
+pkgver=3.12.3
+pkgrel=2
+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)
+optdepends=('fcgi: Map server'
+ 'gpsbabel: GPS Tools plugin'
+ 'gsl: Georeferencer plugin'
+ 'python-gdal: DB Manager plugin; Processing plugin'
+ 'python-jinja: MetaSearch plugin'
+ 'python-owslib: MetaSearch plugin'
+ 'python-psycopg2: DB Manager plugin; Processing plugin'
+ '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')
+
+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() {
+ cd build
+ cmake -G "Unix Makefiles" ../$pkgname-$pkgver/ \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_3D=TRUE \
+ -DWITH_SERVER=TRUE \
+ -DWITH_CUSTOM_WIDGETS=TRUE \
+ -DBINDINGS_GLOBAL_INSTALL=TRUE \
+ -DQGIS_MANUAL_SUBDIR=share/man \
+ -DWITH_QWTPOLAR=TRUE \
+ -DWITH_INTERNAL_QWTPOLAR=FALSE
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="$pkgdir" install
+}
Copied: qgis/repos/community-x86_64/qgis-pyqt-5.15.patch (from rev 638878, qgis/trunk/qgis-pyqt-5.15.patch)
===================================================================
--- qgis-pyqt-5.15.patch (rev 0)
+++ qgis-pyqt-5.15.patch 2020-06-04 09:39:15 UTC (rev 638879)
@@ -0,0 +1,82 @@
+--- 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-04 09:34:42 UTC (rev 638878)
+++ qgis-pyqt5-sip5.patch 2020-06-04 09:39:15 UTC (rev 638879)
@@ -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])
Copied: qgis/repos/community-x86_64/qgis-pyqt5-sip5.patch (from rev 638878, qgis/trunk/qgis-pyqt5-sip5.patch)
===================================================================
--- qgis-pyqt5-sip5.patch (rev 0)
+++ qgis-pyqt5-sip5.patch 2020-06-04 09:39:15 UTC (rev 638879)
@@ -0,0 +1,22 @@
+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])
More information about the arch-commits
mailing list