upgpkg: java-r5 6.6-1

upstream release

upstream v6.6

4 files changed, 11 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 698d96ae9aa0..f227ca1a5fee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = java-r5
 	pkgdesc = Conveyal R5 Routing Engine
-	pkgver = 6.4
+	pkgver = 6.6
 	pkgrel = 1
 	url = https://github.com/conveyal/r5
 	arch = i686
@@ -10,14 +10,12 @@ pkgbase = java-r5
 	makedepends = git
 	depends = jdk11-openjdk
 	depends = java-environment
-	source = r5-6.4.tar.gz::https://github.com/conveyal/r5/archive/refs/tags/v6.4.tar.gz
-	source = 01-don-t-try-to-guess-git-version_v6.4.patch
-	source = 02-path-result-max-destinations_v6.4.patch
+	source = r5-6.6.tar.gz::https://github.com/conveyal/r5/archive/refs/tags/v6.6.tar.gz
+	source = 01-don-t-try-to-guess-git-version_v6.6.patch
 	source = r5-backend.service
 	source = r5-backend.sysusers
-	sha512sums = fbf418570a287aaad143cc3435c01aee1bd784e686fe68aa6292f1b46416d45aaf0527d3ad5ecf056e2ac47ab529248e443aa50a8dabcd37972293b681509d45
-	sha512sums = 1f6468bc25d253f355792414269c099716869e7d3f5d12c079f8c24bad22616fc38a712ba33149b40642a10e45419510077d4f73abbd70b1aefcf410bf9f9f91
-	sha512sums = b797e4ce01b974ea4ac2f1fc13bb99b01bea9d1f9701f3149b2eac1f193c571b4b84780892f6f95ad1302012965623266344f6fd4167cb9e6c126fc2ca4a8dd8
+	sha512sums = 866d682a3ac4fd79a9681f7f3db4c7761eb292ffd61ee66d63d3e89ee45607d6ff3bc0d19abfda071fb71140ecf9ebc1440566f4ff39a416c84efa409a17fd56
+	sha512sums = 7d8441625313921e5644e6cd230b708600647ec3accdc7e3bf75463138e4e9b46298103668012adc32bc9e2c59c035b6bb4f53931801a089e74e99d0e39730a1
 	sha512sums = bbd8b1d60359bd1f33dd4aaf94752cdd7c338e2b46cb91e6488df4f7c27f262ffda1789d010c7621652234be72c9813601bd0775f6e77bad04b8a7ef2d1d3be7
 	sha512sums = 322e32156c18d323c9b62f97e2a3792c151a5f7b677b291061ea0da8697fc00cc6977dbcb3f723ea492ae339508dfb543d731fa1c4f857f7efc0e470c3d1fe09
 
diff --git a/01-don-t-try-to-guess-git-version_v6.4.patch b/01-don-t-try-to-guess-git-version_v6.6.patch
index 2a7ea49d77db..792b9a31acfc 100644
--- a/01-don-t-try-to-guess-git-version_v6.4.patch
+++ b/01-don-t-try-to-guess-git-version_v6.6.patch
@@ -11,11 +11,11 @@ diff --unified --recursive --text a/build.gradle b/build.gradle
  group = 'com.conveyal'
  // set version to `git describe --tags --always --first-parent`, plus '.dirty' if local changes are present.
 -version gitVersion()
