OpenJFX 22+30

4 files changed, 30 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a994db52bd18..5c281dd9e89c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = java-openjfx
 	pkgdesc = Java OpenJFX client application platform (open-source implementation of JavaFX) - latest version
-	pkgver = 21.0.2.u5
-	pkgrel = 3
+	pkgver = 22.u30
+	pkgrel = 1
 	url = https://wiki.openjdk.java.net/display/OpenJFX/Main
 	arch = x86_64
 	arch = x86_64_v3
@@ -15,13 +15,14 @@ pkgbase = java-openjfx
 	makedepends = gdk-pixbuf2
 	makedepends = glib2
 	makedepends = gperf
-	makedepends = gradle7
+	makedepends = gradle<9
 	makedepends = gtk2
 	makedepends = gtk3
-	makedepends = java-environment-openjdk=17
+	makedepends = java-environment-openjdk=21
 	makedepends = libgl
 	makedepends = libx11
 	makedepends = libxtst
+	makedepends = libxxf86vm
 	makedepends = pango
 	makedepends = perl
 	makedepends = python
@@ -30,17 +31,16 @@ pkgbase = java-openjfx
 	makedepends = unzip
 	makedepends = webkit2gtk
 	makedepends = zip
-	source = java-openjfx-21.0.2+5.tar.gz::https://github.com/openjdk/jfx21u/archive/refs/tags/21.0.2+5.tar.gz
+	options = !lto
+	source = java-openjfx-22+30.tar.gz::https://github.com/openjdk/jfx22u/archive/refs/tags/22+30.tar.gz
 	source = gradle.properties
 	source = java-openjfx-flags.patch
-	source = java-openjfx-no-xlocale.patch
-	b2sums = ed5870478bacf5d2d6289118e764a316f2ed44c5abe799dfef97290477824060a7af15bde915aaf86186111eee49df5e3614ecd8aceccfca005aa79bb2663cc8
+	b2sums = 18f138409d18c6ed3bd0492260f71284c0ac3ffd2527e997abc40f08550f64a6480b6c5b50739f03b4e70df44d3287bb0cff2ad601a13dccd8d94c7b726cc7f8
 	b2sums = a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498
-	b2sums = 609ffbc0938922f00ccebab6d1e9ab0d54b84f088f75c10c0eb4211ff1b33438481d76092eae8811a5e9f53dfc3ff422f7aa4e98abd8fc27fb73f1c3d4661c41
-	b2sums = 13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e
+	b2sums = 5b6dafc22995b57564fda89aaedeb2b6ee58b2c635336ac43a123ea4ac6ced3a20eba39d99cc4eb7ec7b29fc7541f5c3bee454ee55ca79fd2d7ce5ef4ed65cd3
 
 pkgname = java-openjfx
-	depends = java-runtime-openjdk=21
+	depends = java-runtime-openjdk=22
 	depends = libgl
 	depends = libx11
 	depends = libxtst
@@ -48,7 +48,7 @@ pkgname = java-openjfx
 	optdepends = gtk2: GTK2 support,
 	optdepends = gtk3: GTK3 support,
 	optdepends = webkit2gtk: Web support
-	provides = java-openjfx=21
+	provides = java-openjfx=22
 
 pkgname = java-openjfx-doc
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index d89a73e3186e..ef10b4aadc70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,8 +15,8 @@ pkgname=(
   java-openjfx-doc
   java-openjfx-src
 )
-pkgver=21.0.2.u5
-pkgrel=3
+pkgver=22.u30
+pkgrel=1
 pkgdesc="Java OpenJFX client application platform (open-source implementation of JavaFX) - latest version"
 arch=(x86_64 x86_64_v3)
 url=https://wiki.openjdk.java.net/display/OpenJFX/Main
