From da06035ff06faf48cf2ee5044822dbf1dd0625ff Mon Sep 17 00:00:00 2001
From: Andrew Hughes <gnu.andrew@redhat.com>
Date: Sun, 19 Sep 2021 13:29:38 +0100
Subject: [PATCH] Update to jdk-17+35, also known as jdk-17-ga.

Switch to GA mode.
Add JDK-8272332 fix so we actually link against HarfBuzz.

Resolves: rhbz#2000925
---
 .gitignore                                    |  1 +
 java-17-openjdk.spec                          | 22 +++++++++++++++----
 ...32-rh2004078-broken_harfbuzz_linking.patch | 21 ++++++++++++++++++
 sources                                       |  2 +-
 4 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 jdk8272332-rh2004078-broken_harfbuzz_linking.patch

diff --git a/.gitignore b/.gitignore
index 6cb2824..09835fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /openjdk-jdk17-jdk-17+26.tar.xz
 /tapsets-icedtea-3.15.0.tar.xz
 /openjdk-jdk17-jdk-17+33.tar.xz
+/openjdk-jdk17-jdk-17+35.tar.xz
diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec
index 3474cf4..e69f1c0 100644
--- a/java-17-openjdk.spec
+++ b/java-17-openjdk.spec
@@ -276,7 +276,7 @@
 %global interimver 0
 %global updatever 0
 %global patchver 0
-# If you bump featurever, you must bump also vendor_version_string
+# If you bump featurever, you must also bump vendor_version_string
 # Used via new version scheme. JDK 17 was
 # GA'ed in September 2021 => 21.9
 %global vendor_version_string 21.9
@@ -297,8 +297,8 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        33
-%global rpmrelease      5
+%global buildver        35
+%global rpmrelease      3
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
 %if %is_system_jdk
 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@@ -321,7 +321,7 @@
 # Release will be (where N is usually a number starting at 1):
 # - 0.N%%{?extraver}%%{?dist} for EA releases,
 # - N%%{?extraver}{?dist} for GA releases
-%global is_ga           0
+%global is_ga           1
 %if %{is_ga}
 %global build_type GA
 %global expected_ea_designator ""
@@ -1188,6 +1188,13 @@ Patch1012: rh1996182-extend_security_policy.patch
 #
 #############################################
 
+#############################################
+#
+# OpenJDK patches appearing in 17.0.1
+#
+#############################################
+# JDK-8272332, RH2004078: --with-harfbuzz=system doesn't add -lharfbuzz after JDK-8255790
+Patch100: jdk8272332-rh2004078-broken_harfbuzz_linking.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -1534,6 +1541,7 @@ pushd %{top_level_dir_name}
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch100 -p1
 popd # openjdk
 
 %patch1000
@@ -2264,6 +2272,12 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Thu Sep 16 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.35-3
+- Update to jdk-17+35, also known as jdk-17-ga.
+- Switch to GA mode.
+- Add JDK-8272332 fix so we actually link against HarfBuzz.
+- Resolves: rhbz#2000925
+
 * Mon Aug 30 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.0.0.33-0.5.ea
 - Extend the default security policy to accomodate PKCS11 accessing jdk.internal.access.
 - Resolves: rhbz#1997359
diff --git a/jdk8272332-rh2004078-broken_harfbuzz_linking.patch b/jdk8272332-rh2004078-broken_harfbuzz_linking.patch
new file mode 100644
index 0000000..9acd70d
--- /dev/null
+++ b/jdk8272332-rh2004078-broken_harfbuzz_linking.patch
@@ -0,0 +1,21 @@
+commit e506cb23cfce35d1bc997d1e280f4dc40c9b3397
+Author: Severin Gehwolf <sgehwolf@openjdk.org>
+Date:   Mon Aug 16 09:57:28 2021 +0000
+
+    8272332: --with-harfbuzz=system doesn't add -lharfbuzz after JDK-8255790
+    
+    Backport-of: d38b31438dd4730ee2149c02277d60c35b9d7d81
+
+diff --git openjdk.orig/make/modules/java.desktop/lib/Awt2dLibraries.gmk openjdk/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+index 4d0c0c00dbf..ef7eadae206 100644
+--- openjdk.orig/make/modules/java.desktop/lib/Awt2dLibraries.gmk
++++ openjdk/make/modules/java.desktop/lib/Awt2dLibraries.gmk
+@@ -435,7 +435,7 @@ endif
+ 
+ ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
+    LIBFONTMANAGER_EXTRA_SRC =
+-   BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS)
++   BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS)
+ else
+    LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
+ 
diff --git a/sources b/sources
index 312b5ef..f4030b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-3.15.0.tar.xz) = c752a197cb3d812d50c35e11e4722772be40096c81d2a57933e0d9b8a3c708b9c157b8108a4e33a06ca7bb81648170994408c75d6f69d5ff12785d0c31009671
-SHA512 (openjdk-jdk17-jdk-17+33.tar.xz) = fa7e852a774d74dbd945a168f8e8f673601fbdf6ff3ce91a4c38a911b1ba66524fa30a8d4cdd60c7bb2c7f7d6d8ab353502c647a5e888a94c18958c7a8348b9c
+SHA512 (openjdk-jdk17-jdk-17+35.tar.xz) = 51f533812219e732f74fd77a19df0e82ecf11a3341d958cf9cb0438350805118a4852ddbbeccce374f96c7b12c80c410435cdcd9e3f576497a7deb6f72e17c69