Various fixing

2 files changed, 27 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7e1dbca4568d..8f3f5b091974 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,30 +2,27 @@ pkgbase = arduino
 	pkgdesc = Arduino prototyping platform SDK
 	pkgver = 1.6.9
 	pkgrel = 1
-	epoch = 1
-	url = http://arduino.cc/en/Main/Software
+	url = https://arduino.cc/en/Main/Software
 	install = arduino.install
 	arch = i686
 	arch = x86_64
+	arch = armv6h
+	arch = armv7h
 	license = GPL
 	license = LGPL
-	makedepends = icoutils
 	depends = gtk2
-	depends = libusb-compat
-	depends = java-runtime
 	depends = desktop-file-utils
-	depends = giflib
-	depends = avrdude
+	depends = shared-mime-info
 	options = !strip
 	options = staticlibs
-	source = arduino.desktop
-	source = arduino.xml
-	sha256sums = ee29f80cc63cf3a21e844372721686372c2ca4b36e35430350d72e0b788a0ae2
-	sha256sums = 473b82156505e9bd903e4d8484e8d183f2e3bf3c1f7e29940b815929ae597b68
-	source_i686 = http://downloads.arduino.cc/arduino-1.6.9-linux32.tar.xz
+	source_i686 = https://downloads.arduino.cc/arduino-1.6.9-linux32.tar.xz
 	sha256sums_i686 = b164905f281ad34ca4ca0d58b2b4c0d67d8125dbcd43ad73d536effd02ef8e56
-	source_x86_64 = http://downloads.arduino.cc/arduino-1.6.9-linux64.tar.xz
+	source_x86_64 = https://downloads.arduino.cc/arduino-1.6.9-linux64.tar.xz
 	sha256sums_x86_64 = 8da3920fe9e168bcf3fe31fef9e1f8454ba5366e7f2e297cf264485e59e8a1a0
+	source_armv6h = https://downloads.arduino.cc/arduino-1.6.9-linuxarm.tar.xz
+	sha256sums_armv6h = 6a960d8a2e9559fa7496ee7341be81e7ec91e769beeb63a5de8d1f740996e53a
+	source_armv7h = https://downloads.arduino.cc/arduino-1.6.9-linuxarm.tar.xz
+	sha256sums_armv7h = 6a960d8a2e9559fa7496ee7341be81e7ec91e769beeb63a5de8d1f740996e53a
 
 pkgname = arduino
 
diff --git a/PKGBUILD b/PKGBUILD
index 1db27ff73383..a173632bbc50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,43 +5,36 @@
 # Contributor: darkapex <me@jailuthra.in>
 # Contributor: tty0 <vt.tty0[d0t]gmail.com>
 
+
 pkgname='arduino'
-epoch=1
 pkgver='1.6.9'
 pkgrel=1
 pkgdesc="Arduino prototyping platform SDK"
-arch=('i686' 'x86_64')
-url="http://arduino.cc/en/Main/Software"
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url="https://arduino.cc/en/Main/Software"
 options=(!strip staticlibs)
 license=('GPL' 'LGPL')
-depends=('gtk2' 'libusb-compat' 'java-runtime' 'desktop-file-utils' 'giflib' 'avrdude')
-makedepends=('icoutils')
+depends=('gtk2' 'desktop-file-utils' 'shared-mime-info')
 install="arduino.install"
-source=('arduino.desktop'
-        'arduino.xml')
-source_i686+=("http://downloads.arduino.cc/arduino-${pkgver}-linux32.tar.xz")
-source_x86_64+=("http://downloads.arduino.cc/arduino-${pkgver}-linux64.tar.xz")
-sha256sums=('ee29f80cc63cf3a21e844372721686372c2ca4b36e35430350d72e0b788a0ae2'
-            '473b82156505e9bd903e4d8484e8d183f2e3bf3c1f7e29940b815929ae597b68')
+source_i686=("https://downloads.arduino.cc/arduino-${pkgver}-linux32.tar.xz")
+source_x86_64=("https://downloads.arduino.cc/arduino-${pkgver}-linux64.tar.xz")
+source_armv6h=("https://downloads.arduino.cc/arduino-${pkgver}-linuxarm.tar.xz")
+source_armv7h=("https://downloads.arduino.cc/arduino-${pkgver}-linuxarm.tar.xz")
 sha256sums_i686=('b164905f281ad34ca4ca0d58b2b4c0d67d8125dbcd43ad73d536effd02ef8e56')
 sha256sums_x86_64=('8da3920fe9e168bcf3fe31fef9e1f8454ba5366e7f2e297cf264485e59e8a1a0')
+sha256sums_armv6h=('6a960d8a2e9559fa7496ee7341be81e7ec91e769beeb63a5de8d1f740996e53a')
+sha256sums_armv7h=('6a960d8a2e9559fa7496ee7341be81e7ec91e769beeb63a5de8d1f740996e53a')
 
-build() {
-  cd "arduino-${pkgver}"
-
-  icotool -x -o .. lib/arduino_icon.ico
-}
 
 package() {
   cd "arduino-${pkgver}"
 
   install -dm755 "${pkgdir}/usr/bin"
-  install -dm755 "${pkgdir}/usr/share/"{doc,applications,mime/packages}
+  install -dm755 "${pkgdir}/usr/share/"{doc,icons/hicolor,applications,mime/packages}
 
   # copy the whole SDK to /usr/share/arduino/
   cp -rf . "${pkgdir}/usr/share/arduino/"
 
-  # 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"
 
@@ -50,11 +43,12 @@ package() {
   ln -s /usr/bin/avrdude "${pkgdir}/usr/share/arduino/hardware/tools/avr/bin/avrdude"
 
   # desktop icon
-  install -dm755 "${pkgdir}/usr/share/icons"
-  for size in 32 48 256; do
-    mv "${pkgdir}/usr/share/arduino/lib/icons/${size}x${size}/" \
-      "${pkgdir}/usr/share/icons/${size}x${size}"
-  done
+  cp -a lib/icons/* "${pkgdir}/usr/share/icons/hicolor"
+  rm -rf "${pkgdir}/usr/share/arduino/lib/icons"
+  ln -s /usr/share/icons/hicolor "${pkgdir}/usr/share/arduino/lib/icons"
+
+  #create desktop file using existing template
+  sed "s,<BINARY_LOCATION>,arduino %U,g;s,<ICON_NAME>,arduino,g" "lib/desktop.template" > "${pkgdir}/usr/share/applications/arduino.desktop"
 
   # desktop and mimetype files
   install -m644 "${srcdir}/arduino.desktop" "${pkgdir}/usr/share/applications/"