Date: Tuesday, June 18, 2019 @ 05:07:45 Author: anthraxx Revision: 356346
upgpkg: java8-openjdk 8.u222-1 Modified: java8-openjdk/trunk/PKGBUILD java8-openjdk/trunk/install_jre8-openjdk-headless.sh ----------------------------------+ PKGBUILD | 45 +++++++++++++------------------------ install_jre8-openjdk-headless.sh | 2 - 2 files changed, 17 insertions(+), 30 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-06-18 04:50:03 UTC (rev 356345) +++ PKGBUILD 2019-06-18 05:07:45 UTC (rev 356346) @@ -2,24 +2,18 @@ # Maintainer: Guillaume ALAUX <[email protected]> # Contributor: Boyan Ding <[email protected]> -# TODO -# once icedtea: -# pulse -# add policytool desktop files - -# Package 'openjfx' must be updated when this one is pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc') pkgbase=java8-openjdk _java_ver=8 -_jdk_update=212 -_jdk_build=01 +_jdk_update=222 +_jdk_build=05 pkgver=${_java_ver}.u${_jdk_update} _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} -pkgrel=2 +pkgrel=1 arch=('x86_64') url='http://openjdk.java.net/' license=('custom') -makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip' +makedepends=('java-environment=8' 'ccache' 'cpio' 'unzip' 'zip' 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib') _url_src=http://hg.openjdk.java.net/jdk8u/jdk8u source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz @@ -31,14 +25,14 @@ langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz) -sha256sums=('81b5e0c769c8439a8660baae148021a7b6589dde190988dda88580c1d9a5803d' - '2a5fe4f4acc92bd325cf487b4c83d03383d97eb54f03eafbf6422e6b2ec8a6b0' - 'c892af62a60d42b6913a759227383301fb33edff8e623c6e75960798bf0961a2' - '08d1b06640ac9dc666820a7ebf52502210b29123c5cad4f26aa3a3851999ad92' - 'c2f8f7a163429b0dfc3aee4f23dbb9da2fab9dd9a1b9fce06ec789efc2c33c39' - 'bc530a1894e16f3b5afca69fdddc52caaf2ed719cc4ca09753f9a1b067cbc6c1' - 'b978a5c459f8da55c7d4a52bf625fce3882f127cebf2f176182227ebd1c98e65' - '02cbc8874beab2066061fe277e9249a505987bc01ef8a3b8fff3e2c38ffcfd22') +sha256sums=('9556cee8070449fd515e1dfb4c23b6499d5dc49586136e17fb8862aff3e37024' + '996e17a077a00e4d205f635c38f432a0eee5225e556a35bf6b5d333b72a2d12f' + '48955c5d073129b57bb2a03f27397a1eb74aaaa3459663848dbd896ccd8ad9de' + '66f1805fdd465813618399ac1bd3b4fbe87a2820afb803cfb6d59a45eebfe51f' + '92e876099a42001e8c8ec749cc00f10a9e2d8d5dba57d8e15e20d05d02474460' + '465b40d283fd2063e4422c3c7f2a43da0dcfe70e8125442cff9134436c8a18d1' + '845e3c106beb7319180adcb41a0f5d40de169453291da4050b326f828de7d8c7' + '96673ee96926ee942148a3e8cc381e172db550bc9af9e230ac0526b45d65234c') case "${CARCH}" in 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; @@ -68,7 +62,7 @@ # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346 export MAKEFLAGS=${MAKEFLAGS/-j*} - # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2 + # Avoid optimization of HotSpot being lowered from O3 to O2 export CFLAGS="${CFLAGS//-O2/-O3} ${CPPFLAGS} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks" export CXXFLAGS="${CXXFLAGS} ${CPPFLAGS}" @@ -150,7 +144,7 @@ mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,} # Remove 'non-headless' lib files - for f in ${_nonheadless[@]}; do + for f in "${_nonheadless[@]}"; do rm "${pkgdir}${_jvmdir}/jre/${f}" done @@ -180,7 +174,7 @@ ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" # Move config files that were set in _backup_etc from ./lib to /etc - for file in ${_backup_etc[@]}; do + for file in "${_backup_etc[@]}"; do _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/} install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}" ln -sf /${file} "${pkgdir}${_filepkgpath}" @@ -194,8 +188,6 @@ 'alsa-lib: for basic sound support' 'gtk2: for the Gtk+ look and feel - desktop usage' 'java8-openjfx: for JavaFX GUI components support') - # TODO when adding IcedTea: 'giflib: for gif format support' - # TODO when adding IcedTea: 'libpulse: for advanced sound support' provides=('java-runtime=8' 'java-runtime-openjdk=8') install=install_jre8-openjdk.sh replaces=('jre8-openjdk-wm') @@ -202,7 +194,7 @@ cd ${_imgdir}/jre - for f in ${_nonheadless[@]}; do + for f in "${_nonheadless[@]}"; do install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}" done @@ -217,11 +209,6 @@ done popd - # Desktop files - # TODO add these when switching to IcedTea - #install -D -m 644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" \ - # "${pkgdir}/usr/share/applications/policytool.desktop" - # Install license install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" Modified: install_jre8-openjdk-headless.sh =================================================================== --- install_jre8-openjdk-headless.sh 2019-06-18 04:50:03 UTC (rev 356345) +++ install_jre8-openjdk-headless.sh 2019-06-18 05:07:45 UTC (rev 356346) @@ -25,7 +25,7 @@ esac if [ ! -f /etc/ssl/certs/java/cacerts ]; then - /usr/bin/update-ca-trust + /usr/bin/update-ca-trust fi }
