Added latest arduino (1.6.9)

This commit is contained in:
layman
2016-07-04 22:55:05 +02:00
parent 60dfb28a5f
commit 6daa628c7d
42 changed files with 990 additions and 0 deletions
+7
View File
@@ -0,0 +1,7 @@
AUX arduino-ide-1.6.9-build.xml.patch 3781 SHA256 6846ed1447d4181ef7ed5c6229bd09a2d4123c9b7d85d0ed4f1b296c1dfd13e9 SHA512 00690ad45079a67c100ebe67565356a4d4a179f6be4a683c30ecf1310519325144d6bd284e70dc4cfa2262ca4a02019bd62564d84e5fe97e6f23d5da9f4480b2 WHIRLPOOL f9c0c3d588228d57e906996aed996e8d2605a5e2146d7228448a96d36293435e7cb20c7543248f99bd2760b2a281710bfb9ac82a086fce067d10fb46c86c7d78
AUX arduino-ide-1.6.9-no-doc.patch 1478 SHA256 6da2bcab4034172fd773eae3fd22ba0f98798d55714b4408b32b722f7c337774 SHA512 708a954fe56b7713cab67a2bd4d5187ba9946567b2e6c712ca9fdda0bc44677017d63c164c4d36dae1875c31daa73f7aa8abed1829848d45041848c895517b2c WHIRLPOOL dc62e1eba814e996d19209bd4ae2f006de0f8973e9d40500a573bc45b08546e274077f2f9ff99ac92335f236ac61396db69c112894a9770fc46ea910d82933f6
AUX arduino-ide-1.6.9-startup.patch 3309 SHA256 a14da2f3fb24214e8636b3a724e02287ac30f6e7ba71cab1fc751c0d1497f45e SHA512 1b51b1f8b8518195c66732ab4e8ced4148971d9ab5a8be8cb638c498cdfefb99abd469211ff449b9fccbd37f77289777f0129c1ff7a682c669b6106a74f7cef2 WHIRLPOOL e8016ce20cc0154b5e19c17e27b67eec02596ef1374f39473cae0022e493f766c9b1db4418e51b544759376761980c09d4986b51d9a475c9d2e4f751759cea4f
AUX arduino-ide.desktop 208 SHA256 d58be4fc8ab0420b403e78c9d2dc7d273d6418ceb9f979086169e8de1eb5c7d8 SHA512 36ca05b24e3dcca0d054f4dcea44abb51a5584b23f87bcb2ba52c294c75df4633117859ef1fda494f77ce481b6b4c1346b73013038a9324e048aa89ad5c87d5d WHIRLPOOL 6f8af8ab13f9be3110aa02973ae369e8a561a29942acb395bac99152e2383289d04d5437216293dcfcc4b456f2c28b182816ebb96b6a69cd8fef2f569f26747d
DIST 1.6.9.tar.gz 81103494 SHA256 0927e4d6bb24fd297765aaf529fe7b16a7da3223848e7b40cdc9843d4246f98d SHA512 92b3508068e3aae6a88c3a395d0906fb63d2fd8ee20d003173b96f3f0ff6851eddcdb77c6349dfec3ad0ee36976f53432c643f56724490e9187d4af049fd4bf8 WHIRLPOOL 841ebd6e4c23b610f87a5254b888a31bd9b36ea162f52f9301b8cc0af2288cb7cff83f130f7f3a03ca71fdaf471818f2faea99ab3f1c64b233d7d504b7ac0049
EBUILD arduino-ide-1.6.9.ebuild 2840 SHA256 2ef8b623f022a4cd6b1b45b6816c2dba412a0d62c33bdf11a3da2381feb64a41 SHA512 73b2f50eac41ea3357ad7b4033a43a7c2d6b8f25407a5229e044d30c792e005596a6550a0d0890122c1cab0a5f0175920b650286d1068f2a725d907f26edd050 WHIRLPOOL d823e50da222028d92da30fa623cc632d65592458c1199c4a2a6e8355c1d3dbd7a90bc9d7ab4c9022a4eebc81e17521af5abab7f8508da4dcbf1e389c880c56b
MISC metadata.xml 208 SHA256 91ad1c1aa6da2120f2a36c6b31826659af1eb7ebc30b62bb537795296c80ad68 SHA512 b53b2af56213a10dea345cecbacd72494d9a84e794274b2739837893a2fdec5ff71d66d8000375c440762734fff7f83a415ff6c44aa759b5bda7be21e983b79e WHIRLPOOL 32934c3a294d9bbbcadec4b77a0968f9f9cad6df554a58cd85d916d05d5a80311d1bbe3945b81662982fb9a7dccf64b8f0170c35bc716e1bb4d0219b8b0d16ed
@@ -0,0 +1,109 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
JAVA_PKG_IUSE="doc"
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="An open-source AVR electronics prototyping platform"
HOMEPAGE="http://arduino.cc/"
SRC_URI="https://github.com/arduino/Arduino/archive/${PV}.tar.gz"
LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# Todo: Remaining bundled libs:
# commons-exec
# jackson-module-mrbean
# java-semver
# rsyntaxtextarea-arduino
# xml-apis
# xml-apis-ext
COMMONDEP="
dev-java/batik:1.8
dev-java/bcpg:1.52
dev-java/bcprov:1.52
dev-java/commons-codec:0
dev-java/commons-compress:0
dev-java/commons-httpclient:3
dev-java/commons-lang:3.3
dev-java/commons-logging:0
>=dev-java/commons-net-3.2:0
dev-java/jackson:2
dev-java/jackson-annotations:2
dev-java/jackson-databind:2
dev-java/jmdns:0
dev-java/jna:0
dev-java/jsch:0
>=dev-java/jssc-2.8.0-r1:0
dev-java/xmlgraphics-commons:2
dev-util/astyle[java]
dev-embedded/listserialportsc"
RDEPEND="${COMMONDEP}
dev-embedded/arduino-core
>=virtual/jre-1.8"
DEPEND="${COMMONDEP}
>=virtual/jdk-1.8"
EANT_GENTOO_CLASSPATH="batik-1.8,bcpg-1.52,bcprov-1.52,commons-codec,commons-compress,commons-httpclient-3,commons-lang-3.3,commons-logging,commons-net,jackson-2,jackson-annotations-2,jackson-databind-2,jmdns,jna,jsch,jssc,xmlgraphics-commons-2"
EANT_EXTRA_ARGS="-Djava.net.preferIPv4Stack=true"
EANT_BUILD_TARGET="build"
JAVA_ANT_REWRITE_CLASSPATH="yes"
S="${WORKDIR}/Arduino-${PV}"
CORE="/usr/share/arduino-core"
java_prepare() {
# Remove bundled libraries to ensure the system libraries are used
rm -f {arduino-core,app}/lib/{apple*,batik*,bcpg*,bcprov*,commons-[^e]*,jackson-[^m]*,jmdns*,jna*,jsch*,jssc*,xmlgraphics*} || die
epatch "${FILESDIR}/${P}-build.xml.patch"
if ! use doc; then
epatch "${FILESDIR}/${P}-no-doc.patch"
fi
sed -e 's/<download-library[^>]*>//g' -i build/build.xml
epatch "${FILESDIR}/${P}-startup.patch"
rm -rf {arduino-core,app}/src/processing/app/macosx
rm -rf arduino-core/src/processing/app/linux/GTKLookAndFeelFixer.java
}
src_compile() {
eant -f build/build.xml
}
src_install() {
cd "${S}"/build/linux/work || die
java-pkg_dojar lib/*.jar
java-pkg_dolauncher ${PN} \
--pwd "${CORE}" \
--main "processing.app.Base" \
--java_args "-DAPP_DIR=/usr/share/${PN} -DCORE_DIR=${CORE} -splash:/usr/share/${PN}/lib/splash.png"
# Install libraries
insinto "/usr/share/${PN}"
rm -fr lib/*.jar lib/*.so
doins -r lib dist
if use doc; then
dodoc revisions.txt "${S}"/README.md
dohtml -r reference
fi
# Install menu and icons
domenu "${FILESDIR}/${PN}.desktop"
for sz in `ls lib/icons | sed -e 's/\([0-9]*\)x[0-9]*/\1/'`; do
newicon -s $sz \
"lib/icons/${sz}x${sz}/apps/arduino.png" \
"${PN}.png"
done
}
@@ -0,0 +1,61 @@
diff -ur Arduino-1.6.9.orig/build/build.xml Arduino-1.6.9/build/build.xml
--- Arduino-1.6.9.orig/build/build.xml 2016-05-10 10:36:07.000000000 +0200
+++ Arduino-1.6.9/build/build.xml 2016-07-04 22:46:28.719469457 +0200
@@ -437,26 +437,6 @@
<param name="target.path" value="${staging_folder}/work/${staging_hardware_folder}/.." />
</antcall>
- <antcall target="unzip">
- <param name="archive_file" value="./libastylej-2.05.1-3.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1-3.zip" />
- <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" todir="macosx/work/${staging_hardware_folder}/../lib/" />
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.jnilib" />
- <copy file="macosx/libastylej-2.05.1/libastylej.jnilib" tofile="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
- <chmod perm="755" file="macosx/work/${staging_hardware_folder}/../lib/libastylej.dylib" />
-
- <antcall target="unzip">
- <param name="archive_file" value="./liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="archive_url" value="http://downloads.arduino.cc/liblistSerials/liblistSerials-${LIBLISTSERIAL-VERSION}.zip" />
- <param name="final_folder" value="${staging_folder}/liblistSerials-${LIBLISTSERIAL-VERSION}" />
- <param name="dest_folder" value="${staging_folder}" />
- </antcall>
- <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">
@@ -726,30 +706,6 @@
<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="avr-toolchain-bundle">
- <param name="unpack_target" value="untar"/>
- <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
- <param name="gcc_version" value="4.8.1-arduino5"/>
- <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
- <param name="avrdude_version" value="6.0.1-arduino5"/>
- </antcall>
-
<antcall target="package-library-index-json-bundle"/>
</target>
@@ -0,0 +1,29 @@
--- build/build.xml.orig2 2016-03-18 01:03:33.298185636 -0400
+++ build/build.xml 2016-03-18 01:03:35.047162990 -0400
@@ -166,26 +166,6 @@
<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>
-
<!-- Write the revision file! -->
<echo file="${target.path}/lib/version.txt" message="${version}" />
@@ -0,0 +1,85 @@
--- a/app/src/processing/app/Base.java 2016-03-13 22:15:01.741451380 -0400
+++ b/app/src/processing/app/Base.java 2016-03-14 19:18:48.020801765 -0400
@@ -747,6 +747,8 @@
} catch (IOException e) {
if (activeEditor != null) {
activeEditor.statusError(e);
+ } else {
+ e.printStackTrace();
}
}
}
--- a/arduino-core/src/processing/app/Platform.java 2016-03-17 00:29:33.841099694 -0400
+++ b/arduino-core/src/processing/app/Platform.java 2016-03-17 00:29:56.909802119 -0400
@@ -145,7 +145,7 @@
}
static {
- loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
+ System.loadLibrary("listSerialsj");
};
private static void loadLib(File lib) {
--- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java 2016-03-17 23:58:11.616069086 -0400
+++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java 2016-03-17 23:58:27.564864023 -0400
@@ -41,7 +41,7 @@
loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
}
- loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
+ System.loadLibrary("astylej");
}
private static void loadLib(File lib) {
--- a/app/src/processing/app/Base.java 2016-03-18 00:30:57.537608387 -0400
+++ b/app/src/processing/app/Base.java 2016-03-18 00:31:15.267371958 -0400
@@ -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) {
--- a/arduino-core/src/processing/app/linux/Platform.java 2016-03-18 00:34:37.179690507 -0400
+++ b/arduino-core/src/processing/app/linux/Platform.java 2016-03-18 00:34:38.536672987 -0400
@@ -37,7 +37,6 @@
// TODO Need to be smarter here since KDE people ain't gonna like that GTK.
// It may even throw a weird exception at 'em for their trouble.
public void setLookAndFeel() throws Exception {
- GTKLookAndFeelFixer.installGtkPopupBugWorkaround();
}
--- a/arduino-core/src/processing/app/BaseNoGui.java 2016-03-26 19:12:50.769791536 -0400
+++ b/arduino-core/src/processing/app/BaseNoGui.java 2016-03-26 19:17:57.352927746 -0400
@@ -161,8 +161,17 @@
return prefs;
}
+ static public boolean isAppDir(String name) {
+ String dirs[] = name.split("//*", 3);
+ if (dirs.length == 0) {
+ return false;
+ }
+ int index = dirs.length >= 2 && dirs[0].equals("") ? 1 : 0;
+ return dirs[index].equals("lib") || dirs[index].equals("dist");
+ }
+
static public File getContentFile(String name) {
- String appDir = System.getProperty("APP_DIR");
+ String appDir = System.getProperty(isAppDir(name) ? "APP_DIR" : "CORE_DIR");
if (appDir == null || appDir.length() == 0) {
appDir = currentDirectory;
}
@@ -0,0 +1,10 @@
[Desktop Entry]
Version=1.0
Name=arduino-ide
Comment=Open-source electronics prototyping platform
Exec=arduino-ide
Icon=arduino-ide
Terminal=false
Type=Application
Categories=Development;
StartupNotify=false
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>junk4me46806@yahoo.com</email>
</maintainer>
</pkgmetadata>