[arch-commits] Commit in processing/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Friday, January 27, 2017 @ 08:54:57
  Author: arodseth
Revision: 209209

upgpkg: processing 3.2.3-3

Modified:
  processing/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-27 07:56:24 UTC (rev 209208)
+++ PKGBUILD	2017-01-27 08:54:57 UTC (rev 209209)
@@ -10,13 +10,13 @@
 url='http://www.processing.org/'
 license=('GPL' 'LGPL')
 makedepends=('gendesk' 'java-openjfx' 'java-environment=8' 'apache-ant' 'rsync')
-depends=('libgl' 'java-openjfx')
+depends=('libgl' 'java-runtime=8')
 options=('!strip')
 source=("https://github.com/$pkgname/$pkgname/archive/$pkgname-$_rev-$pkgver.tar.gz")
 sha256sums=('e2959b16375fa05bfaa2a2d02c5ddb88bd64aca4efd8366a831ace0e2bd119b2')
 
 prepare() {
-  gendesk -n --pkgname="$pkgname" --pkgdesc="$pkgdesc"
+  gendesk -f -n --pkgname="$pkgname" --pkgdesc="$pkgdesc"
 }
 
 build() {
@@ -26,18 +26,20 @@
 }
 
 package() {
-  cd "$pkgname-$pkgname-$_rev-$pkgver/build"
+  cd "$pkgname-$pkgname-$_rev-$pkgver"
 
-  install -d "$pkgdir/usr/bin/" "$pkgdir/usr/share/$pkgname/"
-  cp -r * "$pkgdir/usr/share/$pkgname/"
-  ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
-  ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java"
+  install -d "$pkgdir/usr/"{bin/,share/$pkgname/}
+  cp -r build/linux/work/* "$pkgdir/usr/share/$pkgname/"
 
-  # Desktop icon / application shortcut
-  install -Dm644 "shared/lib/icons/pde-256.png" \
+  # Desktop shortcut
+  install -Dm644 "build/shared/lib/icons/pde-256.png" \
     "$pkgdir/usr/share/pixmaps/$pkgname.png"
   install -Dm644 "$srcdir/$pkgname.desktop" \
     "$pkgdir/usr/share/applications/$pkgname.desktop"
+
+  # Symbolic links in /usr/bin
+  ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java"
 }
 
 # getver: https://raw.githubusercontent.com/processing/processing/master/build/shared/revisions.txt