diff options
| author |   Angelo Arrifano <miknix@gentoo.org> | 2012-02-10 00:09:27 +0000 |
|---|---|---|
| committer | Angelo Arrifano <miknix@gentoo.org> | 2012-02-10 00:09:27 +0000 |
| commit | a8eea7428fad401c88d6ef43007011bbe3309b99 (patch) | |
| tree | ba2a522f984ad21630defe979ea11108a17f9680 /dev-embedded/arduino/files | |
| parent | Added ~mips, bug 393181. (diff) | |
| download | historical-a8eea7428fad401c88d6ef43007011bbe3309b99.tar.gz historical-a8eea7428fad401c88d6ef43007011bbe3309b99.tar.bz2 historical-a8eea7428fad401c88d6ef43007011bbe3309b99.zip | |
Version bump. I'll need to profile mask previous versions since upstream
version has changed.
Package-Manager: portage-2.1.10.41/cvs/Linux x86_64
Diffstat (limited to 'dev-embedded/arduino/files')
| -rw-r--r-- | dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch | 13 | ||||
| -rw-r--r-- | dev-embedded/arduino/files/arduino-1.0-script.patch | 22 |
2 files changed, 35 insertions, 0 deletions
diff --git a/dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch b/dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch new file mode 100644 index 000000000000..727944719d58 --- /dev/null +++ b/dev-embedded/arduino/files/arduino-1.0-prog_char-fix.patch @@ -0,0 +1,13 @@ +diff --git a/hardware/arduino/cores/arduino/Print.cpp b/hardware/arduino/cores/arduino/Print.cpp +index ff9b154..e541a6c 100644 +--- a/hardware/arduino/cores/arduino/Print.cpp ++++ b/hardware/arduino/cores/arduino/Print.cpp +@@ -41,7 +41,7 @@ size_t Print::write(const uint8_t *buffer, size_t size) + + size_t Print::print(const __FlashStringHelper *ifsh) + { +- const prog_char *p = (const prog_char *)ifsh; ++ const char PROGMEM *p = (const char PROGMEM *)ifsh; + size_t n = 0; + while (1) { + unsigned char c = pgm_read_byte(p++); diff --git a/dev-embedded/arduino/files/arduino-1.0-script.patch b/dev-embedded/arduino/files/arduino-1.0-script.patch new file mode 100644 index 000000000000..323d6a639b18 --- /dev/null +++ b/dev-embedded/arduino/files/arduino-1.0-script.patch @@ -0,0 +1,22 @@ +diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino +index d371e76..eec238b 100755 +--- a/build/linux/dist/arduino ++++ b/build/linux/dist/arduino +@@ -10,13 +10,12 @@ for LIB in \ + lib/*.jar \ + ; + do +- CLASSPATH="${CLASSPATH}:${LIB}" ++ CLASSPATH="${CLASSPATH+$CLASSPATH:}${LIB}" + done ++CLASSPATH="${CLASSPATH+$CLASSPATH:}:$(java-config -dp rxtx-2)" + export CLASSPATH + +-LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ++LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}" + export LD_LIBRARY_PATH + +-export PATH="${APPDIR}/java/bin:${PATH}" +- + java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base + |