[arch-commits] Commit in qgis/trunk (PKGBUILD qgis-proj8.patch)

[Jaroslav Lichtblau]

    Date: Saturday, June 19, 2021 @ 16:12:16
  Author: jlichtblau
Revision: 965529

qgis - unneeded patches removed in trunk

Modified:
  qgis/trunk/PKGBUILD
Deleted:
  qgis/trunk/qgis-proj8.patch

------------------+
 PKGBUILD         |    9 +--------
 qgis-proj8.patch |   29 -----------------------------
 2 files changed, 1 insertion(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-19 15:50:15 UTC (rev 965528)
+++ PKGBUILD	2021-06-19 16:12:16 UTC (rev 965529)
@@ -23,18 +23,11 @@
              'txt2tags' 'sip4')
 optdepends=('fcgi: Map server'
             'gpsbabel: GPS Tools plugin')
-source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2"
-        'qgis-qwtpolar-link.patch::https://github.com/qgis/QGIS/commit/75e7e6ca.patch'
-        'qgis-proj8.patch')
+source=("https://qgis.org/downloads/$pkgname-$pkgver.tar.bz2")
 sha256sums=('7decdacb7d6d2cb905b5302bbbc5ed6f64e9739ab2793cb585dc95670ab3f737'
             '0dc0d21ce484932819ce52dae28f09eb797fb4a04e4618ca4319f0ceef553a80'
             '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() {
   cmake -S $pkgname-$pkgver -B build -G Ninja \
     -DCMAKE_INSTALL_PREFIX='/usr' \

Deleted: qgis-proj8.patch
===================================================================
--- qgis-proj8.patch	2021-06-19 15:50:15 UTC (rev 965528)
+++ qgis-proj8.patch	2021-06-19 16:12:16 UTC (rev 965529)
@@ -1,29 +0,0 @@
-From fc1ac8bef8dcc3194857ecd32519aca4867b4fa1 Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg <sebastic at 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}"