[PR PATCH] geos: update to 3.9.0.

[PR PATCH] geos: update to 3.9.0.

[Nyx70]

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

There is a new pull request by Nyx70 against master on the void-packages repository

https://github.com/Nyx70/void-packages geos
https://github.com/void-linux/void-packages/pull/28403

geos: update to 3.9.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully?
- [X] I built this PR locally for my native architecture, (x86_64)
- [X] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [X] i686
  - [X] x86_64-musl
  - [X] aarch64
  - [X] aarch64-musl
  - [X] armv7l
  - [X] armv6l-musl
 

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

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

From 1dcdef2453397a9913a422526c52401ffc53a345 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Mon, 1 Feb 2021 10:00:21 +0100
Subject: [PATCH 1/2] geos: update to 3.9.0.

---
 srcpkgs/geos/patches/geos-arm.patch | 14 ++++++++++++++
 srcpkgs/geos/template               |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/geos/patches/geos-arm.patch

diff --git a/srcpkgs/geos/patches/geos-arm.patch b/srcpkgs/geos/patches/geos-arm.patch
new file mode 100644
index 00000000000..5b6a7c6c7da
--- /dev/null
+++ b/srcpkgs/geos/patches/geos-arm.patch
@@ -0,0 +1,14 @@
+see http://trac.osgeo.org/geos/ticket/222
+
+--- src/inlines.cpp	2020-12-09 18:17:36.000000000 +0100
++++ src/inlines.cpp	2021-02-02 09:57:11.270098998 +0100
+@@ -62,7 +62,9 @@
+ #include <geos/geomgraph/TopologyLocation.inl>
+ #include <geos/geomgraph/index/SegmentIntersector.inl>
+ #include <geos/noding/snapround/HotPixel.inl>
++#if ! defined(__ARM_EABI__)
+ #include <geos/noding/BasicSegmentString.inl>
++#endif // !defined __ARM_EABI__
+ #include <geos/noding/MCIndexNoder.inl>
+ 
+ #endif // defined __CYGWIN__
diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template
index 049af66d27a..4926620832e 100644
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@@ -1,14 +1,14 @@
 # Template file for 'geos'
 pkgname=geos
-version=3.7.1
+version=3.9.0
 revision=1
 build_style=gnu-configure
 short_desc="C++ port of the Java Topology Suite (JTS)"
-maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="LGPL-2.1-or-later"
 homepage="https://trac.osgeo.org/geos"
 distfiles="https://download.osgeo.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=0006c7b49eaed016b9c5c6f872417a7d7dc022e069ddd683335793d905a8228c
+checksum=bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269
 
 geos-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

From 2e30641a38508aeda2cc8fff1add4b213d28a3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=BDx?= <n.y.x@bluewin.ch>
Date: Tue, 2 Feb 2021 10:37:55 +0100
Subject: [PATCH 2/2] common/shlibs: update for geos-3.9.0

---
 common/shlibs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index dd8a7019ee3..a82bac09eb2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3451,8 +3451,8 @@ libmedC.so.11 libmed-4.0.0_1
 libmed.so.11 libmed-4.0.0_1
 libeog.so eog-3.28.0_4
 libfreexl.so.1 freexl-1.0.5_1
-libgeos-3.7.0.so geos-3.7.0_1
-libgeos_c.so.1 geos-3.6.2_1
+libgeos-3.9.0.so geos-3.9.0_1
+libgeos_c.so.1 geos-3.9.0_1
 libpapi.so.5 papi-5.6.0_1
 libpfm.so.4 papi-5.6.0_1
 libfifechan.so.0.1.5 fifechan-0.1.5_1

Re: [PR PATCH] [Closed]: geos: update to 3.9.0.

[Nyx70]

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

There's a closed pull request on the void-packages repository

geos: update to 3.9.0.
https://github.com/void-linux/void-packages/pull/28403

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully?
- [X] I built this PR locally for my native architecture, (x86_64)
- [X] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [X] i686
  - [X] x86_64-musl
  - [X] aarch64
  - [X] aarch64-musl
  - [X] armv7l
  - [X] armv6l-musl
 

Re: geos: update to 3.9.0.

[abenson]

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/28403#issuecomment-771685506

Comment:
Squash this into a single commit.

Re: [PR PATCH] [Updated] geos: update to 3.9.0.

