avrdude fix

3 files changed, 25 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 87903f6180e0..e91c12b909a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = arduino-git
 	pkgdesc = Arduino prototyping platform SDK
-	pkgver = 1.6.10.r0.g3db7ec2
+	pkgver = 1.6.11.r3.g2e70841
 	pkgrel = 2
 	url = https://github.com/arduino/Arduino
 	install = arduino.install
@@ -17,13 +17,15 @@ pkgbase = arduino-git
 	depends = desktop-file-utils
 	depends = shared-mime-info
 	depends = java-runtime=8
+	depends = avrdude
 	provides = arduino
 	conflicts = arduino
-	conflicts = arduino-bin
 	options = !strip
 	options = staticlibs
 	source = arduino-git::git+https://github.com/arduino/Arduino/#branch=master
+	source = arduino.sh
 	sha512sums = SKIP
+	sha512sums = 6dae08b8687e897ed370cc51cfeeba9020bb749356acfd367c796bf34fb43b763888340501be6a577859c19c37fe857be2b8fb52f1295769403b8e826c4e3f28
 
 pkgname = arduino-git
 
diff --git a/PKGBUILD b/PKGBUILD
index c9d723a0e13c..9528414e61a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,23 @@
 # Maintainer: NicoHood <aur {at} nicohood {dot} de>
-# Co-Maintainer: Christopher Loen <christopherloen at gmail dot com>
+# Contributor: Christopher Loen <christopherloen at gmail dot com>
 
 pkgname=arduino-git
-pkgver=1.6.10.r0.g3db7ec2
-pkgrel=2
+pkgver=1.6.11.r3.g2e70841
+pkgrel=1
 pkgdesc="Arduino prototyping platform SDK"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/arduino/Arduino"
 license=('GPL' 'LGPL')
-depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8')
+depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8' 'avrdude')
 makedepends=('java-environment=8' 'apache-ant' 'unzip')
 options=(!strip staticlibs)
 install="arduino.install"
 provides=('arduino')
-conflicts=('arduino' 'arduino-bin')
-source=("${pkgname}::git+https://github.com/arduino/Arduino/#branch=master")
-sha512sums=('SKIP')
+conflicts=('arduino')
+source=("${pkgname}::git+https://github.com/arduino/Arduino/#branch=master"
+        "arduino.sh")
+sha512sums=('SKIP'
+            '6dae08b8687e897ed370cc51cfeeba9020bb749356acfd367c796bf34fb43b763888340501be6a577859c19c37fe857be2b8fb52f1295769403b8e826c4e3f28')
 
 pkgver() {
 	cd "${srcdir}/${pkgname}"
@@ -24,22 +26,27 @@ pkgver() {
 
 build() {
 	cd "${srcdir}/${pkgname}/build"
+	export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
 	ant clean build
 }
 
 package() {
 	cd "${srcdir}/${pkgname}/build/linux/work"
 
-	install -dm755 "${pkgdir}/usr/bin"
+	# Create directories
 	install -dm755 "${pkgdir}/usr/share/"{doc,icons/hicolor,applications,mime/packages}
 
 	# Copy the whole SDK
 	cp -a . "${pkgdir}/usr/share/arduino"
 
-	# Create symlinks
-	ln -s /usr/share/arduino/arduino "${pkgdir}/usr/bin/arduino"
+	# Create wrapper for java8 + documentation symlink
+	install -Dm755 "${srcdir}/arduino.sh" "${pkgdir}/usr/bin/arduino"
 	ln -s /usr/share/arduino/reference "${pkgdir}/usr/share/doc/arduino"
 
+	# Fix avrdude (see https://github.com/arduino/Arduino/issues/5094)
+	rm -f "${pkgdir}/usr/share/arduino/hardware/tools/avr/bin/avrdude"{,_bin}
+	ln -s /usr/bin/avrdude "${pkgdir}/usr/share/arduino/hardware/tools/avr/bin/avrdude"
+
 	# Install desktop icons (keep a symlink for the arduino binary)
 	cp -a lib/icons/* "${pkgdir}/usr/share/icons/hicolor"
 	rm -rf "${pkgdir}/usr/share/arduino/lib/icons"
diff --git a/arduino.sh b/arduino.sh
new file mode 100644
index 000000000000..203c8d184802
--- /dev/null
+++ b/arduino.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH
+exec /usr/share/arduino/arduino "$@"