Date: Sunday, June 21, 2020 @ 01:19:11 Author: svenstaro Revision: 648718
upgpkg: zeroc-ice 3.7.4-1 Added: zeroc-ice/trunk/java14.patch Modified: zeroc-ice/trunk/PKGBUILD --------------+ PKGBUILD | 17 ++++++++++++----- java14.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-06-21 01:14:01 UTC (rev 648717) +++ PKGBUILD 2020-06-21 01:19:11 UTC (rev 648718) @@ -5,8 +5,8 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=zeroc-ice -pkgver=3.7.3 -pkgrel=2 +pkgver=3.7.4 +pkgrel=1 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(x86_64) url="https://zeroc.com"; @@ -17,10 +17,12 @@ "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 ) -sha256sums=('7cbfac83684a7434499f165e784a7a7bb5b89140717537067d7b969eccc111eb' - 'bc84a90d72a50b8d79b4d0fd16060515f25fddb3614a4811479be8f623e726f8' - '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90') +sha256sums=('57f200bd2916799bce12960e579d9f9e5b6a9801addaf93d97bb4ce15c760a44' + '957efa66557fe1a9abcc2b6c61e1d63d9880c990cf884f7a2b230ba65dd24426' + '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90' + '6da6def608b170b26d13dc4cbe3447b32aa942c629ef43388f801970965ed2c8') _make_args=( "OPTIMIZE=yes" @@ -30,6 +32,11 @@ "SKIP=slice2py" ) +prepare() { + cd "${srcdir}"/ice-${pkgver} + patch -Np1 -i "${srcdir}"/java14.patch +} + build() { cd "${srcdir}"/ice-${pkgver} make "${_make_args[@]}" "LANGUAGES=cpp java" Added: java14.patch =================================================================== --- java14.patch (rev 0) +++ java14.patch 2020-06-21 01:19:11 UTC (rev 648718) @@ -0,0 +1,31 @@ +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
