java7-openjdk-7.u91_2.6.2-1.parabola1: updating version

2 files changed, 15 insertions, 39 deletions

diff --git a/libre/java7-openjdk/PKGBUILD b/libre/java7-openjdk/PKGBUILD
index c44781ef4..e2a44dfab 100644
--- a/libre/java7-openjdk/PKGBUILD
+++ b/libre/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 249512 2015-10-19 16:18:01Z guillaume $
+# $Id: PKGBUILD 249676 2015-10-23 09:02:23Z guillaume $
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor (Arch): Jan de Groot <jgc@archlinux.org>
@@ -7,15 +7,15 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.6.1
+_icedtea_ver=2.6.2
 #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=85
+_updatever=91
 pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
-pkgrel=2.parabola1
+pkgrel=1.parabola1
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -39,22 +39,20 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
         icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
         icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
         fontconfig-paths.diff
-        openjdk7_nonreparenting-wm.diff
-        i586-fix.diff)
+        openjdk7_nonreparenting-wm.diff)
 
 # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
 
-sha256sums=('491866e57199b0bc99d716be3eabaab97d9f6a698d1a652d748baeddeedfe963'
-            '0168a0174ee47407139ee32458c4d2a298ba4f44260343b209250156e4da463f'
-            'cd03d97c171a2d45ca94c1642265e09c09a459b1d4ac1191f82af88ca171f6f8'
-            'c00c4c2889f77c4615fd655415067e14840764f52e503f220ed324720117faeb'
-            '2d5ff95dc62ab7986973e15e9cf91d5596d2cf486ee52beab9eab62f70f2ae9f'
-            'a8083e75e14ddb4575bf2cd733e80a0074201b45d8debbe04f84564b32875363'
-            '6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43'
-            '00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3'
+sha256sums=('c19eafacd23c81179934acab123511c424cd07c094739fa33778bf7cc80e14d0'
+            '4911adb6d7877b014777b6db6d90f1d1626314bd0c6a2c9cf9911d1e11eb4b49'
+            '92fa1e73dc0eb463bccd9ce3636643f492b8935cb7a23b91c5d855f4641382af'
+            '94cda3ba29ab3cd36d50f2e6c98a5e250eb6372379e171288b3022b978136fc0'
+            '14467736097197a199b483f24f8111e9c76252a2ad2a5f166c97585c0a3930d4'
+            '7ad801d5f6b61818c78f2f39931df24d8c6f6a1c821180c998975ac884eb8af1'
+            'a53fe8912b8190d82615778cf8bfb77202a55adcdc5bacc56ce7738b6a654335'
+            '984918bcb571fecebd490160935bb282c60eb9e17b4fc8fc77733d8da164c33a'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
-            '9d2f8bda511bddf79fe7e0700294b76e2b3a4efb9da6b3959e72f86964382bc6')
+            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
 
 noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
            icedtea_${_icedtea_ver}_corba.tar.bz2
@@ -85,8 +83,7 @@ build() {
 
   cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/openjdk7_nonreparenting-wm.diff \
-                               patches/i586-fix.diff"
+                               patches/openjdk7_nonreparenting-wm.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
diff --git a/libre/java7-openjdk/i586-fix.diff b/libre/java7-openjdk/i586-fix.diff
deleted file mode 100644
index 61ff56e95..000000000
--- a/libre/java7-openjdk/i586-fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -r ff3cd846027a src/solaris/native/sun/java2d/x11/X11SurfaceData.c
---- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Sun Jul 19 18:19:29 2015 +0100
-+++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c	Thu Jul 30 14:31:59 2015 +0200
-@@ -551,8 +551,6 @@
- {
-     XImage *img = NULL;
-     XShmSegmentInfo *shminfo;
--    JNIEnv* env;
--    jboolean xShmAttachResult;
- 
-     shminfo = malloc(sizeof(XShmSegmentInfo));
-     if (shminfo == NULL) {
-@@ -603,7 +601,7 @@
-      */
-     shmctl(shminfo->shmid, IPC_RMID, 0);
- 
--    if (xShmAttachResult == JNI_FALSE) {
-+    if (isXShmAttachFailed() == JNI_TRUE) {
-         J2dRlsTraceLn1(J2D_TRACE_ERROR,
-                        "X11SD_SetupSharedSegment XShmAttach has failed: %s",
-                        strerror(errno));