summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Martignène2016-04-29 15:08:05 +0200
committerNiels Martignène2016-04-29 15:12:21 +0200
commit090b9b1639b2243f7738f2262e837f5cbde4c95f (patch)
treeee268d87a9fbe95733ad82e500439860de48a268
parent09963f9a09c080076ec5477f0cdd86c6748f56c4 (diff)
downloadaur-090b9b1639b2243f7738f2262e837f5cbde4c95f.tar.gz
Allow parallel installation with Arduino 1.5+
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD35
-rw-r--r--arduino.desktop12
-rw-r--r--arduino10.desktop12
-rw-r--r--arduino10.install (renamed from arduino.install)0
-rw-r--r--arduino10.xml (renamed from arduino.xml)0
6 files changed, 34 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d52514f8483..771e14adcf4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
pkgbase = arduino10
pkgdesc = Arduino prototyping platform SDK (old version)
pkgver = 1.0.6
- pkgrel = 4
+ pkgrel = 5
epoch = 1
url = http://arduino.cc/en/Main/Software
- install = arduino.install
+ install = arduino10.install
arch = i686
arch = x86_64
license = GPL
@@ -15,15 +15,13 @@ pkgbase = arduino10
depends = java-runtime
depends = java-rxtx
depends = desktop-file-utils
- conflicts = arduino
- conflicts = arduino-toolchain
options = !strip
options = staticlibs
source = arduino-fix-arguments.patch
- source = arduino.desktop
- source = arduino.xml
+ source = arduino10.desktop
+ source = arduino10.xml
sha256sums = 631921fce485d14c79bcdc31d5d6f3a95d729d49975390b6b785fe49d238ff65
- sha256sums = ee29f80cc63cf3a21e844372721686372c2ca4b36e35430350d72e0b788a0ae2
+ sha256sums = 00b6ab429a7f85fe4b2e571c08fea50f615d8e5b6b570797b01f293ff9bb57f8
sha256sums = 473b82156505e9bd903e4d8484e8d183f2e3bf3c1f7e29940b815929ae597b68
source_i686 = http://downloads.arduino.cc/arduino-1.0.6-linux32.tgz
sha256sums_i686 = f059a572231abafb92099a3a404c0a41502c3413668610676c40029384edc658
diff --git a/PKGBUILD b/PKGBUILD
index 945e1a00749..1985754673a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=arduino10
epoch=1
pkgver=1.0.6
-pkgrel=4
+pkgrel=5
pkgdesc="Arduino prototyping platform SDK (old version)"
arch=('i686' 'x86_64')
url="http://arduino.cc/en/Main/Software"
@@ -14,18 +14,17 @@ options=(!strip staticlibs)
license=('GPL' 'LGPL')
depends=('gtk2' 'libusb-compat' 'java-runtime' 'java-rxtx' 'desktop-file-utils')
makedepends=('icoutils')
-conflicts=('arduino' 'arduino-toolchain')
-install="arduino.install"
+install="arduino10.install"
source=('arduino-fix-arguments.patch'
- 'arduino.desktop'
- 'arduino.xml')
+ 'arduino10.desktop'
+ 'arduino10.xml')
source_i686+=("http://downloads.arduino.cc/arduino-${pkgver}-linux32.tgz")
source_x86_64+=("http://downloads.arduino.cc/arduino-${pkgver}-linux64.tgz")
sha256sums=('631921fce485d14c79bcdc31d5d6f3a95d729d49975390b6b785fe49d238ff65'
- 'ee29f80cc63cf3a21e844372721686372c2ca4b36e35430350d72e0b788a0ae2'
+ '00b6ab429a7f85fe4b2e571c08fea50f615d8e5b6b570797b01f293ff9bb57f8'
'473b82156505e9bd903e4d8484e8d183f2e3bf3c1f7e29940b815929ae597b68')
-sha256sums_i686+=('f059a572231abafb92099a3a404c0a41502c3413668610676c40029384edc658')
-sha256sums_x86_64+=('1ff175c487de335981d3aad64cf212b56cb2c778a6bdd6655045335ffc65e147')
+sha256sums_i686=('f059a572231abafb92099a3a404c0a41502c3413668610676c40029384edc658')
+sha256sums_x86_64=('1ff175c487de335981d3aad64cf212b56cb2c778a6bdd6655045335ffc65e147')
prepare() {
cd "arduino-${pkgver}"
@@ -41,25 +40,25 @@ package() {
mkdir -p "${pkgdir}/usr/bin"
mkdir -p "${pkgdir}/usr/share/"{doc,applications,mime/packages}
- # copy the whole SDK to /usr/share/arduino/
- cp -a . "${pkgdir}/usr/share/arduino"
+ # copy the whole SDK to /usr/share/arduino10/
+ cp -a . "${pkgdir}/usr/share/arduino10"
# use system's RXTX library
- ln -sf /usr/lib/librxtxSerial.so "${pkgdir}/usr/share/arduino/lib/librxtxSerial.so"
- ln -sf /usr/lib/librxtxSerial.so "${pkgdir}/usr/share/arduino/lib/librxtxSerial64.so"
- ln -sf /usr/share/java/rxtx/RXTXcomm.jar "${pkgdir}/usr/share/arduino/lib/RXTXcomm.jar"
+ ln -sf /usr/lib/librxtxSerial.so "${pkgdir}/usr/share/arduino10/lib/librxtxSerial.so"
+ ln -sf /usr/lib/librxtxSerial.so "${pkgdir}/usr/share/arduino10/lib/librxtxSerial64.so"
+ ln -sf /usr/share/java/rxtx/RXTXcomm.jar "${pkgdir}/usr/share/arduino10/lib/RXTXcomm.jar"
# at least support the FHS a little bit
- ln -s /usr/share/arduino/arduino "${pkgdir}/usr/bin/arduino"
- ln -s /usr/share/arduino/reference "${pkgdir}/usr/share/doc/arduino"
+ ln -s /usr/share/arduino10/arduino "${pkgdir}/usr/bin/arduino10"
+ ln -s /usr/share/arduino10/reference "${pkgdir}/usr/share/doc/arduino10"
# desktop icon
for size in 16 32 48 256; do
install -Dm644 ../arduino_icon_*_${size}x${size}x32.png \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/arduino.png"
+ "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/arduino10.png"
done
# desktop and mimetype files
- install -m644 "${srcdir}/arduino.desktop" "${pkgdir}/usr/share/applications/"
- install -m644 "${srcdir}/arduino.xml" "${pkgdir}/usr/share/mime/packages/"
+ install -m644 "${srcdir}/arduino10.desktop" "${pkgdir}/usr/share/applications/"
+ install -m644 "${srcdir}/arduino10.xml" "${pkgdir}/usr/share/mime/packages/"
}
diff --git a/arduino.desktop b/arduino.desktop
deleted file mode 100644
index 38efd0b0b79..00000000000
--- a/arduino.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Arduino
-GenericName=Arduino IDE
-Comment=The open-source Arduino environment
-TryExec=arduino
-Exec=arduino %U
-Icon=arduino
-Type=Application
-Terminal=false
-MimeType=text/x-arduino;
-Categories=Development;
-StartupWMClass=processing-app-Base
diff --git a/arduino10.desktop b/arduino10.desktop
new file mode 100644
index 00000000000..2bcf43d9075
--- /dev/null
+++ b/arduino10.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Arduino (legacy)
+GenericName=Arduino IDE (legacy)
+Comment=The open-source Arduino environment (legacy)
+TryExec=arduino10
+Exec=arduino10 %U
+Icon=arduino10
+Type=Application
+Terminal=false
+MimeType=text/x-arduino;
+Categories=Development;
+StartupWMClass=processing-app-Base
diff --git a/arduino.install b/arduino10.install
index 4015160bfaa..4015160bfaa 100644
--- a/arduino.install
+++ b/arduino10.install
diff --git a/arduino.xml b/arduino10.xml
index 166b5a245f3..166b5a245f3 100644
--- a/arduino.xml
+++ b/arduino10.xml