From d17493a3d7b6b8be18aca65599ab96d46bfabf53 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 29 Jan 2024 18:00:25 +0000 Subject: [PATCH] Reinstate libfreetype install on JDK21 Signed-off-by: Stewart X Addison --- linux/jdk/debian/src/main/packaging/temurin/21/debian/rules | 3 --- .../redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec | 3 --- .../jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec | 3 --- 3 files changed, 9 deletions(-) diff --git a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules index 3e1a76ea3..faa530c2f 100644 --- a/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules +++ b/linux/jdk/debian/src/main/packaging/temurin/21/debian/rules @@ -59,9 +59,6 @@ override_dh_auto_install: # Add jinfo file (alternatives support). cp debian/jinfo "$(d)/$(jvm_home)/.$(pkg_alias).jinfo" - # Strip bundled Freetype and use OS package instead. - rm -f "$(d)/$(jvm_home)/$(jvm_dir)/lib/libfreetype.so" - # Replace bundled cacerts and redirect to adoptium-ca-certificates. rm -f "$(d)/$(jvm_home)/$(jvm_dir)/lib/security/cacerts" ln -s /etc/ssl/certs/adoptium/cacerts "$(d)/$(jvm_home)/$(jvm_dir)/lib/security/cacerts" diff --git a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec index 92ab982d7..6c7fc8096 100644 --- a/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec +++ b/linux/jdk/redhat/src/main/packaging/temurin/21/temurin-21-jdk.spec @@ -135,9 +135,6 @@ mkdir -p %{buildroot}%{prefix} cd %{buildroot}%{prefix} tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}} -# Strip bundled Freetype and use OS package instead. -rm -f "%{buildroot}%{prefix}/lib/libfreetype.so" - # Use cacerts included in OS rm -f "%{buildroot}%{prefix}/lib/security/cacerts" pushd "%{buildroot}%{prefix}/lib/security" diff --git a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec index 7fe3a7d3e..b781c7a2e 100644 --- a/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec +++ b/linux/jdk/suse/src/main/packaging/temurin/21/temurin-21-jdk.spec @@ -128,9 +128,6 @@ mkdir -p %{buildroot}%{prefix} cd %{buildroot}%{prefix} tar --strip-components=1 -C "%{buildroot}%{prefix}" -xf %{expand:%{SOURCE%{src_num}}} -# Strip bundled Freetype and use OS package instead. -rm -f "%{buildroot}%{prefix}/lib/libfreetype.so" - # Use cacerts included in OS rm -f "%{buildroot}%{prefix}/lib/security/cacerts" pushd "%{buildroot}%{prefix}/lib/security"