Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] [WIP] arduino: include patch to fix astyle
@ 2019-09-12  2:59 voidlinux-github
  2019-09-18 19:09 ` [PR PATCH] [Merged]: " voidlinux-github
  0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-09-12  2:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/karl-nilsson/void-packages arduino_astyle_fix
https://github.com/void-linux/void-packages/pull/14414

[WIP] arduino: include patch to fix astyle
This fixes a bug in the Arduino IDE, enabling code formatting
there's probably a better way to implement this
ping @Gottox 

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

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-arduino_astyle_fix-14414.patch --]
[-- Type: text/x-diff, Size: 3954 bytes --]

From 8e5c4dbabbdca8804622790dfa66c817694e5f19 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Sun, 8 Sep 2019 00:18:21 -0400
Subject: [PATCH] arduino: include patch to fix astyle

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

diff --git a/srcpkgs/arduino/patches/astyle_fix.patch b/srcpkgs/arduino/patches/astyle_fix.patch
new file mode 100644
index 00000000000..7b07f574420
--- /dev/null
+++ b/srcpkgs/arduino/patches/astyle_fix.patch
@@ -0,0 +1,34 @@
+--- 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
index ac27de7601e..970decc78e1 100644
--- a/srcpkgs/arduino/patches/disable-dependency-build.patch
+++ b/srcpkgs/arduino/patches/disable-dependency-build.patch
@@ -1,5 +1,5 @@
---- build/build.xml.orig	2019-02-26 02:16:33.845398910 +0100
-+++ build/build.xml	2019-02-26 02:22:56.667235290 +0100
+--- 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>
  
diff --git a/srcpkgs/arduino/template b/srcpkgs/arduino/template
index ed5954c9195..d877176f70c 100644
--- a/srcpkgs/arduino/template
+++ b/srcpkgs/arduino/template
@@ -1,9 +1,11 @@
 # Template file for 'arduino'
 pkgname=arduino
 version=1.8.9
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* arm*"
-wrksrc=Arduino-$version
+wrksrc=$pkgname-$version
+create_wrksrc=yes
+build_wrksrc=Arduino-$version
 hostmakedepends="apache-ant unzip ImageMagick openjdk"
 depends="virtual?java-runtime avr-binutils avr-gcc avr-libc avrdude"
 short_desc="IDE for the arduino open-source electronics prototyping platform"

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

* Re: [PR PATCH] [Merged]: [WIP] arduino: include patch to fix astyle
  2019-09-12  2:59 [PR PATCH] [WIP] arduino: include patch to fix astyle voidlinux-github
@ 2019-09-18 19:09 ` " voidlinux-github
  0 siblings, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-09-18 19:09 UTC (permalink / raw)
  To: ml

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

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

[WIP] arduino: include patch to fix astyle
https://github.com/void-linux/void-packages/pull/14414

Description:
This fixes a bug in the Arduino IDE, enabling code formatting
there's probably a better way to implement this
ping @Gottox 

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

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-12  2:59 [PR PATCH] [WIP] arduino: include patch to fix astyle voidlinux-github
2019-09-18 19:09 ` [PR PATCH] [Merged]: " voidlinux-github

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