[arch-commits] Commit in arduino/trunk (avr-core.patch build.patch)
NicoHood
nicohood at archlinux.org
Sat Jul 11 09:33:36 UTC 2020
Date: Saturday, July 11, 2020 @ 09:33:35
Author: nicohood
Revision: 663249
Removed outdated patches
Deleted:
arduino/trunk/avr-core.patch
arduino/trunk/build.patch
----------------+
avr-core.patch | 26 -----
build.patch | 239 -------------------------------------------------------
2 files changed, 265 deletions(-)
Deleted: avr-core.patch
===================================================================
--- avr-core.patch 2020-07-11 09:27:35 UTC (rev 663248)
+++ avr-core.patch 2020-07-11 09:33:35 UTC (rev 663249)
@@ -1,26 +0,0 @@
-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();
Deleted: build.patch
===================================================================
--- build.patch 2020-07-11 09:27:35 UTC (rev 663248)
+++ build.patch 2020-07-11 09:33:35 UTC (rev 663249)
@@ -1,239 +0,0 @@
-diff -aur Arduino-1.8.0/build/build.xml Arduino-1.8.0_new/build/build.xml
---- Arduino-1.8.0/build/build.xml 2016-12-21 16:12:44.000000000 +0100
-+++ Arduino-1.8.0_new/build/build.xml 2016-12-23 23:20:06.520217000 +0100
-@@ -178,29 +178,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}" />
-@@ -216,8 +194,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>
-@@ -235,6 +240,9 @@
- <download-library name="SD" version="1.1.0"/>
- <download-library githubuser="Adafruit" name="Adafruit_CircuitPlayground" version="1.6.4"/>
- </target>
-+ <target name="assemble-libraries-light" if="light_bundle">
-+ <mkdir dir="${target.path}/libraries" />
-+ </target>
-
- <macrodef name="download-library">
- <attribute name="name"/>
-@@ -253,13 +261,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 -->
-@@ -468,21 +480,7 @@
- <copy file="macosx/liblistSerials-${LIBLISTSERIAL-VERSION}/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}/.." />
-@@ -702,21 +700,7 @@
- <param name="JVM" value="${LINUXARM_BUNDLED_JVM}"/>
- </antcall>
-
-- <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
-- <mkdir dir="${staging_folder}/arduino-builder-arm"/>
-- <antcall target="untar">
-- <param name="archive_file" value="./arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="archive_url" value="http://downloads.arduino.cc/tools/arduino-builder-arm-${ARDUINO-BUILDER-VERSION}.tar.bz2" />
-- <param name="final_folder" value="${staging_folder}/arduino-builder-arm/arduino-builder" />
-- <param name="dest_folder" value="${staging_folder}/arduino-builder-arm" />
-- </antcall>
-- <copy file="${staging_folder}/arduino-builder-arm/arduino-builder" tofile="linux/work/arduino-builder" />
-- <chmod perm="755" file="linux/work/arduino-builder" />
-- <move file="${staging_folder}/arduino-builder-arm/tools" tofile="linux/work/tools-builder"/>
-- <copy todir="linux/work/hardware" overwrite="true">
-- <fileset dir="${staging_folder}/arduino-builder-arm/hardware" includes="*.txt"/>
-- </copy>
-- <delete dir="${staging_folder}/arduino-builder-arm" includeemptydirs="true"/>
-+ <antcall target="build-arduino-builder" />
-
- <antcall target="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
-@@ -734,21 +718,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"/>
-@@ -766,21 +736,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"/>
-@@ -823,6 +779,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="https://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 -->
-@@ -833,8 +807,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>
More information about the arch-commits
mailing list