From: index-0 <index-0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] geos: update to 3.11.1.
Date: Fri, 25 Nov 2022 14:34:57 +0100 [thread overview]
Message-ID: <20221125133457.PoAfxBvWmA6O0WpKCDBHNCKn3wcr4CzFrGlIjfT-dZM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40631@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 638 bytes --]
There is an updated pull request by index-0 against master on the void-packages repository
https://github.com/index-0/void-packages geos
https://github.com/void-linux/void-packages/pull/40631
geos: update to 3.11.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: x86_64-musl
- I built this PR locally for these architectures:
- i686
- x86_64
- aarch64
- aarch64-musl
- armv7l
- armv7l-musl
- armv6l
- armv6l-musl
A patch file from https://github.com/void-linux/void-packages/pull/40631.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-geos-40631.patch --]
[-- Type: text/x-diff, Size: 2826 bytes --]
From db2a5eddc40039479706f43dbe9ffa1944c5d669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= <alfredoperez1998@tutanota.com>
Date: Fri, 25 Nov 2022 07:34:37 -0600
Subject: [PATCH] geos: update to 3.11.1.
---
common/shlibs | 4 ++--
srcpkgs/geos/patches/geos-arm.patch | 14 --------------
srcpkgs/geos/template | 15 +++++++--------
3 files changed, 9 insertions(+), 24 deletions(-)
delete mode 100644 srcpkgs/geos/patches/geos-arm.patch
diff --git a/common/shlibs b/common/shlibs
index 07296762fcc4..910eb3a69a76 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3433,8 +3433,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.9.0.so geos-3.9.0_1
-libgeos_c.so.1 geos-3.9.0_1
+libgeos.so geos-3.11.1_1
+libgeos_c.so.1 geos-3.11.1_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
deleted file mode 100644
index c4c0e6cec02a..000000000000
--- a/srcpkgs/geos/patches/geos-arm.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-see http://trac.osgeo.org/geos/ticket/222
-
---- a/src/inlines.cpp 2020-12-09 18:17:36.000000000 +0100
-+++ b/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 efc698ab3dc8..615426ea1183 100644
--- a/srcpkgs/geos/template
+++ b/srcpkgs/geos/template
@@ -1,14 +1,14 @@
# Template file for 'geos'
pkgname=geos
-version=3.9.1
-revision=2
-build_style=gnu-configure
+version=3.11.1
+revision=1
+build_style=cmake
short_desc="C++ port of the Java Topology Suite (JTS)"
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=7e630507dcac9dc07565d249a26f06a15c9f5b0c52dd29129a0e3d381d7e382a
+distfiles="https://download.osgeo.org/geos/geos-${version}.tar.bz2"
+checksum=6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2
geos-devel_package() {
depends="${makedepends} ${sourcepkg}-${version}_${revision}"
@@ -17,8 +17,7 @@ geos-devel_package() {
vmove usr/bin/geos-config
vmove usr/include
vmove usr/lib/pkgconfig
- vmove usr/lib/libgeos.so
- vmove usr/lib/libgeos_c.so
- vmove "usr/lib/*.a"
+ vmove usr/lib/cmake
+ vmove "usr/lib/*.so"
}
}
next prev parent reply other threads:[~2022-11-25 13:34 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-20 2:15 [PR PATCH] " index-0
2022-11-24 7:03 ` [PR REVIEW] " classabbyamp
2022-11-25 13:21 ` [PR PATCH] [Closed]: " index-0
2022-11-25 13:21 ` [PR PATCH] [Updated] " index-0
2022-11-25 13:29 ` index-0
2022-11-25 13:34 ` index-0 [this message]
2022-11-25 13:40 ` index-0
2022-11-30 16:42 ` classabbyamp
2022-11-30 16:47 ` classabbyamp
2022-12-05 12:17 ` [PR PATCH] [Updated] " index-0
2022-12-05 20:06 ` [PR REVIEW] " leahneukirchen
2022-12-05 20:27 ` classabbyamp
2022-12-05 20:28 ` classabbyamp
2022-12-06 8:41 ` [PR PATCH] [Updated] " index-0
2022-12-06 8:42 ` [PR REVIEW] " index-0
2022-12-08 19:55 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221125133457.PoAfxBvWmA6O0WpKCDBHNCKn3wcr4CzFrGlIjfT-dZM@z \
--to=index-0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).