[arch-commits] Commit in zeroc-ice/repos/community-x86_64 (5 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sun Jun 21 01:19:19 UTC 2020
Date: Sunday, June 21, 2020 @ 01:19:19
Author: svenstaro
Revision: 648719
archrelease: copy trunk to community-x86_64
Added:
zeroc-ice/repos/community-x86_64/PKGBUILD
(from rev 648718, zeroc-ice/trunk/PKGBUILD)
zeroc-ice/repos/community-x86_64/java14.patch
(from rev 648718, zeroc-ice/trunk/java14.patch)
zeroc-ice/repos/community-x86_64/zeroc-ice.sysusers
(from rev 648718, zeroc-ice/trunk/zeroc-ice.sysusers)
Deleted:
zeroc-ice/repos/community-x86_64/PKGBUILD
zeroc-ice/repos/community-x86_64/zeroc-ice.sysusers
--------------------+
PKGBUILD | 169 ++++++++++++++++++++++++++-------------------------
java14.patch | 31 +++++++++
zeroc-ice.sysusers | 2
3 files changed, 120 insertions(+), 82 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-21 01:19:11 UTC (rev 648718)
+++ PKGBUILD 2020-06-21 01:19:19 UTC (rev 648719)
@@ -1,81 +0,0 @@
-# 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.3
-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
-)
-sha256sums=('7cbfac83684a7434499f165e784a7a7bb5b89140717537067d7b969eccc111eb'
- 'bc84a90d72a50b8d79b4d0fd16060515f25fddb3614a4811479be8f623e726f8'
- '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90')
-
-_make_args=(
- "OPTIMIZE=yes"
- "USR_DIR_INSTALL=yes"
- "prefix=/usr"
- "CONFIGS=shared cpp11-shared"
- "SKIP=slice2py"
-)
-
-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-x86_64/PKGBUILD (from rev 648718, zeroc-ice/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-06-21 01:19:19 UTC (rev 648719)
@@ -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=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
+)
+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-x86_64/java14.patch (from rev 648718, zeroc-ice/trunk/java14.patch)
===================================================================
--- java14.patch (rev 0)
+++ java14.patch 2020-06-21 01:19:19 UTC (rev 648719)
@@ -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
Deleted: zeroc-ice.sysusers
===================================================================
--- zeroc-ice.sysusers 2020-06-21 01:19:11 UTC (rev 648718)
+++ zeroc-ice.sysusers 2020-06-21 01:19:19 UTC (rev 648719)
@@ -1 +0,0 @@
-u ice 101 "Ice User" /var/lib/ice
Copied: zeroc-ice/repos/community-x86_64/zeroc-ice.sysusers (from rev 648718, zeroc-ice/trunk/zeroc-ice.sysusers)
===================================================================
--- zeroc-ice.sysusers (rev 0)
+++ zeroc-ice.sysusers 2020-06-21 01:19:19 UTC (rev 648719)
@@ -0,0 +1 @@
+u ice 101 "Ice User" /var/lib/ice
More information about the arch-commits
mailing list