[Nyx70]

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

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

https://github.com/Nyx70/void-packages geos
https://github.com/void-linux/void-packages/pull/28403

geos: update to 3.9.0.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully?
- [X] I built this PR locally for my native architecture, (x86_64)
- [X] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [X] i686
  - [X] x86_64-musl
  - [X] aarch64
  - [X] aarch64-musl
  - [X] armv7l
  - [X] armv6l-musl
 

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

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

From 31aa6a70a13e47a08f9d0c74e4ea7400306c2e20 Mon Sep 17 00:00:00 2001
From: Nyx70 <n.y.x@bluewin.ch>
Date: Mon, 1 Feb 2021 10:00:21 +0100
Subject: [PATCH] geos: update to 3.9.0.

---
 common/shlibs                       |  4 ++--
 srcpkgs/geos/patches/geos-arm.patch | 14 ++++++++++++++
 srcpkgs/geos/template               |  6 +++---
 3 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 srcpkgs/geos/patches/geos-arm.patch

diff --git a/common/shlibs b/common/shlibs
index dd8a7019ee3..a82bac09eb2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3451,8 +3451,8 @@ libmedC.so.11 libmed-4.0.0_1
 libmed.so.11 libmed-4.0.0_1
 libeog.so eog-3.28.0_4
 libfreexl.so.1 freexl-1.0.5_1
-libgeos-3.7.0.so geos-3.7.0_1
-libgeos_c.so.1 geos-3.6.2_1
+libgeos-3.9.0.so geos-3.9.0_1
+libgeos_c.so.1 geos-3.9.0_1
 libpapi.so.5 papi-5.6.0_1
 libpfm.so.4 papi-5.6.0_1
 libfifechan.so.0.1.5 fifechan-0.1.5_1
diff --git a/srcpkgs/geos/patches/geos-arm.patch b/srcpkgs/geos/patches/geos-arm.patch
new file mode 100644
index 00000000000..5b6a7c6c7da
--- /dev/null
+++ b/srcpkgs/geos/patches/geos-arm.patch
@@ -0,0 +1,14 @@
+see http://trac.osgeo.org/geos/ticket/222
+
+--- src/inlines.cpp	2020-12-09 18:17:36.000000000 +0100
++++ src/inlines.cpp	2021-02-02 09:57:11.270098998 +0100
+@@ -62,7 +62,9 @@
+ #include <geos/geomgraph/TopologyLocation.inl>
+ #include <geos/geomgraph/index/SegmentIntersector.inl>
+ #include <geos/noding/snapround/HotPixel.inl>
++#if ! defined(__ARM_EABI__)
+ #include <geos/noding/BasicSegmentString.inl>
++#endif // !defined __ARM_EABI__
+ #include <geos/noding/MCIndexNoder.inl>
+ 
+ #endif // defined __CYGWIN__
diff --git a/srcpkgs/geos/template b/srcpkgs/geos/template
index 049af66d27a..4926620832e 100644
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@@ -1,14 +1,14 @@
 # Template file for 'geos'
 pkgname=geos
-version=3.7.1
+version=3.9.0
 revision=1
 build_style=gnu-configure
 short_desc="C++ port of the Java Topology Suite (JTS)"
-maintainer="Giuseppe Fierro <gspe@ae-design.ws>"
+maintainer="Nyx70 <n.y.x@bluewin.ch>"
 license="LGPL-2.1-or-later"
 homepage="https://trac.osgeo.org/geos"
 distfiles="https://download.osgeo.org/${pkgname}/${pkgname}-${version}.tar.bz2"
-checksum=0006c7b49eaed016b9c5c6f872417a7d7dc022e069ddd683335793d905a8228c
+checksum=bd8082cf12f45f27630193c78bdb5a3cba847b81e72b20268356c2a4fc065269
 
 geos-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"

Re: [PR PATCH] [Merged]: geos: update to 3.9.0.

[abenson]

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

There's a merged pull request on the void-packages repository

geos: update to 3.9.0.
https://github.com/void-linux/void-packages/pull/28403

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [X] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->

#### Does it build and run successfully?
- [X] I built this PR locally for my native architecture, (x86_64)
- [X] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [X] i686
  - [X] x86_64-musl
  - [X] aarch64
  - [X] aarch64-musl
  - [X] armv7l
  - [X] armv6l-musl