diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
index da2c2695d79..ac27de7601e 100644
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ b/srcpkgs/arduino/patches/disable-dependency-build.patch
@@ -1,51 +1,12 @@
---- build/build.xml.orig	2017-06-26 21:25:28.372389852 +0000
-+++ build/build.xml	2017-06-26 21:36:00.450346631 +0000
-@@ -456,17 +456,6 @@
-     </antcall>
- 
-     <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
--    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
--    <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
--    <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
--
--    <antcall target="unzip">
-       <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-       <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-       <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
-@@ -484,20 +473,6 @@
- 
-   <!-- Unzip AVR tools -->
-   <target name="macosx-build-avr-toolchain" unless="light_bundle">
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-darwin_amd64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
--
--    <chmod perm="+x">
--      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
--      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
--    </chmod>
-   </target>
- 
-   <target name="macosx-run" depends="build,start"/>
-@@ -641,15 +616,6 @@
+--- build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
++++ build/build.xml	2019-02-26 02:22:56.667235290 +0100
+@@ -649,15 +649,6 @@
    </target>
  
    <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
 -    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+-      <param name="archive_file" value="./libastylej-2.05.1-4.zip" />
+-      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
 -      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
@@ -55,13 +16,13 @@
      <antcall target="portable-${portable}">
        <param name="parentdir" value="linux/work" />
      </antcall>
-@@ -666,15 +632,6 @@
+@@ -674,15 +665,6 @@
    </target>
  
    <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
 -    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
+-      <param name="archive_file" value="./libastylej-2.05.1-4.zip" />
+-      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
 -      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
 -      <param name="dest_folder" value="${staging_folder}" />
 -    </antcall>
@@ -71,7 +32,7 @@
      <antcall target="portable-${portable}">
        <param name="parentdir" value="linux/work" />
      </antcall>
-@@ -696,16 +653,6 @@
+@@ -704,28 +686,9 @@
      </antcall>
  
      <antcall target="build-arduino-builder" />
@@ -87,8 +48,37 @@
 -    </antcall>
    </target>
  
+   <target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64">
+-    <antcall target="unzip">
+-      <param name="archive_file" value="./libastylej-2.05.1-4.zip" />
+-      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.zip" />
+-      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
+-      <param name="dest_folder" value="${staging_folder}" />
+-    </antcall>
+-    <copy file="linux/libastylej-2.05.1/libastylej_aarch64.so" tofile="linux/work/lib/libastylej.so" />
+-    <chmod perm="755" file="linux/work/lib/libastylej.so" />
+-
+     <antcall target="portable-${portable}">
+       <param name="parentdir" value="linux/work" />
+     </antcall>
+@@ -746,16 +709,6 @@
+     </antcall>
+ 
+     <antcall target="build-arduino-builder" />
+-
+-    <antcall target="avr-toolchain-bundle">
+-      <param name="unpack_target" value="untar"/>
+-      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
+-      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
+-      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
+-      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
+-      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_aarch64.tar.bz2"/>
+-      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
+-    </antcall>
+   </target>
+ 
    <target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
-@@ -714,16 +661,6 @@
+@@ -764,16 +717,6 @@
      </antcall>
  
      <antcall target="build-arduino-builder" />
@@ -105,7 +95,7 @@
    </target>
  
    <target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
-@@ -732,16 +669,6 @@
+@@ -782,16 +725,6 @@
      </antcall>
  
      <antcall target="build-arduino-builder" />
@@ -122,36 +112,3 @@
    </target>
  
    <target name="linux-jvm-noop"/>
-@@ -982,16 +909,6 @@
-     <antcall target="windows-build-avr-toolchain" />
- 
-     <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
--      <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
--      <param name="dest_folder" value="${staging_folder}" />
--    </antcall>
--    <copy file="windows/libastylej-2.05.1/AStylej.dll" todir="windows/work/lib" />
--    <copy file="windows/msvcp100.dll" todir="windows/work" />
--    <copy file="windows/msvcr100.dll" todir="windows/work" />
--
--    <antcall target="unzip">
-       <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-       <param name="archive_url" value="https://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
-       <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
-@@ -1112,15 +1029,6 @@
-   </target>
- 
-   <target name="windows-build-avr-toolchain">
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="unzip"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.zip"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows_386.zip"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="windows-run" depends="build,start"/>
diff --git a/srcpkgs/arduino/patches/ignore-touchbar.patch b/srcpkgs/arduino/patches/ignore-touchbar.patch
new file mode 100644
index 00000000000..6111db23096
--- /dev/null
+++ b/srcpkgs/arduino/patches/ignore-touchbar.patch
@@ -0,0 +1,21 @@
+--- app/src/processing/app/EditorToolbar.java.orig	2019-02-26 02:26:15.309593724 +0100
++++ app/src/processing/app/EditorToolbar.java	2019-02-26 02:26:57.512244968 +0100
+@@ -149,18 +149,6 @@
+     statusFont = Theme.getFont("buttons.status.font");
+     statusColor = Theme.getColor("buttons.status.color");
+ 
+-    if (OSUtils.isMacOS()) {
+-      editor.addWindowListener(new WindowAdapter() {
+-        public void windowActivated(WindowEvent e) {
+-          if (touchBar == null) {
+-            buildTouchBar();
+-            
+-            touchBar.show(editor); 
+-          }               
+-        }
+-      });
+-    }
+-    
+     addMouseListener(this);
+     addMouseMotionListener(this);
+     KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this);
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index 50b29317a29..336d3c2c7ba 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,20 +1,20 @@
 # Template file for 'arduino'
 pkgname=arduino
-version=1.8.5
-revision=2
+version=1.8.8
+revision=1
+wrksrc=Arduino-$version
 hostmakedepends="apache-ant unzip ImageMagick openjdk"
 depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
 short_desc="IDE for the arduino open-source electronics prototyping platform"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-2, LGPL-2"
+license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="http://arduino.cc/"
 distfiles="
  https://github.com/arduino/Arduino/archive/${version}.tar.gz
  ${SOURCEFORGE_SITE}/astyle/astyle_3.0.1_linux.tar.gz"
-checksum="57e8c4cf9147135a10cfd45431189a675b1c39ddf833eaeed553f4fc869fdf69
+checksum="01bf72e54165a522fe80ae5454b7073994fd4139a326f2edc0bb61b1d226179a
  6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd"
 nostrip=yes
-wrksrc=Arduino-$version
 
 do_build() {
 	. /etc/profile.d/apache-ant.sh