[arch-commits] Commit in qgis/repos/community-staging-x86_64 (3 files)
Balló György
bgyorgy at archlinux.org
Sat Jun 22 11:06:05 UTC 2019
Date: Saturday, June 22, 2019 @ 11:06:05
Author: bgyorgy
Revision: 482763
archrelease: copy trunk to community-staging-x86_64
Added:
qgis/repos/community-staging-x86_64/PKGBUILD
(from rev 482762, qgis/trunk/PKGBUILD)
qgis/repos/community-staging-x86_64/qt-5.13.patch
(from rev 482762, qgis/trunk/qt-5.13.patch)
Deleted:
qgis/repos/community-staging-x86_64/PKGBUILD
---------------+
PKGBUILD | 116 +++++++++++++++++++++++++++++---------------------------
qt-5.13.patch | 22 ++++++++++
2 files changed, 83 insertions(+), 55 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-22 11:06:00 UTC (rev 482762)
+++ PKGBUILD 2019-06-22 11:06:05 UTC (rev 482763)
@@ -1,55 +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.6.3
-pkgrel=2
-pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
-url='https://qgis.org/'
-license=(GPL)
-arch=(x86_64)
-depends=(desktop-file-utils 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)
-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=('b77790b47d978035e24d4652c5ad4227ae68205c056db54fa0fd2da6bf6f7b7d')
-
-prepare() {
- [[ -d build ]] || mkdir build
-}
-
-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-staging-x86_64/PKGBUILD (from rev 482762, qgis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-22 11:06:05 UTC (rev 482763)
@@ -0,0 +1,61 @@
+# 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.8.0
+pkgrel=1
+pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats'
+url='https://qgis.org/'
+license=(GPL)
+arch=(x86_64)
+depends=(desktop-file-utils 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)
+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"
+ qt-5.13.patch)
+sha256sums=('a28ff8cec27e1160ddfd331bc58f190f4dd581222a51b32eece7cd7ca8b8fc03'
+ '2798a8c2d2dfbe18e05a4c44611291d9688dddac3e000dc95f4c8893e0fbfe93')
+
+prepare() {
+ [[ -d build ]] || mkdir build
+
+ cd $pkgname-$pkgver
+ # Fix build with Qt 5.13
+ patch -Np1 -i ../qt-5.13.patch
+}
+
+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-staging-x86_64/qt-5.13.patch (from rev 482762, qgis/trunk/qt-5.13.patch)
===================================================================
--- qt-5.13.patch (rev 0)
+++ qt-5.13.patch 2019-06-22 11:06:05 UTC (rev 482763)
@@ -0,0 +1,22 @@
+From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001
+From: Matthias Kuhn <matthias at opengis.ch>
+Date: Sat, 22 Jun 2019 10:11:31 +0200
+Subject: [PATCH] Add missing include
+
+Fix https://github.com/qgis/QGIS/issues/30316
+---
+ src/analysis/interpolation/qgsinterpolator.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h
+index 35343ccdf7f..5d694418299 100644
+--- a/src/analysis/interpolation/qgsinterpolator.h
++++ b/src/analysis/interpolation/qgsinterpolator.h
+@@ -19,6 +19,7 @@
+ #define QGSINTERPOLATOR_H
+
+ #include <QVector>
++#include <QList>
+ #include "qgis_sip.h"
+ #include "qgis_analysis.h"
+
More information about the arch-commits
mailing list