Use JavaFX 17 instead of 11

5 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e31ff66d50f..123184bf0109 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = processing4-git
 	pkgdesc = Programming environment for creating images, animations and interactions
-	pkgver = 4.0b2.r27.gc9b8a00e7
+	pkgver = 4.0b2.r37.g82fcf9521
 	pkgrel = 1
 	url = https://github.com/processing/processing4
 	arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = processing4-git
 	makedepends = gendesk
 	makedepends = unzip
 	depends = jdk-openjdk
-	depends = java11-openjfx
+	depends = java-openjfx
 	provides = processing
 	provides = processing4
 	conflicts = processing
@@ -27,11 +27,11 @@ pkgbase = processing4-git
 	sha256sums = fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f
 	sha256sums = 500d00811031c0445416b6112972aa1f7a377092dd3b8565d79ead3fdfc62451
 	sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30
-	sha256sums = 1b4b61a1f0b771e5a80fc592b252c690594b8d88dafa1baa9b778aeafa88a362
+	sha256sums = 24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977
 	sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126
 	sha256sums = 0ef5266575db0fe6bde436e5a3205ca848440b3006bccb4c20fe8d7b98951ee9
 	sha256sums = dc733c1cb5a41cb06ef0f9ea01d701fd9ac7713b5817b4fe79d7076a505a7c44
-	sha256sums = aa77c001eb5de9e211bb38d06c17483d81450fa0667748c44fba6d04fa329732
-	sha256sums = 7d5dc98c1c96ae817de604e203f8e77d53625a660a84729eb8f83ad36e150b9f
+	sha256sums = d2877ad894f76594675534026ee91581f6357a3892afe2fd0efcf86de746c7cb
+	sha256sums = 15119264b6ae7b154f033261ba93535c2d1b5e2b9d849f3999dd7881cc9e49cb
 
 pkgname = processing4-git
diff --git a/PKGBUILD b/PKGBUILD
index 0b0d929186af..c3e6aae88b5c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Torben <git at letorbi dot com>
 
 pkgname=processing4-git
-pkgver=4.0b2.r27.gc9b8a00e7
+pkgver=4.0b2.r37.g82fcf9521
 pkgrel=1
 arch=(x86_64)
 pkgdesc='Programming environment for creating images, animations and interactions'
@@ -9,7 +9,7 @@ url='https://github.com/processing/processing4'
 license=(GPL LGPL)
 provides=('processing' 'processing4')
 conflicts=('processing')
