From bf6ae1dac46dc9894f206c7f81570548dbf6785c Mon Sep 17 00:00:00 2001 From: Geoff Parker Date: Mon, 1 May 2023 19:26:20 -0700 Subject: openjdk-8: Update patches for patch fuzz for Yocto 4.2 mickledore Yocto 4.2 bitbake is more pedantic on patch fuzz, which treats patch fuzz Warnings as Errors, and fails the bulid. Corrected patch fuzz with: devtool modify openjdk-8-native devtool finish --force-patch-refresh openjdk-8-native but removed the changes to 1001-hotspot-fix-crash-on-JNI_CreateJavaVM.patch which rewrote a huge amount of source files in their entirety for some reason. Signed-off-by: Geoff Parker --- .../2003-jdk-Allow-using-a-system-installed-libpng.patch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'recipes-core/openjdk/patches-openjdk-8/2003-jdk-Allow-using-a-system-installed-libpng.patch') 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 9c4e70e..dbc714e 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 @@ -From c7fb1d599ba66116fb132537b4696092e9c48331 Mon Sep 17 00:00:00 2001 +From ce26d6cbb550039516432993894d65660b7c9e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Tue, 27 Feb 2018 13:43:04 +0000 -Subject: [PATCH 2003/2009] jdk: Allow using a system-installed libpng +Subject: [PATCH] jdk: Allow using a system-installed libpng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -18,13 +18,14 @@ Issues fixed on top of debian patch: Upstream-Status: Backport Signed-off-by: André Draszik Signed-off-by: Richard Leitner + --- - make/lib/Awt2dLibraries.gmk | 12 +++++++++--- + jdk/make/lib/Awt2dLibraries.gmk | 12 +++++++++--- .../native/sun/awt/splashscreen/splashscreen_png.c | 3 +-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk -index 7fffcafc70..7f42e09ce4 100644 +index 7fffcafc..7f42e09c 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -1155,7 +1155,6 @@ endif @@ -65,7 +66,7 @@ index 7fffcafc70..7f42e09ce4 100644 VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \ RC_FLAGS := $(RC_FLAGS) \ diff --git a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c -index 3599433e42..5bf002ea17 100644 +index 3599433e..5bf002ea 100644 --- a/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c +++ b/jdk/src/share/native/sun/awt/splashscreen/splashscreen_png.c @@ -25,8 +25,7 @@ @@ -78,6 +79,3 @@ index 3599433e42..5bf002ea17 100644 #include #define SIG_BYTES 8 --- -2.26.2 - -- cgit v1.2.3-54-g00ecf