diff --git a/community/geos/20-ruby27.patch b/community/geos/20-ruby27.patch deleted file mode 100644 index dbb231a518a..00000000000 --- a/community/geos/20-ruby27.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Holger Jaekel -Summary: Patch for modified 'rb_define_virtual_variable' signature in Ruby 2.7 - This patch can hopefully be removed when Swig supports Ruby 2.7 -Url: https://github.com/swig/swig/issues/1689 ----- - ---- a/swig/ruby/Makefile.in -+++ b/swig/ruby/Makefile.in -@@ -873,6 +873,7 @@ uninstall-am: uninstall-rubyextensiondir - - @ENABLE_RUBY_TRUE@@ENABLE_SWIG_TRUE@geos_wrap.cxx: ../geos.i ruby.i - @ENABLE_RUBY_TRUE@@ENABLE_SWIG_TRUE@ $(SWIG) -c++ -ruby -autorename -o $@ $< -+@ENABLE_RUBY_TRUE@@ENABLE_SWIG_TRUE@ sed -i 's/swig_ruby_trackings_count, NULL/(rb_gvar_getter_t *)swig_ruby_trackings_count, (rb_gvar_setter_t *)NULL/g' $@ - - @ENABLE_RUBY_TRUE@@ENABLE_SWIG_FALSE@geos_wrap.cxx: ../geos.i ruby.i - @ENABLE_RUBY_TRUE@@ENABLE_SWIG_FALSE@ @echo "SWIG is disabled, can't build geos_wrap.cxx" diff --git a/community/geos/APKBUILD b/community/geos/APKBUILD index 6c760992119..9a8db471a53 100644 --- a/community/geos/APKBUILD +++ b/community/geos/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Holger Jaekel pkgname=geos pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="GEOS is a library providing OpenGIS and JTS spatial operations in C++." url="https://trac.osgeo.org/geos/" arch="all !s390x !mips !mips64" @@ -20,7 +20,6 @@ subpackages=" source=" http://download.osgeo.org/geos/geos-$pkgver.tar.bz2 10-configure-python3.patch - 20-ruby27.patch " build() { @@ -72,5 +71,4 @@ ruby() { rm -rf "${pkgdir:?}"/usr/local } sha512sums="1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056 geos-3.8.1.tar.bz2 -a76aceadb30c6a078ef9c671d8335647bd6b94094bd4bdda5958f0d50271552e8f1f7b4e9d4295986f4371a446071c3cc3a446ef520543e820bde83833fea18e 10-configure-python3.patch -964d9001e49ac3bec415c36cf3d536f4e959b800fd6770344eca6c58e9bc7bfa23c2722422ffb3677c231a00b5d758e6657ba13e9f8920eb530d71eaa03f989e 20-ruby27.patch" +a76aceadb30c6a078ef9c671d8335647bd6b94094bd4bdda5958f0d50271552e8f1f7b4e9d4295986f4371a446071c3cc3a446ef520543e820bde83833fea18e 10-configure-python3.patch"