-depends=( 'jdk-openjdk' 'java11-openjfx')
+depends=( 'jdk-openjdk' 'java-openjfx')
 makedepends=('ant' 'gendesk' 'unzip')
 options=(!strip)
 source=('https://download.processing.org/reference.zip'
@@ -24,12 +24,12 @@ source=('https://download.processing.org/reference.zip'
 sha256sums=('fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f'
             '500d00811031c0445416b6112972aa1f7a377092dd3b8565d79ead3fdfc62451'
             '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30'
-            '1b4b61a1f0b771e5a80fc592b252c690594b8d88dafa1baa9b778aeafa88a362'
+            '24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977'
             'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126'
             '0ef5266575db0fe6bde436e5a3205ca848440b3006bccb4c20fe8d7b98951ee9'
             'dc733c1cb5a41cb06ef0f9ea01d701fd9ac7713b5817b4fe79d7076a505a7c44'
-            'aa77c001eb5de9e211bb38d06c17483d81450fa0667748c44fba6d04fa329732'
-            '7d5dc98c1c96ae817de604e203f8e77d53625a660a84729eb8f83ad36e150b9f')
+            'd2877ad894f76594675534026ee91581f6357a3892afe2fd0efcf86de746c7cb'
+            '15119264b6ae7b154f033261ba93535c2d1b5e2b9d849f3999dd7881cc9e49cb')
 
 pkgver() {
   cd "$srcdir/$pkgname"
diff --git a/fix_theme_engine.patch b/fix_theme_engine.patch
index 6094107e3197..231d12d5ffc0 100644
--- a/fix_theme_engine.patch
+++ b/fix_theme_engine.patch
@@ -5,7 +5,7 @@
  
    <property name="javafx.path"
 -            location="../../../../java/libraries/javafx/library/macosx" />
-+            location="/usr/lib/jvm/java-11-openjfx/lib/" />
++            location="/usr/lib/jvm/java-17-openjdk/lib/" />
  
    <target name="clean" description="Clean the build directories">
      <delete dir="bin" />
diff --git a/use_system_jdk.patch b/use_system_jdk.patch
index 468aa005938b..5ac14aec6ce9 100644
--- a/use_system_jdk.patch
+++ b/use_system_jdk.patch
@@ -15,6 +15,6 @@
  
 -  #java -splash:lib/about-1x.png -Djna.nosys=true -Djava.library.path=lib:modes/java/libraries/javafx/library/linux64 --module-path=modes/java/libraries/javafx/library/linux64/modules --add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web -Xmx512m processing.app.Base "$SKETCH" &
 -  java -Djna.nosys=true -Dpython.console.encoding=UTF-8 -Djava.library.path=lib:modes/java/libraries/javafx/library/linux64 --module-path=modes/java/libraries/javafx/library/linux64/modules --add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web -Xmx512m processing.app.ui.Splash "$SKETCH" &
-+  #java -splash:lib/about-1x.png -Djna.nosys=true -Djava.library.path=lib:/usr/lib/jvm/java-17-openjdk/lib --module-path=/usr/lib/jvm/java-17-openjdk/lib --add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web -Xmx512m processing.app.Base "$SKETCH" &
-+  java -Djna.nosys=true -Dpython.console.encoding=UTF-8 -Djava.library.path=lib:/usr/lib/jvm/java-11-openjfx/lib --module-path=/usr/lib/jvm/java-11-openjfx/lib --add-modules=javafx.base,javafx.controls,javafx.fxml,javafx.graphics,javafx.media,javafx.swing,javafx.web -Xmx512m processing.app.ui.Splash "$SKETCH" &
++  #java -splash:lib/about-1x.png -Djna.nosys=true -Djava.library.path=lib:/usr/lib/jvm/java-17-openjdk/lib --module-path=/usr/lib/jvm/java-17-openjdk/lib/javafx.base.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.controls.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.fxml.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.graphics.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.media.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.swing.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.web -Xmx512m processing.app.Base "$SKETCH" &
++  java -Djna.nosys=true -Dpython.console.encoding=UTF-8 -Djava.library.path=lib:/usr/lib/jvm/java-17-openjdk/lib --module-path=/usr/lib/jvm/java-17-openjdk/lib/javafx.base.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.controls.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.fxml.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.graphics.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.media.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.swing.jar:/usr/lib/jvm/java-17-openjdk/lib/javafx.web -Xmx512m processing.app.ui.Splash "$SKETCH" &
  fi
diff --git a/use_system_libraries.patch b/use_system_libraries.patch
index 776244c18cba..67d2871b301b 100644
--- a/use_system_libraries.patch
+++ b/use_system_libraries.patch
@@ -11,16 +11,16 @@ index db633fff9..f984ae71c 100644
 -    <pathelement location="library/javafx.fxml.jar" />
 -    <pathelement location="library/javafx.graphics.jar" />
 -    <pathelement location="library/javafx.media.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.base.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.controls.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.fxml.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.graphics.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.media.jar" />
++    <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.base.jar" />
++    <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.controls.jar" />
++    <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.fxml.jar" />
++    <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.graphics.jar" />
++    <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.media.jar" />
      <!-- error? it's not a .jar, but is this how config is handled? [fry 210619] -->
 -    <pathelement location="library/javafx.properties" />
 -    <pathelement location="library/javafx.swing.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.properties" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.swing.jar" />
++    <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.properties" />
++    <pathelement location="/usr/lib/jvm/java-17-openjdk/lib/javafx.swing.jar" />
      <!-- <pathelement location="library/javafx.web.jar" /> -->
    </path>