[arch-commits] Commit in java17-openjfx/trunk (PKGBUILD)

[Frederik Schwan]

    Date: Tuesday, April 5, 2022 @ 18:57:13
  Author: freswa
Revision: 441598

upgpkg: java17-openjfx 17.0.3.u1-1

Modified:
  java17-openjfx/trunk/PKGBUILD

----------+
 PKGBUILD |   52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-05 18:56:40 UTC (rev 441597)
+++ PKGBUILD	2022-04-05 18:57:13 UTC (rev 441598)
@@ -9,13 +9,13 @@
 # Contributor: Jens Kapitza <j dot kapitza at schwarze-allianz dot de>
 # Contributor: Olli <olli at coderkun dot de>
 
-pkgbase=java-openjfx
+pkgbase=java17-openjfx
 pkgname=(
-  java-openjfx
-  java-openjfx-doc
-  java-openjfx-src
+  java17-openjfx
+  java17-openjfx-doc
+  java17-openjfx-src
 )
-pkgver=17.0.3.u0
+pkgver=17.0.3.u1
 pkgrel=1
 pkgdesc="Java OpenJFX 17 client application platform (open-source implementation of JavaFX)"
 arch=(x86_64)
@@ -48,13 +48,13 @@
 )
 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
+  ${pkgname}-${pkgver}.tar.gz::https://github.com/openjdk/jfx17u/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=('4feb7e6c066fa2f9bb81f5959bfb6168122bf273ef451814e3f3fac49fc30babef7a3abbafeaeb211beb556c0c1e7f45fa48db8671fecdbd98293bdd03f26158'
         'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498'
         '2bc0cd6945ac33c882d56beb8abaa26bde038ebf25badb6e8f8af301449e7d56c2f795159d57ef2ccc8f5504bb8466e00445e65ff09519d9c6132e1b7dc6f4b5'
         '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e'
@@ -62,7 +62,7 @@
 
 prepare() {
   # cd jfx-${pkgver//.u/-}
-  cd jfx${pkgver%%.*}u-${pkgver//.u/-}
+  cd jfx17u-${pkgver//.u/-}
 
   ln -sf ../gradle.properties .
   patch -Np1 -i ../java-openjfx-flags.patch
@@ -73,7 +73,7 @@
 
 build() {
   # cd jfx-${pkgver//.u/-}
-  cd jfx${pkgver%%.*}u-${pkgver//.u/-}
+  cd jfx17u-${pkgver//.u/-}
 
   # build against ffmpeg4.4
   export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
@@ -81,9 +81,9 @@
   gradle zips
 }
 
-package_java-openjfx() {
+package_java17-openjfx() {
   depends=(
-    java-runtime-openjdk=${pkgver%%.*}
+    java-runtime-openjdk=17
     libgl
     libx11
     libxtst
@@ -94,33 +94,33 @@
     'gtk3: GTK3 support',
     'webkit2gtk: Web support'
   )
-  provides=(java-openjfx=${pkgver%%.*})
+  provides=(java-openjfx=17)
 
   # cd jfx-${pkgver//.u/-}
-  cd jfx${pkgver%%.*}u-${pkgver//.u/-}
+  cd jfx17u-${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/
-  cp -dr --no-preserve=ownership build/jmods "${pkgdir}"/usr/lib/jvm/java-${pkgver%%.*}-openjdk/
-  cp -dr --no-preserve=ownership build/sdk/legal "${pkgdir}"/usr/share/licenses/java-openjfx
+  install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-17-openjdk,share/licenses}
+  cp -dr --no-preserve=ownership build/sdk/lib "${pkgdir}"/usr/lib/jvm/java-17-openjdk/
+  cp -dr --no-preserve=ownership build/jmods "${pkgdir}"/usr/lib/jvm/java-17-openjdk/
+  cp -dr --no-preserve=ownership build/sdk/legal "${pkgdir}"/usr/share/licenses/java17-openjfx
 }
 
-package_java-openjfx-doc() {
+package_java17-openjfx-doc() {
   # cd jfx-${pkgver//.u/-}
-  cd jfx${pkgver%%.*}u-${pkgver//.u/-}
+  cd jfx17u-${pkgver//.u/-}
 
   install -dm 755 "${pkgdir}"/usr/share/{doc,licenses}
-  cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java-openjfx
-  ln -s java-openjfx "${pkgdir}"/usr/share/licenses/java-openjfx-doc
+  cp -dr --no-preserve=ownership build/javadoc "${pkgdir}"/usr/share/doc/java17-openjfx
+  ln -s java17-openjfx "${pkgdir}"/usr/share/licenses/java17-openjfx-doc
 }
 
-package_java-openjfx-src() {
+package_java17-openjfx-src() {
   # cd jfx-${pkgver//.u/-}
-  cd jfx${pkgver%%.*}u-${pkgver//.u/-}
+  cd jfx17u-${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
-  ln -s java-openjfx "${pkgdir}"/usr/share/licenses/java-openjfx-src
+  install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-17-openjdk,share/licenses}
+  install -m 644 build/sdk/src.zip "${pkgdir}"/usr/lib/jvm/java-17-openjdk/javafx-src.zip
+  ln -s java17-openjfx "${pkgdir}"/usr/share/licenses/java17-openjfx-src
 }
 
 # vim: ts=2 sw=2 et: