From 9520a8d47a679f7273f011450b15da5f4acd2313 Mon Sep 17 00:00:00 2001
From: André Draszik <andre.draszik@jci.com>
Date: Mon, 5 Mar 2018 09:30:55 +0000
Subject: openjdk-8: Upgrade to u162b12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- openjdk8-fix-zero-mode-crash.patch was a backport -> dropped
- remaining patches -> refreshed
- license checksum change due to address change in license file
  (see patch)

Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
 .../openjdk8-no-unused-deps.patch                  | 44 +++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch')

diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
index cd42544..7b5d998 100644
--- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
+++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-no-unused-deps.patch
@@ -1,9 +1,9 @@
---- jdk/make/lib/Awt2dLibraries.gmk.orig	2015-09-03 15:05:21.429981848 +0200
-+++ jdk/make/lib/Awt2dLibraries.gmk	2015-09-03 15:05:44.705981936 +0200
-@@ -235,6 +235,10 @@
+--- jdk/make/lib/Awt2dLibraries.gmk.orig
++++ jdk/make/lib/Awt2dLibraries.gmk
+@@ -235,6 +235,10 @@ ifeq ($(OPENJDK_TARGET_OS), aix)
    LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
  endif
-
+ 
 +ifdef BUILD_HEADLESS_ONLY
 +LIBAWT_CFLAGS += -DHEADLESS=true
 +endif
@@ -11,10 +11,10 @@
  LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
      $(X_CFLAGS) \
      $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
-@@ -1126,17 +1130,28 @@
-           -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
-     endif
-
+@@ -792,17 +796,28 @@ ifeq ($(BUILD_HEADLESS), true)
+         -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/jdga \
+         $(foreach dir, $(LIBAWT_HEADLESS_DIRS), -I$(dir))
+ 
 -    LIBAWT_HEADLESS_FILES := \
 -        awt_Font.c \
 -        HeadlessToolkit.c \
@@ -45,7 +45,7 @@
          OGLBlitLoops.c \
          OGLBufImgOps.c \
          OGLContext.c \
-@@ -1149,10 +1164,9 @@
+@@ -815,10 +830,9 @@ ifeq ($(BUILD_HEADLESS), true)
          OGLSurfaceData.c \
          OGLTextRenderer.c \
          OGLVertexCache.c \
@@ -55,23 +55,23 @@
 -        CUPSfuncs.c
 +	$(LIBAWT_HEADLESS_X11_FILES) \
 +	$(LIBAWT_HEADLESS_CUPS_FILES)
-
+ 
      LIBAWT_HEADLESS_REORDER :=
      ifeq ($(OPENJDK_TARGET_OS), solaris)
---- jdk/make/CompileNativeLibraries.gmk.orig	2015-08-24 13:35:55.320678845 +0200
-+++ jdk/make/CompileNativeLibraries.gmk	2015-08-24 13:36:22.776678949 +0200
-@@ -85,7 +85,9 @@
-
+--- jdk/make/CompileNativeLibraries.gmk.orig
++++ jdk/make/CompileNativeLibraries.gmk
+@@ -85,7 +85,9 @@ include lib/ServiceabilityLibraries.gmk
+ 
  include lib/Awt2dLibraries.gmk
-
+ 
 +ifndef BUILD_SOUNDLESS_ONLY
  include lib/SoundLibraries.gmk
 +endif
-
- # Include the corresponding custom file, if present.
+ 
+ # Include the corresponding custom file, if present. 
  -include $(CUSTOM_MAKE_DIR)/CompileNativeLibraries.gmk
---- jdk/src/solaris/native/sun/awt/jawt.c.orig	2015-08-24 14:12:29.376687104 +0200
-+++ jdk/src/solaris/native/sun/awt/jawt.c	2015-08-24 14:16:20.420687974 +0200
+--- jdk/src/solaris/native/sun/awt/jawt.c.orig
++++ jdk/src/solaris/native/sun/awt/jawt.c
 @@ -33,7 +33,7 @@
   */
  JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt)
@@ -81,12 +81,12 @@
      /* there are no AWT libs available at all */
      return JNI_FALSE;
  #else
---- jdk/src/solaris/native/sun/awt/utility/rect.h.orig	2015-09-03 14:45:40.717977403 +0200
-+++ jdk/src/solaris/native/sun/awt/utility/rect.h	2015-09-03 14:46:46.337977650 +0200
+--- jdk/src/solaris/native/sun/awt/utility/rect.h.orig
++++ jdk/src/solaris/native/sun/awt/utility/rect.h
 @@ -28,7 +28,7 @@
  #ifndef _AWT_RECT_H
  #define _AWT_RECT_H
-
+ 
 -#ifndef MACOSX
 +#if !(defined(MACOSX) || defined(HEADLESS))
  #include <X11/Xlib.h>
-- 
cgit v1.2.3-54-g00ecf