-+version 'v6.4'
++version 'v6.6'
 
  java {
      sourceCompatibility = JavaVersion.VERSION_11
-@@ -93,14 +92,13 @@
+@@ -99,14 +98,13 @@
  // such as the full commit ID and branch name, rather than just the version available in the JAR manifest.
  task createVersionProperties(dependsOn: processResources) {
      doLast {
diff --git a/02-path-result-max-destinations_v6.4.patch b/02-path-result-max-destinations_v6.4.patch
deleted file mode 100644
index 642df6c55554..000000000000
--- a/02-path-result-max-destinations_v6.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --unified --recursive --text a/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java b/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java
---- a/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java	2021-05-16 20:18:52.000000000 +0300
-+++ b/src/main/java/com/conveyal/r5/analyst/cluster/PathResult.java	2021-10-27 11:00:31.245320268 +0300
-@@ -32,6 +32,14 @@
- 
- public class PathResult {
- 
-+    /**
-+     * The maximum number of destinations for which we'll generate detailed path information in a single request.
-+     * Detailed path information was added on to the original design, which returned a simple grid of travel times.
-+     * These results are returned to the backend over an HTTP API so we don't want to risk making them too huge.
-+     * This could be set to a higher number in cases where you know the result return channel can handle the size.
-+     */
-+    public static int maxDestinations = 5000;
-+
-     private final int nDestinations;
-     /**
-      * Array with one entry per destination. Each entry is a map from a "path template" to the associated iteration
-@@ -62,8 +70,8 @@
-             // In regional analyses, return paths to all destinations
-             nDestinations = task.nTargetsPerOrigin();
-             // This limitation reflects the initial design, for use with freeform pointset destinations
--            if (nDestinations > 5000) {
--                throw new UnsupportedOperationException("Path results are limited to 5000 destinations");
-+            if (nDestinations > maxDestinations) {
-+                throw new UnsupportedOperationException("Number of detailed path destinations exceeds limit of " + maxDestinations);
-             }
-         }
-         iterationsForPathTemplates = new Multimap[nDestinations];
diff --git a/PKGBUILD b/PKGBUILD
index e3f79b72d569..8ffbd477c3a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=java-r5
 _pkgname=${pkgname#java-}
-pkgver=6.4
+pkgver=6.6
 pkgrel=1
 
 pkgdesc="Conveyal R5 Routing Engine"
@@ -16,16 +16,14 @@ makedepends=("gradle" "git")
 
 source=(
     "${_pkgname}-${pkgver}.tar.gz::https://github.com/conveyal/${_pkgname}/archive/refs/tags/v${pkgver}.tar.gz"
-    "01-don-t-try-to-guess-git-version_v6.4.patch"
-    "02-path-result-max-destinations_v6.4.patch"
+    "01-don-t-try-to-guess-git-version_v6.6.patch"
     "r5-backend.service"
     "r5-backend.sysusers"
 
 )
 sha512sums=(
-    "fbf418570a287aaad143cc3435c01aee1bd784e686fe68aa6292f1b46416d45aaf0527d3ad5ecf056e2ac47ab529248e443aa50a8dabcd37972293b681509d45"
-    "1f6468bc25d253f355792414269c099716869e7d3f5d12c079f8c24bad22616fc38a712ba33149b40642a10e45419510077d4f73abbd70b1aefcf410bf9f9f91"
-    "b797e4ce01b974ea4ac2f1fc13bb99b01bea9d1f9701f3149b2eac1f193c571b4b84780892f6f95ad1302012965623266344f6fd4167cb9e6c126fc2ca4a8dd8"
+    "866d682a3ac4fd79a9681f7f3db4c7761eb292ffd61ee66d63d3e89ee45607d6ff3bc0d19abfda071fb71140ecf9ebc1440566f4ff39a416c84efa409a17fd56"
+    "7d8441625313921e5644e6cd230b708600647ec3accdc7e3bf75463138e4e9b46298103668012adc32bc9e2c59c035b6bb4f53931801a089e74e99d0e39730a1"
     "bbd8b1d60359bd1f33dd4aaf94752cdd7c338e2b46cb91e6488df4f7c27f262ffda1789d010c7621652234be72c9813601bd0775f6e77bad04b8a7ef2d1d3be7"
     "322e32156c18d323c9b62f97e2a3792c151a5f7b677b291061ea0da8697fc00cc6977dbcb3f723ea492ae339508dfb543d731fa1c4f857f7efc0e470c3d1fe09"
 )