arduino-1.0.5-1: updating version

2 files changed, 2 insertions, 97 deletions

diff --git a/java/arduino/PKGBUILD b/java/arduino/PKGBUILD
index 7df52fb67..5f8ae8808 100644
--- a/java/arduino/PKGBUILD
+++ b/java/arduino/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer (AUR): PyroPeter <googlemail.com@abi1789>
 
 pkgname=arduino
-pkgver=1.0.4
+pkgver=1.0.5
 pkgrel=1
 pkgdesc="Arduino SDK and IDE"
 arch=('i686' 'x86_64')
@@ -15,7 +15,6 @@ depends=('avr-gcc' 'avr-libc' 'libusb-compat' 'java-runtime' 'avrdude'
 makedepends=(java-environment apache-ant)
 install="arduino.install"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/arduino/Arduino/archive/${pkgver}.tar.gz"
-	'avrlibc-signals.patch'
 	'external-avrtools.patch'
 	'arduino.png'
 	'arduino.desktop')
@@ -42,12 +41,6 @@ _link_jars() {
 _patch() {
   cd "$srcdir/Arduino-$pkgver"
 
-  # Fix issue 955 to be compatible with newer versions of avr-libc
-  # https://code.google.com/p/arduino/issues/detail?id=955
-  # Note: this patch is not the patch given in the comments
-  patch -Np1 -i "$srcdir/avrlibc-signals.patch"
-  grep -rl 'SIGNAL\s*(' . | xargs sed -ri 's/SIGNAL\s*\(([^)]*_vect)\)/ISR(\1)/g'
-
   # Don't look for pre-compiled avr-tools
   patch -Np1 -i "$srcdir/external-avrtools.patch"
 
@@ -93,8 +86,7 @@ package() {
   install -m644 "$srcdir/arduino.png" "$pkgdir/usr/share/pixmaps/"
 }
 
-md5sums=('cd490dc44ae41c97d3fc6b6bd176385e'
-         'e44975d31aa1770e4f5ac6e6867b0864'
+md5sums=('a7a00be1c3191b7e2c9ceb7a84a30e6f'
          '9c696c2361d57027be41ae64436182aa'
          '9e36d33891d5e68d38ec55d1494499a5'
          'eebc4d6495864bea99ad057af801afb9')
diff --git a/java/arduino/avrlibc-signals.patch b/java/arduino/avrlibc-signals.patch
deleted file mode 100644
index d9c743cc6..000000000
--- a/java/arduino/avrlibc-signals.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -ruN arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.cpp
---- arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-11-04 16:29:10.000000000 -0500
-+++ arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.cpp	2012-12-03 15:35:06.000000000 -0500
-@@ -89,9 +89,7 @@
- #if !defined(USART0_RX_vect) && defined(USART1_RX_vect)
- // do nothing - on the 32u4 the first USART is USART1
- #else
--#if !defined(USART_RX_vect) && !defined(SIG_USART0_RECV) && \
--    !defined(SIG_UART0_RECV) && !defined(USART0_RX_vect) && \
--	!defined(SIG_UART_RECV)
-+#if !defined(USART_RX_vect) && !defined(USART0_RX_vect)
-   #error "Don't know what the Data Received vector is called for the first UART"
- #else
-   void serialEvent() __attribute__((weak));
-@@ -99,14 +97,8 @@
-   #define serialEvent_implemented
- #if defined(USART_RX_vect)
-   SIGNAL(USART_RX_vect)
--#elif defined(SIG_USART0_RECV)
--  SIGNAL(SIG_USART0_RECV)
--#elif defined(SIG_UART0_RECV)
--  SIGNAL(SIG_UART0_RECV)
- #elif defined(USART0_RX_vect)
-   SIGNAL(USART0_RX_vect)
--#elif defined(SIG_UART_RECV)
--  SIGNAL(SIG_UART_RECV)
- #endif
-   {
-   #if defined(UDR0)
-@@ -143,8 +135,6 @@
-       unsigned char c = UDR1;
-     };
-   }
--#elif defined(SIG_USART1_RECV)
--  #error SIG_USART1_RECV
- #endif
- 
- #if defined(USART2_RX_vect) && defined(UDR2)
-@@ -160,8 +150,6 @@
-       unsigned char c = UDR2;
-     };
-   }
--#elif defined(SIG_USART2_RECV)
--  #error SIG_USART2_RECV
- #endif
- 
- #if defined(USART3_RX_vect) && defined(UDR3)
-@@ -177,8 +165,6 @@
-       unsigned char c = UDR3;
-     };
-   }
--#elif defined(SIG_USART3_RECV)
--  #error SIG_USART3_RECV
- #endif
- 
- void serialEventRun(void)
-diff -ruN arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.h arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.h
---- arduino-1.0.2.orig/hardware/arduino/cores/arduino/HardwareSerial.h	2012-11-04 16:29:10.000000000 -0500
-+++ arduino-1.0.2/hardware/arduino/cores/arduino/HardwareSerial.h	2012-12-03 15:35:06.000000000 -0500
-@@ -126,6 +126,15 @@
- #endif
- #endif
- 
-+/*
-+ * on ATmega8, the uart and its bits are not numbered, so there is no "TXC0"
-+ * definition.  It is slightly cleaner to define this here instead of having
-+ * conditional code in the cpp module.
-+ */
-+#if !defined(TXC0)
-+#define TXC0 TXC
-+#endif
-+
- extern void serialEventRun(void) __attribute__((weak));
- 
- #endif
-diff -ruN arduino-1.0.2.orig/hardware/arduino/cores/arduino/WInterrupts.c arduino-1.0.2/hardware/arduino/cores/arduino/WInterrupts.c
---- arduino-1.0.2.orig/hardware/arduino/cores/arduino/WInterrupts.c	2012-11-04 16:29:11.000000000 -0500
-+++ arduino-1.0.2/hardware/arduino/cores/arduino/WInterrupts.c	2012-12-03 15:37:08.000000000 -0500
-@@ -314,7 +314,7 @@
- #endif
- 
- /*
--SIGNAL(SIG_2WIRE_SERIAL) {
-+ISR(TWI_vect) {
-   if(twiIntFunc)
-     twiIntFunc();
- }