[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD)
Date: Friday, August 21, 2020 @ 19:46:54 Author: svenstaro Revision: 686433 upgpkg: zeroc-ice 3.7.4-2: libxcrypt rebuild Modified: zeroc-ice/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-08-21 19:45:59 UTC (rev 686432) +++ PKGBUILD2020-08-21 19:46:54 UTC (rev 686433) @@ -6,7 +6,7 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=zeroc-ice pkgver=3.7.4 -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(x86_64) url="https://zeroc.com;
[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD java14.patch)
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 === --- PKGBUILD2020-06-21 01:14:01 UTC (rev 648717) +++ PKGBUILD2020-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.patch2020-06-21 01:19:11 UTC (rev 648718) @@ -0,0 +1,31 @@ +From 995e2062399bb1f3d1afcedf5a8128b3c6c39bb5 Mon Sep 17 00:00:00 2001 +From: Joe George +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
[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD)
Date: Saturday, January 25, 2020 @ 04:44:10 Author: svenstaro Revision: 555396 upgpkg: zeroc-ice 3.7.3-2: rebuild Modified: zeroc-ice/trunk/PKGBUILD --+ PKGBUILD | 45 ++--- 1 file changed, 22 insertions(+), 23 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-01-25 04:41:50 UTC (rev 555395) +++ PKGBUILD2020-01-25 04:44:10 UTC (rev 555396) @@ -4,9 +4,9 @@ # Contributor: Otto Allmendinger pkgname=(zeroc-ice zeroc-ice-java) -pkgbase=(zeroc-ice) +pkgbase=zeroc-ice pkgver=3.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(x86_64) url="https://zeroc.com; @@ -31,7 +31,7 @@ ) build() { - cd ${srcdir}/ice-${pkgver} + cd "${srcdir}"/ice-${pkgver} make "${_make_args[@]}" "LANGUAGES=cpp java" } @@ -41,39 +41,38 @@ "etc/icegridregistry.conf" ) - cd ${srcdir}/ice-${pkgver} + 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 + 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 -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/ + 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.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 + 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 + 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 + install -Dm644 "${srcdir}"/zeroc-ice.sysusers "${pkgdir}"/usr/lib/sysusers.d/$pkgname.conf } package_zeroc-ice-java() { - makedepends=(gradle 'java-environment=8') depends=(zeroc-ice java-environment) - cd ${srcdir}/ice-${pkgver} + cd "${srcdir}"/ice-${pkgver} export GRADLE_USER_HOME=/tmp make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=java"
[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD)
Date: Wednesday, October 16, 2019 @ 22:11:27 Author: svenstaro Revision: 516390 upgpkg: zeroc-ice 3.7.3-1 Modified: zeroc-ice/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-10-16 19:44:10 UTC (rev 516389) +++ PKGBUILD2019-10-16 22:11:27 UTC (rev 516390) @@ -1,4 +1,4 @@ -# Maintainer: Sven-Hendrik Haase +# Maintainer: Sven-Hendrik Haase # Contributor: Joe George # Contributor: Daniel Spies # Contributor: Otto Allmendinger @@ -5,7 +5,7 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=(zeroc-ice) -pkgver=3.7.2 +pkgver=3.7.3 pkgrel=1 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(x86_64) @@ -18,8 +18,8 @@ "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz; zeroc-ice.sysusers ) -sha256sums=('e329a24abf94a4772a58a0fe61af4e707743a272c854552eef3d7833099f40f9' -'4a1aa0bfe3b2ec8ca9b834cbf3b1300fc48e25ccffe82a7a1b6d2f46644ba0bc' +sha256sums=('7cbfac83684a7434499f165e784a7a7bb5b89140717537067d7b969eccc111eb' +'bc84a90d72a50b8d79b4d0fd16060515f25fddb3614a4811479be8f623e726f8' '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90') _make_args=(
[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD)
Date: Thursday, February 14, 2019 @ 05:48:06 Author: svenstaro Revision: 432171 upgpkg: zeroc-ice 3.7.2-1 Modified: zeroc-ice/trunk/PKGBUILD --+ PKGBUILD | 32 +++- 1 file changed, 11 insertions(+), 21 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-02-14 02:34:00 UTC (rev 432170) +++ PKGBUILD2019-02-14 05:48:06 UTC (rev 432171) @@ -5,13 +5,13 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=(zeroc-ice) -pkgver=3.7.1 +pkgver=3.7.2 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=8' gcc7) +makedepends=(bzip2 gradle java-environment) depends=(mcpp lmdb) source=( "ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz; @@ -18,8 +18,8 @@ "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz; zeroc-ice.sysusers ) -sha256sums=('b1526ab9ba80a3d5f314dacf22674dff005efb9866774903d0efca5a0fab326d' -'92530c87b12471df0cae98a7329039fa42902a9d7909eb32915fdc866b419e8a' +sha256sums=('e329a24abf94a4772a58a0fe61af4e707743a272c854552eef3d7833099f40f9' +'4a1aa0bfe3b2ec8ca9b834cbf3b1300fc48e25ccffe82a7a1b6d2f46644ba0bc' '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90') _make_args=( @@ -32,9 +32,7 @@ build() { cd ${srcdir}/ice-${pkgver} - export CC=gcc-7 - export CXX=g++-7 - GRADLE=gradle make srcs -j$(nproc) "${_make_args[@]}" "LANGUAGES=cpp java" + make "${_make_args[@]}" "LANGUAGES=cpp java" } package_zeroc-ice() { @@ -51,10 +49,8 @@ rm -f ${pkgdir}/usr/share/Ice-${pkgver}/LICENSE rm -f ${pkgdir}/usr/share/Ice-${pkgver}/ICE_LICENSE - if [ $CARCH = "x86_64" ]; then - rm -df ${pkgdir}/usr/lib/ - mv ${pkgdir}/usr/lib64/ ${pkgdir}/usr/lib/ - fi + 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 @@ -77,16 +73,10 @@ makedepends=(gradle 'java-environment=8') depends=(zeroc-ice java-environment) - for d in ${srcdir}/ice-${pkgver}/java ${srcdir}/ice-${pkgver}/java-compat; do - cd $d - gradle \ - --gradle-user-home=/tmp/zeroc-ice-java \ - --no-daemon \ - -PdbHome=/usr/share/java/berkeleydb \ - -Pprefix=${pkgdir}/usr/share/java/zeroc-ice install + cd ${srcdir}/ice-${pkgver} - done + export GRADLE_USER_HOME=/tmp + make install "${_make_args[@]}" DESTDIR="${pkgdir}" "LANGUAGES=java" - mv ${pkgdir}/usr/share/java/zeroc-ice/lib/* ${pkgdir}/usr/share/java/zeroc-ice/ - rmdir ${pkgdir}/usr/share/java/zeroc-ice/lib + rm -rf "${pkgdir}"/usr/share/ice }
[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD)
Date: Wednesday, May 30, 2018 @ 21:55:13 Author: svenstaro Revision: 333541 upgpkg: zeroc-ice 3.7.1-1 Modified: zeroc-ice/trunk/PKGBUILD --+ PKGBUILD | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-05-30 21:55:08 UTC (rev 333540) +++ PKGBUILD2018-05-30 21:55:13 UTC (rev 333541) @@ -5,13 +5,13 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=(zeroc-ice) -pkgver=3.7.0 -pkgrel=3 +pkgver=3.7.1 +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=8') +makedepends=(bzip2 gradle 'java-environment=8' gcc7) depends=(mcpp lmdb) source=( "ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz; @@ -18,8 +18,8 @@ "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz; zeroc-ice.sysusers ) -sha256sums=('809fff14a88a7de1364c846cec771d0d12c72572914e6cc4fb0b2c1861c4a1ee' -'096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb' +sha256sums=('b1526ab9ba80a3d5f314dacf22674dff005efb9866774903d0efca5a0fab326d' +'92530c87b12471df0cae98a7329039fa42902a9d7909eb32915fdc866b419e8a' '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90') _make_args=( @@ -32,6 +32,8 @@ build() { cd ${srcdir}/ice-${pkgver} + export CC=gcc-7 + export CXX=g++-7 GRADLE=gradle make srcs -j$(nproc) "${_make_args[@]}" "LANGUAGES=cpp java" }
[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD ice.install zeroc-ice.sysusers)
Date: Saturday, December 30, 2017 @ 06:46:28 Author: svenstaro Revision: 276944 upgpkg: zeroc-ice 3.7.0-3 Use sysusers Added: zeroc-ice/trunk/zeroc-ice.sysusers Modified: zeroc-ice/trunk/PKGBUILD Deleted: zeroc-ice/trunk/ice.install + PKGBUILD | 12 +--- ice.install| 22 -- zeroc-ice.sysusers |1 + 3 files changed, 10 insertions(+), 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-12-30 06:46:24 UTC (rev 276943) +++ PKGBUILD2017-12-30 06:46:28 UTC (rev 276944) @@ -6,7 +6,7 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=(zeroc-ice) pkgver=3.7.0 -pkgrel=2 +pkgrel=3 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(x86_64) url="https://zeroc.com; @@ -13,13 +13,14 @@ license=(GPL custom:ice) makedepends=(bzip2 gradle 'java-environment=8') depends=(mcpp lmdb) -install=ice.install 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=('809fff14a88a7de1364c846cec771d0d12c72572914e6cc4fb0b2c1861c4a1ee' -'096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb') +'096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb' +'5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90') _make_args=( "OPTIMIZE=yes" @@ -63,6 +64,11 @@ ${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() { Deleted: ice.install === --- ice.install 2017-12-30 06:46:24 UTC (rev 276943) +++ ice.install 2017-12-30 06:46:28 UTC (rev 276944) @@ -1,22 +0,0 @@ -post_install() { - getent group ice >/dev/null || groupadd --system -g 101 ice &>/dev/null - getent passwd ice >/dev/null || useradd --system -g 101 -u 101 -d /var/lib/ice -s /bin/false ice &>/dev/null - - #if type -P systemd-tmpfiles &> /dev/null; then - # systemd-tmpfiles --create ice.conf - #fi - - #if [ -d /var/lib/ice ]; then -#echo "Ice directory '/var/lib/ice' already exists. If you want to recreate default database then delete the directory and run 'rethinkdb create -d /var/lib/rethinkdb/default'." - #fi - - if [ ! -d /var/lib/ice ]; then -mkdir -p /var/lib/ice/icegrid/node1 -mkdir -p /var/lib/ice/icegrid/registry - fi - chown -R ice:ice /var/lib/ice -} - -post_remove() { - echo "Ice data directory '/var/lib/ice' is left untouched. Remove it if you really sure you won't need your data in the future." -} Added: zeroc-ice.sysusers === --- zeroc-ice.sysusers (rev 0) +++ zeroc-ice.sysusers 2017-12-30 06:46:28 UTC (rev 276944) @@ -0,0 +1 @@ +u ice 101 "Ice User" /var/lib/ice
[arch-commits] Commit in zeroc-ice/trunk (PKGBUILD)
Date: Saturday, October 14, 2017 @ 16:51:20 Author: svenstaro Revision: 262758 upgpkg: zeroc-ice 3.7.0-2 Pushing zeroc-ice Modified: zeroc-ice/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-10-14 16:01:20 UTC (rev 262757) +++ PKGBUILD2017-10-14 16:51:20 UTC (rev 262758) @@ -6,7 +6,7 @@ pkgname=(zeroc-ice zeroc-ice-java) pkgbase=(zeroc-ice) pkgver=3.7.0 -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented middleware that provides RPC functionality" arch=(i686 x86_64) url="https://zeroc.com; @@ -68,7 +68,6 @@ package_zeroc-ice-java() { makedepends=(gradle 'java-environment=8') depends=(zeroc-ice java-environment) - arch=(any) for d in ${srcdir}/ice-${pkgver}/java ${srcdir}/ice-${pkgver}/java-compat; do cd $d