From c1eade16fc7e56b0af4fc14d8dda149f4bba8fab Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Tue, 16 Jun 2015 15:46:18 +0200
Subject: [PATCH 1/4] Windows: missing chdir tag in config*.xml prevents double
 clicking .ino file from opening the IDE

---
 build/windows/launcher/config.xml       | 1 +
 build/windows/launcher/config_debug.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index 3f2982a79..1df6d0e0b 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -3,6 +3,7 @@
   <headerType>gui</headerType>
   <jar>lib</jar>
   <outfile>arduino.exe</outfile>
+  <chdir>.</chdir>
   <errTitle>Arduino</errTitle>
   <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
   <icon>application.ico</icon>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index bd4070332..69ff6c472 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -3,6 +3,7 @@
   <headerType>console</headerType>
   <jar>lib</jar>
   <outfile>arduino_debug.exe</outfile>
+  <chdir>.</chdir>
   <errTitle>Arduino</errTitle>
   <downloadUrl>http://www.oracle.com/technetwork/java/javase/downloads/index.html</downloadUrl>
   <icon>application.ico</icon>

From df0cdd0a482300aa8a6abc032ea162a06316e083 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Wed, 17 Jun 2015 13:58:20 +0200
Subject: [PATCH 2/4] Update revisions.txt

---
 build/shared/revisions.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 9d9ea7446..5251ddbd5 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -1,3 +1,8 @@
+ARDUINO 1.6.5-r2 - 2015.06.17
+
+[ide]
+* Windows: fixed a problem that prevented opening the IDE when double clicking a .ino file
+
 ARDUINO 1.6.5 - 2015.06.15
 
 [ide]

From d6c5344b6792ce0e24a08bf695aa5cde6701e461 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 20 Jul 2015 12:28:42 +0200
Subject: [PATCH 3/4] Workaround for MacOSX gatekeeper (OSX 10.10.4)

It seems that gatekeeper now applies tighter checks on
libraries dinamically linked from executables included
in a package.

This is a workaround until a proper solution is found.

Fixes #3468
---
 build/build.xml                                            | 7 ++++++-
 ...rdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha

diff --git a/build/build.xml b/build/build.xml
index f94e7975c..f10df8785 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -409,7 +409,7 @@
       <param name="unpack_target" value="untar"/>
       <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino5"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino5"/>
     </antcall>
 
@@ -417,6 +417,11 @@
       <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>
+
+    <!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
+    <chmod perm="-x">
+      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
+    </chmod>
   </target>
 
   <target name="macosx-old-run" depends="macosx-old-build" description="Run Mac OS X version">
diff --git a/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 000000000..3b1625eee
--- /dev/null
+++ b/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+52afce6cbe1cc1021bca1234cf25b298350f97dd

From a3b5ab4ff7fd0bac497d3d8eead19df17819d289 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Mon, 20 Jul 2015 13:42:16 +0200
Subject: [PATCH 4/4] Update revision log

---
 build/shared/revisions.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 5251ddbd5..783aa84e5 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -1,3 +1,8 @@
+ARDUINO 1.6.5-r3 - 2015.07.20
+
+[ide]
+* Fixed Mac signature for OSX >=10.10.4
+
 ARDUINO 1.6.5-r2 - 2015.06.17
 
 [ide]