Date: Sunday, March 7, 2021 @ 15:24:43 Author: svenstaro Revision: 886707
upgpkg: zeroc-ice 3.7.5-1 Modified: zeroc-ice/trunk/PKGBUILD Deleted: zeroc-ice/trunk/java14.patch --------------+ PKGBUILD | 30 +++++++++++------------------- java14.patch | 31 ------------------------------- 2 files changed, 11 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-03-07 15:24:16 UTC (rev 886706) +++ PKGBUILD 2021-03-07 15:24:43 UTC (rev 886707) @@ -5,24 +5,21 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=zeroc-ice -pkgver=3.7.4 -pkgrel=2 +pkgver=3.7.5 +pkgrel=1 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(x86_64) url="https://zeroc.com"; -license=(GPL custom:ice) -makedepends=(bzip2 gradle java-environment) -depends=(mcpp lmdb) -source=( - "ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz"; - "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz"; - zeroc-ice.sysusers - java14.patch +license=('GPL' 'custom:ice') +makedepends=('gradle' 'java-environment') +depends=('mcpp' 'lmdb' 'libedit' 'expat' 'bzip2' 'openssl' 'libxcrypt') +source=("ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz"; + "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz"; + zeroc-ice.sysusers ) -sha256sums=('57f200bd2916799bce12960e579d9f9e5b6a9801addaf93d97bb4ce15c760a44' - '957efa66557fe1a9abcc2b6c61e1d63d9880c990cf884f7a2b230ba65dd24426' - '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90' - '6da6def608b170b26d13dc4cbe3447b32aa942c629ef43388f801970965ed2c8') +sha256sums=('36bf45591a95e6ee7216153d45d8eca05ff00c1da35608f0c400e6ddc8049da9' + '8cf3a45d609e57f26826449d35eb1c94d074c4b08371779c59dd85184cdec339' + '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90') _make_args=( "OPTIMIZE=yes" @@ -32,11 +29,6 @@ "SKIP=slice2py" ) -prepare() { - cd "${srcdir}"/ice-${pkgver} - patch -Np1 -i "${srcdir}"/java14.patch -} - build() { cd "${srcdir}"/ice-${pkgver} make "${_make_args[@]}" "LANGUAGES=cpp java" Deleted: java14.patch =================================================================== --- java14.patch 2021-03-07 15:24:16 UTC (rev 886706) +++ java14.patch 2021-03-07 15:24:43 UTC (rev 886707) @@ -1,31 +0,0 @@ -From 995e2062399bb1f3d1afcedf5a8128b3c6c39bb5 Mon Sep 17 00:00:00 2001 -From: Joe George <[email protected]> -Date: Fri, 12 Jun 2020 13:58:35 -0400 -Subject: [PATCH] Skip Proguard build of IceGridGUI if using Java 14 - ---- - java/src/IceGridGUI/build.gradle | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle -index 39cecabfe6..ed81a8bcaf 100644 ---- a/java/src/IceGridGUI/build.gradle -+++ b/java/src/IceGridGUI/build.gradle -@@ -81,9 +81,14 @@ jar { - - project.ext.libJars = [] - --project.ext.jarBuilder = "plain-jar.gradle" --if(icegridguiProguard.toBoolean()) { -- project.ext.jarBuilder = "proguard-jar.gradle" -+project.ext.jarBuilder = "proguard-jar.gradle" -+try { -+ // Proguard does not support Java >= 14 -+ if (!icegridguiProguard.toBoolean() || JavaVersion.current() >= JavaVersion.valueOf("VERSION_14")) { -+ project.ext.jarBuilder = "plain-jar.gradle" -+ } -+} catch (IllegalArgumentException) { -+ // Old version of Gralde that that does not know about Java 14 - } - - apply from: jarBuilder
