* [PR PATCH] openjdk{12..16}-bootstrap: fix version, xlint
@ 2022-04-04 16:52 classabbyamp
2022-04-06 17:41 ` [PR PATCH] [Updated] " classabbyamp
2022-04-07 16:55 ` [PR PATCH] [Merged]: " leahneukirchen
0 siblings, 2 replies; 3+ messages in thread
From: classabbyamp @ 2022-04-04 16:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1563 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages openjdk-fix-version
https://github.com/void-linux/void-packages/pull/36521
openjdk{12..16}-bootstrap: fix version, xlint
- openjdk12-bootstrap: fix version, xlint
- openjdk13-bootstrap: fix version, xlint
- openjdk14-bootstrap: fix version, xlint
- openjdk15-bootstrap: fix version, xlint
- openjdk16-bootstrap: fix version, xlint
No need to revbump these packages, this fix should not do anything to the built package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/36521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk-fix-version-36521.patch --]
[-- Type: text/x-diff, Size: 10666 bytes --]
From b1de35948345f3d888e3c163cea91696fcd91288 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
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 <dev@kb6.ee>"
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 <dev@kb6.ee>
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 <dev@kb6.ee>"
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 <dev@kb6.ee>
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 <dev@kb6.ee>"
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 <dev@kb6.ee>
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 <dev@kb6.ee>"
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 <dev@kb6.ee>
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 <dev@kb6.ee>"
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] openjdk{12..16}-bootstrap: fix version, xlint
2022-04-04 16:52 [PR PATCH] openjdk{12..16}-bootstrap: fix version, xlint classabbyamp
@ 2022-04-06 17:41 ` classabbyamp
2022-04-07 16:55 ` [PR PATCH] [Merged]: " leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2022-04-06 17:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages openjdk-fix-version
https://github.com/void-linux/void-packages/pull/36521
openjdk{12..16}-bootstrap: fix version, xlint
- openjdk12-bootstrap: fix version, xlint
- openjdk13-bootstrap: fix version, xlint
- openjdk14-bootstrap: fix version, xlint
- openjdk15-bootstrap: fix version, xlint
- openjdk16-bootstrap: fix version, xlint
No need to revbump these packages, this fix should not do anything to the built package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/36521.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-openjdk-fix-version-36521.patch --]
[-- Type: text/x-diff, Size: 10726 bytes --]
From b086c118d03e2f2a228ffa637fb22fc1d5f04cbd Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
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 4861ad1efc40..2b5d421a52f0 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 <void@placeviolette.net>"
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 fcfd247c902134670e623ea133ee1ab4bc409833 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
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 82c34b7999f3..4a61e102381d 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 <void@placeviolette.net>"
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 ad49b2d08dab217681067bac3f5806a75eb99f28 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
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 5c15ca3f32c0..768b94633196 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 <void@placeviolette.net>"
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 87ec753323b0c397d3465f0606442e3efcf6cf30 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
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 efbc69f9429e..7608f4dd2658 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 <void@placeviolette.net>"
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 0e66a07fbcad1d3d79e46640521b2de7b4ab56a4 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
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 9bea476c6836..28e70a17fd2b 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 <void@placeviolette.net>"
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: openjdk{12..16}-bootstrap: fix version, xlint
2022-04-04 16:52 [PR PATCH] openjdk{12..16}-bootstrap: fix version, xlint classabbyamp
2022-04-06 17:41 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-04-07 16:55 ` leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2022-04-07 16:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1390 bytes --]
There's a merged pull request on the void-packages repository
openjdk{12..16}-bootstrap: fix version, xlint
https://github.com/void-linux/void-packages/pull/36521
Description:
- openjdk12-bootstrap: fix version, xlint
- openjdk13-bootstrap: fix version, xlint
- openjdk14-bootstrap: fix version, xlint
- openjdk15-bootstrap: fix version, xlint
- openjdk16-bootstrap: fix version, xlint
No need to revbump these packages, this fix should not do anything to the built package
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
[ci skip]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-07 16:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-04 16:52 [PR PATCH] openjdk{12..16}-bootstrap: fix version, xlint classabbyamp
2022-04-06 17:41 ` [PR PATCH] [Updated] " classabbyamp
2022-04-07 16:55 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).