From 4be959d08e7069c1764808e1d30f87c857cc6c17 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 18 Apr 2022 14:38:58 -0400
Subject: [PATCH] openjdk17: update to 17.0.3+5.

---
 srcpkgs/openjdk17/template | 43 +++++++++++++++-----------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/openjdk17/template b/srcpkgs/openjdk17/template
index 19fa38707f00..7e368f9b687e 100644
--- a/srcpkgs/openjdk17/template
+++ b/srcpkgs/openjdk17/template
@@ -1,15 +1,14 @@
 # Template file for 'openjdk17'
-_java_ver=17
-_java_min_ver=0
-_java_sec_ver=3
-_jdk_update=1
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk17
-version="${_base_version}+${_jdk_update}"
+version=17.0.3+5
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}"
+_gtest_ver=1.8.1
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+create_wrksrc=yes
+build_wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --enable-unlimited-crypto
@@ -19,8 +18,9 @@ configure_args="--disable-warnings-as-errors
  --with-libpng=system
  --with-lcms=system
  --with-jtreg=no
- --with-gtest=${XBPS_BUILDDIR}/googletest-release-1.8.1
+ --with-gtest=../googletest-release-${_gtest_ver}
  --with-debug-level=release
+ --with-native-debug-symbols=internal
  --with-jobs=${XBPS_ORIG_MAKEJOBS}
  --with-version-pre=
  --with-version-build=${_jdk_update}
@@ -38,15 +38,16 @@ makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel"
 depends="${pkgname}-jre-${version}_${revision}"
-provides="java-environment-${version}_1"
 short_desc="OpenJDK Java Development Kit (version ${_java_ver})"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
- https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz"
-checksum="0fac6d90091fc16678a14349e578f6c1cf29738d55508f9f723fbb69469f6867
+ https://github.com/google/googletest/archive/refs/tags/release-${_gtest_ver}.tar.gz"
+checksum="a557f4d2972bbbbcdc12fa7e167ad60b4ee1461a9bc7ad259a003172c34e6331
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
+provides="java-environment-${version}_1"
+patch_args="-Np1 --directory=$build_wrksrc"
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes
@@ -79,10 +80,6 @@ else
 	configure_args+=" --with-boot-jdk=/usr/lib/jvm/openjdk17"
 fi
 
-if [ -n "$XBPS_DEBUG_PKGS" ]; then
-	configure_args+=" --with-native-debug-symbols=internal"
-fi
-
 alternatives="
  java:/usr/bin/java:/${_jdk_home}/bin/java
  java:/usr/bin/jfr:/${_jdk_home}/bin/jfr
@@ -120,9 +117,9 @@ alternatives="
 "
 
 post_extract() {
-	chmod +x configure
+	chmod +x $build_wrksrc/configure
 	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-		rm -r src/jdk.hotspot.agent
+		rm -r $build_wrksrc/src/jdk.hotspot.agent
 	fi
 }
 
@@ -171,11 +168,6 @@ post_install() {
 	rm -rf ./ca
 }
 
-do_clean() {
-	# clean up gtest
-	rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
-
 subpackages="openjdk17-src openjdk17-jre openjdk17-doc"
 
 openjdk17-jre_package() {
@@ -213,11 +205,10 @@ openjdk17-doc_package() {
 	noshlibprovides=yes
 	short_desc+=" - documentation"
 	pkg_install() {
-		cd ${wrksrc}
 		if [ "$build_option_docs" ]; then
 			local _docdir=usr/share/doc/openjdk$_java_ver
 			vmkdir $_docdir
-			cp -a build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
+			cp -a $wrksrc/$build_wrksrc/build/linux-*/images/docs/* ${PKGDESTDIR}/$_docdir
 		fi
 		vmove $_jdk_home/man/man1
 	}