From 80208fb578cf92cc308906660ca6d7860c6b2a1f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Fri, 9 Mar 2018 16:53:27 +0000
Subject: gentoo resync : 09.03.2018

---
 .../files/arduino-1.8.5-avr-platform.txt.patch     | 26 ++++++++++++++++++
 .../arduino/files/arduino-1.8.5-build.xml.patch    | 31 ++++++++++++++++++++++
 .../arduino/files/arduino-1.8.5-lib-loading.patch  | 26 ++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100644 dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
 create mode 100644 dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
 create mode 100644 dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch

(limited to 'dev-embedded/arduino/files')

diff --git a/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
new file mode 100644
index 000000000000..9903da46dc4a
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.8.5-avr-platform.txt.patch
@@ -0,0 +1,26 @@
+diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
+index f7fb447c1..8ae8b73d9 100644
+--- a/hardware/arduino/avr/platform.txt
++++ b/hardware/arduino/avr/platform.txt
+@@ -18,7 +18,7 @@ compiler.warning_flags.more=-Wall
+ compiler.warning_flags.all=-Wall -Wextra
+ 
+ # Default "compiler.path" is correct, change only if you want to override the initial value
+-compiler.path={runtime.tools.avr-gcc.path}/bin/
++compiler.path=/usr/bin/
+ compiler.c.cmd=avr-gcc
+ compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
+ compiler.c.elf.flags={compiler.warning_flags} -Os -g -flto -fuse-linker-plugin -Wl,--gc-sections
+@@ -91,9 +91,9 @@ recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {
+ # AVR Uploader/Programmers tools
+ # ------------------------------
+ 
+-tools.avrdude.path={runtime.tools.avrdude.path}
+-tools.avrdude.cmd.path={path}/bin/avrdude
+-tools.avrdude.config.path={path}/etc/avrdude.conf
++tools.avrdude.path=/usr
++tools.avrdude.cmd.path=/usr/bin/avrdude
++tools.avrdude.config.path=/etc/avrdude.conf
+ 
+ tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
+ 
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
new file mode 100644
index 000000000000..59d796ca5a7a
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.8.5-build.xml.patch
@@ -0,0 +1,31 @@
+diff --git a/build/build.xml b/build/build.xml
+index d95f8def6..13ba60286 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -641,7 +641,7 @@
+     </chmod>
+   </target>
+ 
+-  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
++  <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch" if="never">
+     <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" />
+@@ -666,7 +666,7 @@
+ 
+   </target>
+ 
+-  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
++  <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM" if="never">
+     <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" />
+@@ -1186,7 +1186,7 @@
+ 	  depends="linux-clean, windows-clean, macosx-clean, subprojects-clean">
+   </target>
+ 
+-  <target name="avr-toolchain-bundle" unless="light_bundle">
++  <target name="avr-toolchain-bundle" if="never">
+     <!-- Unzip AVR tools -->
+     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc"/>
+ 
diff --git a/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch b/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch
new file mode 100644
index 000000000000..d2516aeb7357
--- /dev/null
+++ b/dev-embedded/arduino/files/arduino-1.8.5-lib-loading.patch
@@ -0,0 +1,26 @@
+diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+index 4224bf164..fa92506ba 100644
+--- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java
++++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+@@ -41,7 +41,7 @@ public class AStyleInterface {
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
+       loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
+     }
+-    loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
++    System.loadLibrary("astylej");
+   }
+ 
+   private static void loadLib(File lib) {
+diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
+index 28a7ba0f5..8a943a8ac 100644
+--- a/arduino-core/src/processing/app/Platform.java
++++ b/arduino-core/src/processing/app/Platform.java
+@@ -154,7 +154,7 @@ public class Platform {
+   }
+ 
+   static {
+-    loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
++    System.loadLibrary("listSerialsj");
+   }
+ 
+   private static void loadLib(File lib) {
-- 
cgit v1.2.3