Date: Tuesday, April 5, 2022 @ 18:56:37 Author: freswa Revision: 441596
create a release - change pkgver scheme temporarily - use java-environment-openjdk=18 due to errors at javadoc generation with v11 Modified: java-openjfx/trunk/PKGBUILD ----------+ PKGBUILD | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-05 16:36:43 UTC (rev 441595) +++ PKGBUILD 2022-04-05 18:56:37 UTC (rev 441596) @@ -15,7 +15,7 @@ java-openjfx-doc java-openjfx-src ) -pkgver=17.0.3.u0 +pkgver=18.u12 pkgrel=1 pkgdesc="Java OpenJFX 17 client application platform (open-source implementation of JavaFX)" arch=(x86_64) @@ -34,7 +34,7 @@ gradle gtk2 gtk3 - java-environment-openjdk=11 + java-environment-openjdk=18 libgl libx11 libxtst @@ -47,14 +47,14 @@ zip ) source=( - # https://github.com/openjdk/jfx/archive/refs/tags/jfx-${pkgver//.u/+}.tar.gz - ${pkgname}-${pkgver}.tar.gz::https://github.com/openjdk/jfx${pkgver%%.*}u/archive/refs/tags/${pkgver//.u/+}.tar.gz + https://github.com/openjdk/jfx/archive/refs/tags/${pkgver//.u/+}.tar.gz + # ${pkgname}-${pkgver}.tar.gz::https://github.com/openjdk/jfx${pkgver%%.*}u/archive/refs/tags/${pkgver//.u/+}.tar.gz gradle.properties java-openjfx-flags.patch java-openjfx-no-xlocale.patch java-openjfx-gstreamer-lite-gcc10-compat.patch ) -b2sums=('1a859d93c1710598c7b2ee20ca36250d79889fb8028877de169cf9f7e43173ee38b36b25e7a18220bc955570cf280562c7bc930decb7d08a7c1f9104dd7d67d1' +b2sums=('99a8ea659266e858482d09f29238a132f09b036dcb7c0f53edc26c39b82162bc1dafa02cb9dc8251550f101bfeda03bb2828ca82cecfec22c467549ead874020' 'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498' '2bc0cd6945ac33c882d56beb8abaa26bde038ebf25badb6e8f8af301449e7d56c2f795159d57ef2ccc8f5504bb8466e00445e65ff09519d9c6132e1b7dc6f4b5' '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e' @@ -61,8 +61,8 @@ '119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64') prepare() { - # cd jfx-${pkgver//.u/-} - cd jfx${pkgver%%.*}u-${pkgver//.u/-} + cd jfx-${pkgver//.u/-} + # cd jfx${pkgver%%.*}u-${pkgver//.u/-} ln -sf ../gradle.properties . patch -Np1 -i ../java-openjfx-flags.patch @@ -72,8 +72,8 @@ } build() { - # cd jfx-${pkgver//.u/-} - cd jfx${pkgver%%.*}u-${pkgver//.u/-} + cd jfx-${pkgver//.u/-} + # cd jfx${pkgver%%.*}u-${pkgver//.u/-} # build against ffmpeg4.4 export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig' @@ -96,8 +96,8 @@ ) provides=(java-openjfx=${pkgver%%.*}) - # cd jfx-${pkgver//.u/-} - cd jfx${pkgver%%.*}u-${pkgver//.u/-} + cd jfx-${pkgver//.u/-} + # cd jfx${pkgver%%.*}u-${pkgver//.u/-} install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-${pkgver%%.*}-openjdk,share/licenses} cp -dr --no-preserve=ownership build/sdk/lib "${pkgdir}"/usr/lib/jvm/java-${pkgver%%.*}-openjdk/ @@ -106,8 +106,8 @@ } package_java-openjfx-doc() { - # cd jfx-${pkgver//.u/-} - cd jfx${pkgver%%.*}u-${pkgver//.u/-} + cd jfx-${pkgver//.u/-} + # cd jfx${pkgver%%.*}u-${pkgver//.u/-} install -dm 755 "${pkgdir}"/usr/share/{doc,licenses} cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java-openjfx @@ -115,8 +115,8 @@ } package_java-openjfx-src() { - # cd jfx-${pkgver//.u/-} - cd jfx${pkgver%%.*}u-${pkgver//.u/-} + cd jfx-${pkgver//.u/-} + # cd jfx${pkgver%%.*}u-${pkgver//.u/-} install -dm 755 "${pkgdir}"/usr/{lib/jvm/java-${pkgver%%.*}-openjdk,share/licenses} install -m 644 build/sdk/src.zip "${pkgdir}"/usr/lib/jvm/java-${pkgver%%.*}-openjdk/javafx-src.zip
