Upgrade to 4.0b4; Remove JFX related patches

1 files changed, 7 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index dd597df3026f..45278c906c31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,27 @@
 # Maintainer: Torben <git at letorbi dot com>
 
 pkgname=processing4
-pkgver=4.0b3
-pkgrel=3
+pkgver=4.0b4
+pkgrel=1
 arch=(x86_64)
 pkgdesc='Programming environment for creating images, animations and interactions'
 url='https://github.com/processing/processing4'
 license=(GPL LGPL)
 provides=('processing' 'processing4')
 conflicts=('processing')
-depends=( 'jdk-openjdk' 'java-openjfx')
+depends=('java-environment-openjdk=17')
 makedepends=('ant' 'gendesk' 'rsync' 'unzip')
 options=(!strip)
 source=("https://github.com/processing/processing4/archive/processing-$((1275+${pkgver##4.0b}))-$pkgver.tar.gz"
         disable_update_check.patch
         get_reference_via_https.patch
-        fix_theme_engine.patch
         no_ffmpeg_download.patch
-        no_jdk_download.patch
-        no_jfx_download.patch
-        use_system_jdk.patch
-        use_system_libraries.patch)
-sha256sums=('1f328895ca20b7b077f10faaac8d342f985c3ae80133b2384324c02ffbd185da'
+        no_jdk_download.patch)
+sha256sums=('37d120f1a347b61a53266b8c5a72e18e8e5d4dd8c21d66f97c1b6f91aeac7996'
             '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30'
-            '1d549cf94d033e572050f85a59c6ba526aee2bce6b4c96e8b55764136e6c21b5'
-            '24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977'
+            '970cab09bb2d22f9a72415d626ab77714b31b2727c51e4d8992eeee4f7f3645d'
             'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126'
-            'c390900419ac9ad188700075a09b658f672d2f3471c8ced0be4f3008ee375d5f'
-            'dc733c1cb5a41cb06ef0f9ea01d701fd9ac7713b5817b4fe79d7076a505a7c44'
-            'd2877ad894f76594675534026ee91581f6357a3892afe2fd0efcf86de746c7cb'
-            '15119264b6ae7b154f033261ba93535c2d1b5e2b9d849f3999dd7881cc9e49cb')
+            '5c3314d6a63955fa472aa87c6c99a9675eed3db9c589b784593c9f14432ef201')
 
 prepare() {
   # Symbolic link for not having to repeat the revision number
@@ -40,19 +32,11 @@ prepare() {
 
   # Don't download JDK and JFX files during Ant's build process
   patch $pkgname/build/build.xml < no_jdk_download.patch
-  patch $pkgname/java/libraries/javafx/build.xml < no_jfx_download.patch
   patch $pkgname/build/shared/tools/MovieMaker/build.xml < no_ffmpeg_download.patch
 
   # Ensure that reference.zip is downloaded via HTTPS
   patch -p0 < get_reference_via_https.patch
 
-  # Use system libraries during build process
-  patch $pkgname/core/build.xml < use_system_libraries.patch
-  patch $pkgname/build/shared/tools/ThemeEngine/build.xml < fix_theme_engine.patch
-
-  # Use system JDK to start processing
-  patch $pkgname/build/linux/processing < use_system_jdk.patch
-
   # Disable update check in default preferences
   patch $pkgname/build/shared/lib/defaults.txt < disable_update_check.patch
 }