CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

geos: Upgrade to 3.12.0

Browse Source 
Drop upstreamed patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-07-04 13:55:21 -07:00
parent d79a28bc7f
commit 41123b82dd
2 changed files with 2 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
meta-oe/recipes-navigation/geos/geos/0001-include-missing-cstdint.patch
View File

@ -1,82 +0,0 @@
From 11b9ef265a942cb3fdd373520d0c3fce67d3cdf9 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 26 Jan 2023 18:05:33 -0800
Subject: [PATCH] include missing <cstdint>
gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t.
[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
Upstream-Status: Backport [https://github.com/kraj/geos/commit/0e8d4368b]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
include/geos/geomgraph/TopologyLocation.h | 1 +
include/geos/io/WKTWriter.h | 1 +
include/geos/shape/fractal/HilbertCode.h | 1 +
include/geos/shape/fractal/HilbertEncoder.h | 1 +
include/geos/shape/fractal/MortonCode.h | 1 +
5 files changed, 5 insertions(+)
diff --git a/include/geos/geomgraph/TopologyLocation.h b/include/geos/geomgraph/TopologyLocation.h
index 4cbbacb3..a3ecd212 100644
--- a/include/geos/geomgraph/TopologyLocation.h
+++ b/include/geos/geomgraph/TopologyLocation.h
@@ -25,6 +25,7 @@
#include <geos/inline.h>
#include <geos/geom/Location.h>
+#include <cstdint>
#include <vector>
#include <array>
#include <string>
diff --git a/include/geos/io/WKTWriter.h b/include/geos/io/WKTWriter.h
index c0af8e71..0d60e975 100644
--- a/include/geos/io/WKTWriter.h
+++ b/include/geos/io/WKTWriter.h
@@ -25,6 +25,7 @@
#include <string>
#include <cctype>
+#include <cstdint>
#ifdef _MSC_VER
#pragma warning(push)
diff --git a/include/geos/shape/fractal/HilbertCode.h b/include/geos/shape/fractal/HilbertCode.h
index 46012efc..beeb28c6 100644
--- a/include/geos/shape/fractal/HilbertCode.h
+++ b/include/geos/shape/fractal/HilbertCode.h
@@ -17,6 +17,7 @@
#include <geos/export.h>
#include <string>
+#include <cstdint>
// Forward declarations
namespace geos {
diff --git a/include/geos/shape/fractal/HilbertEncoder.h b/include/geos/shape/fractal/HilbertEncoder.h
index 61c0010d..0126d3d9 100644
--- a/include/geos/shape/fractal/HilbertEncoder.h
+++ b/include/geos/shape/fractal/HilbertEncoder.h
@@ -16,6 +16,7 @@
#pragma once
#include <geos/export.h>
+#include <cstdint>
#include <string>
#include <vector>
diff --git a/include/geos/shape/fractal/MortonCode.h b/include/geos/shape/fractal/MortonCode.h
index 6743f87c..ad4a42e7 100644
--- a/include/geos/shape/fractal/MortonCode.h
+++ b/include/geos/shape/fractal/MortonCode.h
@@ -17,6 +17,7 @@
#include <geos/export.h>
#include <string>
+#include <cstdint>
// Forward declarations
namespace geos {
--
2.39.1

5
meta-oe/recipes-navigation/geos/geos_3.9.4.bb → meta-oe/recipes-navigation/geos/geos_3.12.0.bb
View File

@ -5,9 +5,8 @@ SECTION = "libs"
LICENSE = "LGPL-2.1-or-later"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2 \
file://0001-include-missing-cstdint.patch"
SRC_URI[sha256sum] = "70dff2530d8cd2dfaeeb91a5014bd17afb1baee8f0e3eb18e44d5b4dbea47b14"
SRC_URI = "http://download.osgeo.org/${BPN}/${BP}.tar.bz2"
SRC_URI[sha256sum] = "d96db96011259178a35555a0f6d6e75a739e52a495a6b2aa5efb3d75390fbc39"
inherit autotools pkgconfig binconfig