diff options
-rw-r--r-- | PKGBUILD | 30 | ||||
-rw-r--r-- | change_cmd_name.patch | 11 |
2 files changed, 28 insertions, 13 deletions
@@ -7,19 +7,20 @@ arch=(x86_64) pkgdesc='Programming environment for creating images, animations and interactions' url='https://github.com/processing/processing4' license=(GPL LGPL) -conflicts=(processing processing-bin processing-jdk8) 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') options=(!strip) source=('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 no_downloads.patch use_system_libraries.patch) sha256sums=('2014fdb12f979f79c624acc514c14ce318f07cb2cc15a63e1b4febaff733f2a5' '66e87536b740194954670c482d698fc3183995bf48f580078511d50d1a3f0323' + '7f821db61160248b65df19b018dc3b2ba7cc995564dd389bb83b3ce8e5097119' 'fcd5c5ea558ceadde3f840522a5c1cb11e26569aec651e8154194cca39026611' '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30' 'a07184b87d3d2ccd35525a0721df787973f92487bae367a0668abd3f64134263' @@ -35,7 +36,7 @@ prepare() { git clone --depth 1 https://github.com/processing/processing4.git $pkgname # Create .desktop file - gendesk -f -n --pkgname=processing --pkgdesc="$pkgdesc" + gendesk -f -n --pkgname=processing4 --pkgdesc="$pkgdesc" --name="Processing 4" # Copy reference.zip to the java directory mkdir -p $pkgname/java @@ -58,6 +59,9 @@ prepare() { # 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 } build() { @@ -69,22 +73,22 @@ build() { package() { cd "$pkgname" - install -d "$pkgdir/usr/"{bin/,share/processing/} - cp -r build/linux/work/* "$pkgdir/usr/share/processing/" + install -d "$pkgdir/usr/"{bin/,share/processing4/} + cp -r build/linux/work/* "$pkgdir/usr/share/processing4/" # Desktop shortcut install -Dm644 "build/shared/lib/icons/pde-256.png" \ - "$pkgdir/usr/share/pixmaps/processing.png" - install -Dm644 "$srcdir/processing.desktop" \ - "$pkgdir/usr/share/applications/processing.desktop" + "$pkgdir/usr/share/pixmaps/processing4.png" + install -Dm644 "$srcdir/processing4.desktop" \ + "$pkgdir/usr/share/applications/processing4.desktop" # Symbolic links in /usr/bin - ln -s "/usr/share/processing/processing" "$pkgdir/usr/bin/processing" - ln -s "/usr/share/processing/processing-java" "$pkgdir/usr/bin/processing-java" + 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/processing/java" - mkdir -p "$pkgdir/usr/share/processing/java/bin/" - echo -e '#!/bin/sh\n`which java` "$@"' > "$pkgdir/usr/share/processing/java/bin/java" - chmod a+x "$pkgdir/usr/share/processing/java/bin/java" + 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" } diff --git a/change_cmd_name.patch b/change_cmd_name.patch new file mode 100644 index 000000000000..9a0c146b0601 --- /dev/null +++ b/change_cmd_name.patch @@ -0,0 +1,11 @@ +--- 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 |