diff options
-rw-r--r-- | .SRCINFO | 3 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | change_cmd_name.patch | 11 |
3 files changed, 10 insertions, 29 deletions
@@ -11,14 +11,13 @@ pkgbase = processing4 makedepends = gendesk makedepends = unzip depends = libgl + provides = processing options = !strip source = https://github.com/processing/processing4/archive/processing-1277-4.0b2.tar.gz source = https://download.processing.org/reference.zip - source = change_cmd_name.patch source = disable_update_check.patch sha256sums = 060a126877d63ddb048cd389c505f0d502ba4f00bb59be38b99250b1f7006b2d sha256sums = fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f - sha256sums = 7f821db61160248b65df19b018dc3b2ba7cc995564dd389bb83b3ce8e5097119 sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30 pkgname = processing4 @@ -9,19 +9,18 @@ url='https://github.com/processing/processing4' license=(GPL LGPL) depends=('libgl') makedepends=('ant' 'jdk11-openjdk' 'gendesk' 'unzip') +provides=('processing') options=(!strip) source=("https://github.com/processing/processing4/archive/processing-$((1275+${pkgver##4.0b}))-$pkgver.tar.gz" 'https://download.processing.org/reference.zip' - change_cmd_name.patch disable_update_check.patch) sha256sums=('060a126877d63ddb048cd389c505f0d502ba4f00bb59be38b99250b1f7006b2d' 'fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f' - '7f821db61160248b65df19b018dc3b2ba7cc995564dd389bb83b3ce8e5097119' '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30') prepare() { # Create .desktop file - gendesk -f -n --pkgname=processing4 --pkgdesc="$pkgdesc" --name="Processing 4" + gendesk -f -n --pkgname=processing --pkgdesc="$pkgdesc" --name="Processing" # Symbolic link for not having to repeat the revision number ln -sf "processing4-processing-"*"-$pkgver" $pkgname @@ -30,14 +29,8 @@ prepare() { 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() { @@ -49,16 +42,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 |