[arch-commits] Commit in qgis/repos/community-x86_64 (3 files)
Balló György
bgyorgy at archlinux.org
Sat Aug 18 18:53:18 UTC 2018
Date: Saturday, August 18, 2018 @ 18:53:17
Author: bgyorgy
Revision: 372675
archrelease: copy trunk to community-x86_64
Added:
qgis/repos/community-x86_64/PKGBUILD
(from rev 372674, qgis/trunk/PKGBUILD)
qgis/repos/community-x86_64/qgis-3.2.1-fix-sip-name.patch
(from rev 372674, qgis/trunk/qgis-3.2.1-fix-sip-name.patch)
Deleted:
qgis/repos/community-x86_64/PKGBUILD
-------------------------------+
PKGBUILD | 191 ++++++++++++++++++++--------------------
qgis-3.2.1-fix-sip-name.patch | 62 ++++++++++++
2 files changed, 160 insertions(+), 93 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-18 18:53:14 UTC (rev 372674)
+++ PKGBUILD 2018-08-18 18:53:17 UTC (rev 372675)
@@ -1,93 +0,0 @@
-# $Id$
-# 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.2.0
-pkgrel=3
-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-qt5 qextserialport qt5-3d qt5-webkit qtkeychain qwtpolar spatialindex python-sip)
-makedepends=(cmake fcgi gsl python-six qt5-tools txt2tags sip)
-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")
-sha256sums=('0bc7cc5bdec05bac1f0f50250ce705130b5c3a7df3f0115f26743431fca2beff')
-
-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
-
- [[ -d build ]] || mkdir build
-}
-
-build() {
- cd $pkgname-$pkgver/build
-
- cmake -G "Unix Makefiles" ../ \
- -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
- 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
-}
Copied: qgis/repos/community-x86_64/PKGBUILD (from rev 372674, qgis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-18 18:53:17 UTC (rev 372675)
@@ -0,0 +1,98 @@
+# $Id$
+# 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.2.1
+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-qt5 qextserialport qt5-3d qt5-webkit qtkeychain qwtpolar spatialindex python-sip)
+makedepends=(cmake fcgi gsl python-six qt5-tools txt2tags sip)
+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-3.2.1-fix-sip-name.patch")
+sha256sums=('a5cf6c20cd8d7b7f0d78296ca23216a6459191d804518d615ae110df8afaff73'
+ 'd53899c59c358d4cffb8a498db4cf431b83880e2a7f26e30b3e784088e68b699')
+
+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" ../ \
+ -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
+ 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
+}
Copied: qgis/repos/community-x86_64/qgis-3.2.1-fix-sip-name.patch (from rev 372674, qgis/trunk/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:17 UTC (rev 372675)
@@ -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