From f46cd13c805943dfea2b6c26d5d2f98d8e2f1135 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 15 Mar 2015 15:53:34 +0000 Subject: [PATCH] extra/java8-openjdk to 8.u40-1 --- .../001_adjust-mflags-for-gmake-4.patch | 46 ------------------- extra/java8-openjdk/002_gcc.make-4.9.patch | 12 ----- .../java8-openjdk/003_nonreparenting-wm.patch | 39 ---------------- extra/java8-openjdk/PKGBUILD | 34 +++++--------- extra/java8-openjdk/install_jdk8-openjdk.sh | 4 +- 5 files changed, 13 insertions(+), 122 deletions(-) delete mode 100644 extra/java8-openjdk/001_adjust-mflags-for-gmake-4.patch delete mode 100644 extra/java8-openjdk/002_gcc.make-4.9.patch delete mode 100644 extra/java8-openjdk/003_nonreparenting-wm.patch diff --git a/extra/java8-openjdk/001_adjust-mflags-for-gmake-4.patch b/extra/java8-openjdk/001_adjust-mflags-for-gmake-4.patch deleted file mode 100644 index d998d8aee..000000000 --- a/extra/java8-openjdk/001_adjust-mflags-for-gmake-4.patch +++ /dev/null @@ -1,46 +0,0 @@ - -# HG changeset patch -# User henryjen -# Date 1390363634 28800 -# Node ID e8d4d0db1f06c26defcbf68e6713afab632f3f30 -# Parent c4b78cbea876aa86112cfda16c0026796848d582 -8028407: adjust-mflags.sh failed build with GNU Make 4.0 with -I -Reviewed-by: erikj - -diff -r c4b78cbea876 -r e8d4d0db1f06 make/bsd/makefiles/adjust-mflags.sh ---- a/make/bsd/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 -+++ b/make/bsd/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 -@@ -64,7 +64,7 @@ - echo "$MFLAGS" \ - | sed ' - s/^-/ -/ -- s/ -\([^ ][^ ]*\)j/ -\1 -j/ -+ s/ -\([^ I][^ I]*\)j/ -\1 -j/ - s/ -j[0-9][0-9]*/ -j/ - s/ -j\([^ ]\)/ -j -\1/ - s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ -diff -r c4b78cbea876 -r e8d4d0db1f06 make/linux/makefiles/adjust-mflags.sh ---- a/make/linux/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 -+++ b/make/linux/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 -@@ -64,7 +64,7 @@ - echo "$MFLAGS" \ - | sed ' - s/^-/ -/ -- s/ -\([^ ][^ ]*\)j/ -\1 -j/ -+ s/ -\([^ I][^ I]*\)j/ -\1 -j/ - s/ -j[0-9][0-9]*/ -j/ - s/ -j\([^ ]\)/ -j -\1/ - s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ -diff -r c4b78cbea876 -r e8d4d0db1f06 make/solaris/makefiles/adjust-mflags.sh ---- a/make/solaris/makefiles/adjust-mflags.sh Thu Dec 05 00:36:42 2013 -0800 -+++ b/make/solaris/makefiles/adjust-mflags.sh Tue Jan 21 20:07:14 2014 -0800 -@@ -64,7 +64,7 @@ - echo "$MFLAGS" \ - | sed ' - s/^-/ -/ -- s/ -\([^ ][^ ]*\)j/ -\1 -j/ -+ s/ -\([^ I][^ I]*\)j/ -\1 -j/ - s/ -j[0-9][0-9]*/ -j/ - s/ -j\([^ ]\)/ -j -\1/ - s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/ - diff --git a/extra/java8-openjdk/002_gcc.make-4.9.patch b/extra/java8-openjdk/002_gcc.make-4.9.patch deleted file mode 100644 index 13715a5d6..000000000 --- a/extra/java8-openjdk/002_gcc.make-4.9.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- old/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.838205838 +0100 -+++ new/make/linux/makefiles/gcc.make 2014-04-23 22:07:59.754204533 +0100 -@@ -266,6 +266,9 @@ - ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 3), 1) - OPT_CFLAGS/mulnode.o += $(OPT_CFLAGS/NOOPT) - endif -+ ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 9), 1) -+ OPT_CFLAGS/macroAssembler_x86.o += -fno-devirtualize -+ endif - endif - - # Flags for generating make dependency flags. diff --git a/extra/java8-openjdk/003_nonreparenting-wm.patch b/extra/java8-openjdk/003_nonreparenting-wm.patch deleted file mode 100644 index ba06cadf9..000000000 --- a/extra/java8-openjdk/003_nonreparenting-wm.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:41:39.018530981 -0400 -+++ src/solaris/classes/sun/awt/X11/XWM.java 2014-09-06 18:46:43.098540372 -0400 -@@ -104,7 +104,8 @@ - COMPIZ_WM = 12, - LG3D_WM = 13, - CWM_WM = 14, -- MUTTER_WM = 15; -+ MUTTER_WM = 15, -+ OTHER_NONREPARENTING_WM = 16; - public String toString() { - switch (WMID) { - case NO_WM: -@@ -596,7 +597,7 @@ - } - - static boolean isNonReparentingWM() { -- return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM); -+ return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM); - } - - /* -@@ -786,6 +787,9 @@ - } else if (doIsIceWM && isIceWM()) { - awt_wmgr = XWM.ICE_WM; - } -+ else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) { -+ awt_wmgr = XWM.OTHER_NONREPARENTING_WM; -+ } - /* - * We don't check for legacy WM when we already know that WM - * supports WIN or _NET wm spec. -@@ -1332,6 +1336,7 @@ - res = new Insets(28, 6, 6, 6); - break; - case NO_WM: -+ case OTHER_NONREPARENTING_WM: - case LG3D_WM: - res = zeroInsets; - break; \ No newline at end of file diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD index 12f019983..31a5d3995 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -15,8 +15,8 @@ pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'openjdk8-doc') pkgbase=java8-openjdk _java_ver=8 -_jdk_update=31 -_jdk_build=13 +_jdk_update=40 +_jdk_build=20 pkgver=${_java_ver}.u${_jdk_update} _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build} pkgrel=1 @@ -34,20 +34,16 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/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 - 001_adjust-mflags-for-gmake-4.patch - 003_nonreparenting-wm.patch) + nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz) -sha256sums=('824b28c554ce32edbdaa77cc4f21f8ed57542c74c8748b89cd06be43a1537b34' - '47b07945d3f534e6b87dc273676b8bcb493292e8769667493bb5febfb5c9f347' - '485b1a88b4b44b468e96211de238a5eed80f7472f91977fc27e2f443a8ab8ed3' - 'b3801935199973cc02df02ac2f2587ff0f1989f98af5bf6fe46520a8108c8d6a' - '04bb35fd8b071f65014fa1d3b9816886b88e06548eeda27181993b80efb6a0bf' - '74bb7a376fa706e4283e235caebbcf9736974a6a4cf97b8c8335d389581965e2' - '3e09a644d2fb38970acf78c72bc201c031d43574b5a3f7e00bec1b11bffec9c4' - '2fbdcb016506de4e86db5813c78b28382df5b601f0e73ffd5465c12519b75fd3' - '682104f7723c5c543c47b53f51cc5577e273a12343bd04bebd1bcd70dd72ded9' - 'c41cec7415ace2f68a5f9529e6df7e87a8c21993ab9d040b0f8b395f6173d478') +sha256sums=('1fc7ca0e760af9bab0620049d2e21cde557961101949e54ea74736872295bdde' + '1363462eff9fa2550c803e823695a3f4086380b106dfcff78c456f10c42beb3e' + 'd61a7a2d4d211e068e469ce0894030a2daf9788d66f3994232d5b82c16c9360d' + '2c4fab3a8589f3ac9ea531c7e70d4c0a8e15d995345a90bc5b3b8d8291af3f33' + '6de0d99d6685761c064814855d1e3401e48aadb830a7c68d03b13f0a41e0e950' + 'ad83699c97dec550c532eaf98a8bc049c8fbf80d7211057e76a3c86e5fcc3c0f' + '2fb4444e00ef3d4fe2b9f8f5c4a8618e1fb0f58704c6c07246bafd43f39b41d1' + '39113708d318c070326b5d4543f1bd499bf7e77012f08b67ba0d0313730935ff') case "${CARCH}" in 'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;; @@ -71,14 +67,6 @@ prepare() { do ln -s ../${subrepo}-${_repo_ver} ${subrepo} done - - cd "${srcdir}/jdk8u-${_repo_ver}/hotspot" - # https://bugs.openjdk.java.net/browse/JDK-8028407 - patch -p1 < "${srcdir}/001_adjust-mflags-for-gmake-4.patch" - - cd "${srcdir}/jdk8u-${_repo_ver}/jdk" - # https://bugs.archlinux.org/task/41846 - patch -p0 < "${srcdir}/003_nonreparenting-wm.patch" } build() { diff --git a/extra/java8-openjdk/install_jdk8-openjdk.sh b/extra/java8-openjdk/install_jdk8-openjdk.sh index 8f3dcc225..faac87250 100644 --- a/extra/java8-openjdk/install_jdk8-openjdk.sh +++ b/extra/java8-openjdk/install_jdk8-openjdk.sh @@ -42,9 +42,9 @@ post_upgrade() { pre_remove() { if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then - sudo /usr/bin/archlinux-java unset + /usr/bin/archlinux-java unset if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then - sudo /usr/bin/archlinux-java set ${THIS_JDK}/jre + /usr/bin/archlinux-java set ${THIS_JDK}/jre fi fi }