[arch-commits] Commit in arduino/trunk (PKGBUILD avr-core.patch)

[NicoHood]

    Date: Monday, May 20, 2019 @ 15:28:54
  Author: nicohood
Revision: 468110

upgpkg: arduino 1:1.8.9-2

Added:
  arduino/trunk/avr-core.patch
Modified:
  arduino/trunk/PKGBUILD

----------------+
 PKGBUILD       |   15 +++++++++++----
 avr-core.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-20 15:05:58 UTC (rev 468109)
+++ PKGBUILD	2019-05-20 15:28:54 UTC (rev 468110)
@@ -10,7 +10,7 @@
 
 pkgname=arduino
 pkgver=1.8.9
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Arduino prototyping platform SDK"
 arch=('x86_64')
@@ -17,7 +17,7 @@
 url="https://github.com/arduino/Arduino"
 license=('GPL' 'LGPL')
 depends=('gtk2' 'desktop-file-utils' 'shared-mime-info' 'java-runtime=8' 'arduino-builder')
-makedepends=('java-environment=8' 'apache-ant' 'unzip')
+makedepends=('java-environment=8' 'ant' 'unzip')
 optdepends=('arduino-docs: Offline documentation for arduino'
             'arduino-avr-core: AVR core with upstream avr-gcc and avrdude'
             'python2: Intel Galileo Board installation')
@@ -31,7 +31,8 @@
         "https://downloads.arduino.cc/libastylej-2.05.1-4.zip.asc"
         "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip"
         "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip.asc"
-        "arduino.sh")
+        "arduino.sh"
+        "avr-core.patch")
 sha512sums=('74ac124ea569823b9d8cd5a485d458e5fdac115407a5c7d1a33b8e495c5459c2acf518401fb4f916657fbc83addaa1ee51e81b8b21c5cbbb2eef7ceb243a5372'
             'SKIP'
             '9ddece48bf5c2c73b8e95b7e017894b7ed9341dafbe37fd4bffd6faa65def29b7578e5860b4dfbfac0a3f738c3907d2073891d47f57b41b416c9a7d068f57af1'
@@ -40,9 +41,15 @@
             'SKIP'
             '80f27ef196a205dc512f0aebb426765f2536a00059a633929bbdcfea81d7fb9fec31b27322c534a3e5953240a2906e89914562b0be0649053206a1941f659b58'
             'SKIP'
-            'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a')
+            'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a'
+            '98acc50198334cd2e9c91a1265d9bacd95998bb2a1926141e94311defc0ef77c24e3653c77591055ee5695b7fb8cefd1b12c339a9d0167d4ae8581b2f780f0ef')
 validpgpkeys=('326567C1C6B288DF32CB061A95FA6F43E21188C4') # Arduino Packages <support at arduino.cc>
 
+prepare()
+{
+    patch --strip=1 < avr-core.patch
+}
+
 build() {
     cd "Arduino-master-${pkgver}/build"
 

Added: avr-core.patch
===================================================================
--- avr-core.patch	                        (rev 0)
+++ avr-core.patch	2019-05-20 15:28:54 UTC (rev 468110)
@@ -0,0 +1,26 @@
+diff --unified --recursive --text src.ori/Arduino-master-1.8.9/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java src.new/Arduino-master-1.8.9/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
+--- src.ori/Arduino-master-1.8.9/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java	2019-03-15 15:14:01.000000000 +0100
++++ src.new/Arduino-master-1.8.9/arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java	2019-05-20 17:20:47.402857561 +0200
+@@ -215,7 +215,7 @@
+   }
+ 
+   private void syncBuiltInHardware() throws IOException {
+-    if (index == null) {
++    if (index == null || builtInHardwareFolder == null) {
+       return;
+     }
+     for (File folder : builtInHardwareFolder.listFiles(ONLY_DIRS)) {
+diff --unified --recursive --text src.ori/Arduino-master-1.8.9/arduino-core/src/processing/app/BaseNoGui.java src.new/Arduino-master-1.8.9/arduino-core/src/processing/app/BaseNoGui.java
+--- src.ori/Arduino-master-1.8.9/arduino-core/src/processing/app/BaseNoGui.java	2019-03-15 15:14:01.000000000 +0100
++++ src.new/Arduino-master-1.8.9/arduino-core/src/processing/app/BaseNoGui.java	2019-05-20 17:21:55.776950094 +0200
+@@ -676,7 +676,9 @@
+     // Libraries located in the latest folders on the list can override
+     // other libraries with the same name.
+     librariesIndexer.setLibrariesFolders(librariesFolders);
+-    librariesIndexer.setArchitecturePriority(getTargetPlatform().getId());
++    if (getTargetPlatform() != null) {
++      librariesIndexer.setArchitecturePriority(getTargetPlatform().getId());
++    }
+     librariesIndexer.rescanLibraries();
+ 
+     populateImportToLibraryTable();