Fix broken avrdude after ncurses ABI bump

The solution is simply to use Arch's avrdude instead. Symlinking
libncurses.so.5 to libncursesw.so.6 seems to work superficially,
but let's not take chances.

2 files changed, 8 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a744428b9c6..5559b3903c9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = arduino
 	pkgdesc = Arduino prototyping platform SDK
 	pkgver = 1.6.5.r5
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://arduino.cc/en/Main/Software
 	install = arduino.install
@@ -14,8 +14,8 @@ pkgbase = arduino
 	depends = libusb-compat
 	depends = java-runtime
 	depends = desktop-file-utils
-	depends = libtinfo
 	depends = giflib
+	depends = avrdude
 	options = !strip
 	options = staticlibs
 	source = arduino.desktop
diff --git a/PKGBUILD b/PKGBUILD
index 47268d9c9318..bf375e16e924 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,13 +7,13 @@ pkgname=arduino
 epoch=1
 _arduino=1.6.5-r5
 pkgver=1.6.5.r5
-pkgrel=1
+pkgrel=2
 pkgdesc="Arduino prototyping platform SDK"
 arch=('i686' 'x86_64')
 url="http://arduino.cc/en/Main/Software"
 options=(!strip staticlibs)
 license=('GPL' 'LGPL')
-depends=('gtk2' 'libusb-compat' 'java-runtime' 'desktop-file-utils' 'libtinfo' 'giflib')
+depends=('gtk2' 'libusb-compat' 'java-runtime' 'desktop-file-utils' 'giflib' 'avrdude')
 makedepends=('icoutils')
 install="arduino.install"
 source=('arduino.desktop'
@@ -44,6 +44,10 @@ package() {
   ln -s /usr/share/arduino/arduino "${pkgdir}/usr/bin/arduino"
   ln -s /usr/share/arduino/reference "${pkgdir}/usr/share/doc/arduino"
 
+  # fix avrdude
+  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"
+
   # desktop icon
   for size in 16 32 48 256; do
     install -Dm644 ../arduino_icon_*_${size}x${size}x32.png \