upgpkg: 17.0.3.u0-1

1 files changed, 34 insertions, 42 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 4c12f963f159..cb59ee19dd5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,15 +15,9 @@ pkgname=(
   java-openjfx-doc
   java-openjfx-src
 )
-_majorver=17
-_minorver=0
-_securityver=0
-_patchver=1
-_updatever=1
-pkgver=${_majorver}.${_minorver}.${_securityver}.${_patchver}.u${_updatever}
-#pkgver=${_majorver}.u${_updatever}
-pkgrel=2
-pkgdesc="Java OpenJFX ${_majorver} client application platform (open-source implementation of JavaFX)"
+pkgver=17.0.3.u0
+pkgrel=1
+pkgdesc="Java OpenJFX 17 client application platform (open-source implementation of JavaFX)"
 arch=(x86_64)
 url=https://wiki.openjdk.java.net/display/OpenJFX/Main
 license=(custom)
@@ -34,10 +28,10 @@ makedepends=(
   cmake
   ffmpeg4.4
   freetype2
-  gradle
   gdk-pixbuf2
   glib2
   gperf
+  gradle
   gtk2
   gtk3
   java-environment-openjdk=11
@@ -53,20 +47,22 @@ makedepends=(
   zip
 )
 source=(
-  ${pkgbase}-${pkgver//.u/+}::https://github.com/openjdk/jfx/archive/${pkgver//.u/+}/jfx-${pkgver//.u/+}.tar.gz
+  # https://github.com/openjdk/jfx/archive/refs/tags/jfx-${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
 )
-sha256sums=('7398a87b1c1b593a2610ef84dd8b0fc31fc9a87dc5185ea4d1ef71b560920a5d'
-            '2622aa35d733cc69f4421f1cd053bf425e89f93141cb52c9f016a9b425fc0cb6'
-            'c5a39e6782c952d346935e49ea08c723cc06e0347c486459d0bdeaf097a1ce51'
-            '220c63396561867a6d07ae81b6390160d8f91502587e4873998e3b7a83793a1c'
-            'd7f9db86854b1cb8ab973c2ff255e51a637b9c24af30144182202d33f01a9434')
+b2sums=('1a859d93c1710598c7b2ee20ca36250d79889fb8028877de169cf9f7e43173ee38b36b25e7a18220bc955570cf280562c7bc930decb7d08a7c1f9104dd7d67d1'
+        'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498'
+        '2bc0cd6945ac33c882d56beb8abaa26bde038ebf25badb6e8f8af301449e7d56c2f795159d57ef2ccc8f5504bb8466e00445e65ff09519d9c6132e1b7dc6f4b5'
+        '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e'
+        '119fa1cc5da2cdefa22bbe9b6f76581faa74e05fa7b6e5576470fc0251c6e257f122fbba03754cc01f7c7251145cfa1cab4ffc2f9d59ff0c175a121e943a0f64')
 
 prepare() {
-  cd jfx-${pkgver//.u/-}
+  # cd jfx-${pkgver//.u/-}
+  cd jfx17u-${pkgver//.u/-}
 
   ln -sf ../gradle.properties .
   patch -Np1 -i ../java-openjfx-flags.patch
@@ -76,7 +72,8 @@ prepare() {
 }
 
 build() {
-  cd jfx-${pkgver//.u/-}
+  # cd jfx-${pkgver//.u/-}
+  cd jfx17u-${pkgver//.u/-}
 
   # build against ffmpeg4.4
   export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
@@ -86,37 +83,31 @@ build() {
 
 package_java-openjfx() {
   depends=(
-    alsa-lib
-    cairo
-    ffmpeg4.4
-    gdk-pixbuf2
-    glib2
-    gtk2
-    gtk3
-    java-runtime-openjdk=${_majorver}
-    libavcodec.so
-    libavformat.so
-    libfreetype.so
+    java-runtime-openjdk=17
     libgl
     libx11
     libxtst
-    pango
-    qt5-base
-    ruby
-    unzip
-    webkit2gtk
   )
+  optdepends=(
+    'ffmpeg4.4: Media support',
+    'gtk2: GTK2 support',
+    'gtk3: GTK3 support',
+    'webkit2gtk: Web support'
+  )
+  provides=('java-openjfx=17')
 
-  cd jfx-${pkgver//.u/-}
+  # cd jfx-${pkgver//.u/-}
+  cd jfx17u-${pkgver//.u/-}
 
-  install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-${_majorver}-openjdk,share/licenses}
-  cp -dr --no-preserve=ownership build/sdk/lib "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/
-  cp -dr --no-preserve=ownership build/jmods "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/
+  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
 }
 
 package_java-openjfx-doc() {
-  cd jfx-${pkgver//.u/-}
+  # cd jfx-${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
@@ -124,10 +115,11 @@ package_java-openjfx-doc() {
 }
 
 package_java-openjfx-src() {
-  cd jfx-${pkgver//.u/-}
+  # cd jfx-${pkgver//.u/-}
+  cd jfx17u-${pkgver//.u/-}
 
-  install -dm 755  "${pkgdir}"/usr/{lib/jvm/java-${_majorver}-openjdk,share/licenses}
-  install -m 644 build/sdk/src.zip "${pkgdir}"/usr/lib/jvm/java-${_majorver}-openjdk/javafx-src.zip
+  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
 }