aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Jaekel <holger.jaekel@gmx.de>2020-01-03 13:51:13 +0100
committerLeo <thinkabit.ukim@gmail.com>2020-01-04 02:18:37 +0100
commit07a793af079cf3f9bf6a42bc35b1804a7e4ef2fb (patch)
tree5a44a1d1884cdd32b0e61fc46b40ae8c172a93ed
parent37b3e161e2e7e45c9dd96024a24a99b1d39d9186 (diff)
downloadaports-07a793af079cf3f9bf6a42bc35b1804a7e4ef2fb.tar.bz2
aports-07a793af079cf3f9bf6a42bc35b1804a7e4ef2fb.tar.xz
community/proj: upgrade to 6.3.0
-rw-r--r--community/proj/10-test-tolerance.patch14
-rw-r--r--community/proj/APKBUILD8
2 files changed, 3 insertions, 19 deletions
diff --git a/community/proj/10-test-tolerance.patch b/community/proj/10-test-tolerance.patch
deleted file mode 100644
index 645f8a4ecb..0000000000
--- a/community/proj/10-test-tolerance.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Holger Jaekel <holger.jaekel@gmx.de>
-Summary: Adapt test tolerance for build on aarch64
-----
-
---- a/test/gie/builtins.gie
-+++ b/test/gie/builtins.gie
-@@ -5632,7 +5632,7 @@ van der Grinten (I)
- -------------------------------------------------------------------------------
- operation +proj=vandg +a=6400000 +lat_1=0.5 +lat_2=2
- -------------------------------------------------------------------------------
--tolerance 0.15 mm
-+tolerance 0.25 mm
- accept 2 1
- expect 223395.249543407 111704.596633675
diff --git a/community/proj/APKBUILD b/community/proj/APKBUILD
index 6ca126588c..4a32b7e1b6 100644
--- a/community/proj/APKBUILD
+++ b/community/proj/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=proj
-pkgver=6.2.1
+pkgver=6.3.0
pkgrel=0
_datumgridver=1.8
_jdkver=11
@@ -25,7 +25,6 @@ subpackages="
source="
http://download.osgeo.org/proj/proj-$pkgver.tar.gz
http://download.osgeo.org/proj/proj-datumgrid-$_datumgridver.zip
- 10-test-tolerance.patch
TestJni.java
"
@@ -98,10 +97,9 @@ check() {
-Djava.library.path="$builddir/src/.libs/" \
-cp "$builddir/jniwrap/out/proj.jar":. \
TestJni | \
- grep "\[9.0, 0.0, 8.101251062924646, 0.904618578893133, 9.898748937075354, -0.904618578893133\]"
+ grep "\[9.0, 0.0, 8.101251062924646, 0.9046185788931331, 9.898748937075354, -0.9046185788931331\]"
}
-sha512sums="1e8632a9c6fa00c0354473f60d81e4644f173b42f6613856ba03e2404f429864fd5052aacba945ccd265173397bed2abdbe325320b54bc7b1c4a75ad95395a89 proj-6.2.1.tar.gz
+sha512sums="679fd2e57f27feeb956d2a8843cb9028895a78f0dac104c920cc9060afade434b953fb381fed350e5c8ac15cd796f795220e0f1ad276a4f7482d6e7f5681d06e proj-6.3.0.tar.gz
991206f17348b3de484eb5364d773cd06577057228c2d1a0a1c1658308e2596ca13338a666fa71ddd76d538f23dd5bf21e178fd26a785717edd847a17e5c0cd1 proj-datumgrid-1.8.zip
-d26e7e4c87e322682fad2bb6e4dec09f610dfc9f9d82b3c96fe379167fef47ad67449701c32efc6cd44f66621354585a436130148df3fbbbf085adda1371bf7a 10-test-tolerance.patch
36fe2482f89c6ca38883db99b7f1bf5c650a499c678f799f6b10040e3c90873f6c8bfae08f80eaca99b8957a5361b6966f1925184b4050885af1808e05d063e9 TestJni.java"