diff options
| -rw-r--r-- | libre/java7-openjdk/PKGBUILD | 13 | ||||
| -rw-r--r-- | libre/java7-openjdk/i586-fix.diff | 21 |
2 files changed, 29 insertions, 5 deletions
diff --git a/libre/java7-openjdk/PKGBUILD b/libre/java7-openjdk/PKGBUILD index 933ee953d..721356d7c 100644 --- a/libre/java7-openjdk/PKGBUILD +++ b/libre/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 242405 2015-07-21 19:57:37Z guillaume $ +# $Id: PKGBUILD 249512 2015-10-19 16:18:01Z guillaume $ # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org> # Maintainer (Arch): Guillaume ALAUX <guillaume@archlinux.org> # Contributor (Arch): Jan de Groot <jgc@archlinux.org> @@ -15,7 +15,7 @@ _icedtea_ver=2.6.1 #} _updatever=85 pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver} -pkgrel=1.parabola2 +pkgrel=2.parabola1 _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -39,7 +39,8 @@ 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) + openjdk7_nonreparenting-wm.diff + i586-fix.diff) # http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357 @@ -52,7 +53,8 @@ sha256sums=('491866e57199b0bc99d716be3eabaab97d9f6a698d1a652d748baeddeedfe963' '6db9bd16658fa8460e0afa4b05f28bd47148528d7581a403bea1e70f56cedd43' '00043b0c09aa06ce1766c2973d18b0283bd2128a44c94cde97b626a4856b68b3' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' - '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b') + '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b' + '9d2f8bda511bddf79fe7e0700294b76e2b3a4efb9da6b3959e72f86964382bc6') noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2 icedtea_${_icedtea_ver}_corba.tar.bz2 @@ -88,7 +90,8 @@ build() { cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \ - patches/openjdk7_nonreparenting-wm.diff" + patches/openjdk7_nonreparenting-wm.diff \ + patches/i586-fix.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 new file mode 100644 index 000000000..61ff56e95 --- /dev/null +++ b/libre/java7-openjdk/i586-fix.diff @@ -0,0 +1,21 @@ +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)); |