summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2013-02-10 01:12:52 -0800
committerroot <root@rshg054.dnsready.net>2013-02-10 01:12:52 -0800
commit1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (patch)
tree016bfa1969323404c37dbef29cfc7242a5a8e9f3 /java
parente9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff)
Sun Feb 10 01:12:35 PST 2013
Diffstat (limited to 'java')
-rw-r--r--java/arduino/sig-patch.diff256
-rw-r--r--java/java-rxtx/ChangeLog.txt8
-rw-r--r--java/java-rxtx/destdir.patch20
-rw-r--r--java/java-rxtx/java7-configure.patch38
-rw-r--r--java/pacman-makepkg-git/PKGBUILD116
5 files changed, 0 insertions, 438 deletions
diff --git a/java/arduino/sig-patch.diff b/java/arduino/sig-patch.diff
deleted file mode 100644
index 4be3a6cdc..000000000
--- a/java/arduino/sig-patch.diff
+++ /dev/null
@@ -1,256 +0,0 @@
-diff -ruN arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.cpp
---- arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.cpp 2012-05-21 13:01:43.000000000 -0400
-+++ arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.cpp 2012-10-19 23:26:46.000000000 -0400
-@@ -88,24 +88,16 @@
- #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));
- void serialEvent() {}
- #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)
-+ ISR(USART_RX_vect)
- #elif defined(USART0_RX_vect)
-- SIGNAL(USART0_RX_vect)
--#elif defined(SIG_UART_RECV)
-- SIGNAL(SIG_UART_RECV)
-+ ISR(USART0_RX_vect)
- #endif
- {
- #if defined(UDR0)
-@@ -124,39 +116,33 @@
- void serialEvent1() __attribute__((weak));
- void serialEvent1() {}
- #define serialEvent1_implemented
-- SIGNAL(USART1_RX_vect)
-+ ISR(USART1_RX_vect)
- {
- unsigned char c = UDR1;
- store_char(c, &rx_buffer1);
- }
--#elif defined(SIG_USART1_RECV)
-- #error SIG_USART1_RECV
- #endif
-
- #if defined(USART2_RX_vect) && defined(UDR2)
- void serialEvent2() __attribute__((weak));
- void serialEvent2() {}
- #define serialEvent2_implemented
-- SIGNAL(USART2_RX_vect)
-+ ISR(USART2_RX_vect)
- {
- unsigned char c = UDR2;
- store_char(c, &rx_buffer2);
- }
--#elif defined(SIG_USART2_RECV)
-- #error SIG_USART2_RECV
- #endif
-
- #if defined(USART3_RX_vect) && defined(UDR3)
- void serialEvent3() __attribute__((weak));
- void serialEvent3() {}
- #define serialEvent3_implemented
-- SIGNAL(USART3_RX_vect)
-+ ISR(USART3_RX_vect)
- {
- unsigned char c = UDR3;
- store_char(c, &rx_buffer3);
- }
--#elif defined(SIG_USART3_RECV)
-- #error SIG_USART3_RECV
- #endif
-
- void serialEventRun(void)
-diff -ruN arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.h arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.h
---- arduino-1.0.1.orig/hardware/arduino/cores/arduino/HardwareSerial.h 2012-05-21 13:01:43.000000000 -0400
-+++ arduino-1.0.1/hardware/arduino/cores/arduino/HardwareSerial.h 2012-10-19 23:13:59.000000000 -0400
-@@ -76,6 +76,15 @@
- extern HardwareSerial Serial3;
- #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.1.orig/hardware/arduino/cores/arduino/WInterrupts.c arduino-1.0.1/hardware/arduino/cores/arduino/WInterrupts.c
---- arduino-1.0.1.orig/hardware/arduino/cores/arduino/WInterrupts.c 2012-05-21 13:01:43.000000000 -0400
-+++ arduino-1.0.1/hardware/arduino/cores/arduino/WInterrupts.c 2012-10-19 23:13:59.000000000 -0400
-@@ -216,72 +216,72 @@
- */
-
- #if defined(__AVR_ATmega32U4__)
--SIGNAL(INT0_vect) {
-+ISR(INT0_vect) {
- if(intFunc[EXTERNAL_INT_0])
- intFunc[EXTERNAL_INT_0]();
- }
-
--SIGNAL(INT1_vect) {
-+ISR(INT1_vect) {
- if(intFunc[EXTERNAL_INT_1])
- intFunc[EXTERNAL_INT_1]();
- }
-
- #elif defined(EICRA) && defined(EICRB)
-
--SIGNAL(INT0_vect) {
-+ISR(INT0_vect) {
- if(intFunc[EXTERNAL_INT_2])
- intFunc[EXTERNAL_INT_2]();
- }
-
--SIGNAL(INT1_vect) {
-+ISR(INT1_vect) {
- if(intFunc[EXTERNAL_INT_3])
- intFunc[EXTERNAL_INT_3]();
- }
-
--SIGNAL(INT2_vect) {
-+ISR(INT2_vect) {
- if(intFunc[EXTERNAL_INT_4])
- intFunc[EXTERNAL_INT_4]();
- }
-
--SIGNAL(INT3_vect) {
-+ISR(INT3_vect) {
- if(intFunc[EXTERNAL_INT_5])
- intFunc[EXTERNAL_INT_5]();
- }
-
--SIGNAL(INT4_vect) {
-+ISR(INT4_vect) {
- if(intFunc[EXTERNAL_INT_0])
- intFunc[EXTERNAL_INT_0]();
- }
-
--SIGNAL(INT5_vect) {
-+ISR(INT5_vect) {
- if(intFunc[EXTERNAL_INT_1])
- intFunc[EXTERNAL_INT_1]();
- }
-
--SIGNAL(INT6_vect) {
-+ISR(INT6_vect) {
- if(intFunc[EXTERNAL_INT_6])
- intFunc[EXTERNAL_INT_6]();
- }
-
--SIGNAL(INT7_vect) {
-+ISR(INT7_vect) {
- if(intFunc[EXTERNAL_INT_7])
- intFunc[EXTERNAL_INT_7]();
- }
-
- #else
-
--SIGNAL(INT0_vect) {
-+ISR(INT0_vect) {
- if(intFunc[EXTERNAL_INT_0])
- intFunc[EXTERNAL_INT_0]();
- }
-
--SIGNAL(INT1_vect) {
-+ISR(INT1_vect) {
- if(intFunc[EXTERNAL_INT_1])
- intFunc[EXTERNAL_INT_1]();
- }
-
- #if defined(EICRA) && defined(ISC20)
--SIGNAL(INT2_vect) {
-+ISR(INT2_vect) {
- if(intFunc[EXTERNAL_INT_2])
- intFunc[EXTERNAL_INT_2]();
- }
-@@ -290,9 +290,8 @@
- #endif
-
- /*
--SIGNAL(SIG_2WIRE_SERIAL) {
-+ISR(TWI_vect) {
- if(twiIntFunc)
- twiIntFunc();
- }
- */
--
-diff -ruN arduino-1.0.1.orig/hardware/arduino/cores/arduino/wiring.c arduino-1.0.1/hardware/arduino/cores/arduino/wiring.c
---- arduino-1.0.1.orig/hardware/arduino/cores/arduino/wiring.c 2012-05-21 13:01:43.000000000 -0400
-+++ arduino-1.0.1/hardware/arduino/cores/arduino/wiring.c 2012-10-19 23:13:59.000000000 -0400
-@@ -42,9 +42,9 @@
- static unsigned char timer0_fract = 0;
-
- #if defined(__AVR_ATtiny24__) || defined(__AVR_ATtiny44__) || defined(__AVR_ATtiny84__)
--SIGNAL(TIM0_OVF_vect)
-+ISR(TIM0_OVF_vect)
- #else
--SIGNAL(TIMER0_OVF_vect)
-+ISR(TIMER0_OVF_vect)
- #endif
- {
- // copy these to local variables so they can be stored in registers
-diff -ruN arduino-1.0.1.orig/libraries/Servo/Servo.cpp arduino-1.0.1/libraries/Servo/Servo.cpp
---- arduino-1.0.1.orig/libraries/Servo/Servo.cpp 2012-05-08 20:34:38.000000000 -0400
-+++ arduino-1.0.1/libraries/Servo/Servo.cpp 2012-10-19 23:13:59.000000000 -0400
-@@ -100,28 +100,28 @@
- #ifndef WIRING // Wiring pre-defines signal handlers so don't define any if compiling for the Wiring platform
- // Interrupt handlers for Arduino
- #if defined(_useTimer1)
--SIGNAL (TIMER1_COMPA_vect)
-+ISR(TIMER1_COMPA_vect)
- {
- handle_interrupts(_timer1, &TCNT1, &OCR1A);
- }
- #endif
-
- #if defined(_useTimer3)
--SIGNAL (TIMER3_COMPA_vect)
-+ISR(TIMER3_COMPA_vect)
- {
- handle_interrupts(_timer3, &TCNT3, &OCR3A);
- }
- #endif
-
- #if defined(_useTimer4)
--SIGNAL (TIMER4_COMPA_vect)
-+ISR(TIMER4_COMPA_vect)
- {
- handle_interrupts(_timer4, &TCNT4, &OCR4A);
- }
- #endif
-
- #if defined(_useTimer5)
--SIGNAL (TIMER5_COMPA_vect)
-+ISR(TIMER5_COMPA_vect)
- {
- handle_interrupts(_timer5, &TCNT5, &OCR5A);
- }
-diff -ruN arduino-1.0.1.orig/libraries/Wire/utility/twi.c arduino-1.0.1/libraries/Wire/utility/twi.c
---- arduino-1.0.1.orig/libraries/Wire/utility/twi.c 2012-02-18 19:57:03.000000000 -0500
-+++ arduino-1.0.1/libraries/Wire/utility/twi.c 2012-10-19 23:13:59.000000000 -0400
-@@ -360,7 +360,7 @@
- twi_state = TWI_READY;
- }
-
--SIGNAL(TWI_vect)
-+ISR(TWI_vect)
- {
- switch(TW_STATUS){
- // All Master
diff --git a/java/java-rxtx/ChangeLog.txt b/java/java-rxtx/ChangeLog.txt
deleted file mode 100644
index 7efab2514..000000000
--- a/java/java-rxtx/ChangeLog.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Differences from rxtx-2.1-7r2 made by Arduino:
- * Adding support for /dev/ttyACM* devices on Linux.
- * Fixing (I hope) problems on 64-bit Linux systems.
- * Adding checks for Java 1.6.
- * Removing unnecessary compiler warning.
-
-Differences from Arduino's version:
- * Adding checks for Java 1.7.
diff --git a/java/java-rxtx/destdir.patch b/java/java-rxtx/destdir.patch
deleted file mode 100644
index 11416841f..000000000
--- a/java/java-rxtx/destdir.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig 2012-09-21 15:21:00.000000000 -0400
-+++ Makefile.in 2012-09-21 15:21:07.000000000 -0400
-@@ -566,13 +566,15 @@
- # install librxtxSerial.so into the proper directory and copy $(JARTARGET) to its
- # proper location
- install: all
-+ $(mkinstalldirs) $(DESTDIR)$(RXTX_PATH)
-+ $(mkinstalldirs) $(DESTDIR)$(JHOME)
- @$(LIBTOOL_INST) \
- `for i in $(TARGETLIB);do \
- if [ -f $$i ];then \
- echo $$i; \
- fi; \
-- done` $(RXTX_PATH)
-- $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/
-+ done` $(DESTDIR)$(RXTX_PATH)
-+ $(INSTALL_PROGRAM) $(JARTARGET) $(DESTDIR)$(JHOME)/
-
- clean-generic:
- rm -rf $(DEST) $(TOP)/$(CLASSTOP)
diff --git a/java/java-rxtx/java7-configure.patch b/java/java-rxtx/java7-configure.patch
deleted file mode 100644
index fed710200..000000000
--- a/java/java-rxtx/java7-configure.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.orig 2012-09-21 15:02:54.000000000 -0400
-+++ configure 2012-09-21 15:03:38.000000000 -0400
-@@ -21541,7 +21541,7 @@
- CFLAGS=$CFLAGS" -D__need_timespec"
- case $JAVA_VERSION in
-
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- #fix_parameters $JPATH/jre/lib/javax.comm.properties
- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- JHOME=$JPATH"/jre/lib/ext"
-@@ -21611,7 +21611,7 @@
- TARGETLIB="\$(target_triplet)/librxtxSerial.la \
- \$(target_triplet)/librxtxParallel.la"
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- #fix_parameters $JPATH/jre/lib/javax.comm.properties
- CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-@@ -21747,7 +21747,7 @@
-
- WIN32)
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- CLASSPATH=".:\$(TOP):\$(TOP)/src:`find $JPATH/ -name RXTXcomm.jar |head -n1`:$CLASSPATH"
- JHOME=$JPATH"/jre/lib/ext"
- ;;
-@@ -21799,7 +21799,7 @@
- CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
-
- case $JAVA_VERSION in
-- 1.2*|1.3*|1.4*|1.5*|1.6*)
-+ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*)
- RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
- ;;
- 1.1*)
diff --git a/java/pacman-makepkg-git/PKGBUILD b/java/pacman-makepkg-git/PKGBUILD
deleted file mode 100644
index 0c72f03e9..000000000
--- a/java/pacman-makepkg-git/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Dave Reisner <dave@archlinux.org>
-
-_pkgname=pacman
-pkgname=$_pkgname-makepkg-git
-_relver=4.0.3
-_gitver=2abe1f16461133c0dc386f8ecb8b06865c22940b
-pkgver=${_relver}.git
-
-provides=($_pkgname=$pkgver)
-replaces=($_pkgname)
-conflicts=($_pkgname)
-
-pkgrel=1
-
-pkgdesc="A library-based package manager with dependency support (with makepkg from git)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-#groups=('base')
-depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
- 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
-makedepends=('asciidoc')
-optdepends=('fakeroot: for makepkg usage as normal user')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(ftp://ftp.archlinux.org/other/pacman/$_pkgname-$_relver.tar.gz{,.sig}
- https://projects.archlinux.org/pacman.git/snapshot/$_pkgname-$_gitver.tar.gz
- 0001-Add-conflict-for-replacing-owned-empty-directory.patch
- 0002-Check-empty-subdirectory-ownership.patch
- pacman.conf
- pacman.conf.x86_64
- pacman.conf.mips64el
- makepkg.conf)
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
- '1a70392526c8768470da678b31905a6e'
- '4013517cf9016c920b525611bd63d6dc'
- '1a9b79788640907a2b34e8671cacc94a'
- 'a9ddd43891bed364e1e97d27b2887bf1'
- '080d9f76f56e135cc62205874636aa0f'
- 'ce9943fc8086d491890565e91ea1a0d8'
- 'eb8dba9bd0b315230fbf0e5dc0a7335b'
- 'debc512689a1aa8c124fe0ccf27f5758')
-
-build() {
- cd $srcdir/$_pkgname-$_relver
-
- patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
- patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
-
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc
- make
-
- cd $srcdir/$_pkgname-$_gitver
-
- ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc
- make
-}
-
-check() {
- make -C "$_pkgname-$_relver" check
- make -C "$_pkgname-$_gitver" check
-}
-
-package() {
- cd $srcdir/$_pkgname-$_relver
- make DESTDIR=$pkgdir install
- install $srcdir/$_pkgname-$_gitver/scripts/makepkg $pkgdir/usr/bin/makepkg
-
- # install Arch specific stuff
- mkdir -p $pkgdir/etc
- case "$CARCH" in
- i686)
- install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
- mycarch="i686"
- mychost="i686-pc-linux-gnu"
- myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
- ;;
- x86_64)
- install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
- mycarch="x86_64"
- mychost="x86_64-unknown-linux-gnu"
- myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
- ;;
- mips64el)
- install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
- mycarch="mips64el"
- mychost="mips64el-unknown-linux-gnu"
- myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
- ;;
- esac
- install -m644 $srcdir/makepkg.conf $pkgdir/etc/
- # set things correctly in the default conf file
- sed -i $pkgdir/etc/makepkg.conf \
- -e "s|@CARCH[@]|$mycarch|g" \
- -e "s|@CHOST[@]|$mychost|g" \
- -e "s|@LDFLAGS[@]|$myldflags|g" \
- -e "s|@CARCHFLAGS[@]|$myflags|g"
-
- # install completion files
- install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
- for f in makepkg pacman-key; do
- ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
- done
-
- install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
-}