Don't use system Java environment anymore; Update .SRCINFO

1 files changed, 5 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 9e4a07334f80..2dafdc3823ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,28 +7,19 @@ arch=(x86_64)
 pkgdesc='Programming environment for creating images, animations and interactions'
 url='https://github.com/processing/processing4'
 license=(GPL LGPL)
-depends=('jdk11-openjdk' 'libgl')
-# TODO add jogl as make-dependency once a package for version 2.4.0 exists
-makedepends=('ant' 'gendesk' 'java11-openjfx' 'unzip')
+depends=('libgl')
+makedepends=('ant' 'jdk11-openjdk' 'gendesk' 'unzip')
 options=(!strip)
 source=("https://github.com/processing/processing4/archive/processing-$((1269+${pkgver##4.0a}))-$pkgver.tar.gz"
         'https://download.processing.org/reference.zip'
-        always_use_java-11-openjdk.patch
         change_cmd_name.patch
-        derive_jdk_from_path.patch
         disable_update_check.patch
-        fix_modules_path.patch
-        no_downloads.patch
-        use_system_libraries.patch)
+        fix_modules_path.patch)
 sha256sums=('2b3fe1f5202e00a17afaf9ed0275efaedaa8b26ee74f2f1611e7d466ac951648'
             'fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f'
-            '66e87536b740194954670c482d698fc3183995bf48f580078511d50d1a3f0323'
             '7f821db61160248b65df19b018dc3b2ba7cc995564dd389bb83b3ce8e5097119'
-            'fcd5c5ea558ceadde3f840522a5c1cb11e26569aec651e8154194cca39026611'
             '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30'
-            'b7c2684fd3fa75d1b6b67457c0e5dd4f86fd9a25e104cdbd5961154e00c9fd72'
-            '532484ea829d6d9f8f13b2197f6b5bc90162bc0068235463b571ddcaa18f2b82'
-            'ba6d4ae099bcaee3cc23d0af56b9a11d203afaf3c5bf22d3fd935d752c9a32f3')
+            'b7c2684fd3fa75d1b6b67457c0e5dd4f86fd9a25e104cdbd5961154e00c9fd72')
 
 prepare() {
   # Create .desktop file
@@ -47,21 +38,9 @@ prepare() {
   # Set correct --module-path in start script (#215)
   patch $pkgname/build/linux/processing < fix_modules_path.patch
 
-  # Don't download any files during Ant's build process
-  patch $pkgname/build/build.xml < no_downloads.patch
-
-  # Use system libraries instead of the ones included in the processing4 repo
-  patch $pkgname/core/build.xml < use_system_libraries.patch
-
   # Disable update check in default preferences
   patch $pkgname/build/shared/lib/defaults.txt < disable_update_check.patch
 
-  # Derive JDK location from java binary found in PATH
-  patch $pkgname/build/linux/processing < derive_jdk_from_path.patch
-
-  # Always use OpenJDK 11 to run processing
-  patch $pkgname/build/linux/processing < always_use_java-11-openjdk.patch
-
   # Change command name to 'processing4'
   patch $pkgname/build/linux/processing < change_cmd_name.patch
 }
@@ -69,7 +48,7 @@ prepare() {
 build() {
   cd "$pkgname/build"
 
-  PATH="/usr/lib/jvm/java-11-openjdk/bin/:$PATH" ant build
+  ant build
 }
 
 package() {
@@ -87,10 +66,4 @@ package() {
   # Symbolic links in /usr/bin
   ln -s "/usr/share/processing4/processing" "$pkgdir/usr/bin/processing4"
   ln -s "/usr/share/processing4/processing-java" "$pkgdir/usr/bin/processing4-java"
-
-  # Ensure that processing uses the Java version selected by PATH
-  rmdir "$pkgdir/usr/share/processing4/java"
-  mkdir -p "$pkgdir/usr/share/processing4/java/bin/"
-  echo -e '#!/bin/sh\n`which java` "$@"' > "$pkgdir/usr/share/processing4/java/bin/java"
-  chmod a+x "$pkgdir/usr/share/processing4/java/bin/java"
 }