Page MenuHomeSolus
Files F11047912

D8782.id21088.diff
No OneTemporary
Actions

D8782.id21088.diff
View Options

diff --git a/files/use-openjdk-8.patch b/files/use-openjdk-8.patch
new file mode 100644
--- /dev/null
+++ b/files/use-openjdk-8.patch
@@ -0,0 +1,35 @@
+From c5d1f4774bd9a6b76d7d88323deaf6861fb876d5 Mon Sep 17 00:00:00 2001
+From: Fabio Forni <livingsilver94.solus@redaril.me>
+Date: Fri, 1 May 2020 15:18:34 +0200
+Subject: [PATCH] Run with openjdk-8
+
+---
+ build/linux/dist/arduino | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
+index f70c650..805589e 100755
+--- a/build/linux/dist/arduino
++++ b/build/linux/dist/arduino
+@@ -19,11 +19,6 @@ export PATH="${APPDIR}/java/bin:${PATH}"
+
+ export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
+
+-JAVA=java
+-if [ -x "$APPDIR/java/bin/java" ]; then
+- JAVA=$APPDIR/java/bin/java
+-fi
+-
+ # Collect options to java in an array, to properly handle whitespace in options
+ JAVA_OPTIONS=("-DAPP_DIR=$APPDIR")
+
+@@ -32,5 +27,5 @@ if [[ "$@" != *"--"* ]] ; then
+ JAVA_OPTIONS+=("-splash:$APPDIR/lib/splash.png")
+ fi
+
+-"$JAVA" "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
++/usr/lib64/openjdk-8/bin/java "${JAVA_OPTIONS[@]}" processing.app.Base "$@"
+
+--
+2.26.2
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -35,6 +35,8 @@
export CTAGS_DIR=$workdir/build/ctags
export CTAGS_VERSION=ctags-5.8-arduino11
setup : |
+ %patch -p1 < $pkgfiles/use-openjdk-8.patch
+
# copy dependency libraries
cp $sources/WiFi101-Updater-ArduinoIDE-Plugin-0.10.10.zip $workdir/build/shared/
cp $sources/libastylej-2.05.1-5.zip $workdir/build/
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,7 +2,7 @@
<Source>
<Name>arduino</Name>
<Packager>
- <Name>Mislav Čakarić</Name>
+ <Name>chax</Name>
<Email>mcakaric@gmail.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
@@ -903,11 +903,113 @@
</Package>
<History>
<Update release="4">
- <Date>2020-03-25</Date>
+ <Date>2020-03-26</Date>
<Version>1.8.12</Version>
- <Comment>Packaging update</Comment>
- <Name>Mislav Čakarić</Name>
+ <Comment>Update ArduinoIDE to 1.8.12
+
+Summary:
+Update ArduinoIDE to 1.8.12
+Changelog can be found [here](https://www.arduino.cc/en/Main/ReleaseNotes)
+
+Test Plan:
+- Open ArduinoIDE
+- Open File &gt; Examples &gt; 01.Basics &gt; Blink
+- Connect Arduino Uno
+- Click on Upload
+- Check if sketch successfully compiled and uploaded to Arduino board
+
+Reviewers: #triage_team, JoshStrobl
+
+Reviewed By: #triage_team, JoshStrobl
+
+Subscribers: JoshStrobl
+
+Differential Revision: https://dev.getsol.us/D8549</Comment>
+ <Name>chax</Name>
<Email>mcakaric@gmail.com</Email>
</Update>
+ <Update release="3">
+ <Date>2020-02-06</Date>
+ <Version>1.8.11</Version>
+ <Comment>Update ArduinoIDE to 1.8.11
+
+Summary:
+Update Arduino IDE to 1.8.11
+Changelog can be found [here](https://www.arduino.cc/en/Main/ReleaseNotes)
+
+Test Plan:
+- Open ArduinoIDE
+- Open File &gt; Examples &gt; 01.Basics &gt; Blink
+- Connect Arduino Uno
+- Click on Upload
+- Check if sketch successfully compiled and uploaded to Arduino board
+- Connect Arduino Nano
+- Click on Upload
+- Check if sketch successfully compiled and uploaded to Arduino board
+
+Reviewers: #triage_team, DataDrake
+
+Reviewed By: #triage_team, DataDrake
+
+Subscribers: DataDrake
+
+Differential Revision: https://dev.getsol.us/D8163</Comment>
+ <Name>chax</Name>
+ <Email>mcakaric@gmail.com</Email>
+ </Update>
+ <Update release="2">
+ <Date>2019-09-20</Date>
+ <Version>1.8.10</Version>
+ <Comment>Update ArduinoIDE to 1.8.10
+
+Summary:
+Update Arduino IDE to 1.8.10
+Changelog can be found [here](https://www.arduino.cc/en/Main/ReleaseNotes)
+
+Test Plan:
+- Open ArduinoIDE
+- Open File &gt; Examples &gt; 01.Basics &gt; Blink
+- Connect Arduino Uno
+- Click on Upload
+- Check if skech successfully compiled and uploaded to Arduino board
+
+Reviewers: #triage_team, JoshStrobl
+
+Reviewed By: #triage_team, JoshStrobl
+
+Subscribers: JoshStrobl
+
+Differential Revision: https://dev.getsol.us/D7209</Comment>
+ <Name>chax</Name>
+ <Email>mcakaric@gmail.com</Email>
+ </Update>
+ <Update release="1">
+ <Date>2019-07-05</Date>
+ <Version>1.8.9</Version>
+ <Comment>Initial inclusion of Arduino IDE
+
+Summary:
+Initial inclusion of Arduino IDE
+Fixes T210
+
+Test Plan:
+ - Open Arduino IDE
+ - Open Examples &gt; 01. Basics &gt; Blink
+ - Build and upload Sketch to Arduino UNO board
+ - Sketch is successfully built and works on Arduino UNO board
+ - Test few different Built-in Examples
+
+Reviewers: #triage_team, JoshStrobl
+
+Reviewed By: #triage_team, JoshStrobl
+
+Subscribers: JoshStrobl, livingsilver94
+
+Maniphest Tasks: T210
+
+Differential Revision: https://dev.getsol.us/D6641</Comment>
+ <Name>chax</Name>
+ <Email>mislav.cakaric@homecontrol.no</Email>
+ </Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Fri, Aug 11, 3:56 PM (3 h, 4 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5810381
Default Alt Text
D8782.id21088.diff (5 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.