Date: Friday, December 24, 2021 @ 09:48:29 Author: arojas Revision: 433016
archrelease: copy trunk to extra-x86_64 Added: java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 433015, java8-openjdk/trunk/PKGBUILD) java8-openjdk/repos/extra-x86_64/gcc11.patch (from rev 433015, java8-openjdk/trunk/gcc11.patch) java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 433015, java8-openjdk/trunk/install_jdk8-openjdk.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 433015, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 433015, java8-openjdk/trunk/install_jre8-openjdk.sh) Deleted: java8-openjdk/repos/extra-x86_64/PKGBUILD java8-openjdk/repos/extra-x86_64/gcc11.patch java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh ----------------------------------+ PKGBUILD | 561 ++++++++++++++++++------------------- gcc11.patch | 148 ++++----- install_jdk8-openjdk.sh | 100 +++--- install_jre8-openjdk-headless.sh | 96 +++--- install_jre8-openjdk.sh | 84 ++--- 5 files changed, 495 insertions(+), 494 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-12-24 09:48:12 UTC (rev 433015) +++ PKGBUILD 2021-12-24 09:48:29 UTC (rev 433016) @@ -1,280 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> -# Contributor: Boyan Ding <stu_...@126.com> - -pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc') -pkgbase=java8-openjdk -_java_ver=8 -_jdk_update=312 -_jdk_build=10 -pkgver=${_java_ver}.u${_jdk_update} -_repo_ver=jdk${_java_ver}u${_jdk_update}-ga -pkgrel=1 -arch=('x86_64') -url='https://openjdk.java.net/' -license=('custom') -makedepends=('java-environment=8' 'ccache' 'cpio' 'unzip' 'zip' - 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib') -_url_src=https://hg.openjdk.java.net/jdk8u/jdk8u -source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz - corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz - hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz - jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz - jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz - jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz - 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 - gcc11.patch) - -sha256sums=('c10d984ab561f9e9733c313432e0da88bed9cde5202b462bc73cfe488fc65328' - '0a66933a2d7011eece138ca1e8d3db584335c711463092c79ada638c825c41d1' - '1bef21655dae14e1964c14add6c23c6c2f555a79e269a3bfe06e8a8d2a23fd0a' - 'f06786055e3266913a0c3b647e877d6bcffea618503c5ac30f6e224d98013207' - '8bf8a31a5bdf98ebc1b30163b952a86288ecb1d3411f4ac659eed6a020a4f9d7' - 'd394e6e3f7858ec16d9f32b147f30f01d37bf5fbc8428019171f6677bb511ef4' - '684ed7650fba6e36272d85076cdeabf73c22917e1b9e5a37c9645a91918eeab3' - '253d8ffa68f210d284c3344d5df94f2ef1279e5a4155a2a1b3d2436d552864b1' - 'e1e9452b2078c3e9b45aa73491f3f187e7a9abbc40b6a7fc9239d4e5e525569e') - -case "${CARCH}" in - 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; - 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;; -esac - -_jdkname=openjdk8 -_jvmdir=/usr/lib/jvm/java-8-openjdk -_prefix="jdk8u-${_repo_ver}/image" -_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})" -_nonheadless=(bin/policytool - lib/${_JARCH}/libjsound.so - lib/${_JARCH}/libjsoundalsa.so - lib/${_JARCH}/libsplashscreen.so) - -prepare() { -# Fix build with C++17 - patch -d hotspot-${_repo_ver} -p2 < gcc11.patch - - cd jdk8u-${_repo_ver} - for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do - ln -s ../${subrepo}-${_repo_ver} ${subrepo} - done -} - -build() { - cd jdk8u-${_repo_ver} - - unset JAVA_HOME - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346 - export MAKEFLAGS=${MAKEFLAGS/-j*} - - # Avoid optimization of HotSpot being lowered from O3 to O2 - export CFLAGS="${CFLAGS//-O2/-O3} -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -Wno-error=format-overflow=" - export CXXFLAGS="${CXXFLAGS} -fcommon" - - install -d -m 755 "${srcdir}/${_prefix}/" - sh configure \ - --prefix="${srcdir}/${_prefix}" \ - --with-update-version="${_jdk_update}" \ - --with-build-number="b${_jdk_build}" \ - --with-milestone="fcs" \ - --enable-unlimited-crypto \ - --with-zlib=system \ - --with-extra-cflags="${CFLAGS}" \ - --with-extra-cxxflags="${CXXFLAGS}" \ - --with-extra-ldflags="${LDFLAGS}" - - # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed) - #--with-giflib=system \ - - # These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1 - # Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html - make - make docs - - # FIXME sadly 'DESTDIR' is not used here! - make install - - cd ../${_imgdir} - - # A lot of build stuff were directly taken from - # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec - - # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 - find . -iname '*.jar' -exec chmod ugo+r {} \; - chmod ugo+r lib/ct.sym - - # remove redundant *diz and *debuginfo files - find . -iname '*.diz' -exec rm {} \; - find . -iname '*.debuginfo' -exec rm {} \; -} - -check() { - cd jdk8u-${_repo_ver} - #make -k test -} - -package_jre8-openjdk-headless() { - pkgdesc='OpenJDK Java 8 headless runtime environment' - depends=('java-runtime-common' 'ca-certificates-utils' 'nss') - optdepends=('java-rhino: for some JavaScript support') - provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8') - # Upstream config files that should go to etc and get backup - _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg - etc/java-8-openjdk/calendars.properties - etc/java-8-openjdk/content-types.properties - etc/java-8-openjdk/flavormap.properties - etc/java-8-openjdk/images/cursors/cursors.properties - etc/java-8-openjdk/logging.properties - etc/java-8-openjdk/management/jmxremote.access - etc/java-8-openjdk/management/jmxremote.password - etc/java-8-openjdk/management/management.properties - etc/java-8-openjdk/management/snmp.acl - etc/java-8-openjdk/net.properties - etc/java-8-openjdk/psfont.properties.ja - etc/java-8-openjdk/psfontj2d.properties - etc/java-8-openjdk/security/java.policy - etc/java-8-openjdk/security/java.security - etc/java-8-openjdk/sound.properties) - replaces=('jre8-openjdk-headless-wm') - backup=(${_backup_etc[@]}) - install=install_jre8-openjdk-headless.sh - - cd ${_imgdir}/jre - - install -d -m 755 "${pkgdir}${_jvmdir}/jre/" - cp -a bin lib "${pkgdir}${_jvmdir}/jre" - - # Set config files - mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,} - mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,} - - # Remove 'non-headless' lib files - for f in "${_nonheadless[@]}"; do - rm "${pkgdir}${_jvmdir}/jre/${f}" - done - - # Man pages - pushd "${pkgdir}${_jvmdir}/jre/bin" - install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ - for file in *; do - if [ -f "${srcdir}/${_imgdir}/man/man1/${file}.1" ]; then - install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ - "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" - fi - if [ -f "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" ]; then - install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ - "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" - fi - done - popd - - # Link JKS keystore from ca-certificates-utils - rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" - ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" - - # Install license - install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" - install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ - "${pkgdir}/usr/share/licenses/${pkgbase}" - 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 - _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/} - install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}" - ln -sf /${file} "${pkgdir}${_filepkgpath}" - done -} - -package_jre8-openjdk() { - pkgdesc='OpenJDK Java 8 full runtime environment' - depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme') - optdepends=('icedtea-web: web browser plugin + Java Web Start' - 'alsa-lib: for basic sound support' - 'gtk2: for the Gtk+ look and feel - desktop usage' - 'java8-openjfx: for JavaFX GUI components support') - provides=('java-runtime=8' 'java-runtime-openjdk=8') - install=install_jre8-openjdk.sh - replaces=('jre8-openjdk-wm') - - cd ${_imgdir}/jre - - for f in "${_nonheadless[@]}"; do - install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}" - done - - # Man pages - pushd "${pkgdir}${_jvmdir}/jre/bin" - install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ - for file in *; do - install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ - "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" - install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ - "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" - done - popd - - # Install license - install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" - ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" -} - -package_jdk8-openjdk() { - pkgdesc='OpenJDK Java 8 development kit' - depends=('java-environment-common' "jre8-openjdk=${pkgver}-${pkgrel}") - provides=('java-environment=8' 'java-environment-openjdk=8') - replaces=('jdk8-openjdk-wm') - install=install_jdk8-openjdk.sh - - cd ${_imgdir} - - # Main files - install -d -m 755 "${pkgdir}${_jvmdir}" - - cp -a include lib "${pkgdir}${_jvmdir}" - - # 'bin' files - pushd bin - - # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page - for b in $(ls | grep -v java-rmi.cgi); do - if [ -e ../jre/bin/${b} ]; then - # Provide a link of the jre binary in the jdk/bin/ directory - ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}" - else - # Copy binary to jdk/bin/ - install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}" - # Copy man page - if [ -f ../man/man1/${b}.1 ]; then - install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1" - fi - if [ -f ../man/ja/man1/${b}.1 ]; then - install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1" - fi - fi - done - popd - - # Handling 'java-rmi.cgi' separately - install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi" - - # link license - install -d -m 755 "${pkgdir}/usr/share/licenses/" - ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" -} - -package_openjdk8-src() { - pkgdesc='OpenJDK Java 8 sources' - - install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip" -} - -package_openjdk8-doc() { - pkgdesc='OpenJDK Java 8 documentation' - - install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/" - cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \ - "${pkgdir}/usr/share/doc/${pkgbase}/" -} - -# vim: ts=2 sw=2 et: Copied: java8-openjdk/repos/extra-x86_64/PKGBUILD (from rev 433015, java8-openjdk/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-12-24 09:48:29 UTC (rev 433016) @@ -0,0 +1,281 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Guillaume ALAUX <guilla...@archlinux.org> +# Contributor: Boyan Ding <stu_...@126.com> + +pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc') +pkgbase=java8-openjdk +_java_ver=8 +_jdk_update=312 +_jdk_build=10 +pkgver=${_java_ver}.u${_jdk_update} +_repo_ver=jdk${_java_ver}u${_jdk_update}-ga +pkgrel=2 +arch=('x86_64') +url='https://openjdk.java.net/' +license=('custom') +makedepends=('java-environment=8' 'ccache' 'cpio' 'unzip' 'zip' + 'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib') +_url_src=https://hg.openjdk.java.net/jdk8u/jdk8u +source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz + corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz + hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz + jdk-${_repo_ver}.tar.gz::${_url_src}/jdk/archive/${_repo_ver}.tar.gz + jaxws-${_repo_ver}.tar.gz::${_url_src}/jaxws/archive/${_repo_ver}.tar.gz + jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz + 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 + gcc11.patch) +options=(!lto) +sha256sums=('c10d984ab561f9e9733c313432e0da88bed9cde5202b462bc73cfe488fc65328' + '0a66933a2d7011eece138ca1e8d3db584335c711463092c79ada638c825c41d1' + '1bef21655dae14e1964c14add6c23c6c2f555a79e269a3bfe06e8a8d2a23fd0a' + 'f06786055e3266913a0c3b647e877d6bcffea618503c5ac30f6e224d98013207' + '8bf8a31a5bdf98ebc1b30163b952a86288ecb1d3411f4ac659eed6a020a4f9d7' + 'd394e6e3f7858ec16d9f32b147f30f01d37bf5fbc8428019171f6677bb511ef4' + '684ed7650fba6e36272d85076cdeabf73c22917e1b9e5a37c9645a91918eeab3' + '253d8ffa68f210d284c3344d5df94f2ef1279e5a4155a2a1b3d2436d552864b1' + 'e1e9452b2078c3e9b45aa73491f3f187e7a9abbc40b6a7fc9239d4e5e525569e') + +case "${CARCH}" in + 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; + 'i686' ) _JARCH=i386 ; _DOC_ARCH=x86 ;; +esac + +_jdkname=openjdk8 +_jvmdir=/usr/lib/jvm/java-8-openjdk +_prefix="jdk8u-${_repo_ver}/image" +_imgdir="${_prefix}/jvm/openjdk-1.8.0_$(printf '%.2d' ${_jdk_update})" +_nonheadless=(bin/policytool + lib/${_JARCH}/libjsound.so + lib/${_JARCH}/libjsoundalsa.so + lib/${_JARCH}/libsplashscreen.so) + +prepare() { +# Fix build with C++17 (Fedora) + patch -d hotspot-${_repo_ver} -p2 < gcc11.patch + + cd jdk8u-${_repo_ver} + for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do + ln -s ../${subrepo}-${_repo_ver} ${subrepo} + done +} + +build() { + cd jdk8u-${_repo_ver} + + unset JAVA_HOME + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346 + export MAKEFLAGS=${MAKEFLAGS/-j*} + + # Avoid optimization of HotSpot being lowered from O3 to O2 + # -fno-exceptions for FS#73134 + export CFLAGS="${CFLAGS//-O2/-O3} -Wno-error=nonnull -Wno-error=deprecated-declarations -Wno-error=stringop-overflow= -Wno-error=return-type -Wno-error=cpp -fno-lifetime-dse -fno-delete-null-pointer-checks -fcommon -fno-exceptions -Wno-error=format-overflow=" + export CXXFLAGS="${CXXFLAGS} -fcommon -fno-exceptions" + + install -d -m 755 "${srcdir}/${_prefix}/" + sh configure \ + --prefix="${srcdir}/${_prefix}" \ + --with-update-version="${_jdk_update}" \ + --with-build-number="b${_jdk_build}" \ + --with-milestone="fcs" \ + --enable-unlimited-crypto \ + --with-zlib=system \ + --with-extra-cflags="${CFLAGS}" \ + --with-extra-cxxflags="${CXXFLAGS}" \ + --with-extra-ldflags="${LDFLAGS}" + + # TODO OpenJDK does not want last version of giflib (add 'giflib' as dependency once fixed) + #--with-giflib=system \ + + # These help to debug builds: LOG=trace HOTSPOT_BUILD_JOBS=1 + # Without 'DEBUG_BINARIES', i686 won't build: http://mail.openjdk.java.net/pipermail/core-libs-dev/2013-July/019203.html + make + make docs + + # FIXME sadly 'DESTDIR' is not used here! + make install + + cd ../${_imgdir} + + # A lot of build stuff were directly taken from + # http://pkgs.fedoraproject.org/cgit/java-1.8.0-openjdk.git/tree/java-1.8.0-openjdk.spec + + # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1437 + find . -iname '*.jar' -exec chmod ugo+r {} \; + chmod ugo+r lib/ct.sym + + # remove redundant *diz and *debuginfo files + find . -iname '*.diz' -exec rm {} \; + find . -iname '*.debuginfo' -exec rm {} \; +} + +check() { + cd jdk8u-${_repo_ver} + #make -k test +} + +package_jre8-openjdk-headless() { + pkgdesc='OpenJDK Java 8 headless runtime environment' + depends=('java-runtime-common' 'ca-certificates-utils' 'nss') + optdepends=('java-rhino: for some JavaScript support') + provides=('java-runtime-headless=8' 'java-runtime-headless-openjdk=8') + # Upstream config files that should go to etc and get backup + _backup_etc=(etc/java-8-openjdk/${_JARCH}/jvm.cfg + etc/java-8-openjdk/calendars.properties + etc/java-8-openjdk/content-types.properties + etc/java-8-openjdk/flavormap.properties + etc/java-8-openjdk/images/cursors/cursors.properties + etc/java-8-openjdk/logging.properties + etc/java-8-openjdk/management/jmxremote.access + etc/java-8-openjdk/management/jmxremote.password + etc/java-8-openjdk/management/management.properties + etc/java-8-openjdk/management/snmp.acl + etc/java-8-openjdk/net.properties + etc/java-8-openjdk/psfont.properties.ja + etc/java-8-openjdk/psfontj2d.properties + etc/java-8-openjdk/security/java.policy + etc/java-8-openjdk/security/java.security + etc/java-8-openjdk/sound.properties) + replaces=('jre8-openjdk-headless-wm') + backup=(${_backup_etc[@]}) + install=install_jre8-openjdk-headless.sh + + cd ${_imgdir}/jre + + install -d -m 755 "${pkgdir}${_jvmdir}/jre/" + cp -a bin lib "${pkgdir}${_jvmdir}/jre" + + # Set config files + mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,} + mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,} + + # Remove 'non-headless' lib files + for f in "${_nonheadless[@]}"; do + rm "${pkgdir}${_jvmdir}/jre/${f}" + done + + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ + for file in *; do + if [ -f "${srcdir}/${_imgdir}/man/man1/${file}.1" ]; then + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" + fi + if [ -f "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" ]; then + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" + fi + done + popd + + # Link JKS keystore from ca-certificates-utils + rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" + ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts" + + # Install license + install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" + install -m 644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \ + "${pkgdir}/usr/share/licenses/${pkgbase}" + 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 + _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-8-openjdk/} + install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}" + ln -sf /${file} "${pkgdir}${_filepkgpath}" + done +} + +package_jre8-openjdk() { + pkgdesc='OpenJDK Java 8 full runtime environment' + depends=("jre8-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme') + optdepends=('icedtea-web: web browser plugin + Java Web Start' + 'alsa-lib: for basic sound support' + 'gtk2: for the Gtk+ look and feel - desktop usage' + 'java8-openjfx: for JavaFX GUI components support') + provides=('java-runtime=8' 'java-runtime-openjdk=8') + install=install_jre8-openjdk.sh + replaces=('jre8-openjdk-wm') + + cd ${_imgdir}/jre + + for f in "${_nonheadless[@]}"; do + install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}" + done + + # Man pages + pushd "${pkgdir}${_jvmdir}/jre/bin" + install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/ + for file in *; do + install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \ + "${pkgdir}/usr/share/man/man1/${file}-${_jdkname}.1" + install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \ + "${pkgdir}/usr/share/man/ja/man1/${file}-${_jdkname}.1" + done + popd + + # Install license + install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgbase}/" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_jdk8-openjdk() { + pkgdesc='OpenJDK Java 8 development kit' + depends=('java-environment-common' "jre8-openjdk=${pkgver}-${pkgrel}") + provides=('java-environment=8' 'java-environment-openjdk=8') + replaces=('jdk8-openjdk-wm') + install=install_jdk8-openjdk.sh + + cd ${_imgdir} + + # Main files + install -d -m 755 "${pkgdir}${_jvmdir}" + + cp -a include lib "${pkgdir}${_jvmdir}" + + # 'bin' files + pushd bin + + # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page + for b in $(ls | grep -v java-rmi.cgi); do + if [ -e ../jre/bin/${b} ]; then + # Provide a link of the jre binary in the jdk/bin/ directory + ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}" + else + # Copy binary to jdk/bin/ + install -D -m 755 ${b} "${pkgdir}${_jvmdir}/bin/${b}" + # Copy man page + if [ -f ../man/man1/${b}.1 ]; then + install -D -m 644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}-${_jdkname}.1" + fi + if [ -f ../man/ja/man1/${b}.1 ]; then + install -D -m 644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}-${_jdkname}.1" + fi + fi + done + popd + + # Handling 'java-rmi.cgi' separately + install -D -m 755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi" + + # link license + install -d -m 755 "${pkgdir}/usr/share/licenses/" + ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}" +} + +package_openjdk8-src() { + pkgdesc='OpenJDK Java 8 sources' + + install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip" +} + +package_openjdk8-doc() { + pkgdesc='OpenJDK Java 8 documentation' + + install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/" + cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-server-release/docs/* \ + "${pkgdir}/usr/share/doc/${pkgbase}/" +} + +# vim: ts=2 sw=2 et: Deleted: gcc11.patch =================================================================== --- gcc11.patch 2021-12-24 09:48:12 UTC (rev 433015) +++ gcc11.patch 2021-12-24 09:48:29 UTC (rev 433016) @@ -1,74 +0,0 @@ -diff --git a/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp b/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp -index 31955ff7..6dcd90ac 100644 ---- openjdk/hotspot/src/share/vm/adlc/adlparse.cpp -+++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp -@@ -4564,7 +4564,7 @@ char *ADLParser::get_paren_expr(const char *description, bool include_location) - // string(still inside the file buffer). Returns a pointer to the string or - // NULL if some other token is found instead. - char *ADLParser::get_ident_common(bool do_preproc) { -- register char c; -+ char c; - char *start; // Pointer to start of token - char *end; // Pointer to end of token - -@@ -4762,7 +4762,7 @@ char *ADLParser::get_unique_ident(FormDict& dict, const char* nameDescription){ - // invokes a parse_err if the next token is not an integer. - // This routine does not leave the integer null-terminated. - int ADLParser::get_int(void) { -- register char c; -+ char c; - char *start; // Pointer to start of token - char *end; // Pointer to end of token - int result; // Storage for integer result -diff --git a/openjdk/hotspot/src/share/vm/adlc/arena.cpp b/openjdk/hotspot/src/share/vm/adlc/arena.cpp -index d7e4fc6e..406187ae 100644 ---- openjdk/hotspot/src/share/vm/adlc/arena.cpp -+++ openjdk/hotspot/src/share/vm/adlc/arena.cpp -@@ -79,7 +79,7 @@ Arena::Arena( Arena *a ) - // Total of all Chunks in arena - size_t Arena::used() const { - size_t sum = _chunk->_len - (_max-_hwm); // Size leftover in this Chunk -- register Chunk *k = _first; -+ Chunk *k = _first; - while( k != _chunk) { // Whilst have Chunks in a row - sum += k->_len; // Total size of this Chunk - k = k->_next; // Bump along to next Chunk -@@ -93,7 +93,7 @@ void* Arena::grow( size_t x ) { - // Get minimal required size. Either real big, or even bigger for giant objs - size_t len = max(x, Chunk::size); - -- register Chunk *k = _chunk; // Get filled-up chunk address -+ Chunk *k = _chunk; // Get filled-up chunk address - _chunk = new (len) Chunk(len); - - if( k ) k->_next = _chunk; // Append new chunk to end of linked list -diff --git a/openjdk/hotspot/src/share/vm/adlc/dict2.cpp b/openjdk/hotspot/src/share/vm/adlc/dict2.cpp -index f341a2b6..2dc60b25 100644 ---- openjdk/hotspot/src/share/vm/adlc/dict2.cpp -+++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp -@@ -283,9 +283,9 @@ void Dict::print(PrintKeyOrValue print_key, PrintKeyOrValue print_value) { - // limited to MAXID characters in length. Experimental evidence on 150K of - // C text shows excellent spreading of values for any size hash table. - int hashstr(const void *t) { -- register char c, k = 0; -- register int sum = 0; -- register const char *s = (const char *)t; -+ char c, k = 0; -+ int sum = 0; -+ const char *s = (const char *)t; - - while (((c = s[k]) != '\0') && (k < MAXID-1)) { // Get characters till nul - c = (char) ((c << 1) + 1); // Characters are always odd! -diff --git a/openjdk/hotspot/src/share/vm/adlc/main.cpp b/openjdk/hotspot/src/share/vm/adlc/main.cpp -index 52044f12..40bcda74 100644 ---- openjdk/hotspot/src/share/vm/adlc/main.cpp -+++ openjdk/hotspot/src/share/vm/adlc/main.cpp -@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) - - // Read command line arguments and file names - for( int i = 1; i < argc; i++ ) { // For all arguments -- register char *s = argv[i]; // Get option/filename -+ char *s = argv[i]; // Get option/filename - - if( *s++ == '-' ) { // It's a flag? (not a filename) - if( !*s ) { // Stand-alone `-' means stdin Copied: java8-openjdk/repos/extra-x86_64/gcc11.patch (from rev 433015, java8-openjdk/trunk/gcc11.patch) =================================================================== --- gcc11.patch (rev 0) +++ gcc11.patch 2021-12-24 09:48:29 UTC (rev 433016) @@ -0,0 +1,74 @@ +diff --git a/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp b/openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +index 31955ff7..6dcd90ac 100644 +--- openjdk/hotspot/src/share/vm/adlc/adlparse.cpp ++++ openjdk/hotspot/src/share/vm/adlc/adlparse.cpp +@@ -4564,7 +4564,7 @@ char *ADLParser::get_paren_expr(const char *description, bool include_location) + // string(still inside the file buffer). Returns a pointer to the string or + // NULL if some other token is found instead. + char *ADLParser::get_ident_common(bool do_preproc) { +- register char c; ++ char c; + char *start; // Pointer to start of token + char *end; // Pointer to end of token + +@@ -4762,7 +4762,7 @@ char *ADLParser::get_unique_ident(FormDict& dict, const char* nameDescription){ + // invokes a parse_err if the next token is not an integer. + // This routine does not leave the integer null-terminated. + int ADLParser::get_int(void) { +- register char c; ++ char c; + char *start; // Pointer to start of token + char *end; // Pointer to end of token + int result; // Storage for integer result +diff --git a/openjdk/hotspot/src/share/vm/adlc/arena.cpp b/openjdk/hotspot/src/share/vm/adlc/arena.cpp +index d7e4fc6e..406187ae 100644 +--- openjdk/hotspot/src/share/vm/adlc/arena.cpp ++++ openjdk/hotspot/src/share/vm/adlc/arena.cpp +@@ -79,7 +79,7 @@ Arena::Arena( Arena *a ) + // Total of all Chunks in arena + size_t Arena::used() const { + size_t sum = _chunk->_len - (_max-_hwm); // Size leftover in this Chunk +- register Chunk *k = _first; ++ Chunk *k = _first; + while( k != _chunk) { // Whilst have Chunks in a row + sum += k->_len; // Total size of this Chunk + k = k->_next; // Bump along to next Chunk +@@ -93,7 +93,7 @@ void* Arena::grow( size_t x ) { + // Get minimal required size. Either real big, or even bigger for giant objs + size_t len = max(x, Chunk::size); + +- register Chunk *k = _chunk; // Get filled-up chunk address ++ Chunk *k = _chunk; // Get filled-up chunk address + _chunk = new (len) Chunk(len); + + if( k ) k->_next = _chunk; // Append new chunk to end of linked list +diff --git a/openjdk/hotspot/src/share/vm/adlc/dict2.cpp b/openjdk/hotspot/src/share/vm/adlc/dict2.cpp +index f341a2b6..2dc60b25 100644 +--- openjdk/hotspot/src/share/vm/adlc/dict2.cpp ++++ openjdk/hotspot/src/share/vm/adlc/dict2.cpp +@@ -283,9 +283,9 @@ void Dict::print(PrintKeyOrValue print_key, PrintKeyOrValue print_value) { + // limited to MAXID characters in length. Experimental evidence on 150K of + // C text shows excellent spreading of values for any size hash table. + int hashstr(const void *t) { +- register char c, k = 0; +- register int sum = 0; +- register const char *s = (const char *)t; ++ char c, k = 0; ++ int sum = 0; ++ const char *s = (const char *)t; + + while (((c = s[k]) != '\0') && (k < MAXID-1)) { // Get characters till nul + c = (char) ((c << 1) + 1); // Characters are always odd! +diff --git a/openjdk/hotspot/src/share/vm/adlc/main.cpp b/openjdk/hotspot/src/share/vm/adlc/main.cpp +index 52044f12..40bcda74 100644 +--- openjdk/hotspot/src/share/vm/adlc/main.cpp ++++ openjdk/hotspot/src/share/vm/adlc/main.cpp +@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) + + // Read command line arguments and file names + for( int i = 1; i < argc; i++ ) { // For all arguments +- register char *s = argv[i]; // Get option/filename ++ char *s = argv[i]; // Get option/filename + + if( *s++ == '-' ) { // It's a flag? (not a filename) + if( !*s ) { // Stand-alone `-' means stdin Deleted: install_jdk8-openjdk.sh =================================================================== --- install_jdk8-openjdk.sh 2021-12-24 09:48:12 UTC (rev 433015) +++ install_jdk8-openjdk.sh 2021-12-24 09:48:29 UTC (rev 433016) @@ -1,50 +0,0 @@ -THIS_JDK='java-8-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 - "" | ${THIS_JDK}/jre) - /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}" -o "x${default}" = "x${THIS_JDK}/jre" ]; 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 - /usr/bin/archlinux-java unset - if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then - /usr/bin/archlinux-java set ${THIS_JDK}/jre - fi - fi -} Copied: java8-openjdk/repos/extra-x86_64/install_jdk8-openjdk.sh (from rev 433015, java8-openjdk/trunk/install_jdk8-openjdk.sh) =================================================================== --- install_jdk8-openjdk.sh (rev 0) +++ install_jdk8-openjdk.sh 2021-12-24 09:48:29 UTC (rev 433016) @@ -0,0 +1,50 @@ +THIS_JDK='java-8-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 + "" | ${THIS_JDK}/jre) + /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}" -o "x${default}" = "x${THIS_JDK}/jre" ]; 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 + /usr/bin/archlinux-java unset + if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then + /usr/bin/archlinux-java set ${THIS_JDK}/jre + fi + fi +} Deleted: install_jre8-openjdk-headless.sh =================================================================== --- install_jre8-openjdk-headless.sh 2021-12-24 09:48:12 UTC (rev 433015) +++ install_jre8-openjdk-headless.sh 2021-12-24 09:48:29 UTC (rev 433016) @@ -1,48 +0,0 @@ -THIS_JRE='java-8-openjdk/jre' - -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} | ${THIS_JRE/\/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/\/jre}" = "x${THIS_JRE/\/jre}" ]; then - /usr/bin/archlinux-java unset - echo "No Java environment is set as default anymore" - fi -} Copied: java8-openjdk/repos/extra-x86_64/install_jre8-openjdk-headless.sh (from rev 433015, java8-openjdk/trunk/install_jre8-openjdk-headless.sh) =================================================================== --- install_jre8-openjdk-headless.sh (rev 0) +++ install_jre8-openjdk-headless.sh 2021-12-24 09:48:29 UTC (rev 433016) @@ -0,0 +1,48 @@ +THIS_JRE='java-8-openjdk/jre' + +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} | ${THIS_JRE/\/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/\/jre}" = "x${THIS_JRE/\/jre}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +} Deleted: install_jre8-openjdk.sh =================================================================== --- install_jre8-openjdk.sh 2021-12-24 09:48:12 UTC (rev 433015) +++ install_jre8-openjdk.sh 2021-12-24 09:48:29 UTC (rev 433016) @@ -1,42 +0,0 @@ -THIS_JRE='java-8-openjdk/jre' - -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} | ${THIS_JRE/\/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 -} - -pre_remove() { - if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then - /usr/bin/archlinux-java unset - echo "No Java environment is set as default anymore" - fi -} Copied: java8-openjdk/repos/extra-x86_64/install_jre8-openjdk.sh (from rev 433015, java8-openjdk/trunk/install_jre8-openjdk.sh) =================================================================== --- install_jre8-openjdk.sh (rev 0) +++ install_jre8-openjdk.sh 2021-12-24 09:48:29 UTC (rev 433016) @@ -0,0 +1,42 @@ +THIS_JRE='java-8-openjdk/jre' + +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} | ${THIS_JRE/\/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 +} + +pre_remove() { + if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then + /usr/bin/archlinux-java unset + echo "No Java environment is set as default anymore" + fi +}