Use processing instead of processing4 as command name

4 files changed, 12 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3c57810db3d..225b8c8b7980 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = processing4-git
 	pkgdesc = Programming environment for creating images, animations and interactions
-	pkgver = 4.0a6.r2.ga1122aa67
+	pkgver = 4.0b2.r23.g272801f95
 	pkgrel = 1
 	url = https://github.com/processing/processing4
 	arch = x86_64
@@ -11,14 +11,12 @@ pkgbase = processing4-git
 	makedepends = gendesk
 	makedepends = unzip
 	depends = libgl
+	provides = processing
 	provides = processing4
-	conflicts = processing4
 	options = !strip
 	source = https://download.processing.org/reference.zip
-	source = change_cmd_name.patch
 	source = disable_update_check.patch
 	sha256sums = fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f
-	sha256sums = 7f821db61160248b65df19b018dc3b2ba7cc995564dd389bb83b3ce8e5097119
 	sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30
 
 pkgname = processing4-git
diff --git a/PKGBUILD b/PKGBUILD
index 7a8fc3680940..09142ad6ba52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,19 @@
 # Maintainer: Torben <git at letorbi dot com>
 
 pkgname=processing4-git
-pkgver=4.0a6.r2.ga1122aa67
+pkgver=4.0b2.r23.g272801f95
 pkgrel=1
 arch=(x86_64)
 pkgdesc='Programming environment for creating images, animations and interactions'
 url='https://github.com/processing/processing4'
 license=(GPL LGPL)
-provides=('processing4')
-conflicts=('processing4')
+provides=('processing' 'processing4')
 depends=('libgl')
 makedepends=('ant' 'jdk11-openjdk' 'gendesk' 'unzip')
 options=(!strip)
 source=('https://download.processing.org/reference.zip'
-        change_cmd_name.patch
         disable_update_check.patch)
 sha256sums=('fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f'
-            '7f821db61160248b65df19b018dc3b2ba7cc995564dd389bb83b3ce8e5097119'
             '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30')
 
 pkgver() {
@@ -32,20 +29,14 @@ prepare() {
   git clone --depth 1000 https://github.com/processing/processing4.git $pkgname
 
   # Create .desktop file
-  gendesk -f -n --pkgname=processing4 --pkgdesc="$pkgdesc" --name="Processing 4"
+  gendesk -f -n --pkgname=processing --pkgdesc="$pkgdesc" --name="Processing"
 
   # Copy reference.zip to the java directory
   mkdir -p $pkgname/java
   cp reference.zip $pkgname/java/
 
-  # Create missing directories
-  mkdir -p $pkgname/build/linux/work/java
-
   # Disable update check in default preferences
   patch $pkgname/build/shared/lib/defaults.txt < disable_update_check.patch
-
-  # Change command name to 'processing4'
-  patch $pkgname/build/linux/processing < change_cmd_name.patch
 }
 
 build() {
@@ -57,16 +48,16 @@ build() {
 package() {
   cd "$pkgname"
 
-  install -d "$pkgdir/usr/"{bin/,share/processing4/}
-  cp -r build/linux/work/* "$pkgdir/usr/share/processing4/"
+  install -d "$pkgdir/usr/"{bin/,share/processing/}
+  cp -r build/linux/work/* "$pkgdir/usr/share/processing/"
 
   # Desktop shortcut
   install -Dm644 "build/shared/lib/icons/pde-256.png" \
-    "$pkgdir/usr/share/pixmaps/processing4.png"
-  install -Dm644 "$srcdir/processing4.desktop" \
-    "$pkgdir/usr/share/applications/processing4.desktop"
+    "$pkgdir/usr/share/pixmaps/processing.png"
+  install -Dm644 "$srcdir/processing.desktop" \
+    "$pkgdir/usr/share/applications/processing.desktop"
 
   # 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"
+  ln -s "/usr/share/processing/processing" "$pkgdir/usr/bin/processing"
+  ln -s "/usr/share/processing/processing-java" "$pkgdir/usr/bin/processing-java"
 }
diff --git a/change_cmd_name.patch b/change_cmd_name.patch
deleted file mode 100644
index 9a0c146b0601..000000000000
--- a/change_cmd_name.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build/linux/processing	2020-06-18 10:59:49.559381692 +0200
-+++ b/build/linux/processing	2020-06-18 11:02:47.809690486 +0200
-@@ -103,7 +103,7 @@
- log PATH
- 
- current_name=`basename $0`
--cmd_name='processing-java'
-+cmd_name='processing4-java'
- 
- if [ $current_name = $cmd_name ]
- then
diff --git a/use_system_libraries.patch b/use_system_libraries.patch
deleted file mode 100644
index a1f5752e375b..000000000000
--- a/use_system_libraries.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- build_core.xml.orig	2020-06-13 00:09:40.000000000 +0200
-+++ build_core.xml	2020-06-17 15:54:22.945551353 +0200
-@@ -60,15 +60,15 @@
-   <path id="classpath.base">
-     <pathelement location="library/jogl-all.jar" />
-     <pathelement location="library/gluegen-rt.jar" />
--    <pathelement location="library/javafx-swt.jar" />
--    <pathelement location="library/javafx.base.jar" />
--    <pathelement location="library/javafx.controls.jar" />
--    <pathelement location="library/javafx.fxml.jar" />
--    <pathelement location="library/javafx.graphics.jar" />
--    <pathelement location="library/javafx.media.jar" />
--    <pathelement location="library/javafx.properties" />
--    <pathelement location="library/javafx.swing.jar" />
--    <pathelement location="library/javafx.web.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx-swt.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-11-openjfx/lib/javafx.properties" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.swing.jar" />
-+    <pathelement location="/usr/lib/jvm/java-11-openjfx/lib/javafx.web.jar" />
-   </path>
- 
-   <path id="classpath.test">