Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] [WIP] arduino: update to 1.8.11.
@ 2020-01-31  0:55 voidlinux-github
  2020-05-21  4:44 ` ericonr
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: voidlinux-github @ 2020-01-31  0:55 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

There is a new pull request by anjandev against master on the void-packages repository

https://github.com/anjandev/void-packages arduino
https://github.com/void-linux/void-packages/pull/18673

[WIP] arduino: update to 1.8.11.
Patches failed so I deleted them. Cannot test if the patches are needed until I can get arduino to compile.

Unfortunately, the template fails to compile because of issue #11718

A patch file from https://github.com/void-linux/void-packages/pull/18673.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-arduino-18673.patch --]
[-- Type: text/x-diff, Size: 9602 bytes --]

From 56ff924f0fecd1d670b173b2900ea50f261510e8 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Thu, 30 Jan 2020 00:15:48 -0800
Subject: [PATCH] arduino: update to 1.8.11.

---
 srcpkgs/arduino/patches/astyle_fix.patch      |  34 ------
 .../patches/disable-dependency-build.patch    | 114 ------------------
 srcpkgs/arduino/template                      |   6 +-
 3 files changed, 3 insertions(+), 151 deletions(-)
 delete mode 100644 srcpkgs/arduino/patches/astyle_fix.patch
 delete mode 100644 srcpkgs/arduino/patches/disable-dependency-build.patch

diff --git a/srcpkgs/arduino/patches/astyle_fix.patch b/srcpkgs/arduino/patches/astyle_fix.patch
deleted file mode 100644
index 7b07f574420..00000000000
--- a/srcpkgs/arduino/patches/astyle_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- astyle/src/astyle_main.cpp	2017-05-30 20:26:37.000000000 -0400
-+++ astyle/src/astyle_main.cpp	2019-09-11 20:38:02.155936887 -0400
-@@ -3749,7 +3749,7 @@
- // called by a java program to get the version number
- // the function name is constructed from method names in the calling java program
- extern "C"  EXPORT
--jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
-+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass)
- {
- 	return env->NewStringUTF(g_version);
- }
-@@ -3757,7 +3757,7 @@
- // called by a java program to format the source code
- // the function name is constructed from method names in the calling java program
- extern "C"  EXPORT
--jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
-+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
-                                                 jobject obj,
-                                                 jstring textInJava,
-                                                 jstring optionsJava)
---- astyle/src/astyle_main.h	2017-05-30 20:26:37.000000000 -0400
-+++ astyle/src/astyle_main.h	2019-09-11 20:39:15.953536523 -0400
-@@ -406,9 +406,9 @@
- char* STDCALL javaMemoryAlloc(unsigned long memoryNeeded);
- // the following function names are constructed from method names in the calling java program
- extern "C" EXPORT
--jstring STDCALL Java_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
-+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleGetVersion(JNIEnv* env, jclass);
- extern "C" EXPORT
--jstring STDCALL Java_AStyleInterface_AStyleMain(JNIEnv* env,
-+jstring STDCALL Java_cc_arduino_packages_formatter_AStyleInterface_AStyleMain(JNIEnv* env,
-                                                 jobject obj,
-                                                 jstring textInJava,
-                                                 jstring optionsJava);
diff --git a/srcpkgs/arduino/patches/disable-dependency-build.patch b/srcpkgs/arduino/patches/disable-dependency-build.patch
deleted file mode 100644
index 970decc78e1..00000000000
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- Arduino-1.8.9/build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
-+++ Arduino-1.8.9/build/build.xml	2019-02-26 02:22:56.667235290 +0100
-@@ -649,15 +649,6 @@
-   </target>
- 
-   <target name="linux-libastyle-x86" depends="linux-build" description="Download libastyle.so for x86/x64 arch">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-4.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.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>
-@@ -674,15 +665,6 @@
-   </target>
- 
-   <target name="linux-libastyle-arm" depends="linux-build" description="Download libastyle.so for ARM">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-4.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.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_arm.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>
-@@ -704,28 +686,9 @@
-     </antcall>
- 
-     <antcall target="build-arduino-builder" />
--
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-libastyle-aarch64" depends="linux-build" description="Download libastyle.so for AArch64">
--    <antcall target="unzip">
--      <param name="archive_file" value="./libastylej-2.05.1-4.zip" />
--      <param name="archive_url" value="https://downloads.arduino.cc/libastylej-2.05.1-4.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_aarch64.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>
-@@ -746,16 +709,6 @@
-     </antcall>
- 
-     <antcall target="build-arduino-builder" />
--
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-aarch64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_aarch64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux32-build" depends="linux-libastyle-x86" description="Build linux (32-bit) version">
-@@ -764,16 +717,6 @@
-     </antcall>
- 
-     <antcall target="build-arduino-builder" />
--
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_386.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux64-build" depends="linux-libastyle-x86" description="Build linux (64-bit) version">
-@@ -782,16 +725,6 @@
-     </antcall>
- 
-     <antcall target="build-arduino-builder" />
--
--    <antcall target="avr-toolchain-bundle">
--      <param name="unpack_target" value="untar"/>
--      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
--      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
--      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
--      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_amd64.tar.bz2"/>
--      <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
--    </antcall>
-   </target>
- 
-   <target name="linux-jvm-noop"/>
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index fa30576f2f0..84525f568d2 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,7 +1,7 @@
 # Template file for 'arduino'
 pkgname=arduino
-version=1.8.9
-revision=2
+version=1.8.11
+revision=1
 archs="x86_64* i686* aarch64* arm*"
 wrksrc=$pkgname-$version
 create_wrksrc=yes
@@ -15,7 +15,7 @@ homepage="http://arduino.cc/"
 distfiles="
  https://github.com/arduino/Arduino/archive/${version}.tar.gz
  ${SOURCEFORGE_SITE}/astyle/astyle_3.0.1_linux.tar.gz"
-checksum="2fcdf989d7eacf052b357f1e4d3a1bf177c0e76110085ed0f78314ea47faacf0
+checksum="ba0a4ebdb5f46a4c7639b5b872da861e3be23c9ccd9df0a1b1fc7ea9f0271f2b
  6c3ab029e0e4a75e2e603d449014374aa8269218fdd03a4aaa46ab743b1912fd"
 nostrip=yes
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [WIP] arduino: update to 1.8.11.
  2020-01-31  0:55 [PR PATCH] [WIP] arduino: update to 1.8.11 voidlinux-github
@ 2020-05-21  4:44 ` ericonr
  2020-05-22  4:12 ` anjandev
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2020-05-21  4:44 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/18673#issuecomment-631876264

Comment:
If you come to need Arduino goodies, https://github.com/void-linux/void-packages/pull/22163 :)

Btw, when you manage to get it working, could you look into #19290 ? If the fix isn't trivial, we just need to tag the package as broken for musl. We can open an issue about it with upstream as well, if it persists with the new version.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [WIP] arduino: update to 1.8.11.
  2020-01-31  0:55 [PR PATCH] [WIP] arduino: update to 1.8.11 voidlinux-github
  2020-05-21  4:44 ` ericonr
