From 2b30abf526cc53ab385492e80cbc497e5fbe92d3 Mon Sep 17 00:00:00 2001
From: Gianluca Sforna <giallu@gmail.com>
Date: Oct 11 2017 11:41:54 +0000
Subject: fix osx patch


---

diff --git a/arduino-1.8.3-macosx.patch b/arduino-1.8.3-macosx.patch
deleted file mode 100644
index d8a8444..0000000
--- a/arduino-1.8.3-macosx.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up Arduino-1.8.3/app/src/processing/app/Base.java.macosx Arduino-1.8.3/app/src/processing/app/Base.java
---- Arduino-1.8.3/app/src/processing/app/Base.java.macosx	2017-05-31 11:03:10.000000000 -0400
-+++ Arduino-1.8.3/app/src/processing/app/Base.java	2017-08-14 15:25:00.613226485 -0400
-@@ -49,7 +49,6 @@ import processing.app.helpers.filefilter
- import processing.app.helpers.filefilters.OnlyFilesWithExtension;
- import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
- import processing.app.legacy.PApplet;
--import processing.app.macosx.ThinkDifferent;
- import processing.app.packages.LibraryList;
- import processing.app.packages.UserLibrary;
- import processing.app.syntax.PdeKeywords;
-@@ -132,10 +131,6 @@ public class Base {
-     }
-     System.setProperty("java.net.useSystemProxies", "true");
- 
--    if (OSUtils.isMacOS()) {
--      ThinkDifferent.init();
--    }
--
-     try {
-       INSTANCE = new Base(args);
-     } catch (Throwable e) {
diff --git a/arduino-1.8.5-macosx.patch b/arduino-1.8.5-macosx.patch
new file mode 100644
index 0000000..f6ede87
--- /dev/null
+++ b/arduino-1.8.5-macosx.patch
@@ -0,0 +1,27 @@
+diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
+index 477f931..f64235f 100644
+--- a/app/src/processing/app/Base.java
++++ b/app/src/processing/app/Base.java
+@@ -49,7 +49,6 @@ import processing.app.helpers.filefilters.OnlyDirs;
+ import processing.app.helpers.filefilters.OnlyFilesWithExtension;
+ import processing.app.javax.swing.filechooser.FileNameExtensionFilter;
+ import processing.app.legacy.PApplet;
+-import processing.app.macosx.ThinkDifferent;
+ import processing.app.packages.LibraryList;
+ import processing.app.packages.UserLibrary;
+ import processing.app.syntax.PdeKeywords;
+@@ -132,14 +131,6 @@ public class Base {
+     }
+     System.setProperty("java.net.useSystemProxies", "true");
+ 
+-    if (OSUtils.isMacOS()) {
+-      System.setProperty("apple.laf.useScreenMenuBar",
+-        String.valueOf(!System.getProperty("os.version").startsWith("10.13")
+-          || com.apple.eawt.Application.getApplication().isAboutMenuItemPresent()));
+-
+-      ThinkDifferent.init();
+-    }
+-
+     try {
+       INSTANCE = new Base(args);
+     } catch (Throwable e) {