[arch-commits] Commit in qgis/trunk (PKGBUILD qgis-3.2.1-fix-sip-name.patch)

Balló György bgyorgy at archlinux.org
Sat Aug 18 18:53:14 UTC 2018 

    Date: Saturday, August 18, 2018 @ 18:53:14
  Author: bgyorgy
Revision: 372674

upgpkg: qgis 3.2.1-1

Update to new version

Added:
  qgis/trunk/qgis-3.2.1-fix-sip-name.patch
Modified:
  qgis/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   13 +++++---
 qgis-3.2.1-fix-sip-name.patch |   62 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-18 17:45:53 UTC (rev 372673)
+++ PKGBUILD	2018-08-18 18:53:14 UTC (rev 372674)
@@ -10,8 +10,8 @@
 # Contributor: Eric Forgeot < http://esclinux.tk >
 
 pkgname=qgis
-pkgver=3.2.0
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
 url='https://qgis.org/'
 license=(GPL)
@@ -28,8 +28,10 @@
             'python-pygments: MetaSearch plugin'
             'python-numpy: Processing plugin'
             'python-yaml: Processing plugin')
-source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
-sha256sums=('0bc7cc5bdec05bac1f0f50250ce705130b5c3a7df3f0115f26743431fca2beff')
+source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
+        "qgis-3.2.1-fix-sip-name.patch")
+sha256sums=('a5cf6c20cd8d7b7f0d78296ca23216a6459191d804518d615ae110df8afaff73'
+            'd53899c59c358d4cffb8a498db4cf431b83880e2a7f26e30b3e784088e68b699')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -51,6 +53,9 @@
       -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
 }
 

Added: qgis-3.2.1-fix-sip-name.patch
===================================================================
--- qgis-3.2.1-fix-sip-name.patch	                        (rev 0)
+++ qgis-3.2.1-fix-sip-name.patch	2018-08-18 18:53:14 UTC (rev 372674)
@@ -0,0 +1,62 @@
+--- 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;

More information about the arch-commits mailing list