[arch-commits] Commit in zeroc-ice/repos (4 files)

[Sven-Hendrik Haase]

    Date: Friday, August 21, 2020 @ 19:47:00
  Author: svenstaro
Revision: 686434

archrelease: copy trunk to community-testing-x86_64

Added:
  zeroc-ice/repos/community-testing-x86_64/
  zeroc-ice/repos/community-testing-x86_64/PKGBUILD
    (from rev 686433, zeroc-ice/trunk/PKGBUILD)
  zeroc-ice/repos/community-testing-x86_64/java14.patch
    (from rev 686433, zeroc-ice/trunk/java14.patch)
  zeroc-ice/repos/community-testing-x86_64/zeroc-ice.sysusers
    (from rev 686433, zeroc-ice/trunk/zeroc-ice.sysusers)

--------------------+
 PKGBUILD           |   88 +++++++++++++++++++++++++++++++++++++++++++++++++++
 java14.patch       |   31 +++++++++++++++++
 zeroc-ice.sysusers |    1 
 3 files changed, 120 insertions(+)

Copied: zeroc-ice/repos/community-testing-x86_64/PKGBUILD (from rev 686433, zeroc-ice/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2020-08-21 19:47:00 UTC (rev 686434)
@@ -0,0 +1,88 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: Joe George <joe at externl dot com>
+# Contributor: Daniel Spies <ds20150201aur at pskx dot net>
+# Contributor: Otto Allmendinger <otto.allmendinger at gmail.com>
+
+pkgname=(zeroc-ice zeroc-ice-java)
+pkgbase=zeroc-ice
+pkgver=3.7.4
+pkgrel=2
+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
+)
+sha256sums=('57f200bd2916799bce12960e579d9f9e5b6a9801addaf93d97bb4ce15c760a44'
+            '957efa66557fe1a9abcc2b6c61e1d63d9880c990cf884f7a2b230ba65dd24426'
+            '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90'
+            '6da6def608b170b26d13dc4cbe3447b32aa942c629ef43388f801970965ed2c8')
+
+_make_args=(
+    "OPTIMIZE=yes"
+    "USR_DIR_INSTALL=yes"
+    "prefix=/usr"
+    "CONFIGS=shared cpp11-shared"
+    "SKIP=slice2py"
+)
+
+prepare() {
+  cd "${srcdir}"/ice-${pkgver}
+  patch -Np1 -i "${srcdir}"/java14.patch
+}
+
+build() {
+  cd "${srcdir}"/ice-${pkgver}
+  make "${_make_args[@]}" "LANGUAGES=cpp java"
+}
+
+package_zeroc-ice() {
+  backup=("etc/glacier2router.conf"
+          "etc/icegridnode.conf"
+          "etc/icegridregistry.conf"
+  )
+
+  cd "${srcdir}"/ice-${pkgver}
+
+  make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=cpp"
+  install -Dm644 "${srcdir}"/ice-${pkgver}/ICE_LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  rm -f "${pkgdir}"/usr/share/Ice-${pkgver}/LICENSE
+  rm -f "${pkgdir}"/usr/share/Ice-${pkgver}/ICE_LICENSE
+
+  rm -df "${pkgdir}"/usr/lib/
+  mv "${pkgdir}"/usr/lib64/ "${pkgdir}"/usr/lib/
+
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/glacier2router.conf "${pkgdir}"/etc/glacier2router.conf
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridnode.conf "${pkgdir}"/etc/icegridnode.conf
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridregistry.conf "${pkgdir}"/etc/icegridregistry.conf
+
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/glacier2router.service \
+                 "${pkgdir}"/usr/lib/systemd/system/glacier2router.service
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridnode.service \
+                 "${pkgdir}"/usr/lib/systemd/system/icegridnode.service
+  install -Dm644 "${srcdir}"/ice-packaging-${pkgver}/ice/rpm/icegridregistry.service \
+                 "${pkgdir}"/usr/lib/systemd/system/icegridregistry.service
+
+  mkdir -p "${pkgdir}"/var/lib/ice/icegrid/{node1,registry}
+  chown -R 101:101 "${pkgdir}"/var/lib/ice
+
+  install -Dm644 "${srcdir}"/zeroc-ice.sysusers "${pkgdir}"/usr/lib/sysusers.d/$pkgname.conf
+}
+
+package_zeroc-ice-java() {
+  depends=(zeroc-ice java-environment)
+
+  cd "${srcdir}"/ice-${pkgver}
+
+  export GRADLE_USER_HOME=/tmp
+  make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=java"
+
+  rm -rf "${pkgdir}"/usr/share/ice
+}

Copied: zeroc-ice/repos/community-testing-x86_64/java14.patch (from rev 686433, zeroc-ice/trunk/java14.patch)
===================================================================
--- community-testing-x86_64/java14.patch	                        (rev 0)
+++ community-testing-x86_64/java14.patch	2020-08-21 19:47:00 UTC (rev 686434)
@@ -0,0 +1,31 @@
+From 995e2062399bb1f3d1afcedf5a8128b3c6c39bb5 Mon Sep 17 00:00:00 2001
+From: Joe George <joe at zeroc.com>
+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

Copied: zeroc-ice/repos/community-testing-x86_64/zeroc-ice.sysusers (from rev 686433, zeroc-ice/trunk/zeroc-ice.sysusers)
===================================================================
--- community-testing-x86_64/zeroc-ice.sysusers	                        (rev 0)
+++ community-testing-x86_64/zeroc-ice.sysusers	2020-08-21 19:47:00 UTC (rev 686434)
@@ -0,0 +1 @@
+u ice 101 "Ice User" /var/lib/ice