java8-openjdk-8.u20-3.parabola1: fix FS#41846 -> https://bugs.archlinux.org/task/41846

2 files changed, 49 insertions, 4 deletions

diff --git a/libre/java8-openjdk/003_nonreparenting-wm.patch b/libre/java8-openjdk/003_nonreparenting-wm.patch
new file mode 100644
index 000000000..c7352f2a2
--- /dev/null
+++ b/libre/java8-openjdk/003_nonreparenting-wm.patch
@@ -0,0 +1,39 @@
+--- 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;
diff --git a/libre/java8-openjdk/PKGBUILD b/libre/java8-openjdk/PKGBUILD
index b0e48a3d3..7ec5d8f3d 100644
--- a/libre/java8-openjdk/PKGBUILD
+++ b/libre/java8-openjdk/PKGBUILD
@@ -15,7 +15,7 @@ _jdk_update=20
 _jdk_build=23
 pkgver=${_java_ver}.u${_jdk_update}
 _repo_ver=jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
-pkgrel=2.parabola1
+pkgrel=3.parabola1
 arch=('i686' 'x86_64')
 url='http://openjdk.java.net/'
 license=('custom')
@@ -31,7 +31,8 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/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
-        002_gcc.make-4.9.patch)
+        002_gcc.make-4.9.patch
+        003_nonreparenting-wm.patch)
 
 sha256sums=('ec0b86c0a5883f769cb951a96a0b61734aa7e3c2b62e3b448f7bf6866a36c237'
             'e979396e3d64af94664932a28eb63d3048bdf3595f180bd4bd3fad91bc8b685c'
@@ -42,7 +43,8 @@ sha256sums=('ec0b86c0a5883f769cb951a96a0b61734aa7e3c2b62e3b448f7bf6866a36c237'
             '05177c5ba5ec95d041d46e871358692ff1e62f8568c8c9580688b39e5165d580'
             '2499b19562e320eb304be8797c2a895f1fe2ab2d16fd7da68aeaed180b3f1899'
             '682104f7723c5c543c47b53f51cc5577e273a12343bd04bebd1bcd70dd72ded9'
-            '5b1ed72ffd14a18e36aba2129e0781696b8c9cccd060bf4dbe1c4b9a44100b69')
+            '5b1ed72ffd14a18e36aba2129e0781696b8c9cccd060bf4dbe1c4b9a44100b69'
+            '7d3d7ce8661d0f33ff9ad8247f8cfef528c4dff74615e64fa0ac87f4beb78db4')
 
 case "${CARCH}" in
   'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
@@ -66,11 +68,15 @@ prepare() {
     ln -s ../${subrepo}-${_repo_ver} ${subrepo}
   done
 
-  cd hotspot
+  cd "${srcdir}/jdk8u-${_repo_ver}/hotspot"
   # https://bugs.openjdk.java.net/browse/JDK-8028407
   patch -p1 < "${srcdir}/001_adjust-mflags-for-gmake-4.patch"
   # https://bugs.openjdk.java.net/browse/JDK-8041658
   patch -p1 < "${srcdir}/002_gcc.make-4.9.patch"
+
+  cd "${srcdir}/jdk8u-${_repo_ver}/jdk"
+  # https://bugs.archlinux.org/task/41846
+  patch -p0 < "${srcdir}/003_nonreparenting-wm.patch"
 }
 
 build() {