[arch-commits] Commit in java-openjdk/repos/extra-x86_64 (14 files)

Levente Polyak anthraxx at archlinux.org
Sat May 23 19:01:10 UTC 2020


    Date: Saturday, May 23, 2020 @ 19:01:10
  Author: anthraxx
Revision: 387465

archrelease: copy trunk to extra-x86_64

Added:
  java-openjdk/repos/extra-x86_64/PKGBUILD
    (from rev 387464, java-openjdk/trunk/PKGBUILD)
  java-openjdk/repos/extra-x86_64/freedesktop-java.desktop
    (from rev 387464, java-openjdk/trunk/freedesktop-java.desktop)
  java-openjdk/repos/extra-x86_64/freedesktop-jconsole.desktop
    (from rev 387464, java-openjdk/trunk/freedesktop-jconsole.desktop)
  java-openjdk/repos/extra-x86_64/freedesktop-jshell.desktop
    (from rev 387464, java-openjdk/trunk/freedesktop-jshell.desktop)
  java-openjdk/repos/extra-x86_64/install_jdk-openjdk.sh
    (from rev 387464, java-openjdk/trunk/install_jdk-openjdk.sh)
  java-openjdk/repos/extra-x86_64/install_jre-openjdk-headless.sh
    (from rev 387464, java-openjdk/trunk/install_jre-openjdk-headless.sh)
  java-openjdk/repos/extra-x86_64/install_jre-openjdk.sh
    (from rev 387464, java-openjdk/trunk/install_jre-openjdk.sh)
Deleted:
  java-openjdk/repos/extra-x86_64/PKGBUILD
  java-openjdk/repos/extra-x86_64/freedesktop-java.desktop
  java-openjdk/repos/extra-x86_64/freedesktop-jconsole.desktop
  java-openjdk/repos/extra-x86_64/freedesktop-jshell.desktop
  java-openjdk/repos/extra-x86_64/install_jdk-openjdk.sh
  java-openjdk/repos/extra-x86_64/install_jre-openjdk-headless.sh
  java-openjdk/repos/extra-x86_64/install_jre-openjdk.sh

---------------------------------+
 PKGBUILD                        |  550 +++++++++++++++++++-------------------
 freedesktop-java.desktop        |   24 -
 freedesktop-jconsole.desktop    |   22 -
 freedesktop-jshell.desktop      |   18 -
 install_jdk-openjdk.sh          |  100 +++---
 install_jre-openjdk-headless.sh |   96 +++---
 install_jre-openjdk.sh          |   70 ++--
 7 files changed, 444 insertions(+), 436 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-23 19:01:01 UTC (rev 387464)
