From 600f74da5a6be070748347d071a0639f471e90b8 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 14 Mar 2024 16:34:56 -0400 Subject: [PATCH] Remove RH1649512 patch for libjpeg-turbo FAR macro - Related: RHEL-27133 --- java-17-openjdk.spec | 3 +-- ...eg_turbo_1_4_compat_for_jdk10_and_up.patch | 19 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 1381345..ba48ef3 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1347,7 +1347,6 @@ Patch600: rh1750419-redhat_alt_java.patch # Ignore AWTError when assistive technologies are loaded Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch -Patch3: rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch # Depend on pcsc-lite-libs instead of pcsc-lite-devel as this is only in optional repo Patch6: rh1684077-openjdk_should_depend_on_pcsc-lite-libs_instead_of_pcsc-lite-devel.patch @@ -1858,7 +1857,6 @@ pushd %{top_level_dir_name} # is not backward-compatible with prior (circa RHEL-8) versions of # rpmbuild. %patch -P1 -p1 -%patch -P3 -p1 %patch -P6 -p1 # Add crypto policy and FIPS support %patch -P1001 -p1 @@ -2500,6 +2498,7 @@ require "copy_jdk_configs.lua" - Require tzdata 2023d (JDK-8322725) - generate_source_tarball.sh: Add license - openjdk_news.sh: Use grep -E instead of egrep +- Remove RH1649512 patch for libjpeg-turbo FAR macro - Related: RHEL-27133 * Thu Jan 11 2024 Andrew Hughes - 1:17.0.10.0.7-2 diff --git a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch b/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch deleted file mode 100644 index 1b706a1..0000000 --- a/rh649512-remove_uses_of_far_in_jpeg_libjpeg_turbo_1_4_compat_for_jdk10_and_up.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove uses of FAR in jpeg code - -Upstream libjpeg-trubo removed the (empty) FAR macro: -http://sourceforge.net/p/libjpeg-turbo/code/1312/ - -Adjust our code to not use the undefined FAR macro anymore. - -diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c ---- openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c -+++ openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c -@@ -1385,7 +1385,7 @@ - /* and fill it in */ - dst_ptr = icc_data; - for (seq_no = first; seq_no < last; seq_no++) { -- JOCTET FAR *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN; -+ JOCTET *src_ptr = icc_markers[seq_no]->data + ICC_OVERHEAD_LEN; - unsigned int length = - icc_markers[seq_no]->data_length - ICC_OVERHEAD_LEN; -