From df2072bf0a3ff862e603f28a73ac7781b1c732a9 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Fri, 19 Oct 2012 23:36:10 -0400
Subject: improve java/arduino

 * patch to be compatible with newer versions of avr-libc
 * use jh
---
 java/arduino/PKGBUILD | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'java/arduino/PKGBUILD')

diff --git a/java/arduino/PKGBUILD b/java/arduino/PKGBUILD
index b21db4fbf..426664a37 100644
--- a/java/arduino/PKGBUILD
+++ b/java/arduino/PKGBUILD
@@ -2,26 +2,37 @@
 
 pkgname=arduino
 pkgver=1.0.1
-pkgrel=1
-pkgdesc="Arduino SDK"
+pkgrel=2
+pkgdesc="Arduino SDK and IDE"
 arch=('i686' 'x86_64')
 url="http://arduino.cc/en/Main/Software"
 options=(!strip)
 license=('GPL')
 
-makedependa=(java-environment avr-gcc avr-libc make apache-ant)
-depends=('avr-gcc>=4.3.2' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
+depends=('avr-gcc' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
     'java-rxtx' 'antlr2' 'eclipse-ecj' 'jna')
-#conflicts=('avr-gcc>=4.4')
+makedepends=(java-environment apache-ant jh)
 install="arduino.install"
 source=("http://arduino.googlecode.com/files/arduino-$pkgver-src.tar.gz"
+	'sig-patch.diff'
 	'arduino.png'
 	'arduino.desktop')
 
 unset _JAVA_OPTIONS
 . /etc/profile.d/jdk.sh
 
+mksource() {
+  cd "$srcdir/arduino-$pkgver"
+  find . -name '*.jar' -delete
+  find . -name '*.swp' -delete
+  find . -name '*.so' -delete
+  rm -rf build/linux/dist/*/*
+}
+
 build() {
+  cd "$srcdir/arduino-$pkgver"
+  eval `jh mksource build/shared/reference.zip`
+
   cd "$srcdir"
   mkdir empty.d
   cd empty.d
@@ -30,10 +41,11 @@ build() {
   rmdir empty.d
 
   cd "$srcdir/arduino-$pkgver"
-  find . -name '*.jar' -delete
-  find . -name '*.swp' -delete
-  find . -name '*.so' -delete
-  rm -rf build/linux/dist/*/*
+
+  # Fix issue 955 to be compatible with newer versions of avr-libc
+  # https://code.google.com/p/arduino/issues/detail?id=955
+  # Note: this patch is not the patch given in the comments
+  patch -Np1 -i "$srcdir/sig-patch.diff"
 
   #ln -s /.../RXTXcomm.jar app/lib # already on the classpath
   ln -s /usr/share/java/antlr2.jar app/lib/antlr.jar
@@ -84,5 +96,6 @@ package() {
 }
 
 md5sums=('03263613f4be4f865989244420be04fa'
+         'acadc724cbe08c09711825f4bd5c04f6'
          '9e36d33891d5e68d38ec55d1494499a5'
          'eebc4d6495864bea99ad057af801afb9')
-- 
cgit v1.2.3-54-g00ecf