+++ PKGBUILD	2020-05-23 19:01:10 UTC (rev 387465)
@@ -1,271 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-
-# TODO add test, see about packaging jtreg and using it here
-
-pkgbase=java-openjdk
-pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc')
-_majorver=13
-_minorver=0
-_securityver=2
-_updatever=8
-pkgrel=1
-pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
-arch=('x86_64')
-url='https://openjdk.java.net/'
-license=('custom')
-makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
-             'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
-             'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
-             'libnet' 'bash')
-source=(https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz
-        freedesktop-java.desktop
-        freedesktop-jconsole.desktop
-        freedesktop-jshell.desktop)
-sha256sums=('d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0'
-            '4edd8475037062cdff87993c1745ddb6df31f49e76c2774bca3841da70675580'
-            'd759e5e360abe9fae7b5f87498f81dd786aa568aa997d0cb8ba3e75fa0c364dd'
-            '939b2d8b24f18ad82c4868880e337c6291daee9b7edcfeadb8951bf99d6c2acc')
-
-case "${CARCH}" in
-  x86_64) _JARCH='x86_64';;
-  i686)   _JARCH='x86';;
-esac
-
-_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk
-_jdkdir=jdk${_majorver}u-${_hg_tag}
-_imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images
-
-_nonheadless=(lib/libawt_xawt.{so,debuginfo}
-              lib/libjawt.{so,debuginfo}
-              lib/libjsound.{so,debuginfo}
-              lib/libsplashscreen.{so,debuginfo})
-
-build() {
-  cd ${_jdkdir}
-
-  NUM_PROC_OPT=''
-  MAKEFLAG_J=$(echo ${MAKEFLAGS} | sed -En 's/.*-j([0-9]+).*/\1/p')
-  if [ -n "${MAKEFLAG_J}" ]; then
-    # http://hg.openjdk.java.net/jdk10/jdk10/file/85e6cb013b98/make/InitSupport.gmk#l105
-    echo "Removing '-j${MAKEFLAG_J}' from MAKEFLAGS to prevent build fail. Passing it directly to ./configure."
-    export MAKEFLAGS=${MAKEFLAGS/-j${MAKEFLAG_J}/}
-    NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}"
-  fi
-
-  # Avoid optimization of HotSpot to be lowered from O3 to O2
-  local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS}"
-  local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS}"
-  local _LDFLAGS=${LDFLAGS}
-  if [[ ${CARCH} = i686 ]]; then
-    echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture"
-    _CFLAGS=${CFLAGS/-fno-plt/}
-    _CXXFLAGS=${CXXFLAGS/-fno-plt/}
-  fi
-
-  # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning
-  # in the output of ./configure unless used like such:
-  #  --with-extra-cflags="${CFLAGS}"
-  #  --with-extra-cxxflags="${CXXFLAGS}"
-  #  --with-extra-ldflags="${LDFLAGS}"
-  # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_hg_tag}/common/doc/building.md
-  unset CFLAGS
-  unset CXXFLAGS
-  unset LDFLAGS
-
-  bash configure \
-    --with-version-build="${_updatever}" \
-    --with-version-pre="" \
-    --with-version-opt="" \
-    --with-stdc++lib=dynamic \
-    --with-extra-cflags="${_CFLAGS}" \
-    --with-extra-cxxflags="${_CXXFLAGS}" \
-    --with-extra-ldflags="${_LDFLAGS}" \
-    --with-libjpeg=system \
-    --with-giflib=system \
-    --with-libpng=system \
-    --with-lcms=system \
-    --with-zlib=system \
-    --with-jvm-features=zgc \
-    --enable-unlimited-crypto \
-    --disable-warnings-as-errors \
-    ${NUM_PROC_OPT}
-    #--disable-javac-server
-
-  make images legacy-jre-image docs
-
-  # https://bugs.openjdk.java.net/browse/JDK-8173610
-  find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \;
-}
-
-check() {
-  cd jdk${_majorver}u-${_hg_tag}
-  # TODO package jtreg
-  # make -k check
-}
-
-package_jre-openjdk-headless() {
-  pkgdesc="OpenJDK Java ${_majorver} headless runtime environment"
-  depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet' 'freetype2')
-  optdepends=('java-rhino: for some JavaScript support')
-  provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
-  backup=(etc/${pkgbase}/logging.properties
-          etc/${pkgbase}/management/jmxremote.access
-          etc/${pkgbase}/management/jmxremote.password.template
-          etc/${pkgbase}/management/management.properties
-          etc/${pkgbase}/net.properties
-          etc/${pkgbase}/security/java.policy
-          etc/${pkgbase}/security/java.security
-          etc/${pkgbase}/security/policy/README.txt
-          etc/${pkgbase}/security/policy/limited/default_US_export.policy
-          etc/${pkgbase}/security/policy/limited/default_local.policy
-          etc/${pkgbase}/security/policy/limited/exempt_local.policy
-          etc/${pkgbase}/security/policy/unlimited/default_US_export.policy
-          etc/${pkgbase}/security/policy/unlimited/default_local.policy
-          etc/${pkgbase}/sound.properties)
-  install=install_jre-openjdk-headless.sh
-
-  cd ${_imgdir}/jre
-
-  install -dm 755 "${pkgdir}${_jvmdir}"
-
-  cp -a bin lib \
-    "${pkgdir}${_jvmdir}"
-
-  for f in "${_nonheadless[@]}"; do
-    rm "${pkgdir}${_jvmdir}/${f}"
-  done
-
-  cp ../jdk/release "${pkgdir}${_jvmdir}"
-  cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib"
-
-  # Conf
-  install -dm 755 "${pkgdir}/etc"
-  cp -r conf "${pkgdir}/etc/${pkgbase}"
-  ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf"
-
-  # Legal
-  install -dm 755 "${pkgdir}/usr/share/licenses"
-  cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
-  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal"
-
-  # Man pages
-  for f in bin/*; do
-    f=$(basename "${f}")
-    _man=../jdk/man/man1/"${f}.1"
-    test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
-  done
-  ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
-
-  # Link JKS keystore from ca-certificates-utils
-  rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
-}
-
-package_jre-openjdk() {
-  pkgdesc="OpenJDK Java ${_majorver} full runtime environment"
-  depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib')
-  optdepends=('alsa-lib: for basic sound support'
-              'gtk2: for the Gtk+ 2 look and feel - desktop usage'
-              'gtk3: for the Gtk+ 3 look and feel - desktop usage')
-  provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}")
-  install=install_jre-openjdk.sh
-
-  cd ${_imgdir}/jre
-
-  install -dm 755 "${pkgdir}${_jvmdir}"
-
-  for f in "${_nonheadless[@]}"; do
-    install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
-  done
-
-  # Licenses
-  install -dm 755 "${pkgdir}/usr/share/licenses"
-  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_jdk-openjdk() {
-  pkgdesc="OpenJDK Java ${_majorver} development kit"
-  depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf')
-  provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
-  install=install_jdk-openjdk.sh
-
-  cd ${_imgdir}/jdk
-
-  install -dm 755 "${pkgdir}${_jvmdir}"
-
-  cp -a bin demo include jmods lib \
-    "${pkgdir}${_jvmdir}"
-
-  rm "${pkgdir}${_jvmdir}/lib/src.zip"
-
-  # Remove files held by JRE
-  pushd ../jre
-  for d in bin lib; do
-    find ${d} ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \;
-  done
-  popd
-  find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete
-
-  # Conf files all belong to JRE
-
-  # Legal
-  install -dm 755 "${pkgdir}/usr/share/licenses"
-  cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
-  pushd ../jre/legal
-  find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \;
-  popd
-  find "${pkgdir}/usr/share/licenses" -type d -empty -delete
-  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  # Man pages
-  for f in bin/*; do
-    f=$(basename "${f}")
-    _man=man/man1/"${f}.1"
-    test -f "../jre/bin/${f}" && continue
-    test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
-  done
-
-  # Icons
-  for s in 16 24 32 48; do
-    install -Dm 644 \
-      "${srcdir}/jdk${_majorver}u-${_hg_tag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/${pkgbase}.png"
-  done
-
-  # Desktop files
-  for f in jconsole java jshell; do
-    install -Dm 644 \
-      "${srcdir}/freedesktop-${f}.desktop" \
-      "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"
-  done
-}
-
-package_openjdk-src() {
-  pkgdesc="OpenJDK Java ${_majorver} sources"
-  # Depends on JDK to get license files
-  depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
-  provides=("openjdk${_majorver}-src=${pkgver}-${pkgrel}")
-
-  install -Dm 644 -t "${pkgdir}${_jvmdir}/lib" ${_imgdir}/jdk/lib/src.zip
-
-  install -dm 755 "${pkgdir}/usr/share/licenses"
-  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_openjdk-doc() {
-  pkgdesc="OpenJDK Java ${_majorver} documentation"
-  # Depends on JDK to get license files
-  depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
-  provides=("openjdk${_majorver}-doc=${pkgver}-${pkgrel}")
-
-  install -dm 755 "${pkgdir}/usr/share/doc"
-  cp -r ${_imgdir}/docs "${pkgdir}/usr/share/doc/${pkgbase}"
-
-  install -dm 755 "${pkgdir}/usr/share/licenses"
-  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-# vim: ts=2 sw=2 et:

Copied: java-openjdk/repos/extra-x86_64/PKGBUILD (from rev 387464, java-openjdk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-23 19:01:10 UTC (rev 387465)
@@ -0,0 +1,279 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+
+# TODO add test, see about packaging jtreg and using it here
+
+pkgbase=java-openjdk
+pkgname=('jre-openjdk-headless' 'jre-openjdk' 'jdk-openjdk' 'openjdk-src' 'openjdk-doc')
+_majorver=14
+_minorver=0
+_securityver=1
+_updatever=7
+pkgrel=1
+pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
+_hg_tag=jdk-${_majorver}.${_minorver}.${_securityver}+${_updatever}
+arch=('x86_64')
+url='https://openjdk.java.net/'
+license=('custom')
+makedepends=('java-environment>=11' 'cpio' 'unzip' 'zip' 'libelf' 'libcups' 'libx11'
+             'libxrender' 'libxtst' 'libxt' 'libxext' 'libxrandr' 'alsa-lib' 'pandoc'
+             'graphviz' 'freetype2' 'libjpeg-turbo' 'giflib' 'libpng' 'lcms2'
+             'libnet' 'bash')
+source=(https://hg.openjdk.java.net/jdk-updates/jdk${_majorver}u/archive/${_hg_tag}.tar.gz
+        freedesktop-java.desktop
+        freedesktop-jconsole.desktop
+        freedesktop-jshell.desktop
+        java-openjdk-make-4.3.patch::https://hg.openjdk.java.net/jdk/jdk/raw-rev/0743e1d49930)
+sha256sums=('301203cbda9c40a5fc496b3299806995ac4833b39c6d2e8470fd85a35461afd4'
+            '165273caba29f70496e697c9ed5bf61a4322ab324888f78559820f0032df48c9'
+            '1e3decf29075b6f62238a5b2ac537679f00c185ce36d83db254004237cfe7084'
+            '676c74c8aed53d6cd4c4755ece2b2e3ab1a72b1bd2ef53983dcad0229d91af3c'
+            'c92e82183318afe9fdb621c238becba3e03cdc83ced714e871855fa1dc252f66')
+
+case "${CARCH}" in
+  x86_64) _JARCH='x86_64';;
+  i686)   _JARCH='x86';;
+esac
+
+_jvmdir=/usr/lib/jvm/java-${_majorver}-openjdk
+_jdkdir=jdk${_majorver}u-${_hg_tag}
+_imgdir=${_jdkdir}/build/linux-${_JARCH}-server-release/images
+
+_nonheadless=(lib/libawt_xawt.{so,debuginfo}
+              lib/libjawt.{so,debuginfo}
+              lib/libjsound.{so,debuginfo}
+              lib/libsplashscreen.{so,debuginfo})
+
+prepare() {
+  cd ${_jdkdir}
+  # https://bugs.openjdk.java.net/browse/JDK-8237879
+  patch -Np1 < "${srcdir}/java-openjdk-make-4.3.patch"
+}
+
+build() {
+  cd ${_jdkdir}
+
+  NUM_PROC_OPT=''
+  MAKEFLAG_J=$(echo ${MAKEFLAGS} | sed -En 's/.*-j([0-9]+).*/\1/p')
+  if [ -n "${MAKEFLAG_J}" ]; then
+    # http://hg.openjdk.java.net/jdk10/jdk10/file/85e6cb013b98/make/InitSupport.gmk#l105
+    echo "Removing '-j${MAKEFLAG_J}' from MAKEFLAGS to prevent build fail. Passing it directly to ./configure."
+    export MAKEFLAGS=${MAKEFLAGS/-j${MAKEFLAG_J}/}
+    NUM_PROC_OPT="--with-num-cores=${MAKEFLAG_J}"
+  fi
+
+  # Avoid optimization of HotSpot to be lowered from O3 to O2
+  local _CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon"
+  local _CXXFLAGS="${CXXFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon"
+  local _LDFLAGS=${LDFLAGS}
+  if [[ ${CARCH} = i686 ]]; then
+    echo "Removing '-fno-plt' from CFLAGS and CXXFLAGS to prevent build fail with this architecture"
+    _CFLAGS=${CFLAGS/-fno-plt/}
+    _CXXFLAGS=${CXXFLAGS/-fno-plt/}
+  fi
+
+  # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning
+  # in the output of ./configure unless used like such:
+  #  --with-extra-cflags="${CFLAGS}"
+  #  --with-extra-cxxflags="${CXXFLAGS}"
+  #  --with-extra-ldflags="${LDFLAGS}"
+  # See also paragraph "Configure Control Variables from "jdk${_majorver}-${_hg_tag}/common/doc/building.md
+  unset CFLAGS
+  unset CXXFLAGS
+  unset LDFLAGS
+
+  bash configure \
+    --with-version-build="${_updatever}" \
+    --with-version-pre="" \
+    --with-version-opt="" \
+    --with-stdc++lib=dynamic \
+    --with-extra-cflags="${_CFLAGS}" \
+    --with-extra-cxxflags="${_CXXFLAGS}" \
+    --with-extra-ldflags="${_LDFLAGS}" \
+    --with-libjpeg=system \
+    --with-giflib=system \
+    --with-libpng=system \
+    --with-lcms=system \
+    --with-zlib=system \
+    --with-jvm-features=zgc \
+    --enable-unlimited-crypto \
+    --disable-warnings-as-errors \
+    ${NUM_PROC_OPT}
+    #--disable-javac-server
+
+  make images legacy-jre-image docs
+
+  # https://bugs.openjdk.java.net/browse/JDK-8173610
+  find "../${_imgdir}" -iname '*.so' -exec chmod +x {} \;
+}
+
+check() {
+  cd jdk${_majorver}u-${_hg_tag}
+  # TODO package jtreg
+  # make -k check
+}
+
+package_jre-openjdk-headless() {
+  pkgdesc="OpenJDK Java ${_majorver} headless runtime environment"
+  depends=('java-runtime-common>=3' 'ca-certificates-utils' 'nss' 'libjpeg-turbo' 'lcms2' 'libnet' 'freetype2')
+  optdepends=('java-rhino: for some JavaScript support')
+  provides=("java-runtime-headless=${_majorver}" "java-runtime-headless-openjdk=${_majorver}" "jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}")
+  backup=(etc/${pkgbase}/logging.properties
+          etc/${pkgbase}/management/jmxremote.access
+          etc/${pkgbase}/management/jmxremote.password.template
+          etc/${pkgbase}/management/management.properties
+          etc/${pkgbase}/net.properties
+          etc/${pkgbase}/security/java.policy
+          etc/${pkgbase}/security/java.security
+          etc/${pkgbase}/security/policy/README.txt
+          etc/${pkgbase}/security/policy/limited/default_US_export.policy
+          etc/${pkgbase}/security/policy/limited/default_local.policy
+          etc/${pkgbase}/security/policy/limited/exempt_local.policy
+          etc/${pkgbase}/security/policy/unlimited/default_US_export.policy
+          etc/${pkgbase}/security/policy/unlimited/default_local.policy
+          etc/${pkgbase}/sound.properties)
+  install=install_jre-openjdk-headless.sh
+
+  cd ${_imgdir}/jre
+
+  install -dm 755 "${pkgdir}${_jvmdir}"
+
+  cp -a bin lib \
+    "${pkgdir}${_jvmdir}"
+
+  for f in "${_nonheadless[@]}"; do
+    rm "${pkgdir}${_jvmdir}/${f}"
+  done
+
+  cp ../jdk/release "${pkgdir}${_jvmdir}"
+  cp ../jdk/lib/modules "${pkgdir}${_jvmdir}/lib"
+
+  # Conf
+  install -dm 755 "${pkgdir}/etc"
+  cp -r conf "${pkgdir}/etc/${pkgbase}"
+  ln -s /etc/${pkgbase} "${pkgdir}/${_jvmdir}/conf"
+
+  # Legal
+  install -dm 755 "${pkgdir}/usr/share/licenses"
+  cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
+  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s /usr/share/licenses/${pkgbase} "${pkgdir}/${_jvmdir}/legal"
+
+  # Man pages
+  for f in bin/*; do
+    f=$(basename "${f}")
+    _man=../jdk/man/man1/"${f}.1"
+    test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+  done
+  ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"
+
+  # Link JKS keystore from ca-certificates-utils
+  rm -f "${pkgdir}${_jvmdir}/lib/security/cacerts"
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/lib/security/cacerts"
+}
+
+package_jre-openjdk() {
+  pkgdesc="OpenJDK Java ${_majorver} full runtime environment"
+  depends=("jre${_majorver}-openjdk-headless=${pkgver}-${pkgrel}" 'giflib')
+  optdepends=('alsa-lib: for basic sound support'
+              'gtk2: for the Gtk+ 2 look and feel - desktop usage'
+              'gtk3: for the Gtk+ 3 look and feel - desktop usage')
+  provides=("java-runtime=${_majorver}" "java-runtime-openjdk=${_majorver}" "jre${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  install=install_jre-openjdk.sh
+
+  cd ${_imgdir}/jre
+
+  install -dm 755 "${pkgdir}${_jvmdir}"
+
+  for f in "${_nonheadless[@]}"; do
+    install -Dm 644 ${f} "${pkgdir}${_jvmdir}/${f}"
+  done
+
+  # Licenses
+  install -dm 755 "${pkgdir}/usr/share/licenses"
+  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk-openjdk() {
+  pkgdesc="OpenJDK Java ${_majorver} development kit"
+  depends=("jre${_majorver}-openjdk=${pkgver}-${pkgrel}" 'java-environment-common=3' 'hicolor-icon-theme' 'libelf')
+  provides=("java-environment=${_majorver}" "java-environment-openjdk=${_majorver}" "jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  install=install_jdk-openjdk.sh
+
+  cd ${_imgdir}/jdk
+
+  install -dm 755 "${pkgdir}${_jvmdir}"
+
+  cp -a bin demo include jmods lib \
+    "${pkgdir}${_jvmdir}"
+
+  rm "${pkgdir}${_jvmdir}/lib/src.zip"
+
+  # Remove files held by JRE
+  pushd ../jre
+  for d in bin lib; do
+    find ${d} ! -type d -exec rm "${pkgdir}${_jvmdir}/{}" \;
+  done
+  popd
+  find "${pkgdir}${_jvmdir}/lib" -type d -empty -delete
+
+  # Conf files all belong to JRE
+
+  # Legal
+  install -dm 755 "${pkgdir}/usr/share/licenses"
+  cp -r legal "${pkgdir}/usr/share/licenses/${pkgbase}"
+  pushd ../jre/legal
+  find . ! -type d -exec rm "${pkgdir}/usr/share/licenses/${pkgbase}/{}" \;
+  popd
+  find "${pkgdir}/usr/share/licenses" -type d -empty -delete
+  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  # Man pages
+  for f in bin/*; do
+    f=$(basename "${f}")
+    _man=man/man1/"${f}.1"
+    test -f "../jre/bin/${f}" && continue
+    test -f "${_man}" && install -Dm 644 "${_man}" "${pkgdir}/usr/share/man/man1/${f}-openjdk${_majorver}.1"
+  done
+
+  # Icons
+  for s in 16 24 32 48; do
+    install -Dm 644 \
+      "${srcdir}/jdk${_majorver}u-${_hg_tag}/src/java.desktop/unix/classes/sun/awt/X11/java-icon${s}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/${pkgbase}.png"
+  done
+
+  # Desktop files
+  for f in jconsole java jshell; do
+    install -Dm 644 \
+      "${srcdir}/freedesktop-${f}.desktop" \
+      "${pkgdir}/usr/share/applications/${f}-${pkgbase}.desktop"
+  done
+}
+
+package_openjdk-src() {
+  pkgdesc="OpenJDK Java ${_majorver} sources"
+  # Depends on JDK to get license files
+  depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  provides=("openjdk${_majorver}-src=${pkgver}-${pkgrel}")
+
+  install -Dm 644 -t "${pkgdir}${_jvmdir}/lib" ${_imgdir}/jdk/lib/src.zip
+
+  install -dm 755 "${pkgdir}/usr/share/licenses"
+  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_openjdk-doc() {
+  pkgdesc="OpenJDK Java ${_majorver} documentation"
+  # Depends on JDK to get license files
+  depends=("jdk${_majorver}-openjdk=${pkgver}-${pkgrel}")
+  provides=("openjdk${_majorver}-doc=${pkgver}-${pkgrel}")
+
+  install -dm 755 "${pkgdir}/usr/share/doc"
+  cp -r ${_imgdir}/docs "${pkgdir}/usr/share/doc/${pkgbase}"
+
+  install -dm 755 "${pkgdir}/usr/share/licenses"
+  ln -s ${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim: ts=2 sw=2 et:

Deleted: freedesktop-java.desktop
===================================================================
--- freedesktop-java.desktop	2020-05-23 19:01:01 UTC (rev 387464)
+++ freedesktop-java.desktop	2020-05-23 19:01:10 UTC (rev 387465)
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Java 13 Runtime
-Name[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
-Comment=OpenJDK Java 13 Runtime
-Comment[fi]=OpenJDK Java 13 - ajonaikainen ympäristö
-Keywords=java;runtime
-Exec=/usr/lib/jvm/java-13-openjdk/bin/java -jar
-Terminal=false
-Type=Application
-Icon=java13-openjdk
-MimeType=application/x-java-archive;application/java-archive;application/x-jar;
-NoDisplay=true

Copied: java-openjdk/repos/extra-x86_64/freedesktop-java.desktop (from rev 387464, java-openjdk/trunk/freedesktop-java.desktop)
===================================================================
--- freedesktop-java.desktop	                        (rev 0)
+++ freedesktop-java.desktop	2020-05-23 19:01:10 UTC (rev 387465)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=OpenJDK Java 14 Runtime
+Name[fi]=OpenJDK Java 14 - ajonaikainen ympäristö
+Comment=OpenJDK Java 14 Runtime
+Comment[fi]=OpenJDK Java 14 - ajonaikainen ympäristö
+Keywords=java;runtime
+Exec=/usr/lib/jvm/java-14-openjdk/bin/java -jar
+Terminal=false
+Type=Application
+Icon=java14-openjdk
+MimeType=application/x-java-archive;application/java-archive;application/x-jar;
+NoDisplay=true

Deleted: freedesktop-jconsole.desktop
===================================================================
--- freedesktop-jconsole.desktop	2020-05-23 19:01:01 UTC (rev 387464)
+++ freedesktop-jconsole.desktop	2020-05-23 19:01:10 UTC (rev 387465)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Java 13 Console
-Name[fi]=OpenJDK Java 13 - konsoli
-Comment=OpenJDK Java 13 Monitoring & Management Console
-Comment[fi]=OpenJDK Java 13 - valvonta- ja hallintakonsoli
-Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-13-openjdk/bin/jconsole
-Terminal=false
-Type=Application
-Icon=java13-openjdk
-Categories=Application;System;

Copied: java-openjdk/repos/extra-x86_64/freedesktop-jconsole.desktop (from rev 387464, java-openjdk/trunk/freedesktop-jconsole.desktop)
===================================================================
--- freedesktop-jconsole.desktop	                        (rev 0)
+++ freedesktop-jconsole.desktop	2020-05-23 19:01:10 UTC (rev 387465)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=OpenJDK Java 14 Console
+Name[fi]=OpenJDK Java 14 - konsoli
+Comment=OpenJDK Java 14 Monitoring & Management Console
+Comment[fi]=OpenJDK Java 14 - valvonta- ja hallintakonsoli
+Keywords=java;console;monitoring
+Exec=/usr/lib/jvm/java-14-openjdk/bin/jconsole
+Terminal=false
+Type=Application
+Icon=java14-openjdk
+Categories=Application;System;

Deleted: freedesktop-jshell.desktop
===================================================================
--- freedesktop-jshell.desktop	2020-05-23 19:01:01 UTC (rev 387464)
+++ freedesktop-jshell.desktop	2020-05-23 19:01:10 UTC (rev 387465)
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Java 13 Shell
-Comment=OpenJDK Java 13 Shell
-Keywords=java;shell
-Exec=/usr/lib/jvm/java-13-openjdk/bin/jshell
-Terminal=true
-Type=Application
-Icon=java13-openjdk
-Categories=Application;System;

Copied: java-openjdk/repos/extra-x86_64/freedesktop-jshell.desktop (from rev 387464, java-openjdk/trunk/freedesktop-jshell.desktop)
===================================================================
--- freedesktop-jshell.desktop	                        (rev 0)
+++ freedesktop-jshell.desktop	2020-05-23 19:01:10 UTC (rev 387465)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=OpenJDK Java 14 Shell
+Comment=OpenJDK Java 14 Shell
+Keywords=java;shell
+Exec=/usr/lib/jvm/java-14-openjdk/bin/jshell
+Terminal=true
+Type=Application
+Icon=java14-openjdk
+Categories=Application;System;

Deleted: install_jdk-openjdk.sh
===================================================================
--- install_jdk-openjdk.sh	2020-05-23 19:01:01 UTC (rev 387464)
+++ install_jdk-openjdk.sh	2020-05-23 19:01:10 UTC (rev 387465)
@@ -1,50 +0,0 @@
-THIS_JDK='java-13-openjdk'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JDK}
-      ;;
-    ${THIS_JDK})
-      # Nothing
-      ;;
-    *)
-      echo "Default Java environment is already set to '${default}'"
-      echo "See 'archlinux-java help' to change it"
-      ;;
-  esac
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-post_upgrade() {
-  default=$(fix_default)
-  if [ -z "${default}" ]; then
-    /usr/bin/archlinux-java set ${THIS_JDK}
-  fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-pre_remove() {
-  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
-    # Check JRE is still available
-    if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
-      /usr/bin/archlinux-java unset
-    fi
-  fi
-}

Copied: java-openjdk/repos/extra-x86_64/install_jdk-openjdk.sh (from rev 387464, java-openjdk/trunk/install_jdk-openjdk.sh)
===================================================================
--- install_jdk-openjdk.sh	                        (rev 0)
+++ install_jdk-openjdk.sh	2020-05-23 19:01:10 UTC (rev 387465)
@@ -0,0 +1,50 @@
+THIS_JDK='java-14-openjdk'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JDK}
+      ;;
+    ${THIS_JDK})
+      # Nothing
+      ;;
+    *)
+      echo "Default Java environment is already set to '${default}'"
+      echo "See 'archlinux-java help' to change it"
+      ;;
+  esac
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+post_upgrade() {
+  default=$(fix_default)
+  if [ -z "${default}" ]; then
+    /usr/bin/archlinux-java set ${THIS_JDK}
+  fi
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+pre_remove() {
+  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+    # Check JRE is still available
+    if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
+      /usr/bin/archlinux-java unset
+    fi
+  fi
+}

Deleted: install_jre-openjdk-headless.sh
===================================================================
--- install_jre-openjdk-headless.sh	2020-05-23 19:01:01 UTC (rev 387464)
+++ install_jre-openjdk-headless.sh	2020-05-23 19:01:10 UTC (rev 387465)
@@ -1,48 +0,0 @@
-THIS_JRE='java-13-openjdk'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JRE}
-      ;;
-    ${THIS_JRE})
-      # Nothing
-      ;;
-    *)
-      echo "Default Java environment is already set to '${default}'"
-      echo "See 'archlinux-java help' to change it"
-      ;;
-  esac
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-post_upgrade() {
-  if [ -z "$(fix_default)" ]; then
-    /usr/bin/archlinux-java set ${THIS_JRE}
-  fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-pre_remove() {
-  default=$(fix_default)
-  if [ "x${default}" = "x${THIS_JRE}" ]; then
-    /usr/bin/archlinux-java unset
-    echo "No Java environment is set as default anymore"
-  fi
-}

Copied: java-openjdk/repos/extra-x86_64/install_jre-openjdk-headless.sh (from rev 387464, java-openjdk/trunk/install_jre-openjdk-headless.sh)
===================================================================
--- install_jre-openjdk-headless.sh	                        (rev 0)
+++ install_jre-openjdk-headless.sh	2020-05-23 19:01:10 UTC (rev 387465)
@@ -0,0 +1,48 @@
+THIS_JRE='java-14-openjdk'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JRE}
+      ;;
+    ${THIS_JRE})
+      # Nothing
+      ;;
+    *)
+      echo "Default Java environment is already set to '${default}'"
+      echo "See 'archlinux-java help' to change it"
+      ;;
+  esac
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+post_upgrade() {
+  if [ -z "$(fix_default)" ]; then
+    /usr/bin/archlinux-java set ${THIS_JRE}
+  fi
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+pre_remove() {
+  default=$(fix_default)
+  if [ "x${default}" = "x${THIS_JRE}" ]; then
+    /usr/bin/archlinux-java unset
+    echo "No Java environment is set as default anymore"
+  fi
+}

Deleted: install_jre-openjdk.sh
===================================================================
--- install_jre-openjdk.sh	2020-05-23 19:01:01 UTC (rev 387464)
+++ install_jre-openjdk.sh	2020-05-23 19:01:10 UTC (rev 387465)
@@ -1,35 +0,0 @@
-THIS_JRE='java-13-openjdk'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JRE}
-      ;;
-    ${THIS_JRE})
-      # Nothing
-      ;;
-    *)
-      echo "Default Java environment is already set to '${default}'"
-      echo "See 'archlinux-java help' to change it"
-      ;;
-  esac
-
-  echo "when you use a non-reparenting window manager,"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
-}
-
-post_upgrade() {
-  if [ -z "$(fix_default)" ]; then
-    /usr/bin/archlinux-java set ${THIS_JRE}
-  fi
-}

Copied: java-openjdk/repos/extra-x86_64/install_jre-openjdk.sh (from rev 387464, java-openjdk/trunk/install_jre-openjdk.sh)
===================================================================
--- install_jre-openjdk.sh	                        (rev 0)
+++ install_jre-openjdk.sh	2020-05-23 19:01:10 UTC (rev 387465)
@@ -0,0 +1,35 @@
+THIS_JRE='java-14-openjdk'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JRE}
+      ;;
+    ${THIS_JRE})
+      # Nothing
+      ;;
+    *)
+      echo "Default Java environment is already set to '${default}'"
+      echo "See 'archlinux-java help' to change it"
+      ;;
+  esac
+
+  echo "when you use a non-reparenting window manager,"
+  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+}
+
+post_upgrade() {
+  if [ -z "$(fix_default)" ]; then
+    /usr/bin/archlinux-java set ${THIS_JRE}
+  fi
+}


More information about the arch-commits mailing list