geos: Upgrade to 3.9.3

Remove an upstreamed patch.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Zoltán Böszörményi
2022-06-22 16:17:07 +02:00
committed by Khem Raj
parent b85b4afe93
commit 78d7e94dab
3 changed files with 3 additions and 46 deletions
@@ -1,39 +0,0 @@
From 9d51027c228dafd7db2d0cffca1f0fc695e950fd Mon Sep 17 00:00:00 2001
From: Otavio Salvador <otavio@ossystems.com.br>
Date: Mon, 2 Dec 2013 11:33:26 -0200
Subject: [PATCH] geos-config: Add includedir variable
This fixes cross-compile as it is easier to mangle the includedir
during sysroot generation.
Upstream-Status: Pending
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
tools/geos-config.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/geos-config.in b/tools/geos-config.in
index 9b45b5f..1749892 100644
--- a/tools/geos-config.in
+++ b/tools/geos-config.in
@@ -1,6 +1,7 @@
#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
+includedir=@includedir@
libdir=@libdir@
usage()
@@ -38,7 +39,7 @@ case $1 in
echo @VERSION@
;;
--cflags)
- echo -I${prefix}/include
+ echo -I${includedir}
;;
--libs)
# TODO: make an alias for --clibs
--
1.7.10.4
@@ -1,7 +0,0 @@
require geos.inc
SRC_URI += "file://geos-config-Add-includedir-variable.patch \
"
SRC_URI[md5sum] = "77f2c2cca1e9f49bc1bece9037ac7a7a"
SRC_URI[sha256sum] = "cfbf68079117c1c2b76411636444ff41d73c31093c4cab9dcc9a8c1bbe7e3897"
@@ -0,0 +1,3 @@
require geos.inc
SRC_URI[sha256sum] = "f8b2314e311456f7a449144efb5e3188c2a28774752bc50fc882a3cd5c89ee35"