Date: Wednesday, May 3, 2023 @ 21:21:40
Author: arojas
Revision: 1458626
archrelease: copy trunk to community-x86_64
Added:
qgis/repos/community-x86_64/973549cd.patch
(from rev 1458625, qgis/trunk/973549cd.patch)
qgis/repos/community-x86_64/PKGBUILD
(from rev 1458625, qgis/trunk/PKGBUILD)
Deleted:
qgis/repos/community-x86_64/PKGBUILD
----------------+
973549cd.patch | 28 ++++++++++++
PKGBUILD | 126 ++++++++++++++++++++++++++++---------------------------
2 files changed, 94 insertions(+), 60 deletions(-)
Copied: qgis/repos/community-x86_64/973549cd.patch (from rev 1458625,
qgis/trunk/973549cd.patch)
===================================================================
--- 973549cd.patch (rev 0)
+++ 973549cd.patch 2023-05-03 21:21:40 UTC (rev 1458626)
@@ -0,0 +1,28 @@
+From 973549cd49d0867367a100269dd4ec37c50735cc Mon Sep 17 00:00:00 2001
+From: Basil Eric Rabi <[email protected]>
+Date: Fri, 31 Mar 2023 20:04:12 +0800
+Subject: [PATCH] add missing headers
+
+fixes #52462
+---
+diff --git a/external/untwine/api/QgisUntwine.cpp
b/external/untwine/api/QgisUntwine.cpp
+index c25fe99365d8..f79e99348d14 100644
+--- a/external/untwine/api/QgisUntwine.cpp
++++ b/external/untwine/api/QgisUntwine.cpp
+@@ -1,3 +1,4 @@
++#include <cstdint>
+ #include <iostream>
+
+ #include "QgisUntwine.hpp"
+diff --git a/external/untwine/untwine/VoxelKey.hpp
b/external/untwine/untwine/VoxelKey.hpp
+index a29a8024b9c0..839e1ec746b8 100644
+--- a/external/untwine/untwine/VoxelKey.hpp
++++ b/external/untwine/untwine/VoxelKey.hpp
+@@ -11,6 +11,7 @@
+ ****************************************************************************/
+
+ #include <string>
++#include <cstdint>
+ #include <algorithm>
+
+ #pragma once
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-05-03 21:21:23 UTC (rev 1458625)
+++ PKGBUILD 2023-05-03 21:21:40 UTC (rev 1458626)
@@ -1,60 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Maintainer: Bruno Pagani <[email protected]
-# 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 <[email protected]>
-# Contributor: Eric Forgeot < http://esclinux.tk >
-
-pkgname=qgis
-pkgver=3.30.1
-pkgrel=2
-pkgdesc="Geographic Information System (GIS) that supports vector, raster &
database formats"
-arch=(x86_64)
-url="https://qgis.org/";
-license=(GPL)
-depends=(ocl-icd proj geos gdal expat spatialindex qwt libzip sqlite3 protobuf
- zlib exiv2 postgresql-libs libspatialite zstd pdal
- qt5-base qt5-svg qt5-serialport qt5-location qt5-3d qt5-declarative
qt5-multimedia
- qscintilla-qt5 qtkeychain-qt5 qca-qt5 gsl python-pyqt5
python-qscintilla-qt5
- hdf5 netcdf libxml2) # laz-perf
-makedepends=(cmake ninja opencl-clhpp fcgi qt5-tools sip pyqt-builder)
-optdepends=('fcgi: Map server'
- 'gpsbabel: GPS Tools plugin')
-source=(https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2)
-sha256sums=('baac5f55ca3d34dd5b1bfa0535cecfecc74ecbc837cbeb70b95cdb91b1c7af55')
-
-build() {
- cmake -S $pkgname-$pkgver -B build -G Ninja \
- -DCMAKE_INSTALL_PREFIX='/usr' \
- -DWITH_3D=TRUE \
- -DWITH_QUICK=TRUE \
- -DWITH_SERVER=TRUE \
- -DWITH_CUSTOM_WIDGETS=TRUE \
- -DBINDINGS_GLOBAL_INSTALL=TRUE \
- -DQGIS_MANUAL_SUBDIR=share/man \
- -DWITH_QTWEBKIT=FALSE \
- -DWITH_QWTPOLAR=TRUE \
- -DQWTPOLAR_LIBRARY=/usr/lib/libqwt.so \
- -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DQWT_POLAR_VERSION=0x060200" \
- -DWITH_INTERNAL_QWTPOLAR=FALSE \
- -DWITH_PDAL=TRUE \
- -DHAS_KDE_QT5_PDF_TRANSFORM_FIX=TRUE \
- -DHAS_KDE_QT5_SMALL_CAPS_FIX=TRUE \
- -DHAS_KDE_QT5_FONT_STRETCH_FIX=TRUE
- # https://github.com/qgis/QGIS/issues/48374
- #-DWITH_INTERNAL_LAZPERF=FALSE \
- # https://github.com/qgis/QGIS/issues/35440
- #-DWITH_PY_COMPILE=TRUE \
-
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
- install -Dm644 $pkgname-$pkgver/rpm/sources/qgis-mime.xml
"$pkgdir/usr/share/mime/packages/qgis.xml"
-}
Copied: qgis/repos/community-x86_64/PKGBUILD (from rev 1458625,
qgis/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-05-03 21:21:40 UTC (rev 1458626)
@@ -0,0 +1,66 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer: Bruno Pagani <[email protected]
+# 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 <[email protected]>
+# Contributor: Eric Forgeot < http://esclinux.tk >
+
+pkgname=qgis
+pkgver=3.30.2
+pkgrel=1
+pkgdesc="Geographic Information System (GIS) that supports vector, raster &
database formats"
+arch=(x86_64)
+url="https://qgis.org/";
+license=(GPL)
+depends=(ocl-icd proj geos gdal expat spatialindex qwt libzip sqlite3 protobuf
+ zlib exiv2 postgresql-libs libspatialite zstd pdal
+ qt5-base qt5-svg qt5-serialport qt5-location qt5-3d qt5-declarative
qt5-multimedia
+ qscintilla-qt5 qtkeychain-qt5 qca-qt5 gsl python-pyqt5
python-qscintilla-qt5
+ hdf5 netcdf libxml2) # laz-perf
+makedepends=(cmake ninja opencl-clhpp fcgi qt5-tools sip pyqt-builder)
+optdepends=('fcgi: Map server'
+ 'gpsbabel: GPS Tools plugin')
+source=(https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2
+ 973549cd.patch)
+sha256sums=('996e50561ba2c9234b99f19df512b98549203723da8b3856dd7eb091a60e4272'
+ 'ad43095fb5683b862fc55e12edbb3dc9cdd61ff3375c1aa7c8d7e6bbeb6c01de')
+
+prepare() {
+ patch -d $pkgname-$pkgver -p1 < 973549cd.patch # Fix build with GCC 13
+}
+
+build() {
+ cmake -S $pkgname-$pkgver -B build -G Ninja \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DWITH_3D=TRUE \
+ -DWITH_QUICK=TRUE \
+ -DWITH_SERVER=TRUE \
+ -DWITH_CUSTOM_WIDGETS=TRUE \
+ -DBINDINGS_GLOBAL_INSTALL=TRUE \
+ -DQGIS_MANUAL_SUBDIR=share/man \
+ -DWITH_QTWEBKIT=FALSE \
+ -DWITH_QWTPOLAR=TRUE \
+ -DQWTPOLAR_LIBRARY=/usr/lib/libqwt.so \
+ -DQWTPOLAR_INCLUDE_DIR=/usr/include/qwt \
+ -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DQWT_POLAR_VERSION=0x060200" \
+ -DWITH_INTERNAL_QWTPOLAR=FALSE \
+ -DWITH_PDAL=TRUE \
+ -DHAS_KDE_QT5_PDF_TRANSFORM_FIX=TRUE \
+ -DHAS_KDE_QT5_SMALL_CAPS_FIX=TRUE \
+ -DHAS_KDE_QT5_FONT_STRETCH_FIX=TRUE
+ # https://github.com/qgis/QGIS/issues/48374
+ #-DWITH_INTERNAL_LAZPERF=FALSE \
+ # https://github.com/qgis/QGIS/issues/35440
+ #-DWITH_PY_COMPILE=TRUE \
+
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+ install -Dm644 $pkgname-$pkgver/rpm/sources/qgis-mime.xml
"$pkgdir/usr/share/mime/packages/qgis.xml"
+}
