extra/java7-openjdk to 7.u231_2.6.19-1

extra/java7-openjdk/PKGBUILD

@@ -1,4 +1,3 @@
-## $Id$
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -13,13 +12,13 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.6.13
+_icedtea_ver=2.6.19
 #pkgver() {
 #  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
 #    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
 #  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
 #}
-_updatever=171
+_updatever=231
 pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
 pkgrel=1
 
@@ -30,10 +29,10 @@ url='http://icedtea.classpath.org'
 license=('custom')
 options=('!emptydirs')
 makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
-             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
+             'alsa-lib' 'giflib' 'libpng>=1.5.7' 'gtk2'
              'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget' 'procps-ng' 'inetutils'
              'eclipse-ecj' 'pcsclite' 'lksctp-tools')
-
+_antver=1.9.14
 _icedtea_url=http://icedtea.classpath.org/download
 _drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
 source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.xz{,.sig}
@@ -44,25 +43,31 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.xz{,.sig}
         icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2
         icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
         icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
+        https://archive.apache.org/dist/ant/binaries/apache-ant-${_antver}-bin.tar.bz2
         fontconfig-paths.diff
         openjdk7_nonreparenting-wm.diff
+        icedtea-jdk-xattr.diff
+        fix-xattr-include.patch
         text-relocations.diff)
 # EdDSA key may require `keyserver sks-keyservers.net` in GPG config
 validpgpkeys=('5132579DD1540ED23E04C5A0CFDA0F9B35964222') # Andrew John Hughes
 
 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
 
-sha256sums=('104e84205d1176e217e24f770784c53d1cd666aeb23ab0bae8ac858e5b0e63f0'
+sha256sums=('2ba0d2ec3970a163f27d1996074ac4a8767075fc0b7671ef3974cd667aba277d'
             'SKIP'
-            '14a9f90e2fe5c0bb73dc8ffcc9ea5dc76d3ce7a74a0c901cfd0b0ae3fc8c6450'
+            '2531838d9cf08755d88c91498da6fef427000d0fd527c7ddeaa60c993aa679ea'
-            'df1154915cad317b93555b563fc12acad1b92e5f2870642736f186b7a4d80f14'
+            'aae916ff4c1f3cbdb14f57716d03adf1f2d9cb221bf0fa0580f607d7a360245b'
-            '143a5b957fbb00889ff9d38a4bf391218786b6a33664235279edbb6e79a3decc'
+            '4545cf0b2bfeca6cd019f1c8bab3ed7317963776b859f80ffc4d8d79d3c82e8f'
-            'd3e3d55d6e2231c4420d30d124f72c56695d45e8a398e3cc7ba21ff2a93c1284'
+            '9b2b76598996962c5128e586edded4022e162421d9898a57c3d6dce2fbe7ee6b'
-            'adbda93d1e9be89447e009733a6c9050c6e6cebda3c674a76ebbeb8986623534'
+            '1653315e15f30f4f250d6ec9085043b534a28c293ba445467e274c56fef84b88'
-            '12036b985f8811cdadf6d5bf840f90bab25f4da1cc3e86bab9c3f6efcc10055b'
+            'd9d02a7f135350d66d2dde28dad7f2257843d11cc663b641740b1cf21ec3d710'
-            '9ae3d6d43ff771cf02b8c7805ac0f0a457f5fa7026b1334ea1085262d3d86d9d'
+            'fbbfa17c95891491311758d2ef595ec322c46452e0bf7b51eb42a9ca1ccc419b'
+            'efad74bd98d9eb72b080a3e08f5b17118e05372d22e3aa3bc0bd1686aa71361c'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
+            '8da7248a72c60f4cb82c33712bdd8ce8f25b0cd147816efb7112f18a752fcabd'
+            '9a48d91af72d28d7f0fca8ea6f5e42085d7c877c7141a7d895331ab1f5882086'
             '6dd92db9ba302141c94a2031082e3e130bcb370a5adcb8185467dd22cbff6b51')
 
 noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
@@ -85,6 +90,14 @@ _nonheadless=(bin/policytool
               lib/${_JARCH}/libsplashscreen.so
               lib/${_JARCH}/xawt/libmawt.so)
  
+prepare() {
+  cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
+ 
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
+  patch -Np1 -i ../fix-xattr-include.patch
+  ./autogen.sh
+}
+
 build() {
   cd "${srcdir}/icedtea-${_icedtea_ver}"
 
@@ -93,11 +106,9 @@ build() {
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
-  . /etc/profile.d/apache-ant.sh
-
-  cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
                                patches/openjdk7_nonreparenting-wm.diff \
+                               patches/icedtea-jdk-xattr.diff \
                                patches/text-relocations.diff"
 
   if [ "$_bootstrap" = "1" ]; then
@@ -106,6 +117,10 @@ build() {
      BOOTSTRAPOPT="--disable-bootstrap"
   fi
 
+  export EXTRA_CFLAGS="$CFLAGS $CPPFLAGS -std=gnu++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-strict-overflow"
+  export EXTRA_LDFLAGS="$LDFLAGS"
+
+  export PATH="${srcdir}/apache-ant-${_antver}/bin:$PATH"
   ./configure \
         ${BOOTSTRAPOPT} \
         --with-parallel-jobs="${MAKEFLAGS/-j}" \
@@ -122,8 +137,6 @@ build() {
         --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \
         --enable-nss \
         --with-rhino \
-        --with-abs-install-dir=${_jvmdir} \
-        --enable-infinality=no \
         --disable-docs \
         --enable-zero
     make

extra/java7-openjdk/fix-xattr-include.patch

@@ -0,0 +1,13 @@
+--- icedtea-2.6.17.orig/acinclude.m4	2019-05-30 09:49:34.952140696 +0300
++++ icedtea-2.6.17/acinclude.m4	2019-05-30 09:50:28.231483929 +0300
+@@ -2271,8 +2271,8 @@
+     dnl Check for syscalls
+     AC_CHECK_FUNCS([openat64 fstatat64 fgetxattr fsetxattr fremovexattr flistxattr unlinkat renameat futimesat fdopendir epoll_create epoll_ctl epoll_wait],,
+       [AC_MSG_ERROR([Could not find required syscalls; check config.log and use --disable-compile-against-syscalls if necessary.])])
+-    AC_CHECK_HEADERS([sys/epoll.h attr/xattr.h],
+-      , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers, libc6-dev and/or libattr-devel, libattr1-dev or use --disable-compile-against-syscalls if necessary.])])
++    AC_CHECK_HEADERS([sys/epoll.h sys/xattr.h],
++      , [AC_MSG_ERROR([Could not find required system headers; install the appropriate files from glibc-headers or libc6-dev or use --disable-compile-against-syscalls if necessary.])])
+     ENABLE_SYSCALL_COMPILATION=true
+   fi
+   AM_CONDITIONAL(USE_SYSCALL_COMPILATION, test x"${ENABLE_SYSCALL_COMPILATION}" = "xtrue")

extra/java7-openjdk/icedtea-jdk-xattr.diff

@@ -0,0 +1,11 @@
+--- openjdk.orig/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c	2019-05-30 09:55:45.271164370 +0300
++++ openjdk/jdk/src/solaris/native/sun/nio/fs/LinuxNativeDispatcher.c	2019-05-30 09:56:01.000980599 +0300
+@@ -38,7 +38,7 @@
+ 
+ #ifdef COMPILE_AGAINST_SYSCALLS
+ #include <sys/types.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #else
+ #include <syscalls_fp.h>
+ #endif