diff options
| -rw-r--r-- | development/arduino/README | 2 | ||||
| -rw-r--r-- | development/arduino/arduino.SlackBuild | 19 | ||||
| -rw-r--r-- | development/arduino/arduino.desktop | 2 | ||||
| -rw-r--r-- | development/arduino/arduino.info | 2 |
4 files changed, 14 insertions, 11 deletions
diff --git a/development/arduino/README b/development/arduino/README index 87404edbb78ab..440c2d63835ed 100644 --- a/development/arduino/README +++ b/development/arduino/README @@ -16,7 +16,7 @@ upload it to the i/o board. It runs on Windows, Mac OS X, and Linux. The environment is written in Java and based on Processing, avr-gcc, and other open source software. -This requires avr-libc, avr-gcc and avr-binutils. +This requires avr-libc, avr-gcc, and avr-binutils. Note: Due to a bug in the Arduino IDE, you might need to downgrade to avr-binutils 2.20.1 to compile programs for some boards. You can use the diff --git a/development/arduino/arduino.SlackBuild b/development/arduino/arduino.SlackBuild index dd52ecb03597d..89a845b8ce0f1 100644 --- a/development/arduino/arduino.SlackBuild +++ b/development/arduino/arduino.SlackBuild @@ -15,7 +15,7 @@ PRGNAM=arduino VERSION=${VERSION:-1.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -33,7 +33,7 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then LIBDIRSUFFIX="" - SRCSUFFIX="" + SRCSUFFIX="-linux" elif [ "$ARCH" = "i686" ]; then LIBDIRSUFFIX="" SRCSUFFIX="-linux" @@ -52,11 +52,11 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT +rm -rf $TMP/$PRGNAM-$VERSION cd $TMP -rm -rf $PRGNAM-$VERSION tar xvf $CWD/$SOURCENAME -cd $PRGNAM-$VERSION -chown -R root:root . +cd $PKG +chown -R root:root $PKG $TMP/$PRGNAM-$VERSION find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ @@ -70,6 +70,9 @@ find . \ mkdir -p $PKG/usr/bin cat << EOF > $PKG/usr/bin/$PRGNAM #!/bin/sh +if [ -n \${CPLUS_INCLUDE_PATH} ]; then + unset CPLUS_INCLUDE_PATH +fi cd \$HOME if [ \$(echo \$PATH | grep java | wc -l) -lt 1 ]; then export PATH=\$PATH:/usr/lib$LIBDIRSUFFIX/java/bin:/usr/lib$LIBDIRSUFFIX/java/jre/bin:/usr/lib$LIBDIRSUFFIX/java/bin; @@ -79,17 +82,17 @@ EOF chmod 0755 $PKG/usr/bin/$PRGNAM mkdir -p $PKG/$SYSTEMFOLDER -cp -a * $PKG/$SYSTEMFOLDER/ +cp -a ../$PRGNAM-$VERSION/* $PKG/$SYSTEMFOLDER/ install -D -m 644 $CWD/arduino.desktop $PKG/usr/share/applications/arduino.desktop -install -D -m 644 reference/img/logo.png $PKG/usr/share/pixmaps/arduino.png +install -D -m 644 $TMP/$PRGNAM-$VERSION/reference/img/logo.png $PKG/usr/share/pixmaps/arduino.png find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - revisions.txt \ + ../$PRGNAM-$VERSION/revisions.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/arduino/arduino.desktop b/development/arduino/arduino.desktop index 0d6a0cf702a8b..90a01e87696b8 100644 --- a/development/arduino/arduino.desktop +++ b/development/arduino/arduino.desktop @@ -2,7 +2,7 @@ Name=Arduino IDE GenericName=Arduino IDE Comment=Arduino IDE development -Exec=/opt/arduino/arduino +Exec=/usr/bin/arduino Icon=arduino Terminal=false Type=Application diff --git a/development/arduino/arduino.info b/development/arduino/arduino.info index 32a032739718e..e690e21dea511 100644 --- a/development/arduino/arduino.info +++ b/development/arduino/arduino.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="http://files.arduino.cc/downloads/arduino-1.0-linux64.tgz" MD5SUM_x86_64="14336316af4cc4aef5f879afed9dd7ea" MAINTAINER="Vliegendehuiskat" EMAIL="vliegendehuiskat [at] gmail [dot] com" -APPROVED="Niels Horn" +APPROVED="rworkman" |