diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,13 +1,13 @@ name : arduino -version : 1.8.10 -release : 2 +version : 1.8.11 +release : 3 source : - - https://github.com/arduino/Arduino/archive/1.8.10.tar.gz : 9b0ab3de8d8b95d67c74dba6b34c84a6842576c56ab521490455f21ee1e3f043 - - https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.9/WiFi101-Updater-ArduinoIDE-Plugin-0.10.9.zip : b9067c0a345576a5a5b8d3c6c67fb0a09291659df57baa83978f686ebdc78534 - - https://downloads.arduino.cc/libastylej-2.05.1-4.zip : 3a8d98e85c344ca945790f05ff8b1b0f2a3cfcc2939001e58f47ad5ed03a6060 - - https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2.zip : 75a89f408f3ecd4796ac173eaddd3c7e55021af030aee7f85b59a4190459a8dc - - https://downloads.arduino.cc/cores/avr-1.6.23.tar.bz2 : 18618d7f256f26cd77c35f4c888d5d1b2334f07925094fdc99ac3188722284aa - - https://github.com/arduino/arduino-builder/releases/download/1.4.4/arduino-builder-1.4.4.tar.xz : 2a895be601efed806936c009c5b79e7f43f802123ebc2ae73a4ecc8b46563662 + - https://github.com/arduino/Arduino/archive/1.8.11.tar.gz : ba0a4ebdb5f46a4c7639b5b872da861e3be23c9ccd9df0a1b1fc7ea9f0271f2b + - https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.10.10/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip : 0d70f3aa3cd7dc46cc402fc0a915519e7cf8af6cdc544458c182394d5fc3452f + - https://downloads.arduino.cc/libastylej-2.05.1-5.zip : def22874099c28d482720ee2a444ec4709f0980bae41f3ebb6033bbc79beb486 + - https://downloads.arduino.cc/liblistSerials/liblistSerials-1.4.2-2.zip : a338d470822de19bd971bd7a71d43f5273ba082baa9236be28c44b47c3e51f6b + - https://downloads.arduino.cc/cores/avr-1.8.2.tar.bz2 : 6213d41c6e91a75ac931527da5b10f2dbe0140c8cc1dd41b06cd4e78b943f41b + - https://github.com/arduino/arduino-builder/releases/download/1.5.1/arduino-builder-1.5.1.tar.xz : 71a1c20798e568a1af329c45894e9b07177115d3e47df2ba2685dba66f3a2abe - https://github.com/arduino/ctags/releases/download/5.8-arduino11/ctags-5.8-arduino11.tar.xz : 9591ce86efa2ff7c277561706e6ace376201c5ec5f0b3925c50884ebf365d7e7 license : GPL-2.0-or-later component : programming.ide @@ -30,25 +30,24 @@ - avrdude environment: | export PREFIX=/usr/share/arduino - export GOPATH="$workdir/build" export HARDWARE_DIR=$workdir/build/linux/work/hardware/arduino - export BUILDER_DIR=$workdir/build/src/github.com/arduino/arduino-builder + export BUILDER_DIR=$workdir/build/arduino-builder export CTAGS_DIR=$workdir/build/ctags export CTAGS_VERSION=ctags-5.8-arduino11 setup : | # copy dependency libraries - cp $sources/WiFi101-Updater-ArduinoIDE-Plugin-0.10.9.zip $workdir/build/shared/ - cp $sources/libastylej-2.05.1-4.zip $workdir/build/ - cp $sources/liblistSerials-1.4.2.zip $workdir/build/ + cp $sources/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip $workdir/build/shared/ + cp $sources/libastylej-2.05.1-5.zip $workdir/build/ + cp $sources/liblistSerials-1.4.2-2.zip $workdir/build/ # unpack and patch ArduinoCore-avr to use system avr toolchain and avrdude mkdir -p $HARDWARE_DIR - tar xCjv $HARDWARE_DIR -f $sources/avr-1.6.23.tar.bz2 + tar xCjv $HARDWARE_DIR -f $sources/avr-1.8.2.tar.bz2 %patch -p1 < $pkgfiles/0001-use-system-toolchain.patch -d $HARDWARE_DIR/avr # unpack arduino-builder source mkdir -p $BUILDER_DIR - tar xCv $BUILDER_DIR -f $sources/arduino-builder-1.4.4.tar.xz --strip-components=1 + tar xCv $BUILDER_DIR -f $sources/arduino-builder-1.5.1.tar.xz --strip-components=1 # unpack arduino-ctags source mkdir -p $CTAGS_DIR @@ -58,22 +57,12 @@ ant dist -Dversion=%version% build \ -Dlight_bundle=true \ -Dno_docs=true \ - -Dlocal_sources=false \ + -Dlocal_sources=true \ -Dno_arduino_builder=true - # install golang dependencies for building arduino-builder - go get github.com/go-errors/errors - go get github.com/stretchr/testify - go get github.com/jstemmer/go-junit-report - go get -u github.com/arduino/go-properties-map - go get -u github.com/arduino/go-timeutils - go get google.golang.org/grpc - go get github.com/golang/protobuf/proto - go get golang.org/x/net/context - go get github.com/fsnotify/fsnotify - go get github.com/schollz/closestmatch # build arduino-builder - go build github.com/arduino/arduino-builder/arduino-builder + cd $BUILDER_DIR + go build # build arduino-ctags cd $CTAGS_DIR @@ -85,7 +74,7 @@ cp -a build/linux/work/* $installdir$PREFIX # install arduino-builder - cp build/arduino-builder $installdir$PREFIX + cp $BUILDER_DIR/arduino-builder $installdir$PREFIX cp -a $BUILDER_DIR/hardware/* $installdir$PREFIX/hardware # install arduino-ctags diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -294,8 +294,6 @@ /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Circuitplay32u4.hex /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Esplora.hex /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Esplora.txt - /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Genuino-Micro.hex - /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Genuino-Micro.txt /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Industrial101.hex /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Leonardo.hex /usr/share/arduino/hardware/arduino/avr/bootloaders/caterina/Caterina-Leonardo.txt @@ -735,6 +733,7 @@ /usr/share/arduino/hardware/arduino/avr/libraries/SoftwareSerial/src/SoftwareSerial.h /usr/share/arduino/hardware/arduino/avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino /usr/share/arduino/hardware/arduino/avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino + /usr/share/arduino/hardware/arduino/avr/libraries/Wire/examples/i2c_scanner/i2c_scanner.ino /usr/share/arduino/hardware/arduino/avr/libraries/Wire/examples/master_reader/master_reader.ino /usr/share/arduino/hardware/arduino/avr/libraries/Wire/examples/master_writer/master_writer.ino /usr/share/arduino/hardware/arduino/avr/libraries/Wire/examples/slave_receiver/slave_receiver.ino @@ -759,7 +758,6 @@ /usr/share/arduino/hardware/arduino/avr/variants/standard/pins_arduino.h /usr/share/arduino/hardware/arduino/avr/variants/yun/pins_arduino.h /usr/share/arduino/hardware/platform.keys.rewrite.txt - /usr/share/arduino/hardware/platform.txt /usr/share/arduino/lib/about.png /usr/share/arduino/lib/about@2x.png /usr/share/arduino/lib/appdata.xml @@ -892,6 +890,8 @@ /usr/share/arduino/tools/WiFi101/tool/firmwares/NINA/1.2.3/NINA_W102.bin /usr/share/arduino/tools/WiFi101/tool/firmwares/NINA/1.2.4/NINA_W102-Uno_WiFi_Rev2.bin /usr/share/arduino/tools/WiFi101/tool/firmwares/NINA/1.2.4/NINA_W102.bin + /usr/share/arduino/tools/WiFi101/tool/firmwares/NINA/1.3.0/NINA_W102-Uno_WiFi_Rev2.bin + /usr/share/arduino/tools/WiFi101/tool/firmwares/NINA/1.3.0/NINA_W102.bin /usr/share/arduino/tools/WiFi101/tool/firmwares/WINC1500/19.4.4/m2m_aio_2b0.bin /usr/share/arduino/tools/WiFi101/tool/firmwares/WINC1500/19.4.4/m2m_aio_3a0.bin /usr/share/arduino/tools/WiFi101/tool/firmwares/WINC1500/19.5.2/m2m_aio_3a0.bin @@ -902,12 +902,12 @@ - - 2019-09-20 - 1.8.10 + + 2020-02-05 + 1.8.11 Packaging update Mislav Čakarić mcakaric@gmail.com \ No newline at end of file