From b1de35948345f3d888e3c163cea91696fcd91288 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:25 -0400 Subject: [PATCH 1/5] openjdk12-bootstrap: fix version, xlint --- srcpkgs/openjdk12-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template index 770fce5bb07e..2318d7ddc788 100644 --- a/srcpkgs/openjdk12-bootstrap/template +++ b/srcpkgs/openjdk12-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk12-bootstrap' -_java_ver=12 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=10 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk12-bootstrap -version="${_base_version}+${_jdk_update}" +version=12.0.2+10 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates 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" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 12)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://openjdk.java.net" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb +provides="java-environment-${version}_1 java-runtime-${version}_1" lib32disabled=yes nocross=yes From 8038b4ae122203ac76a0d0dd62cb426e486688f8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:26 -0400 Subject: [PATCH 2/5] openjdk13-bootstrap: fix version, xlint --- srcpkgs/openjdk13-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template index ccbafa367962..fbb17ffb51a7 100644 --- a/srcpkgs/openjdk13-bootstrap/template +++ b/srcpkgs/openjdk13-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk13-bootstrap' -_java_ver=13 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=8 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk13-bootstrap -version="${_base_version}+${_jdk_update}" +version=13.0.2+8 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates 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" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 13)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="https://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0 +provides="java-environment-${version}_1 java-runtime-${version}_1" lib32disabled=yes nocross=yes From ce2ed7c47c1818e5d7f2f0f567d9d112a4c80754 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:27 -0400 Subject: [PATCH 3/5] openjdk14-bootstrap: fix version, xlint --- srcpkgs/openjdk14-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template index 62011285f35d..f026c434ed27 100644 --- a/srcpkgs/openjdk14-bootstrap/template +++ b/srcpkgs/openjdk14-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk14-bootstrap' -_java_ver=14 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=12 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk14-bootstrap -version="${_base_version}+${_jdk_update}" +version=14.0.2+12 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates 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 openjdk13-bootstrap" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 14)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" homepage="http://openjdk.java.net/" distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz" checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935 +provides="java-environment-${version}_1 java-runtime-${version}_1" nocross=yes # Build is still parallel, but don't use -jN. From ff4faba5ccfd4e9fa79a739c111df1cba18cd1b1 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:28 -0400 Subject: [PATCH 4/5] openjdk15-bootstrap: fix version, xlint --- srcpkgs/openjdk15-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template index 70b38621be25..0a3e60e530f6 100644 --- a/srcpkgs/openjdk15-bootstrap/template +++ b/srcpkgs/openjdk15-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk15-bootstrap' -_java_ver=15 -_java_min_ver=0 -_java_sec_ver=3 -_jdk_update=3 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk15-bootstrap -version="${_base_version}+${_jdk_update}" +version=15.0.3+3 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${version}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib @@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates 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 harfbuzz-devel openjdk14-bootstrap" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 15)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" @@ -47,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk- https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz" checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" +provides="java-environment-${version}_1 java-runtime-${version}_1" nocross=yes # Build is still parallel, but don't use -jN. From ce2307195c7bea4440521a340c899c865d9cb287 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 4 Apr 2022 12:50:29 -0400 Subject: [PATCH 5/5] openjdk16-bootstrap: fix version, xlint --- srcpkgs/openjdk16-bootstrap/template | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template index 876bfe6de81b..7e804c06313a 100644 --- a/srcpkgs/openjdk16-bootstrap/template +++ b/srcpkgs/openjdk16-bootstrap/template @@ -1,15 +1,12 @@ # Template file for 'openjdk16-bootstrap' -_java_ver=16 -_java_min_ver=0 -_java_sec_ver=2 -_jdk_update=7 -_jdk_home="usr/lib/jvm/openjdk${_java_ver}" -_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}" - pkgname=openjdk16-bootstrap -version="${_base_version}+${_jdk_update}" +version=16.0.2+7 revision=1 -wrksrc="jdk${_java_ver}u-jdk-${_base_version}-${_jdk_update}" +_java_ver="${version%%.*}" +_jdk_update="${version#*+}" +_base_version="${version%+*}" +_jdk_home="usr/lib/jvm/openjdk${_java_ver}" +wrksrc="jdk${_java_ver}u-jdk-${version/+/-}" build_style=gnu-configure configure_args="--disable-warnings-as-errors --enable-unlimited-crypto @@ -38,7 +35,6 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates 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 harfbuzz-devel openjdk15-bootstrap" -provides="java-environment-${version}_1 java-runtime-${version}_1" short_desc="OpenJDK Java Development Kit (bootstrap version 16)" maintainer="classabbyamp " license="GPL-2.0-only WITH Classpath-exception-2.0" @@ -47,6 +43,7 @@ distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.ta https://github.com/google/googletest/archive/refs/tags/release-1.8.1.tar.gz" checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c 9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c" +provides="java-environment-${version}_1 java-runtime-${version}_1" nocross=yes # Build is still parallel, but don't use -jN.