Re: [PR PATCH] [Updated] New package: libkml-1.3.0

[Nyx70 <Nyx70@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 310 bytes --]

There is an updated pull request by Nyx70 against master on the void-packages repository

https://github.com/Nyx70/void-packages libkml
https://github.com/void-linux/void-packages/pull/26727

New package: libkml-1.3.0


A patch file from https://github.com/void-linux/void-packages/pull/26727.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libkml-26727.patch --]
[-- Type: text/x-diff, Size: 3314 bytes --]

From e2e1d0ff5a2adcd80a188701d61af8078ada9c1d Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Thu, 26 Nov 2020 18:47:25 +0100
Subject: [PATCH 1/2] New package: libkml-1.3.0

libkml is a library to process Google-KML GEO files.
It can be used in GDAL (libgdal), OSSIM, OTB and osgEarth
---
 srcpkgs/libkml-devel                   |  1 +
 srcpkgs/libkml/patches/NOUNCRYPT.patch | 17 +++++++++++++++++
 srcpkgs/libkml/template                | 24 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/libkml-devel
 create mode 100644 srcpkgs/libkml/patches/NOUNCRYPT.patch
 create mode 100644 srcpkgs/libkml/template

diff --git a/srcpkgs/libkml-devel b/srcpkgs/libkml-devel
new file mode 120000
index 00000000000..cf12be102f4
--- /dev/null
+++ b/srcpkgs/libkml-devel
@@ -0,0 +1 @@
+libkml
\ No newline at end of file
diff --git a/srcpkgs/libkml/patches/NOUNCRYPT.patch b/srcpkgs/libkml/patches/NOUNCRYPT.patch
new file mode 100644
index 00000000000..5b7e016c0e0
--- /dev/null
+++ b/srcpkgs/libkml/patches/NOUNCRYPT.patch
@@ -0,0 +1,17 @@
+minizip/crypt.h was removed from the packet minizip-1.2.11_2. 
+
+with "#define NOUNCRYPT" libkml can be built without "crypt.h"
+https://github.com/void-linux/void-packages/commit/952ac913cf
+https://github.com/madler/zlib/pull/229
+
+--- a/src/kml/base/contrib/minizip/unzip.c	2015-12-21 18:23:05.000000000 +0100
++++ b/src/kml/base/contrib/minizip/unzip.c	2020-11-26 15:45:55.033835816 +0100
+@@ -42,7 +42,7 @@
+ #include <zlib.h> //RR
+ #include "unzip.h"
+ #include "iomem_simple.h"
+-#undef NOUNCRYPT
++#define NOUNCRYPT
+ 
+ #ifdef STDC
+ #  include <stddef.h>
diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
new file mode 100644
index 00000000000..87ce6bc7706
--- /dev/null
+++ b/srcpkgs/libkml/template
@@ -0,0 +1,24 @@
+# Template file for 'libkml'
+pkgname=libkml
+version=1.3.0
+revision=1
+build_style=cmake
+makedepends="zlib-devel expat-devel boost-devel minizip-devel uriparser-devel"
+short_desc="Library to manipulate KML OGC files"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/libkml/libkml"
+distfiles="https://github.com/libkml/libkml/archive/${version}.tar.gz"
+checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
+patch_args=-Np1
+
+libkml-devel_package() {
+	depends="$pkgname-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
+		vmove "usr/lib/*.so"
+	}
+}

From 9c211e8cdb5687c96da3e3dee6916f3784b33979 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Sun, 13 Dec 2020 14:41:07 +0100
Subject: [PATCH 2/2] libkml: libkml-devel_package depends= fixed

---
 srcpkgs/libkml/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libkml/template b/srcpkgs/libkml/template
index 87ce6bc7706..7d4f5a72660 100644
--- a/srcpkgs/libkml/template
+++ b/srcpkgs/libkml/template
@@ -13,7 +13,7 @@ checksum=8892439e5570091965aaffe30b08631fdf7ca7f81f6495b4648f0950d7ea7963
 patch_args=-Np1
 
 libkml-devel_package() {
-	depends="$pkgname-${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include