summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2019-02-15 14:29:42 +0100
committerAndreas Grapentin <andreas@grapentin.org>2019-02-15 14:29:42 +0100
commitbbb3bca55520493899bb83864c668ebe7516eeab (patch)
treee38d88269f5877b58c142bf26ba212a7678511dc
parent131f90dac8d4e418474f309dbc42a52ffe6ff24c (diff)
pcr/arduino: removed, already in community
-rw-r--r--pcr/arduino/PKGBUILD117
-rw-r--r--pcr/arduino/arduino-build.patch223
-rw-r--r--pcr/arduino/arduino-macosx.patch21
-rw-r--r--pcr/arduino/arduino-use-system-astyle.patch12
-rw-r--r--pcr/arduino/arduino.install9
-rw-r--r--pcr/arduino/arduino.sh3
6 files changed, 0 insertions, 385 deletions
diff --git a/pcr/arduino/PKGBUILD b/pcr/arduino/PKGBUILD
deleted file mode 100644
index 33393e990..000000000
--- a/pcr/arduino/PKGBUILD
+++ /dev/null
@@ -1,117 +0,0 @@
-# Maintainer (Arch): NicoHood <aur {at} nicohood {dot} de>
-# Contributor (Arch): Christopher Loen <christopherloen at gmail dot com>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-# Contributor: Luke Shumaker <lukeshu@parabola.nu>
-
-pkgname=arduino
-pkgver=1.6.8
-pkgrel=1.parabola1
-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'
- 'bcpg' 'bcprov' 'java-batik' 'java-commons-codec' 'java-commons-compress' 'java-commons-exec'
- 'java-commons-lang3' 'java-commons-logging' 'java-commons-net' 'java-jackson-annotations'
- 'java-jackson-core' 'java-jackson-databind' 'java-jackson-module-mrbean' 'java-jsch'
- 'java-rsyntaxtextarea' 'java-semver' 'jmdns' 'jssc' 'astyle=3.0.1')
-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"
- 'http://downloads.arduino.cc/packages/package_index.json.gz'
- 'http://downloads.arduino.cc/libraries/library_index.json.gz'
- 'arduino-build.patch'
- 'arduino-macosx.patch'
- 'arduino-use-system-astyle.patch'
- 'arduino.sh')
-sha256sums=('5b2e8b3115000986f12ebdc126162d22c2dc85b3ca9732b8f8966e6dcdf2edad'
- 'e21d1946346893fa0f40e12bd16027d84173c5edec0b9856be38555b97706f8a'
- 'f984d81816751d6872566890611c863ddc3d13f9bfe1b6242aeefe4fa4070d08'
- 'e15fe37f6b575c65d2546afb96f215112295f99856ca2bee91a2ca9963c37f8e'
- '2ef32c994f44e6667136c02ecddaf86e9dd9009fd89b8d697257c0121d5f41cd'
- 'a5bfb3ba51f8ff30eb121e6d4fa6292db2a3f8aa5ca8c33b8b57a451d4c8f4f9'
- '6a0a2f12440f90df39ae244dd74baf40f30e3f06c0e5eca33e16d6d54324e0bf')
-
-prepare() {
- cd "${srcdir}/Arduino-${pkgver}"
- rm -v $(find . -name \*.exe)
- rm -v $(find . -name \*.hex)
- rm -v $(find . -name \*.jar)
- #rm -v $(find . -name \*.so)
- #rm -v $(find . -name \*.swp)
- #rm -f build/linux/dist/tools/avrdude*
- rm -rfv hardware/arduino/avr/firmwares/wifishield
-
- rm -rfv $(find . -type d -name 'macosx')
- rm -rfv $(find . -type d -name 'windows')
-
- cp -v ../{library_index,package_index}.json .
-
- # Patch arduino build process.
- #patch -Np1 -i ../arduino-avrtools.patch"
- patch -Np1 -i ../arduino-build.patch
- patch -Np1 -i ../arduino-macosx.patch
- patch -Np1 -i ../arduino-use-system-astyle.patch
-
- cd "${srcdir}/Arduino-${pkgver}/arduino-core/lib"
- _link_jars
-
- cd "${srcdir}/Arduino-${pkgver}/app/lib"
- _link_jars
-}
-
-_link_jars() {
- for jar in rxtx/RXTXcomm.jar antlr2.jar ecj.jar jna.jar batik-transcoder.jar bcpg.jar bcprov.jar commons-codec.jar commons-compress.jar commons-exec.jar commons-lang3.jar commons-logging.jar commons-net.jar jackson-annotations.jar jackson-core.jar jackson-databind.jar jackson-module-mrbean.jar java-semver.jar jmdns.jar jsch.jar jssc.jar rsyntaxtextarea.jar; do
- ln -sf /usr/share/java/$jar .
- done
-}
-
-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 linux-clean dist -Dversion=${pkgver} build -Dlight_bundle=true \
- -Dno_docs=true \
- -Dlocal_sources=true \
- -Dno_arduino_builder=true
-}
-
-package() {
- cd "$srcdir/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"
-
- # Arduino-builder
- ln -s /usr/bin/arduino-builder "${pkgdir}/usr/share/arduino/arduino-builder"
- install -dm755 "${pkgdir}/usr/share/arduino/tools-builder"
-
- 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"
-}
diff --git a/pcr/arduino/arduino-build.patch b/pcr/arduino/arduino-build.patch
deleted file mode 100644
index 20a07ab21..000000000
--- a/pcr/arduino/arduino-build.patch
+++ /dev/null
@@ -1,223 +0,0 @@
---- Arduino-1.6.8.orig/build/build.xml 2016-03-09 10:01:15.000000000 -0500
-+++ Arduino-1.6.8/build/build.xml 2017-08-13 23:40:20.822832538 -0500
-@@ -166,6 +166,15 @@
-
- <mkdir dir="${target.path}/reference"/>
-
-+ <antcall target="assemble-docs" />
-+
-+ <!-- Write the revision file! -->
-+ <echo file="${target.path}/lib/version.txt" message="${version}" />
-+
-+ <antcall target="assemble-libraries" />
-+ </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" />
-@@ -185,15 +194,11 @@
- <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
- <param name="dest_folder" value="${target.path}/reference/" />
- </antcall>
--
-- <!-- Write the revision file! -->
-- <echo file="${target.path}/lib/version.txt" message="${version}" />
--
-- <antcall target="assemble-libraries" />
- </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>
-@@ -209,6 +214,9 @@
- <download-library name="Mouse" version="1.0.1"/>
- <download-library name="Keyboard" version="1.0.1"/>
- </target>
-+ <target name="assemble-libraries-light" if="light_bundle">
-+ <mkdir dir="${target.path}/libraries" />
-+ </target>
-
- <macrodef name="download-library">
- <attribute name="name"/>
-@@ -444,21 +452,7 @@
- <copy file="macosx/liblistSerials-1.0.5/osx/liblistSerialsj.dylib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/liblistSerialsj.dylib" />
-
-- <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
-- <mkdir dir="${staging_folder}/arduino-builder-macosx"/>
-- <antcall target="untar">
-- <param name="archive_file" value="./arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-macosx-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="final_folder" value="${staging_folder}/arduino-builder-macosx/arduino-builder" />
-- <param name="dest_folder" value="${staging_folder}/arduino-builder-macosx" />
-- </antcall>
-- <copy file="${staging_folder}/arduino-builder-macosx/arduino-builder" tofile="macosx/work/${staging_hardware_folder}/../arduino-builder" />
-- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../arduino-builder" />
-- <move file="${staging_folder}/arduino-builder-macosx/tools" tofile="macosx/work/${staging_hardware_folder}/../tools-builder"/>
-- <copy todir="macosx/work/${staging_hardware_folder}" overwrite="true">
-- <fileset dir="${staging_folder}/arduino-builder-macosx/hardware" includes="*.txt"/>
-- </copy>
-- <delete dir="${staging_folder}/arduino-builder-macosx" includeemptydirs="true"/>
-+ <antcall target="build-arduino-builder" />
-
- <antcall target="portable-${portable}">
- <param name="parentdir" value="macosx/work/${staging_hardware_folder}/.." />
-@@ -625,28 +619,6 @@
- <fileset dir="linux/work" includes="**/*.sh" />
- </chmod>
-
-- <antcall target="unzip">
-- <param name="archive_file" value="./libastylej-2.05.1.zip" />
-- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
-- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
-- <param name="dest_folder" value="${staging_folder}" />
-- </antcall>
-- <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
-- <chmod perm="755" file="linux/work/lib/libastylej.so" />
--
-- <antcall target="portable-${portable}">
-- <param name="parentdir" value="linux/work" />
-- </antcall>
--
-- <antcall target="unzip">
-- <param name="archive_file" value="./liblistSerials-1.0.5.zip" />
-- <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-1.0.5.zip" />
-- <param name="final_folder" value="${staging_folder}/liblistSerials-1.0.5" />
-- <param name="dest_folder" value="${staging_folder}" />
-- </antcall>
-- <copy file="linux/liblistSerials-1.0.5/linux${arch-bits}/liblistSerialsj.so" todir="linux/work/lib/" />
-- <chmod perm="755" file="linux/work/lib/liblistSerialsj.so" />
--
- </target>
-
- <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
-@@ -654,21 +626,7 @@
- <param name="JVM" value="${LINUX32_BUNDLED_JVM}"/>
- </antcall>
-
-- <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
-- <mkdir dir="${staging_folder}/arduino-builder-linux32"/>
-- <antcall target="untar">
-- <param name="archive_file" value="./arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux32-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="final_folder" value="${staging_folder}/arduino-builder-linux32/arduino-builder" />
-- <param name="dest_folder" value="${staging_folder}/arduino-builder-linux32" />
-- </antcall>
-- <copy file="${staging_folder}/arduino-builder-linux32/arduino-builder" tofile="linux/work/arduino-builder" />
-- <chmod perm="755" file="linux/work/arduino-builder" />
-- <move file="${staging_folder}/arduino-builder-linux32/tools" tofile="linux/work/tools-builder"/>
-- <copy todir="linux/work/hardware" overwrite="true">
-- <fileset dir="${staging_folder}/arduino-builder-linux32/hardware" includes="*.txt"/>
-- </copy>
-- <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
-+ <antcall target="build-arduino-builder" />
-
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
-@@ -686,21 +644,7 @@
- <param name="JVM" value="${LINUX64_BUNDLED_JVM}"/>
- </antcall>
-
-- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
-- <mkdir dir="${staging_folder}/arduino-builder-linux64"/>
-- <antcall target="untar">
-- <param name="archive_file" value="./arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-linux64-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="final_folder" value="${staging_folder}/arduino-builder-linux64/arduino-builder" />
-- <param name="dest_folder" value="${staging_folder}/arduino-builder-linux64" />
-- </antcall>
-- <copy file="${staging_folder}/arduino-builder-linux64/arduino-builder" tofile="linux/work/arduino-builder" />
-- <chmod perm="755" file="linux/work/arduino-builder" />
-- <move file="${staging_folder}/arduino-builder-linux64/tools" tofile="linux/work/tools-builder"/>
-- <copy todir="linux/work/hardware" overwrite="true">
-- <fileset dir="${staging_folder}/arduino-builder-linux64/hardware" includes="*.txt"/>
-- </copy>
-- <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
-+ <antcall target="build-arduino-builder" />
-
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
-@@ -737,6 +681,24 @@
- <exec executable="./linux/work/arduino" spawn="false" failonerror="true"/>
- </target>
-
-+ <target name="build-arduino-builder" unless="no_arduino_builder">
-+ <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
-+ <mkdir dir="${staging_folder}/arduino-builder-${platform}"/>
-+ <antcall target="untar">
-+ <param name="archive_file" value="./arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-+ <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-${platform}-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-+ <param name="final_folder" value="${staging_folder}/arduino-builder-${platform}/arduino-builder" />
-+ <param name="dest_folder" value="${staging_folder}/arduino-builder-${platform}" />
-+ </antcall>
-+ <copy file="${staging_folder}/arduino-builder-${platform}/arduino-builder" tofile="linux/work/arduino-builder" />
-+ <chmod perm="755" file="linux/work/arduino-builder" />
-+ <move file="${staging_folder}/arduino-builder-${platform}/tools" tofile="linux/work/tools-builder"/>
-+ <copy todir="linux/work/hardware" overwrite="true">
-+ <fileset dir="${staging_folder}/arduino-builder-${platform}/hardware" includes="*.txt"/>
-+ </copy>
-+ <delete dir="${staging_folder}/arduino-builder-${platform}" includeemptydirs="true"/>
-+ </target>
-+
- <!-- Set '${dist_file}_available' property if toolchain dist_file is downloaded -->
- <!-- Set '${dist_file}_installed' property if toolchain is installed in working directory -->
- <!-- hardware/tools/${dist_check_file} is checked for existence -->
-@@ -747,8 +709,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>
-@@ -1085,23 +1060,14 @@
- <target name="package-library-index-json-bundle">
- <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
-
-- <get src="${package_index_url}.gz"
-- dest="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz"
-- verbose="true" skipexisting="false" />
-- <gunzip src ="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz"
-- dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
-- <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz"/>
--
-- <get src="${package_index_url}.sig"
-- dest="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.sig"
-- verbose="true" skipexisting="false" />
--
-- <get src="${library_index_url}.gz"
-- dest="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz"
-- verbose="true" skipexisting="false" />
-- <gunzip src ="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz"
-- dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
-- <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz"/>
-+ <exec executable="cp" failonerror="true">
-+ <arg value="../package_index.json" />
-+ <arg value="${staging_folder}/work/dist/" />
-+ </exec>
-+ <exec executable="cp" failonerror="true">
-+ <arg value="../library_index.json" />
-+ <arg value="${staging_folder}/work/dist/" />
-+ </exec>
-
- <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
- </target>
diff --git a/pcr/arduino/arduino-macosx.patch b/pcr/arduino/arduino-macosx.patch
deleted file mode 100644
index cb0603d9b..000000000
--- a/pcr/arduino/arduino-macosx.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- Arduino-1.6.8.orig/app/src/processing/app/Base.java 2016-03-09 10:01:15.000000000 -0500
-+++ Arduino-1.6.8/app/src/processing/app/Base.java 2017-08-13 16:52:59.404525529 -0500
-@@ -47,7 +47,6 @@
- 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;
-@@ -129,10 +128,6 @@
-
- splashScreenHelper.splashText(tr("Loading configuration..."));
-
-- if (OSUtils.isMacOS()) {
-- ThinkDifferent.init();
-- }
--
- try {
- guardedMain(args);
- } catch (Throwable e) {
diff --git a/pcr/arduino/arduino-use-system-astyle.patch b/pcr/arduino/arduino-use-system-astyle.patch
deleted file mode 100644
index 6808d1395..000000000
--- a/pcr/arduino/arduino-use-system-astyle.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Arduino-1.6.8.orig/app/src/cc/arduino/packages/formatter/AStyleInterface.java 2016-03-09 10:01:15.000000000 -0500
-+++ Arduino-1.6.8/app/src/cc/arduino/packages/formatter/AStyleInterface.java 2017-08-13 23:47:16.007089868 -0500
-@@ -41,7 +41,8 @@
- loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
- loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
- }
-- loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
-+ File astyleLib = new File("/usr/lib/libastyle.so.3.0.1");
-+ loadLib(astyleLib);
- }
-
- private static void loadLib(File lib) {
diff --git a/pcr/arduino/arduino.install b/pcr/arduino/arduino.install
deleted file mode 100644
index c222e1b6d..000000000
--- a/pcr/arduino/arduino.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- xdg-icon-resource install --size 256 --novendor /usr/share/pixmaps/arduino.png
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --size 256 arduino
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/pcr/arduino/arduino.sh b/pcr/arduino/arduino.sh
deleted file mode 100644
index e0f12fe8b..000000000
--- a/pcr/arduino/arduino.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:"$PATH"
-exec /usr/share/arduino/arduino "$@"