summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD12
-rw-r--r--qgis-proj8.patch29
3 files changed, 41 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08687f57116..9d72e85c531 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qgis-ltr
pkgdesc = Geographic Information System (GIS); Long Term Release
pkgver = 3.16.6
- pkgrel = 1
+ pkgrel = 2
url = https://qgis.org/
arch = x86_64
license = GPL
@@ -42,7 +42,9 @@ pkgbase = qgis-ltr
provides = qgis=3.16.6
conflicts = qgis
source = https://qgis.org/downloads/qgis-3.16.6.tar.bz2
+ source = qgis-proj8.patch
sha256sums = 496388cfcdb8096d2f43bec1f5a2cca6c8c9152a4854fe2da2f685b9a3a698f3
+ sha256sums = 58f58b5e43cc9f13b55bf2a9742b3c7cb555eee3c4075611980f0496cfd24c89
pkgname = qgis-ltr
diff --git a/PKGBUILD b/PKGBUILD
index 64394fbe954..0688588c0ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@
_pkgname=qgis
pkgname="$_pkgname"-ltr
pkgver=3.16.6
-pkgrel=1
+pkgrel=2
pkgdesc='Geographic Information System (GIS); Long Term Release'
url='https://qgis.org/'
license=(GPL)
@@ -26,9 +26,15 @@ optdepends=('fcgi: Map server'
'gpsbabel: GPS Tools plugin')
provides=("$_pkgname=$pkgver")
conflicts=("$_pkgname")
-source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2")
+source=("https://qgis.org/downloads/$_pkgname-$pkgver.tar.bz2"
+ 'qgis-proj8.patch')
# curl https://qgis.org/downloads/qgis-latest-ltr.tar.bz2.sha256
-sha256sums=('496388cfcdb8096d2f43bec1f5a2cca6c8c9152a4854fe2da2f685b9a3a698f3')
+sha256sums=('496388cfcdb8096d2f43bec1f5a2cca6c8c9152a4854fe2da2f685b9a3a698f3'
+ '58f58b5e43cc9f13b55bf2a9742b3c7cb555eee3c4075611980f0496cfd24c89')
+
+prepare() {
+ patch -d "$_pkgname-$pkgver" -p1 < qgis-proj8.patch # https://github.com/qgis/QGIS/issues/41735
+ }
build() {
cmake -G Ninja -B build -S "$_pkgname-$pkgver" \
diff --git a/qgis-proj8.patch b/qgis-proj8.patch
new file mode 100644
index 00000000000..a71ba3cbcc2
--- /dev/null
+++ b/qgis-proj8.patch
@@ -0,0 +1,29 @@
+From fc1ac8bef8dcc3194857ecd32519aca4867b4fa1 Mon Sep 17 00:00:00 2001
+From: Bas Couwenberg <sebastic@xs4all.nl>
+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}"