From 9e4b4abb38f17916285d8a624a667593948ac480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Sat, 15 Jun 2024 00:15:54 +0200
Subject: [PATCH] shapelib: update to 1.6.0.

---
 common/shlibs                         |  2 +-
 srcpkgs/shapelib/patches/libdir.patch | 21 ---------------------
 srcpkgs/shapelib/template             |  6 +++---
 3 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 srcpkgs/shapelib/patches/libdir.patch

diff --git a/common/shlibs b/common/shlibs
index 72e08c4524d..abcfb0e0ee4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3546,7 +3546,7 @@ libspa-jack.so libspa-jack-0.3.6_1
 libspa-v4l2.so libspa-v4l2-0.3.6_1
 libspa-videoconvert.so libspa-videoconvert-0.3.6_1
 libspa-vulkan.so libspa-vulkan-0.3.6_1
-libshp.so.1 shapelib-1.4.1_1
+libshp.so.4 shapelib-1.6.0_1
 libantlr3c.so libantlr3c-3.4_1
 libbzrtp.so.0 bzrtp-1.0.6_1
 libbellesip.so.1 belle-sip-4.4.0_1
diff --git a/srcpkgs/shapelib/patches/libdir.patch b/srcpkgs/shapelib/patches/libdir.patch
deleted file mode 100644
index d506ad9edc3..00000000000
--- a/srcpkgs/shapelib/patches/libdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git CMakeLists.txt CMakeLists.txt
-index c3ef935..4b0e65c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,11 +53,11 @@ set(
-   CACHE PATH "install location for user executables"
-   )
- 
--set(
--  CMAKE_INSTALL_LIBDIR
--  ${CMAKE_INSTALL_PREFIX}/lib
--  CACHE PATH "install location for object code libraries"
--  )
-+# set(
-+#   CMAKE_INSTALL_LIBDIR
-+#   ${CMAKE_INSTALL_PREFIX}/lib
-+#   CACHE PATH "install location for object code libraries"
-+#   )
- 
- set(
-   CMAKE_INSTALL_INCLUDEDIR
diff --git a/srcpkgs/shapelib/template b/srcpkgs/shapelib/template
index 67a6f9c0dc7..cf0644156f4 100644
--- a/srcpkgs/shapelib/template
+++ b/srcpkgs/shapelib/template
@@ -1,6 +1,6 @@
 # Template file for 'shapelib'
 pkgname=shapelib
-version=1.5.0
+version=1.6.0
 revision=1
 build_style=cmake
 short_desc="Library for reading and writing of ESRI Shapefiles"
@@ -8,7 +8,7 @@ maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="LGPL-2.0-only"
 homepage="http://shapelib.maptools.org/"
 distfiles="http://download.osgeo.org/shapelib/shapelib-${version}.tar.gz"
-checksum=1fc0a480982caef9e7b9423070b47750ba34cd0ba82668f2e638fab1d07adae1
+checksum=19528b24377241705637320c367943031ad5088665d1fb0e1eaa52a71264a6c4
 
 shapelib-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
@@ -16,7 +16,7 @@ shapelib-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.so"
-		vmove usr/share/shp
+		vmove usr/share/shapelib/*.cmake
 	}
 }