diff options
author | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 09:00:08 +0200 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2020-08-20 15:11:36 +0200 |
commit | e5510ba991a5494e562776f135fc07f2999a86a8 (patch) | |
tree | 48c5fb5d665af845c4dfd92861dc99aa88b71347 /recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | |
parent | a599da830cdfe8f50534a8b5d4b8b963b34bc045 (diff) | |
download | meta-java-e5510ba991a5494e562776f135fc07f2999a86a8.tar.gz |
openjdk-8: update to latest ga version 265
Patch related changes:
* The hotspot patch 1004 was mainlined in changeset 3a3803a0c789 [1] and
is therfore dropped.
* The jdk patch 2010 was mainlined in changeset c4418d567028 [2] and is
therefore dropped.
* Rename hotspot/aarch64 patches to start with number 1401.
* Rename hotspot/aarch32 patches to start with number 1201.
* Merge aarch32-hotspot-fix-shark-build-pt2.patch and
openjdk8-fix-shark-build-pt2.patch to hotspot patch 1013 as they were
the same.
[1] https://hg.openjdk.java.net/jdk8u/jdk8u/hotspot/rev/3a3803a0c789
[2] https://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/c4418d567028
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch index 13d3045..eb79183 100644 --- a/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch +++ b/recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From bdf8cb302ab7c8f11b676f93da482cd4a9405ce4 Mon Sep 17 00:00:00 2001 | 1 | From f74002f805b000df6565418d9e8416edbe86be25 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> | 2 | From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com> |
3 | Date: Tue, 27 Feb 2018 13:43:04 +0000 | 3 | Date: Tue, 27 Feb 2018 13:43:04 +0000 |
4 | Subject: [PATCH 2003/2008] jdk: Allow using a system-installed libpng | 4 | Subject: [PATCH 2003/2009] jdk: Allow using a system-installed libpng |
5 | MIME-Version: 1.0 | 5 | MIME-Version: 1.0 |
6 | Content-Type: text/plain; charset=UTF-8 | 6 | Content-Type: text/plain; charset=UTF-8 |
7 | Content-Transfer-Encoding: 8bit | 7 | Content-Transfer-Encoding: 8bit |
@@ -24,10 +24,10 @@ Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | |||
24 | 2 files changed, 10 insertions(+), 5 deletions(-) | 24 | 2 files changed, 10 insertions(+), 5 deletions(-) |
25 | 25 | ||
26 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk | 26 | diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk |
27 | index 12b9da11d..cd8b94cd8 100644 | 27 | index 7fffcafc70..7f42e09ce4 100644 |
28 | --- a/jdk/make/lib/Awt2dLibraries.gmk | 28 | --- a/jdk/make/lib/Awt2dLibraries.gmk |
29 | +++ b/jdk/make/lib/Awt2dLibraries.gmk | 29 | +++ b/jdk/make/lib/Awt2dLibraries.gmk |
30 | @@ -1148,7 +1148,6 @@ endif | 30 | @@ -1155,7 +1155,6 @@ endif |
31 | ifndef BUILD_HEADLESS_ONLY | 31 | ifndef BUILD_HEADLESS_ONLY |
32 | LIBSPLASHSCREEN_DIRS := \ | 32 | LIBSPLASHSCREEN_DIRS := \ |
33 | $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ | 33 | $(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg \ |
@@ -35,7 +35,7 @@ index 12b9da11d..cd8b94cd8 100644 | |||
35 | $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen | 35 | $(JDK_TOPDIR)/src/share/native/sun/awt/splashscreen |
36 | 36 | ||
37 | ifeq ($(USE_EXTERNAL_LIBGIF), true) | 37 | ifeq ($(USE_EXTERNAL_LIBGIF), true) |
38 | @@ -1165,6 +1164,13 @@ ifndef BUILD_HEADLESS_ONLY | 38 | @@ -1172,6 +1171,13 @@ ifndef BUILD_HEADLESS_ONLY |
39 | LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg | 39 | LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/share/native/sun/awt/image/jpeg |
40 | endif | 40 | endif |
41 | 41 | ||
@@ -49,7 +49,7 @@ index 12b9da11d..cd8b94cd8 100644 | |||
49 | ifneq ($(OPENJDK_TARGET_OS), macosx) | 49 | ifneq ($(OPENJDK_TARGET_OS), macosx) |
50 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen | 50 | LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/awt/splashscreen |
51 | else | 51 | else |
52 | @@ -1222,12 +1228,12 @@ ifndef BUILD_HEADLESS_ONLY | 52 | @@ -1229,12 +1235,12 @@ ifndef BUILD_HEADLESS_ONLY |
53 | LANG := C, \ | 53 | LANG := C, \ |
54 | OPTIMIZATION := LOW, \ | 54 | OPTIMIZATION := LOW, \ |
55 | CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ | 55 | CFLAGS := $(LIBSPLASHSCREEN_CFLAGS) $(CFLAGS_JDKLIB) \ |
@@ -65,7 +65,7 @@ index 12b9da11d..cd8b94cd8 100644 | |||
65 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ | 65 | VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ |
66 | RC_FLAGS := $(RC_FLAGS) \ | 66 | RC_FLAGS := $(RC_FLAGS) \ |
67 | diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | 67 | diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c |
68 | index 3599433e4..5bf002ea1 100644 | 68 | index 3599433e42..5bf002ea17 100644 |
69 | --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | 69 | --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c |
70 | +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c | 70 | +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c |
71 | @@ -25,8 +25,7 @@ | 71 | @@ -25,8 +25,7 @@ |
@@ -79,5 +79,5 @@ index 3599433e4..5bf002ea1 100644 | |||
79 | 79 | ||
80 | #define SIG_BYTES 8 | 80 | #define SIG_BYTES 8 |
81 | -- | 81 | -- |
82 | 2.24.1 | 82 | 2.26.2 |
83 | 83 | ||