Date: Wednesday, December 14, 2016 @ 18:47:42 Author: nicohood Revision: 199426
archrelease: copy trunk to community-i686, community-x86_64 Added: arduino/repos/community-i686/ arduino/repos/community-i686/PKGBUILD (from rev 199425, arduino/trunk/PKGBUILD) arduino/repos/community-i686/arduino.install (from rev 199425, arduino/trunk/arduino.install) arduino/repos/community-i686/arduino.sh (from rev 199425, arduino/trunk/arduino.sh) arduino/repos/community-i686/build.patch (from rev 199425, arduino/trunk/build.patch) arduino/repos/community-x86_64/ arduino/repos/community-x86_64/PKGBUILD (from rev 199425, arduino/trunk/PKGBUILD) arduino/repos/community-x86_64/arduino.install (from rev 199425, arduino/trunk/arduino.install) arduino/repos/community-x86_64/arduino.sh (from rev 199425, arduino/trunk/arduino.sh) arduino/repos/community-x86_64/build.patch (from rev 199425, arduino/trunk/build.patch) ----------------------------------+ community-i686/PKGBUILD | 106 ++++++++++++++++++++++++++++++++ community-i686/arduino.install | 31 +++++++++ community-i686/arduino.sh | 3 community-i686/build.patch | 122 +++++++++++++++++++++++++++++++++++++ community-x86_64/PKGBUILD | 106 ++++++++++++++++++++++++++++++++ community-x86_64/arduino.install | 31 +++++++++ community-x86_64/arduino.sh | 3 community-x86_64/build.patch | 122 +++++++++++++++++++++++++++++++++++++ 8 files changed, 524 insertions(+) Copied: arduino/repos/community-i686/PKGBUILD (from rev 199425, arduino/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,106 @@ +# Maintainer: NicoHood <archlinux {at} nicohood {dot} de> +# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161 +# Contributor: Tomas Schertel <tschertel at gmail dot com> +# Contributor: Christopher Loen <christopherloen at gmail dot com> +# Contributor: Peter Reschenhofer <peter.reschenho...@gmail.com> +# Contributor: Niels Martignène <niels.martign...@gmail.com> +# Contributor: PyroPeter <googlemail.com@abi1789> +# Contributor: darkapex <m...@jailuthra.in> +# Contributor: tty0 <vt.tty0[d0t]gmail.com> + +pkgname=arduino +pkgver=1.6.13 +pkgrel=1 +epoch=1 +pkgdesc="Arduino prototyping platform SDK" +arch=('i686' 'x86_64') +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') +optdepends=('arduino-docs: Offline documentation for arduino' + 'arduino-avr-core: AVR core with upstream avr-gcc and avrdude' + 'python2: Intel Galileo Board installation') +options=(!strip) +install="arduino.install" +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/Arduino/archive/${pkgver}.tar.gz" + "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.3/WiFi101-Updater-ArduinoIDE-Plugin-0.8.3.zip" + "https://downloads.arduino.cc/libastylej-2.05.1-3.zip" + "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.2.0.zip" + "arduino.sh" + "build.patch") +source_i686=("https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2") +source_x86_64=("https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2") +sha512sums=('54643199a56fd01ac9e031fc03f174c38a2cc7b0b13953e1c543aae58f2d0987ad127abe224e3863eb6ec9c81022288073613f86b75543babfc9d186f75a15f9' + 'fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab' + '7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555' + '79f2eaf75c5f948c8388b6d89d3ce1f14518390ee2df111e1603eafb490f54a5c071af61b228cae3bfa8c20bc0a5450b1131f2328c419241ba0d127837b97292' + 'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a' + '8f0186a6554a54c3067bcf71b8891a6e51b2613fd9135f4b0a10e6e24f4797757ca968ee1195f5bcac01f0aa22b73005b273939346a3aea9aee391e8d31a3588') +sha512sums_i686=('a0df7ba3d7f313aeac4c32365b9aaf32feb374c18e0b82516d61e51be10db897f368e46b6ff4e1574fec8b78fe584c39a76215974b32b440e85e27a1434e3d12') +sha512sums_x86_64=('223b81ae4cdb14962e3e6b271f78a88c055185785991d0ff32b3dbb3db9a4861cec495e5e726718df484e8c9901f5d3f0650d4d1e3b8d7bdb8f197c23222e748') + +prepare() +{ + # Patch arduino build process. See PR: https://github.com/arduino/Arduino/pull/5438 + cd "${srcdir}/Arduino-${pkgver}" + patch -Np1 -i "${srcdir}/build.patch" + + # echo -e "\n# By default, don't notify the user of a new upstream version." \ + # "\n# https://bugzilla.redhat.com/show_bug.cgi?id=773519" \ + # "\nupdate.check=false" \ + # >> build/shared/lib/preferences.txt +} + +build() { + cd "Arduino-${pkgver}/build" + + # Compile with java8 + export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH + + # Do not include their avr-core + tools and no docs. We build them seperately + ant clean dist -Dversion=${pkgver} build -Dlight_bundle=true -Dno_docs=true -Dlocal_sources=true +} + +package() { + cd "Arduino-${pkgver}/build/linux/work" + + # Create directories + install -dm755 "${pkgdir}/usr/share/"{doc,icons/hicolor,applications,mime/packages} + + # Copy the whole SDK + cp -a . "${pkgdir}/usr/share/arduino" + + # Create wrapper for java8 + buider and documentation symlink + install -Dm755 "${srcdir}/arduino.sh" "${pkgdir}/usr/bin/arduino" + + # Link arduino-builder, ctags, libastylej, libserialport and docs + # TODO ctags, astyle libserialport do not work yet + # TODO remove unzip dependency once all deps are resolved + # https://github.com/arduino/ctags/issues/12 + # https://github.com/arduino/Arduino/issues/5538 + # https://github.com/arduino/listSerialPortsC/issues/9 + rm "${pkgdir}/usr/share/arduino/arduino-builder" + ln -s /usr/bin/arduino-builder "${pkgdir}/usr/share/arduino/arduino-builder" + # ctags TODO -> patch platform.txt and not the binary ln + #rm "${pkgdir}/usr/share/arduino/tools-builder/ctags/5.8-arduino10/ctags" + #ln -s /usr/bin/ctags "${pkgdir}/usr/share/arduino/tools-builder/ctags/5.8-arduino10/ctags" + #rm "${pkgdir}/usr/share/arduino/lib/libastylej.so" + #ln -s /usr/lib/libastyle-2.05.1.so "${pkgdir}/usr/share/arduino/lib/libastylej.so" + #rm "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so" + #ln -s /usr/lib/libserialport.so "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so" + rm -r "${pkgdir}/usr/share/arduino/reference" + ln -s /usr/share/doc/arduino "${pkgdir}/usr/share/arduino/reference" + + # Install desktop icons (keep a symlink for the arduino binary) + cp -a lib/icons/* "${pkgdir}/usr/share/icons/hicolor" + rm -rf "${pkgdir}/usr/share/arduino/lib/icons" + ln -s /usr/share/icons/hicolor "${pkgdir}/usr/share/arduino/lib/icons" + + # Create desktop file using existing template + sed "s,<BINARY_LOCATION>,arduino %U,g;s,<ICON_NAME>,arduino,g" "lib/desktop.template" \ + > "${pkgdir}/usr/share/applications/arduino.desktop" + + # Install Arduino mime type + ln -s /usr/share/arduino/lib/arduino-arduinoide.xml "${pkgdir}/usr/share/mime/packages/arduino.xml" +} Copied: arduino/repos/community-i686/arduino.install (from rev 199425, arduino/trunk/arduino.install) =================================================================== --- community-i686/arduino.install (rev 0) +++ community-i686/arduino.install 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,31 @@ +post_install() { + echo "Add yourself to the uucp group to access the serial ports:" + echo "sudo usermod -a -G uucp <user>" + echo "Please checkout the wiki for further information." +} + +pre_upgrade() { + if [[ $(vercmp 1:1.6.12-1 "$2") -eq 1 ]]; then + echo "If arduino fails to install try to manually remove it first:" + echo "sudo pacman -Rs arduino" + fi +} + +_1:1.6.12_1_changes() { + echo ":: arduino is now split into arduino-builder, arduino-avr-core and arduino-docs" + echo " If arduino fails to run, check for a zombie folder:" + echo " ls -la /usr/share/arduino/hardware/avr" + echo " It might be left from a very old upgrade. Please remove it." +} + +post_upgrade() { + local v upgrades=( + 1:1.6.12-1 + ) + + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//-/_}_changes" + fi + done +} Copied: arduino/repos/community-i686/arduino.sh (from rev 199425, arduino/trunk/arduino.sh) =================================================================== --- community-i686/arduino.sh (rev 0) +++ community-i686/arduino.sh 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,3 @@ +#!/bin/sh +export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH" +exec /usr/share/arduino/arduino "$@" Copied: arduino/repos/community-i686/build.patch (from rev 199425, arduino/trunk/build.patch) =================================================================== --- community-i686/build.patch (rev 0) +++ community-i686/build.patch 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,122 @@ +diff -aur Arduino-1.6.13/build/build.xml Arduino-1.6.13_new/build/build.xml +--- Arduino-1.6.13/build/build.xml 2016-11-22 15:49:35.000000000 +0100 ++++ Arduino-1.6.13_new/build/build.xml 2016-12-12 18:37:31.499962000 +0100 +@@ -177,29 +177,7 @@ + + <mkdir dir="${target.path}/reference"/> + +- <!-- Unzip documentation --> +- <antcall target="unzip"> +- <param name="archive_file" value="shared/reference-1.6.6-3.zip" /> +- <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" /> +- <param name="final_folder" value="${target.path}/reference/www.arduino.cc" /> +- <param name="dest_folder" value="${target.path}/reference/" /> +- </antcall> +- <antcall target="unzip"> +- <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" /> +- <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" /> +- <param name="final_folder" value="${target.path}/reference/Galileo_help_files" /> +- <param name="dest_folder" value="${target.path}/reference/" /> +- </antcall> +- <antcall target="unzip"> +- <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" /> +- <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" /> +- <param name="final_folder" value="${target.path}/reference/Edison_help_files" /> +- <param name="dest_folder" value="${target.path}/reference/" /> +- </antcall> +- +- <!-- Fix wrong permissions from zip file root folder --> +- <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" /> +- <chmod perm="755" dir="${target.path}/reference/Edison_help_files" /> ++ <antcall target="assemble-docs" /> + + <!-- Write the revision file! --> + <echo file="${target.path}/lib/version.txt" message="${version}" /> +@@ -215,8 +193,35 @@ + </antcall> + </target> + ++ <target name="assemble-docs" unless="no_docs"> ++ <!-- Unzip documentation --> ++ <antcall target="unzip"> ++ <param name="archive_file" value="shared/reference-1.6.6-3.zip" /> ++ <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" /> ++ <param name="final_folder" value="${target.path}/reference/www.arduino.cc" /> ++ <param name="dest_folder" value="${target.path}/reference/" /> ++ </antcall> ++ <antcall target="unzip"> ++ <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" /> ++ <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" /> ++ <param name="final_folder" value="${target.path}/reference/Galileo_help_files" /> ++ <param name="dest_folder" value="${target.path}/reference/" /> ++ </antcall> ++ <antcall target="unzip"> ++ <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" /> ++ <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" /> ++ <param name="final_folder" value="${target.path}/reference/Edison_help_files" /> ++ <param name="dest_folder" value="${target.path}/reference/" /> ++ </antcall> ++ ++ <!-- Fix wrong permissions from zip file root folder --> ++ <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" /> ++ <chmod perm="755" dir="${target.path}/reference/Edison_help_files" /> ++ </target> ++ + <!-- copy library folder --> +- <target name="assemble-libraries" unless="light_bundle"> ++ <target name="assemble-libraries" depends="assemble-libraries-full, assemble-libraries-light" /> ++ <target name="assemble-libraries-full" unless="light_bundle"> + <copy todir="${target.path}/libraries"> + <fileset dir="../libraries"/> + </copy> +@@ -233,6 +238,9 @@ + <download-library name="Keyboard" version="1.0.1"/> + <download-library name="SD" version="1.0.9"/> + </target> ++ <target name="assemble-libraries-light" if="light_bundle"> ++ <mkdir dir="${target.path}/libraries" /> ++ </target> + + <macrodef name="download-library"> + <attribute name="name"/> +@@ -251,13 +259,17 @@ + </macrodef> + + <!-- copy hardware folder --> +- <target name="assemble-hardware" unless="light_bundle"> ++ <target name="assemble-hardware" depends="assemble-hardware-full, assemble-hardware-light" /> ++ <target name="assemble-hardware-full" unless="light_bundle"> + <copy todir="${target.path}/hardware"> + <fileset dir="../hardware"> + <exclude name="arduino/sam/**"/> + </fileset> + </copy> + </target> ++ <target name="assemble-hardware-light" if="light_bundle"> ++ <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware" /> ++ </target> + + <!-- - - - - - - - - --> + <!-- Revision check --> +@@ -823,8 +835,21 @@ + + <!-- Retrieve tool --> + <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available"> ++ <antcall target="untar-unzip-download-web" /> ++ <antcall target="untar-unzip-download-local" /> ++ </target> ++ <target name="untar-unzip-download-web" unless="local_sources"> + <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" /> + </target> ++ <target name="untar-unzip-download-local" if="local_sources"> ++ <basename file="${archive_file}" property="basename" /> ++ <echo>Skipping download of ${archive_url}, using makepkg downloaded ${basename}</echo> ++ <exec executable="ln" failonerror="true"> ++ <arg value="-s" /> ++ <arg value="${basedir}/../../${basename}" /> ++ <arg value="${archive_file}" /> ++ </exec> ++ </target> + + <target name="untar-unzip-checksum" depends="untar-unzip-download"> + <echo>Testing checksum of "${archive_file}"</echo> Copied: arduino/repos/community-x86_64/PKGBUILD (from rev 199425, arduino/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,106 @@ +# Maintainer: NicoHood <archlinux {at} nicohood {dot} de> +# PGP ID: 97312D5EB9D7AE7D0BD4307351DAE9B7C1AE9161 +# Contributor: Tomas Schertel <tschertel at gmail dot com> +# Contributor: Christopher Loen <christopherloen at gmail dot com> +# Contributor: Peter Reschenhofer <peter.reschenho...@gmail.com> +# Contributor: Niels Martignène <niels.martign...@gmail.com> +# Contributor: PyroPeter <googlemail.com@abi1789> +# Contributor: darkapex <m...@jailuthra.in> +# Contributor: tty0 <vt.tty0[d0t]gmail.com> + +pkgname=arduino +pkgver=1.6.13 +pkgrel=1 +epoch=1 +pkgdesc="Arduino prototyping platform SDK" +arch=('i686' 'x86_64') +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') +optdepends=('arduino-docs: Offline documentation for arduino' + 'arduino-avr-core: AVR core with upstream avr-gcc and avrdude' + 'python2: Intel Galileo Board installation') +options=(!strip) +install="arduino.install" +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/Arduino/archive/${pkgver}.tar.gz" + "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.3/WiFi101-Updater-ArduinoIDE-Plugin-0.8.3.zip" + "https://downloads.arduino.cc/libastylej-2.05.1-3.zip" + "https://downloads.arduino.cc/liblistSerials/liblistSerials-1.2.0.zip" + "arduino.sh" + "build.patch") +source_i686=("https://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2") +source_x86_64=("https://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2") +sha512sums=('54643199a56fd01ac9e031fc03f174c38a2cc7b0b13953e1c543aae58f2d0987ad127abe224e3863eb6ec9c81022288073613f86b75543babfc9d186f75a15f9' + 'fb2c5f77ea047c060e67705886d106379ac4a297f3a7d1f7d6d0b2410c4592f09cece4578aeeaed867c03a2efe5fe8d124ccc36c4189ee5c875cd16473a6faab' + '7f82d64e34ef2d85a6b037caeecfa338b72f8edfc57a9903af3ab89b1d42cf7dfd9a6170abe8131ae3e6506850d82ed5092c3b08983a16d9c80319cd24c14555' + '79f2eaf75c5f948c8388b6d89d3ce1f14518390ee2df111e1603eafb490f54a5c071af61b228cae3bfa8c20bc0a5450b1131f2328c419241ba0d127837b97292' + 'd97e73a6764232c5fbcdbd46d98f1dfde1d95d8256f578fb05480694423842ec864c49d572a325c7d00b026619d84dc114f1e3e0d2f8219b94871dce1718f05a' + '8f0186a6554a54c3067bcf71b8891a6e51b2613fd9135f4b0a10e6e24f4797757ca968ee1195f5bcac01f0aa22b73005b273939346a3aea9aee391e8d31a3588') +sha512sums_i686=('a0df7ba3d7f313aeac4c32365b9aaf32feb374c18e0b82516d61e51be10db897f368e46b6ff4e1574fec8b78fe584c39a76215974b32b440e85e27a1434e3d12') +sha512sums_x86_64=('223b81ae4cdb14962e3e6b271f78a88c055185785991d0ff32b3dbb3db9a4861cec495e5e726718df484e8c9901f5d3f0650d4d1e3b8d7bdb8f197c23222e748') + +prepare() +{ + # Patch arduino build process. See PR: https://github.com/arduino/Arduino/pull/5438 + cd "${srcdir}/Arduino-${pkgver}" + patch -Np1 -i "${srcdir}/build.patch" + + # echo -e "\n# By default, don't notify the user of a new upstream version." \ + # "\n# https://bugzilla.redhat.com/show_bug.cgi?id=773519" \ + # "\nupdate.check=false" \ + # >> build/shared/lib/preferences.txt +} + +build() { + cd "Arduino-${pkgver}/build" + + # Compile with java8 + export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:$PATH + + # Do not include their avr-core + tools and no docs. We build them seperately + ant clean dist -Dversion=${pkgver} build -Dlight_bundle=true -Dno_docs=true -Dlocal_sources=true +} + +package() { + cd "Arduino-${pkgver}/build/linux/work" + + # Create directories + install -dm755 "${pkgdir}/usr/share/"{doc,icons/hicolor,applications,mime/packages} + + # Copy the whole SDK + cp -a . "${pkgdir}/usr/share/arduino" + + # Create wrapper for java8 + buider and documentation symlink + install -Dm755 "${srcdir}/arduino.sh" "${pkgdir}/usr/bin/arduino" + + # Link arduino-builder, ctags, libastylej, libserialport and docs + # TODO ctags, astyle libserialport do not work yet + # TODO remove unzip dependency once all deps are resolved + # https://github.com/arduino/ctags/issues/12 + # https://github.com/arduino/Arduino/issues/5538 + # https://github.com/arduino/listSerialPortsC/issues/9 + rm "${pkgdir}/usr/share/arduino/arduino-builder" + ln -s /usr/bin/arduino-builder "${pkgdir}/usr/share/arduino/arduino-builder" + # ctags TODO -> patch platform.txt and not the binary ln + #rm "${pkgdir}/usr/share/arduino/tools-builder/ctags/5.8-arduino10/ctags" + #ln -s /usr/bin/ctags "${pkgdir}/usr/share/arduino/tools-builder/ctags/5.8-arduino10/ctags" + #rm "${pkgdir}/usr/share/arduino/lib/libastylej.so" + #ln -s /usr/lib/libastyle-2.05.1.so "${pkgdir}/usr/share/arduino/lib/libastylej.so" + #rm "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so" + #ln -s /usr/lib/libserialport.so "${pkgdir}/usr/share/arduino/lib/liblistSerialsj.so" + rm -r "${pkgdir}/usr/share/arduino/reference" + ln -s /usr/share/doc/arduino "${pkgdir}/usr/share/arduino/reference" + + # Install desktop icons (keep a symlink for the arduino binary) + cp -a lib/icons/* "${pkgdir}/usr/share/icons/hicolor" + rm -rf "${pkgdir}/usr/share/arduino/lib/icons" + ln -s /usr/share/icons/hicolor "${pkgdir}/usr/share/arduino/lib/icons" + + # Create desktop file using existing template + sed "s,<BINARY_LOCATION>,arduino %U,g;s,<ICON_NAME>,arduino,g" "lib/desktop.template" \ + > "${pkgdir}/usr/share/applications/arduino.desktop" + + # Install Arduino mime type + ln -s /usr/share/arduino/lib/arduino-arduinoide.xml "${pkgdir}/usr/share/mime/packages/arduino.xml" +} Copied: arduino/repos/community-x86_64/arduino.install (from rev 199425, arduino/trunk/arduino.install) =================================================================== --- community-x86_64/arduino.install (rev 0) +++ community-x86_64/arduino.install 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,31 @@ +post_install() { + echo "Add yourself to the uucp group to access the serial ports:" + echo "sudo usermod -a -G uucp <user>" + echo "Please checkout the wiki for further information." +} + +pre_upgrade() { + if [[ $(vercmp 1:1.6.12-1 "$2") -eq 1 ]]; then + echo "If arduino fails to install try to manually remove it first:" + echo "sudo pacman -Rs arduino" + fi +} + +_1:1.6.12_1_changes() { + echo ":: arduino is now split into arduino-builder, arduino-avr-core and arduino-docs" + echo " If arduino fails to run, check for a zombie folder:" + echo " ls -la /usr/share/arduino/hardware/avr" + echo " It might be left from a very old upgrade. Please remove it." +} + +post_upgrade() { + local v upgrades=( + 1:1.6.12-1 + ) + + for v in "${upgrades[@]}"; do + if [[ $(vercmp "$v" "$2") -eq 1 ]]; then + "_${v//-/_}_changes" + fi + done +} Copied: arduino/repos/community-x86_64/arduino.sh (from rev 199425, arduino/trunk/arduino.sh) =================================================================== --- community-x86_64/arduino.sh (rev 0) +++ community-x86_64/arduino.sh 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,3 @@ +#!/bin/sh +export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH" +exec /usr/share/arduino/arduino "$@" Copied: arduino/repos/community-x86_64/build.patch (from rev 199425, arduino/trunk/build.patch) =================================================================== --- community-x86_64/build.patch (rev 0) +++ community-x86_64/build.patch 2016-12-14 18:47:42 UTC (rev 199426) @@ -0,0 +1,122 @@ +diff -aur Arduino-1.6.13/build/build.xml Arduino-1.6.13_new/build/build.xml +--- Arduino-1.6.13/build/build.xml 2016-11-22 15:49:35.000000000 +0100 ++++ Arduino-1.6.13_new/build/build.xml 2016-12-12 18:37:31.499962000 +0100 +@@ -177,29 +177,7 @@ + + <mkdir dir="${target.path}/reference"/> + +- <!-- Unzip documentation --> +- <antcall target="unzip"> +- <param name="archive_file" value="shared/reference-1.6.6-3.zip" /> +- <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" /> +- <param name="final_folder" value="${target.path}/reference/www.arduino.cc" /> +- <param name="dest_folder" value="${target.path}/reference/" /> +- </antcall> +- <antcall target="unzip"> +- <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" /> +- <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" /> +- <param name="final_folder" value="${target.path}/reference/Galileo_help_files" /> +- <param name="dest_folder" value="${target.path}/reference/" /> +- </antcall> +- <antcall target="unzip"> +- <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" /> +- <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" /> +- <param name="final_folder" value="${target.path}/reference/Edison_help_files" /> +- <param name="dest_folder" value="${target.path}/reference/" /> +- </antcall> +- +- <!-- Fix wrong permissions from zip file root folder --> +- <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" /> +- <chmod perm="755" dir="${target.path}/reference/Edison_help_files" /> ++ <antcall target="assemble-docs" /> + + <!-- Write the revision file! --> + <echo file="${target.path}/lib/version.txt" message="${version}" /> +@@ -215,8 +193,35 @@ + </antcall> + </target> + ++ <target name="assemble-docs" unless="no_docs"> ++ <!-- Unzip documentation --> ++ <antcall target="unzip"> ++ <param name="archive_file" value="shared/reference-1.6.6-3.zip" /> ++ <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" /> ++ <param name="final_folder" value="${target.path}/reference/www.arduino.cc" /> ++ <param name="dest_folder" value="${target.path}/reference/" /> ++ </antcall> ++ <antcall target="unzip"> ++ <param name="archive_file" value="shared/Galileo_help_files-1.6.2.zip" /> ++ <param name="archive_url" value="http://downloads.arduino.cc/Galileo_help_files-1.6.2.zip" /> ++ <param name="final_folder" value="${target.path}/reference/Galileo_help_files" /> ++ <param name="dest_folder" value="${target.path}/reference/" /> ++ </antcall> ++ <antcall target="unzip"> ++ <param name="archive_file" value="shared/Edison_help_files-1.6.2.zip" /> ++ <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" /> ++ <param name="final_folder" value="${target.path}/reference/Edison_help_files" /> ++ <param name="dest_folder" value="${target.path}/reference/" /> ++ </antcall> ++ ++ <!-- Fix wrong permissions from zip file root folder --> ++ <chmod perm="755" dir="${target.path}/reference/Galileo_help_files" /> ++ <chmod perm="755" dir="${target.path}/reference/Edison_help_files" /> ++ </target> ++ + <!-- copy library folder --> +- <target name="assemble-libraries" unless="light_bundle"> ++ <target name="assemble-libraries" depends="assemble-libraries-full, assemble-libraries-light" /> ++ <target name="assemble-libraries-full" unless="light_bundle"> + <copy todir="${target.path}/libraries"> + <fileset dir="../libraries"/> + </copy> +@@ -233,6 +238,9 @@ + <download-library name="Keyboard" version="1.0.1"/> + <download-library name="SD" version="1.0.9"/> + </target> ++ <target name="assemble-libraries-light" if="light_bundle"> ++ <mkdir dir="${target.path}/libraries" /> ++ </target> + + <macrodef name="download-library"> + <attribute name="name"/> +@@ -251,13 +259,17 @@ + </macrodef> + + <!-- copy hardware folder --> +- <target name="assemble-hardware" unless="light_bundle"> ++ <target name="assemble-hardware" depends="assemble-hardware-full, assemble-hardware-light" /> ++ <target name="assemble-hardware-full" unless="light_bundle"> + <copy todir="${target.path}/hardware"> + <fileset dir="../hardware"> + <exclude name="arduino/sam/**"/> + </fileset> + </copy> + </target> ++ <target name="assemble-hardware-light" if="light_bundle"> ++ <copy file="../hardware/package_index_bundled.json" todir="${target.path}/hardware" /> ++ </target> + + <!-- - - - - - - - - --> + <!-- Revision check --> +@@ -823,8 +835,21 @@ + + <!-- Retrieve tool --> + <target name="untar-unzip-download" depends="untar-unzip-check" unless="${archive_file}_available"> ++ <antcall target="untar-unzip-download-web" /> ++ <antcall target="untar-unzip-download-local" /> ++ </target> ++ <target name="untar-unzip-download-web" unless="local_sources"> + <get src="${archive_url}" dest="${archive_file}" verbose="true" ignoreerrors="true" /> + </target> ++ <target name="untar-unzip-download-local" if="local_sources"> ++ <basename file="${archive_file}" property="basename" /> ++ <echo>Skipping download of ${archive_url}, using makepkg downloaded ${basename}</echo> ++ <exec executable="ln" failonerror="true"> ++ <arg value="-s" /> ++ <arg value="${basedir}/../../${basename}" /> ++ <arg value="${archive_file}" /> ++ </exec> ++ </target> + + <target name="untar-unzip-checksum" depends="untar-unzip-download"> + <echo>Testing checksum of "${archive_file}"</echo>