snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

arduino: include patch to fix astyle

This commit is contained in:
Karl Nilsson 2019-09-08 00:18:21 -04:00 committed by Enno Boland
parent df3709709d
commit fd77c8d23d
3 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
srcpkgs/arduino/patches/astyle_fix.patch Normal file
View File

@ -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);

4
srcpkgs/arduino/patches/disable-dependency-build.patch
View File

@ -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>

6
srcpkgs/arduino/template
View File

@ -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"