diff --git a/dev-embedded/arduino/additional-files/arduino-bin.rdef.in b/dev-embedded/arduino/additional-files/arduino-bin.rdef.in index 7952ccfa2..6fdf84fe6 100644 --- a/dev-embedded/arduino/additional-files/arduino-bin.rdef.in +++ b/dev-embedded/arduino/additional-files/arduino-bin.rdef.in @@ -16,42 +16,29 @@ resource app_version { resource app_signature "@APP_SIGNATURE@"; resource vector_icon { - $"6E636966040300969C03FDFEFE050004007A0B0009BEC0B3EABEC0B3EAC1D2B3" - $"A4C74DB6B5C4FBB4ABC9B8B8C1CB52BF04CB35BBD9CB7CC1E6C89BC704CA77C4" - $"D0C6BFC93AC12BCB11C40BCAB9BD99CB92B75BC7A3B9DBCA3AB4F7C537B41DBE" - $"4EB3C0C1B2B46CBB2AB89EB648B61AB830BA5FB4EABEC0B3EABC88B418BEC0B3" - $"EA0208BB37BB6ABD16BB53B94EBB75B73BBED5B788BCF0B6CFC0E2BA45C388B8" - $"40C30ABC6B4BBFB8C10CBE99C2D8C0B347C433C3A6C257C3C550C3ADC837C043" - $"C7E9C227C896BE65C5A6BBB9C771BC60C36EBAC8BFB8BE0CC0E9BC19BEBFBC8B" - $"0005BB12BCE9BB12BCE9BCCDBCB6BEE7BF89BE2BBE20BE33C116BAB5C21CBC88" - $"C297B918C1CFB8E8BE60B816BFD3B953BD92BB12BCE9BA2ABCFEBB12BCE90204" - $"BA36BF21BB0DBF1FBA30BF68BA35BFF7BA34BFB0BB11BFFABCCABFF7BBEDBFF8" - $"BCBFBFB4BCBABF22BCE43FBBE4BF1D0005C3D3BCE9C3D3BCE9C585BCABC6C6C0" - $"0FC72DBE5CC67CC18DC359C21CC4CCC288C20FC1CDC08ABF8FC125C0ACC129BE" - $"49C3D3BCE9C250BD05C3D3BCE9020CC382BE49C3C9BE46C37EBE8FC37FBF1EC3" - $"82BED8C338BF23C2A8BF2148BF1EC2A3BF68C2A8BFF6C2A6BFB048BFFAC37FBF" - $"F9C337BFF6C38CC042C38FC0DCC369C09DC3D2C0DFC456C0DCC414C0DFC45BC0" - $"91C458BFF9C455C045C4A1BFF5C530BFF7C4E8BFF9C534BFB0C530BF22C532BF" - $"68C4E9BF1DC459BF1EC4A1BF22C455BED8C457BE49C459BE90C40FBE440009BB" - $"37BB6ABB37BB6ABD16BB53BFB8BE0CBEBFBC8BC0E9BC19C5A6BBB9C36EBAC8C7" - $"71BC60C837C043C896BE65C7E9C227C433C3A650C3ADC257C3C5BFB8C10CC0B3" - $"47BE99C2D8BA45C388BC6B4BB840C30AB73BBED5B6CFC0E2B788BCF0BB37BB6A" - $"B94EBB75BB37BB6A0005BB12BCE9BB12BCE9BA2ABCFEB8E8BE60B953BD92B816" - $"BFD3BAB5C21CB918C1CFBC88C297BEE7BF89BE33C116BE2BBE20BB12BCE9BCCD" - $"BCB6BB12BCE90204C3D3BCE9C585BCABC250BD05C08ABF8FC129BE49C125C0AC" - $"C359C21CC20FC1CDC4CCC288C6C6C00FC67CC18DC72DBE5C020CC382BE49C37E" - $"BE8FC3C9BE46C457BE49C40FBE44C459BE90C459BF1EC455BED8C4A1BF22C530" - $"BF22C4E9BF1DC532BF68C530BFF7C534BFB0C4E8BFF9C458BFF9C4A1BFF5C455" - $"C045C456C0DCC45BC091C414C0DFC38FC0DCC3D2C0DFC369C09DC37FBFF9C38C" - $"C042C337BFF6C2A8BFF648BFFAC2A6BFB0C2A8BF21C2A3BF6848BF1EC37FBF1E" - $"C338BF23C382BED80204BA36BF21BA30BF68BB0DBF1FBCBABF22BBE4BF1DBCE4" - $"3FBCCABFF7BCBFBFB4BBEDBFF8BA35BFF7BB11BFFABA34BFB00A0A0302000102" - $"4013B1000000000000400A6A3F1C0F41B9BA0A02020001123FBE660000000000" - $"003FCED4420ADF42025A01178400040A00020001023FBE660000000000003FCE" - $"D4420ADF42025A0A00020203023FBE660000000000003FCED4420ADF42025A0A" - $"00020405023FBE660000000000003FCED4420ADF42025A0A0203060708123FBE" - $"660000000000003FCED4420ADF42025A01178300040A0103060708023FBE6600" - $"00000000003FCED4420ADF42025A0A0202090A123FBE660000000000003FCED4" - $"420ADF42025A01178300040A010109023FBE660000000000003FCED4420ADF42" - $"025A0A01010A023FBE660000000000003FCED4420ADF42025A" + $"6E63696604020106043DC1BB3E6C14BE44C63D84C44891F74514F900FFFFFF35" + $"2DEFF6B604A1A7FF007F7F03FDFEFE050004007A060009BEC0B3EABEC0B3EAC1" + $"D2B3A4C74DB6B5C4FBB4ABC9B7B8C0CB51BF03CB34BBD9CB7CC1E6C89BC704CA" + $"77C4D0C6BEC939C12ACB11C40ACAB8BD99CB92B75BC7A2B9DBCA39B4F7C537B4" + $"1DBE4EB3C0C1B2B46BBB2AB89EB648B619B82FBA5FB4EABEC0B3EABC87B418BE" + $"C0B3EA0009BB37BB6ABB37BB6ABD16BB52BFB7BE0CBEBFBC8BC0E9BC19C5A5BB" + $"B8C36EBAC7C770BC5FC837C042C896BE65C7E9C226C433C3A550C3ACC257C3C4" + $"BFB7C10BC0B347BE99C2D7BA45C388BC6A4BB840C309B73BBED5B6CFC0E1B788" + $"BCF0BB37BB6AB94DBB75BB37BB6A0005BB11BCE9BB11BCE9BA2ABCFEB8E7BE5F" + $"B953BD91B815BFD3BAB5C21CB918C1CFBC87C297BEE7BF89BE33C115BE2ABE1F" + $"BB11BCE9BCCDBCB6BB11BCE90204C3D3BCE9C585BCAAC250BD04C08ABF8EC128" + $"BE49C125C0ABC358C21CC20EC1CDC4CCC288C6C6C00EC67CC18CC72DBE5B020C" + $"C382BE49C37E3DC3C9BE45C456BE49C40EBE43C458BE8FC458BF1DC455BED8C4" + $"A1BF22C530BF22C4E9BF1CC532BF67C530BFF6C534BFB0C4E8BFF8C457BFF8C4" + $"A1BFF4C455C044C455C0DBC45AC090C413C0DEC38EC0DBC3D2C0DEC369C09DC3" + $"7FBFF8C38BC041C337BFF5C2A7BFF548BFF9C2A5BFB0C2A7BF21C2A3BF6748BF" + $"1DC37FBF1DC338BF23C382BED80204BA36BF21BA2FBF67BB0DBF1EBCB9BF22BB" + $"E4BF1CBCE43FBCCABFF6BCBFBFB3BBECBFF7BA35BFF6BB11BFF9BA34BFB0080A" + $"030100023F66EA0000000000003C6B9C4710BD4AD65E0A020100123FBE660000" + $"000000003FCED44015BE42025A01178500040A000100023FBE66000000000000" + $"3FCED44015BE42025A0A020302030112400BC70000000000004027FEC1796BC0" + $"ECFC01178400040A010302030102400BC70000000000004027FEC1796BC0ECFC" + $"0A0202040512400BC70000000000004027FEC1796BC0ECFC01178300040A0101" + $"0402400BC70000000000004027FEC1796BC0ECFC0A01010502400BC700000000" + $"00004027FEC1796BC0ECFC" }; diff --git a/dev-embedded/arduino/additional-files/arduino.rdef.in b/dev-embedded/arduino/additional-files/arduino.rdef.in index 898edaf1a..9e47801d8 100644 --- a/dev-embedded/arduino/additional-files/arduino.rdef.in +++ b/dev-embedded/arduino/additional-files/arduino.rdef.in @@ -21,42 +21,29 @@ resource file_types message { }; resource vector_icon { - $"6E636966040300969C03FDFEFE050004007A0B0009BEC0B3EABEC0B3EAC1D2B3" - $"A4C74DB6B5C4FBB4ABC9B8B8C1CB52BF04CB35BBD9CB7CC1E6C89BC704CA77C4" - $"D0C6BFC93AC12BCB11C40BCAB9BD99CB92B75BC7A3B9DBCA3AB4F7C537B41DBE" - $"4EB3C0C1B2B46CBB2AB89EB648B61AB830BA5FB4EABEC0B3EABC88B418BEC0B3" - $"EA0208BB37BB6ABD16BB53B94EBB75B73BBED5B788BCF0B6CFC0E2BA45C388B8" - $"40C30ABC6B4BBFB8C10CBE99C2D8C0B347C433C3A6C257C3C550C3ADC837C043" - $"C7E9C227C896BE65C5A6BBB9C771BC60C36EBAC8BFB8BE0CC0E9BC19BEBFBC8B" - $"0005BB12BCE9BB12BCE9BCCDBCB6BEE7BF89BE2BBE20BE33C116BAB5C21CBC88" - $"C297B918C1CFB8E8BE60B816BFD3B953BD92BB12BCE9BA2ABCFEBB12BCE90204" - $"BA36BF21BB0DBF1FBA30BF68BA35BFF7BA34BFB0BB11BFFABCCABFF7BBEDBFF8" - $"BCBFBFB4BCBABF22BCE43FBBE4BF1D0005C3D3BCE9C3D3BCE9C585BCABC6C6C0" - $"0FC72DBE5CC67CC18DC359C21CC4CCC288C20FC1CDC08ABF8FC125C0ACC129BE" - $"49C3D3BCE9C250BD05C3D3BCE9020CC382BE49C3C9BE46C37EBE8FC37FBF1EC3" - $"82BED8C338BF23C2A8BF2148BF1EC2A3BF68C2A8BFF6C2A6BFB048BFFAC37FBF" - $"F9C337BFF6C38CC042C38FC0DCC369C09DC3D2C0DFC456C0DCC414C0DFC45BC0" - $"91C458BFF9C455C045C4A1BFF5C530BFF7C4E8BFF9C534BFB0C530BF22C532BF" - $"68C4E9BF1DC459BF1EC4A1BF22C455BED8C457BE49C459BE90C40FBE440009BB" - $"37BB6ABB37BB6ABD16BB53BFB8BE0CBEBFBC8BC0E9BC19C5A6BBB9C36EBAC8C7" - $"71BC60C837C043C896BE65C7E9C227C433C3A650C3ADC257C3C5BFB8C10CC0B3" - $"47BE99C2D8BA45C388BC6B4BB840C30AB73BBED5B6CFC0E2B788BCF0BB37BB6A" - $"B94EBB75BB37BB6A0005BB12BCE9BB12BCE9BA2ABCFEB8E8BE60B953BD92B816" - $"BFD3BAB5C21CB918C1CFBC88C297BEE7BF89BE33C116BE2BBE20BB12BCE9BCCD" - $"BCB6BB12BCE90204C3D3BCE9C585BCABC250BD05C08ABF8FC129BE49C125C0AC" - $"C359C21CC20FC1CDC4CCC288C6C6C00FC67CC18DC72DBE5C020CC382BE49C37E" - $"BE8FC3C9BE46C457BE49C40FBE44C459BE90C459BF1EC455BED8C4A1BF22C530" - $"BF22C4E9BF1DC532BF68C530BFF7C534BFB0C4E8BFF9C458BFF9C4A1BFF5C455" - $"C045C456C0DCC45BC091C414C0DFC38FC0DCC3D2C0DFC369C09DC37FBFF9C38C" - $"C042C337BFF6C2A8BFF648BFFAC2A6BFB0C2A8BF21C2A3BF6848BF1EC37FBF1E" - $"C338BF23C382BED80204BA36BF21BA30BF68BB0DBF1FBCBABF22BBE4BF1DBCE4" - $"3FBCCABFF7BCBFBFB4BBEDBFF8BA35BFF7BB11BFFABA34BFB00A0A0302000102" - $"4013B1000000000000400A6A3F1C0F41B9BA0A02020001123FBE660000000000" - $"003FCED4420ADF42025A01178400040A00020001023FBE660000000000003FCE" - $"D4420ADF42025A0A00020203023FBE660000000000003FCED4420ADF42025A0A" - $"00020405023FBE660000000000003FCED4420ADF42025A0A0203060708123FBE" - $"660000000000003FCED4420ADF42025A01178300040A0103060708023FBE6600" - $"00000000003FCED4420ADF42025A0A0202090A123FBE660000000000003FCED4" - $"420ADF42025A01178300040A010109023FBE660000000000003FCED4420ADF42" - $"025A0A01010A023FBE660000000000003FCED4420ADF42025A" + $"6E63696604020106043DC1BB3E6C14BE44C63D84C44891F74514F900FFFFFF35" + $"2DEFF6B604A1A7FF007F7F03FDFEFE050004007A060009BEC0B3EABEC0B3EAC1" + $"D2B3A4C74DB6B5C4FBB4ABC9B7B8C0CB51BF03CB34BBD9CB7CC1E6C89BC704CA" + $"77C4D0C6BEC939C12ACB11C40ACAB8BD99CB92B75BC7A2B9DBCA39B4F7C537B4" + $"1DBE4EB3C0C1B2B46BBB2AB89EB648B619B82FBA5FB4EABEC0B3EABC87B418BE" + $"C0B3EA0009BB37BB6ABB37BB6ABD16BB52BFB7BE0CBEBFBC8BC0E9BC19C5A5BB" + $"B8C36EBAC7C770BC5FC837C042C896BE65C7E9C226C433C3A550C3ACC257C3C4" + $"BFB7C10BC0B347BE99C2D7BA45C388BC6A4BB840C309B73BBED5B6CFC0E1B788" + $"BCF0BB37BB6AB94DBB75BB37BB6A0005BB11BCE9BB11BCE9BA2ABCFEB8E7BE5F" + $"B953BD91B815BFD3BAB5C21CB918C1CFBC87C297BEE7BF89BE33C115BE2ABE1F" + $"BB11BCE9BCCDBCB6BB11BCE90204C3D3BCE9C585BCAAC250BD04C08ABF8EC128" + $"BE49C125C0ABC358C21CC20EC1CDC4CCC288C6C6C00EC67CC18CC72DBE5B020C" + $"C382BE49C37E3DC3C9BE45C456BE49C40EBE43C458BE8FC458BF1DC455BED8C4" + $"A1BF22C530BF22C4E9BF1CC532BF67C530BFF6C534BFB0C4E8BFF8C457BFF8C4" + $"A1BFF4C455C044C455C0DBC45AC090C413C0DEC38EC0DBC3D2C0DEC369C09DC3" + $"7FBFF8C38BC041C337BFF5C2A7BFF548BFF9C2A5BFB0C2A7BF21C2A3BF6748BF" + $"1DC37FBF1DC338BF23C382BED80204BA36BF21BA2FBF67BB0DBF1EBCB9BF22BB" + $"E4BF1CBCE43FBCCABFF6BCBFBFB3BBECBFF7BA35BFF6BB11BFF9BA34BFB0080A" + $"030100023F66EA0000000000003C6B9C4710BD4AD65E0A020100123FBE660000" + $"000000003FCED44015BE42025A01178500040A000100023FBE66000000000000" + $"3FCED44015BE42025A0A020302030112400BC70000000000004027FEC1796BC0" + $"ECFC01178400040A010302030102400BC70000000000004027FEC1796BC0ECFC" + $"0A0202040512400BC70000000000004027FEC1796BC0ECFC01178300040A0101" + $"0402400BC70000000000004027FEC1796BC0ECFC0A01010502400BC700000000" + $"00004027FEC1796BC0ECFC" }; diff --git a/dev-embedded/arduino/arduino-1.7.11.recipe b/dev-embedded/arduino/arduino-1.6.1.recipe similarity index 80% rename from dev-embedded/arduino/arduino-1.7.11.recipe rename to dev-embedded/arduino/arduino-1.6.1.recipe index 15896faf3..8ff434079 100644 --- a/dev-embedded/arduino/arduino-1.7.11.recipe +++ b/dev-embedded/arduino/arduino-1.6.1.recipe @@ -3,22 +3,24 @@ DESCRIPTION="Arduino is an open-source tool used for building electronics projec Arduino consists of a physical programmable circuit board (often referred to as a micro-controller) \ and a development environment, or IDE (Integrated Development Environment) that runs on your computer, \ used to write and upload computer code to the board." -HOMEPAGE="http://arduino.org" -COPYRIGHT="2016 Arduino S.r.l. - Italy" +HOMEPAGE="http://arduino.cc" +COPYRIGHT="2016 Arduino" LICENSE="GNU GPL v2" -REVISION="5" -SOURCE_URI="https://github.com/arduino-cli/arduino-version/releases/download/$portVersion/arduino-$portVersion-linux32.zip" -CHECKSUM_SHA256="c80560935109121c4a8db6b34404bbdeb45e421584a895ca2277babc468f3b6a" -SOURCE_DIR="arduino-$portVersion-linux32" -SOURCE_URI_2="https://github.com/scream3r/java-simple-serial-connector/archive/f5564869f8a70503c29c0d24609245321ba39b2c.tar.gz" -CHECKSUM_SHA256_2="3d874fbf2afa60f6c21db7da6d89cc584f42e6ff01b63238bf235776699379e6" -SOURCE_DIR_2="java-simple-serial-connector-f5564869f8a70503c29c0d24609245321ba39b2c" -SOURCE_URI_3="https://github.com/arduino-org/Arduino/archive/4f0efcc55f1adb750fbf29b50fc4d96195f26ced.tar.gz" -CHECKSUM_SHA256_3="5346a8cff057c454ff0cdbb84919636639985621ca8a73438002a780fc461eed" -SOURCE_DIR_3="Arduino-4f0efcc55f1adb750fbf29b50fc4d96195f26ced/app/src/processing/app" -SOURCE_URI_4="https://github.com/arduino-org/Arduino/archive/4f0efcc55f1adb750fbf29b50fc4d96195f26ced.tar.gz" -CHECKSUM_SHA256_4="5346a8cff057c454ff0cdbb84919636639985621ca8a73438002a780fc461eed" -SOURCE_DIR_4="Arduino-4f0efcc55f1adb750fbf29b50fc4d96195f26ced/arduino-core/src/processing" +REVISION="1" +SOURCE_URI="https://downloads.arduino.cc/arduino-$portVersion-linux32.tar.xz" +CHECKSUM_SHA256="8e64d32c56c116a8bad4741bfcbe715b2040447fbcc1634c99f486790a0021a4" +SOURCE_DIR="arduino-$portVersion" +jsscVersion="2.8.0" +SOURCE_URI_2="https://github.com/scream3r/java-simple-serial-connector/archive/refs/tags/v$jsscVersion.tar.gz" +CHECKSUM_SHA256_2="c3287bfc31ea81929739271b087b833fb7050686af6a90ec953c5b2f41b4d42d" +SOURCE_DIR_2="java-simple-serial-connector-$jsscVersion" +SOURCE_URI_3="https://github.com/arduino/Arduino/archive/refs/tags/$portVersion.tar.gz" +CHECKSUM_SHA256_3="4e389aa0de6fd0acfbf0610713b9f297abe67750a15aefe9a695ac4d507cd897" +SOURCE_DIR_3="Arduino-$portVersion/app/src/processing/app" +SOURCE_URI_4="https://github.com/arduino/Arduino/archive/refs/tags/$portVersion.tar.gz" +CHECKSUM_SHA256_4="4e389aa0de6fd0acfbf0610713b9f297abe67750a15aefe9a695ac4d507cd897" +SOURCE_DIR_4="Arduino-$portVersion/arduino-core/src/processing" + PATCHES="arduino-$portVersion.patchset" PATCHES_2="jssc_2.8.0.patchset" PATCHES_3="JFileChooser-$portVersion.patchset" @@ -123,18 +125,12 @@ INSTALL() cp -r hardware/arduino/avr $arduinoDir/hardware/arduino #Patch for AVR tools - sed -i "s|^compiler.path=.*|compiler.path=$binDir/|g" \ + sed -i "s|^compiler.path=.*|compiler.path=/bin/|g" \ $arduinoDir/hardware/arduino/avr/platform.txt - sed -i "s|^tools.avrdude.cmd.path=.*|tools.avrdude.cmd.path=$binDir/avrdude|g" \ + sed -i "s|^tools.avrdude.cmd.path=.*|tools.avrdude.cmd.path=/bin/avrdude|g" \ $arduinoDir/hardware/arduino/avr/platform.txt sed -i "s|^tools.avrdude.config.path=.*|tools.avrdude.config.path=/system/settings/avrdude.conf|g" \ $arduinoDir/hardware/arduino/avr/platform.txt - #Patch for SAM tools - #sed -i "s|^compiler.path=.*|compiler.path=$binDir/|g" \ - # $arduinoDir/hardware/arduino/sam/platform.txt - #Patch for SAMD tools - #sed -i "s|^compiler.path=.*|compiler.path=$binDir/|g" \ - # $arduinoDir/hardware/arduino/samd/platform.txt #Disable check for update sed -i 's|^update.check.*|update.check = false|g' \ diff --git a/dev-embedded/arduino/patches/JFileChooser-1.7.11.patchset b/dev-embedded/arduino/patches/JFileChooser-1.6.1.patchset similarity index 94% rename from dev-embedded/arduino/patches/JFileChooser-1.7.11.patchset rename to dev-embedded/arduino/patches/JFileChooser-1.6.1.patchset index 6b498a2d7..b7fa28e00 100644 --- a/dev-embedded/arduino/patches/JFileChooser-1.7.11.patchset +++ b/dev-embedded/arduino/patches/JFileChooser-1.6.1.patchset @@ -1,11 +1,11 @@ -From be2b430a99273bcbab22f716fb33a07ea8ee2be8 Mon Sep 17 00:00:00 2001 +From daf12b26bf71bfffa7952d9b7de3697886b09cb4 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 11 Jun 2015 18:25:51 +1000 Subject: Use JFileChooser instead of FileDialog for open files diff --git a/Base.java b/Base.java -index ec0b5fc..f0e5e0d 100644 +index d844b4c..c034bef 100644 --- a/Base.java +++ b/Base.java @@ -656,30 +656,21 @@ public class Base { @@ -51,7 +51,7 @@ index ec0b5fc..f0e5e0d 100644 Preferences.set("last.folder", inputFile.getAbsolutePath()); handleOpen(inputFile); diff --git a/Sketch.java b/Sketch.java -index ca8d13c..a937988 100644 +index 2f142d0..21b5576 100644 --- a/Sketch.java +++ b/Sketch.java @@ -790,16 +790,22 @@ public class Sketch { @@ -84,17 +84,17 @@ index ca8d13c..a937988 100644 // now do the work of adding the file boolean result = addFile(sourceFile); -- -2.21.0 +2.36.1 -From a94ad93405daab4738a230691c4428d58187307e Mon Sep 17 00:00:00 2001 +From a9e0d3dfd3c1f1ecb671208d6fa8d30431a9bbc3 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 7 Apr 2017 00:31:04 +0000 Subject: Use JFileChooser instead of FileDialog for save diff --git a/Sketch.java b/Sketch.java -index a937988..23fe2c4 100644 +index 21b5576..00501c5 100644 --- a/Sketch.java +++ b/Sketch.java @@ -645,25 +645,34 @@ public class Sketch { @@ -142,17 +142,17 @@ index a937988..23fe2c4 100644 File newFolder = new File(newParentDir, newName); -- -2.21.0 +2.36.1 -From eeab0c20120f4b45baa9fdeabc2d444371202485 Mon Sep 17 00:00:00 2001 +From 7fa36cdbe4dda233438793895e44c23becbfe76d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 17 Jul 2019 19:39:27 +1000 Subject: Fix build diff --git a/Base.java b/Base.java -index f0e5e0d..8980f98 100644 +index c034bef..24db056 100644 --- a/Base.java +++ b/Base.java @@ -31,7 +31,6 @@ import processing.app.helpers.filefilters.OnlyDirs; @@ -173,5 +173,5 @@ index f0e5e0d..8980f98 100644 String sketchbookPath = BaseNoGui.getSketchbookPath(); -- -2.21.0 +2.36.1 diff --git a/dev-embedded/arduino/patches/SettingsFolder-1.7.11.patchset b/dev-embedded/arduino/patches/SettingsFolder-1.6.1.patchset similarity index 82% rename from dev-embedded/arduino/patches/SettingsFolder-1.7.11.patchset rename to dev-embedded/arduino/patches/SettingsFolder-1.6.1.patchset index 3fcdc137a..d37bf9bc1 100644 --- a/dev-embedded/arduino/patches/SettingsFolder-1.7.11.patchset +++ b/dev-embedded/arduino/patches/SettingsFolder-1.6.1.patchset @@ -5,7 +5,7 @@ Subject: Move preferences to haiku settings folder diff --git a/app/Platform.java b/app/Platform.java -index fc42cad..191fc13 100644 +index 3c46c09..4ccb556 100644 --- a/app/Platform.java +++ b/app/Platform.java @@ -81,8 +81,8 @@ public class Platform { @@ -13,12 +13,11 @@ index fc42cad..191fc13 100644 public File getSettingsFolder() throws Exception { // otherwise make a .processing directory int the user's home dir - File home = new File(System.getProperty("user.home")); -- File dataFolder = new File(home, ".arduino17"); +- File dataFolder = new File(home, ".arduino15"); + File settings = new File(System.getProperty("user.home")+"/config/settings/"); -+ File dataFolder = new File(settings, "Arduino17"); ++ File dataFolder = new File(settings, "Arduino16"); return dataFolder; /* -- 2.36.1 - diff --git a/dev-embedded/arduino/patches/arduino-1.7.11.patchset b/dev-embedded/arduino/patches/arduino-1.6.1.patchset similarity index 99% rename from dev-embedded/arduino/patches/arduino-1.7.11.patchset rename to dev-embedded/arduino/patches/arduino-1.6.1.patchset index d49db0847..bdfb2683f 100644 --- a/dev-embedded/arduino/patches/arduino-1.7.11.patchset +++ b/dev-embedded/arduino/patches/arduino-1.6.1.patchset @@ -1,4 +1,4 @@ -From 5845caa5ebf3789b173a3ccf10ddd9b95595b911 Mon Sep 17 00:00:00 2001 +From 2d9ae443457731e6da51e63042feeea7d92a27f3 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 28 Jun 2022 22:03:31 +1000 Subject: Add binary launcher