@ 2020-05-22  4:12 ` anjandev
  2020-05-22  4:13 ` [PR PATCH] [Closed]: " anjandev
  2020-05-24  2:03 ` ericonr
  3 siblings, 0 replies; 5+ messages in thread
From: anjandev @ 2020-05-22  4:12 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

New comment by anjandev on void-packages repository

https://github.com/void-linux/void-packages/pull/18673#issuecomment-632468629

Comment:

The project I needed this package for ended so I don't have a lot of
motivation to fix this. I also dont have a musl machine so I dont think
I can fix that issue.

Sorry I cannot help with this.


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PR PATCH] [Closed]: [WIP] arduino: update to 1.8.11.
  2020-01-31  0:55 [PR PATCH] [WIP] arduino: update to 1.8.11 voidlinux-github
  2020-05-21  4:44 ` ericonr
  2020-05-22  4:12 ` anjandev
@ 2020-05-22  4:13 ` anjandev
  2020-05-24  2:03 ` ericonr
  3 siblings, 0 replies; 5+ messages in thread
From: anjandev @ 2020-05-22  4:13 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

There's a closed pull request on the void-packages repository

[WIP] arduino: update to 1.8.11.
https://github.com/void-linux/void-packages/pull/18673

Description:
Patches failed so I deleted them. Cannot test if the patches are needed until I can get arduino to compile.

Unfortunately, the template fails to compile because of issue #11718

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [WIP] arduino: update to 1.8.11.
  2020-01-31  0:55 [PR PATCH] [WIP] arduino: update to 1.8.11 voidlinux-github
                   ` (2 preceding siblings ...)
  2020-05-22  4:13 ` [PR PATCH] [Closed]: " anjandev
@ 2020-05-24  2:03 ` ericonr
  3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2020-05-24  2:03 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/18673#issuecomment-633165883

Comment:
No problem :) 

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-31  0:55 [PR PATCH] [WIP] arduino: update to 1.8.11 voidlinux-github
2020-05-21  4:44 ` ericonr
2020-05-22  4:12 ` anjandev
2020-05-22  4:13 ` [PR PATCH] [Closed]: " anjandev
2020-05-24  2:03 ` ericonr

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git