Date: Wednesday, April 21, 2021 @ 20:53:03 Author: bgyorgy Revision: 920681
upgpkg: qgis 3.18.2-2: Rebuild for gdal 3.2.2 and proj 8.0.0 Added: qgis/trunk/qgis-proj8.patch Modified: qgis/trunk/PKGBUILD ------------------+ PKGBUILD | 9 ++++++--- qgis-proj8.patch | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-04-21 20:47:48 UTC (rev 920680) +++ PKGBUILD 2021-04-21 20:53:03 UTC (rev 920681) @@ -10,7 +10,7 @@ pkgname=qgis pkgver=3.18.2 -pkgrel=1 +pkgrel=2 pkgdesc='Geographic Information System (GIS) that supports vector, raster & database formats' url='https://qgis.org/' license=('GPL') @@ -24,12 +24,15 @@ optdepends=('fcgi: Map server' 'gpsbabel: GPS Tools plugin') source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"; - 'qgis-qwtpolar-link.patch') + 'qgis-qwtpolar-link.patch' + 'qgis-proj8.patch') sha256sums=('1913e4d5596bbc8b7d143f3defb18bf376f750a71f334f69d76af5deca7ecc5d' - 'd4c1e7bad45186822348a3a7f0951a8253506c69075bd2ead090ae017cd26af4') + 'd4c1e7bad45186822348a3a7f0951a8253506c69075bd2ead090ae017cd26af4' + '58f58b5e43cc9f13b55bf2a9742b3c7cb555eee3c4075611980f0496cfd24c89') prepare() { patch -d $pkgname-$pkgver -p1 < qgis-qwtpolar-link.patch # https://github.com/qgis/QGIS/issues/41910 + patch -d $pkgname-$pkgver -p1 < qgis-proj8.patch # https://github.com/qgis/QGIS/issues/41735 } build() { Added: qgis-proj8.patch =================================================================== --- qgis-proj8.patch (rev 0) +++ qgis-proj8.patch 2021-04-21 20:53:03 UTC (rev 920681) @@ -0,0 +1,29 @@ +From fc1ac8bef8dcc3194857ecd32519aca4867b4fa1 Mon Sep 17 00:00:00 2001 +From: Bas Couwenberg <[email protected]> +Date: Tue, 23 Feb 2021 18:40:14 +0100 +Subject: [PATCH] Add support for PROJ 8.0.0 in FindProj.cmake. + +proj_api.h is no longer available in PROJ 8.0.0, use proj.h instead. + +Fixes: #41735 +--- + cmake/FindProj.cmake | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/cmake/FindProj.cmake b/cmake/FindProj.cmake +index 0afee15fd14c..ccfaf13d9edf 100644 +--- a/cmake/FindProj.cmake ++++ b/cmake/FindProj.cmake +@@ -40,6 +40,12 @@ FIND_PATH(PROJ_INCLUDE_DIR proj_api.h + "$ENV{INCLUDE}" + "$ENV{LIB_DIR}/include" + ) ++IF (NOT PROJ_INCLUDE_DIR) ++ FIND_PATH(PROJ_INCLUDE_DIR proj.h ++ "$ENV{INCLUDE}" ++ "$ENV{LIB_DIR}/include" ++ ) ++ENDIF (NOT PROJ_INCLUDE_DIR) + + FIND_LIBRARY(PROJ_LIBRARY NAMES proj_i proj PATHS + "$ENV{LIB}"
