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

[Alexander Rødseth]

    Date: Tuesday, November 20, 2018 @ 12:21:41
  Author: arodseth
Revision: 409050

upgpkg: processing 3.4-2

Adding a more informative error message, in connection with FS#60521

Added:
  processing/trunk/errormessage.patch
Modified:
  processing/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   23 +++++++++++------------
 errormessage.patch |   11 +++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-20 12:21:37 UTC (rev 409049)
+++ PKGBUILD	2018-11-20 12:21:41 UTC (rev 409050)
@@ -1,8 +1,8 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
 
 pkgname=processing
 pkgver=3.4
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 pkgdesc='Programming environment for creating images, animations and interactions'
 url='http://www.processing.org/'
@@ -15,10 +15,12 @@
 # ex: 3.4 -> 0265,  update the expression when the version scheme changes
 source=("https://github.com/$pkgname/$pkgname/archive/$pkgname-0$((265+${pkgver/3.4/0}))-$pkgver.tar.gz"
         "http://download.processing.org/reference.zip"
-        'build.xml')
+        'build.xml'
+        'errormessage.patch')
 sha256sums=('ae27b35c0193c99b3297029f97b459a262b4c0998aa4b5fb3c3f0f81f72bb4a4'
-            '7538a32db09136de822db26af81a1edab541c6c593d0bd945bfec833f6dd1adc'
-            '9f4050475b3363eb5e966fa891caea0391b3dcc2cdb68245f1a053b0d7ffb220')
+            '367decfcba704c0755ad1dc71a7657d4e220fd8a78c4298437f6b0274c66202a'
+            '9f4050475b3363eb5e966fa891caea0391b3dcc2cdb68245f1a053b0d7ffb220'
+            '3c49143a129c6b3655586bce9f175ee145ab388b78ad4615d6c0b80563ba6f26')
 
 prepare() {
   gendesk -f -n --pkgname="$pkgname" --pkgdesc="$pkgdesc"
@@ -26,6 +28,9 @@
   # Symbolic link for not having to repeat the revision number
   ln -sf "$pkgname-$pkgname-"*"-$pkgver" "$pkgname"
 
+  # Add some details to one of the error messages
+  patch -p0 -i errormessage.patch
+
   # Copy reference.zip to the java directory
   mkdir -p "$pkgname/java"
   cp "$srcdir/reference.zip" "$pkgname/java/"
@@ -44,12 +49,6 @@
   sed 's|  java|  _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=gasp" java|g' \
     -i "$pkgname/build/linux/processing"
 
-  # Don't try to delete the JRE files with rsync or extract them with tar
-  #sed -i 's/rsync/true/g;s/executable="tar" dir="linux"/executable="true"/g' "$pkgname/build/build.xml"
-
-  # DON'T download the JRE from Oracle!
-  #sed -i 's/jre-download, //g' "$pkgname/build/build.xml"
-
   # Use a custom build.xml file for ant
   cp -fv build.xml "$pkgname/build/build.xml"
 }
@@ -82,4 +81,4 @@
 }
 
 # getver: github.com/processing/processing/search?type=Commits&q=release+notes+author-date%3A%3E2018-03-14
-# vim: ts=2 sw=2 et:
+# vim: ts=2 sw=2 et

Added: errormessage.patch
===================================================================
--- errormessage.patch	                        (rev 0)
+++ errormessage.patch	2018-11-20 12:21:41 UTC (rev 409050)
@@ -0,0 +1,11 @@
+--- processing/app/src/processing/app/contrib/ContributionManager.java	2018-07-26 23:59:08.000000000 +0200
++++ processing/app/src/processing/app/contrib/ContributionManager.java	2018-11-20 12:53:07.229171545 +0100
+@@ -206,7 +206,7 @@
+                   .interpolate("contrib.errors.contrib_download.timeout",
+                                ad.getName()));
+               } else {
+-                status.setErrorMessage(Language
++                status.setErrorMessage("Could not download " + url + " to " + contribZip + " : " + Language
+                   .interpolate("contrib.errors.download_and_install",
+                                ad.getName()));
+               }