@@ -31,13 +31,14 @@ makedepends=(
   gdk-pixbuf2
   glib2
   gperf
-  gradle7
+  'gradle<9'
   gtk2
   gtk3
-  java-environment-openjdk=17
+  java-environment-openjdk=$((${pkgver%%.*}-1))
   libgl
   libx11
   libxtst
+  libxxf86vm
   pango
   perl
   python
@@ -47,36 +48,42 @@ makedepends=(
   webkit2gtk
   zip
 )
+options=(!lto)
 source=(
   "${pkgbase}-${pkgver//.u/+}.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
 )
-b2sums=('ed5870478bacf5d2d6289118e764a316f2ed44c5abe799dfef97290477824060a7af15bde915aaf86186111eee49df5e3614ecd8aceccfca005aa79bb2663cc8'
+b2sums=('18f138409d18c6ed3bd0492260f71284c0ac3ffd2527e997abc40f08550f64a6480b6c5b50739f03b4e70df44d3287bb0cff2ad601a13dccd8d94c7b726cc7f8'
         'a77fd8814a5978827de01a652f7b945f3439df04606434ced8998c8d77a82985292490e6965299aeb52f9da3d8069b4091d75519bd4ec8a15f70bc6d28b13498'
-        '609ffbc0938922f00ccebab6d1e9ab0d54b84f088f75c10c0eb4211ff1b33438481d76092eae8811a5e9f53dfc3ff422f7aa4e98abd8fc27fb73f1c3d4661c41'
-        '13216615c01b8d48d17889ffa22668c38568870d83ab30c542eb5b5620db305f02efb1acb99d9b5e89eb0a73a134bb336cb301f4de4e8855cae50efb099e384e')
+        '5b6dafc22995b57564fda89aaedeb2b6ee58b2c635336ac43a123ea4ac6ced3a20eba39d99cc4eb7ec7b29fc7541f5c3bee454ee55ca79fd2d7ce5ef4ed65cd3')
 
 _jfxdir=jfx${pkgver%%.*}u-${pkgver//.u/-}
 
 prepare() {
   cd $_jfxdir
 
+  # Clean from potential previous runs
+  gradle --stop
+  rm -rf build
+  #gradle clean
+
   ln -sf ../gradle.properties .
   patch -Np1 -i ../java-openjfx-flags.patch
-  patch -Np1 -i ../java-openjfx-no-xlocale.patch
   sed 's|, "-Werror"||g' -i buildSrc/linux.gradle
 }
 
 build() {
   cd $_jfxdir
 
-  # Build with openjdk-17
-  export PATH="/usr/lib/jvm/java-17-openjdk/bin/:$PATH"
+  # Build with openjdk-(current version minus 1)
+  export PATH="/usr/lib/jvm/java-$((${pkgver%%.*}-1))-openjdk/bin/:$PATH"
 
   # build against ffmpeg4.4
   export PKG_CONFIG_PATH='/usr/lib/ffmpeg4.4/pkgconfig'
+  
+  # Workaround for situation where the linker treats whitespace as arguments
+  export LDFLAGS="${LDFLAGS//+([[:space:]]|[[:blank:]])/ }"
 
   gradle zips
 }
diff --git a/java-openjfx-flags.patch b/java-openjfx-flags.patch
index 06936dc4874a..c4f0be8700d9 100644
--- a/java-openjfx-flags.patch
+++ b/java-openjfx-flags.patch
@@ -25,7 +25,7 @@ index 387d5eee06..ac3be55f6a 100644
 
 +commonFlags.addAll(System.getenv("CFLAGS").trim().replaceAll(" +", " ").split(" "))
 +
- if (!IS_64) {
+ if (OS_ARCH == "i386") {
      commonFlags += "-m32"
  }
 @@ -70,6 +73,7 @@ def dynamicLinkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", common
diff --git a/java-openjfx-no-xlocale.patch b/java-openjfx-no-xlocale.patch
deleted file mode 100644
index da3ac418836f..000000000000
--- a/java-openjfx-no-xlocale.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fixes the compatibility with the version of glibc in Debian
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: https://bugs.openjdk.java.net/browse/JDK-8211399
---- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
-+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
-@@ -25,9 +25,6 @@
- #ifdef HAVE_LOCALE_H
- #include <locale.h>
- #endif
--#ifdef HAVE_XLOCALE_H
--#include <xlocale.h>
--#endif
- 
- typedef locale_t xsltLocale;
- typedef xmlChar xsltLocaleChar;
-