diff options
Diffstat (limited to 'abs/core-testing')
-rw-r--r-- | abs/core-testing/gcc-libs/PKGBUILD | 45 | ||||
-rw-r--r-- | abs/core-testing/gcc-libs/buildfix_new_bison.patch | 22 | ||||
-rw-r--r-- | abs/core-testing/lirc/PKGBUILD | 16 | ||||
-rw-r--r-- | abs/core-testing/lirc/kernel-2.6.27.patch | 78 | ||||
-rw-r--r-- | abs/core-testing/lirc/lirc.install | 6 |
5 files changed, 139 insertions, 28 deletions
diff --git a/abs/core-testing/gcc-libs/PKGBUILD b/abs/core-testing/gcc-libs/PKGBUILD index 7bca5de..09d23d5 100644 --- a/abs/core-testing/gcc-libs/PKGBUILD +++ b/abs/core-testing/gcc-libs/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 6599 2008-07-25 17:11:14Z andyrtr $ +# $Id: PKGBUILD 19319 2008-11-20 10:56:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + pkgname=gcc-libs -pkgver=4.3.1 -pkgrel=12 -_snapshot=4.3-20080724 +pkgver=4.3.2 +pkgrel=2 +#_snapshot=4.3-20080724 pkgdesc="Runtime libraries shipped by GCC for C and C++ languages" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('GPL' 'LGPL') groups=('base') url="http://gcc.gnu.org" -depends=('glibc>=2.8-2') -makedepends=('binutils>=2.18-8' 'gcc>=4.3.1' 'mpfr>=2.3.1' 'texinfo') +depends=('glibc>=2.8-3') +makedepends=('binutils>=2.19' 'gcc>=4.3.2' 'mpfr>=2.3.1' 'texinfo' 'flex') conflicts=('gcc-fortran' 'gcc-objc') provides=("gcc-objc=${pkgver}") -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc}-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc}-${_snapshot}.tar.bz2 +options=('!libtool' '!emptydirs' '!docs') +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc}-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc}-${_snapshot}.tar.bz2 gcc_pure64.patch - gcc-hash-style-both.patch) -md5sums=('99ce6170e379779fe9c0971f9e27c704' - 'e39db43584ec603b314348405c753bd5' - '76b9d6a71eb2cd778cd6ad3e9d576c64' - '2b2456702ca6362b01583160e888be14' + gcc-hash-style-both.patch + buildfix_new_bison.patch) +md5sums=('dd8048b43d3d4e5595bcade47b9144c6' + 'bfdf8d19e1b85f522f8b8d48d25e7aaa' + 'b3294ae213d65e05aacb9b46d11e1025' + '08efa42ef267f8759146aa4e11904d25' '4030ee1c08dd1e843c0225b772360e76' - 'bb420bc84b1104455b7230b1cd4b96c2') + 'bb420bc84b1104455b7230b1cd4b96c2' + '412fb8ebb30958eb1a93e9bd89413dd7') build() { if ! locale -a | grep ^de_DE; then @@ -31,8 +35,8 @@ build() { return 1 fi - #cd ${srcdir}/gcc-${pkgver} - cd ${srcdir}/gcc-${_snapshot} + cd ${srcdir}/gcc-${pkgver} + #cd ${srcdir}/gcc-${_snapshot} # Don't install libiberty sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in @@ -40,11 +44,12 @@ build() { patch -Np1 -i ../gcc_pure64.patch || return 1 fi patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch || return 1 + patch -Np0 -i ${srcdir}/buildfix_new_bison.patch || return 1 # Don't run fixincludes sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - echo ${pkgver} > gcc/BASE-VER +# echo ${pkgver} > gcc/BASE-VER mkdir build cd build @@ -62,4 +67,6 @@ build() { rm -rf ${pkgdir}/usr/bin rm -rf ${pkgdir}/usr{,share}/man find ${pkgdir} -name gcc.mo -delete + +# rm -f {pkgdir}/usr/share/info/dir } diff --git a/abs/core-testing/gcc-libs/buildfix_new_bison.patch b/abs/core-testing/gcc-libs/buildfix_new_bison.patch new file mode 100644 index 0000000..01b8880 --- /dev/null +++ b/abs/core-testing/gcc-libs/buildfix_new_bison.patch @@ -0,0 +1,22 @@ +--- gcc/treelang/parse.y 2007-07-18 08:19:29.000000000 +0000 ++++ gcc/treelang/parse.y.new 2008-11-20 06:40:00.013275486 +0000 +@@ -369,7 +369,6 @@ + current_function = NULL; + } + ; +- + variable_defs_opt: + /* Nil. */ { + $$ = 0; +@@ -685,9 +684,9 @@ + + expressions_with_commas_opt: + /* Nil. */ { +-$$ = 0 ++$$ = 0; + } +-|expressions_with_commas { $$ = $1 } ++|expressions_with_commas { $$ = $1; } + ; + + expressions_with_commas: diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD index d7fc488..4548a46 100644 --- a/abs/core-testing/lirc/PKGBUILD +++ b/abs/core-testing/lirc/PKGBUILD @@ -1,27 +1,28 @@ -# $Id: PKGBUILD 6055 2008-07-23 02:44:55Z eric $ +# $Id: PKGBUILD 14978 2008-10-11 21:04:37Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=lirc pkgver=0.8.3 -pkgrel=1 -_kernver=2.6.26-ARCH +pkgrel=3 +_kernver=2.6.27-ARCH pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" arch=(i686 x86_64) url="http://www.lirc.org/" license=('GPL') -depends=('lirc-utils=0.8.3' 'kernel26>=2.6.26-1' 'kernel26<2.6.27') +depends=('lirc-utils=0.8.3' 'kernel26>=2.6.27' 'kernel26<2.6.28') makedepends=('help2man') replaces=('lirc+pctv') options=('!makeflags') install=$pkgname.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \ - kernel-2.6.26.patch) -md5sums=('8e78eeded7b31e5ad02e328970437c0f' '1753acd774f50b638e6173d364de53fd') + kernel-2.6.26.patch + kernel-2.6.27.patch) build() { # configure cd $startdir/src/lirc-$pkgver || return 1 patch -Np1 -i ../kernel-2.6.26.patch || return 1 + patch -Np1 -i ../kernel-2.6.27.patch || return 1 ./configure --enable-sandboxed --prefix=/usr \ --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ @@ -48,3 +49,6 @@ build() { sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \ $startdir/lirc.install || return 1 } +md5sums=('8e78eeded7b31e5ad02e328970437c0f' + '1753acd774f50b638e6173d364de53fd' + '6f151eb4e81fc7776a06c9063e6ad9a5') diff --git a/abs/core-testing/lirc/kernel-2.6.27.patch b/abs/core-testing/lirc/kernel-2.6.27.patch new file mode 100644 index 0000000..05cf75b --- /dev/null +++ b/abs/core-testing/lirc/kernel-2.6.27.patch @@ -0,0 +1,78 @@ +diff -Nur lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c lirc-0.8.3/drivers/lirc_dev/lirc_dev.c +--- lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c 2008-01-13 11:45:02.000000000 +0100 ++++ lirc-0.8.3/drivers/lirc_dev/lirc_dev.c 2008-10-10 16:29:15.000000000 +0200 +@@ -49,7 +49,7 @@ + #include <linux/uaccess.h> + #include <linux/errno.h> + #endif +-#include <asm/semaphore.h> ++#include <linux/semaphore.h> + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) + #include <linux/wrapper.h> + #endif +diff -Nur lirc-0.8.3.orig/drivers/lirc_i2c/lirc_i2c.c lirc-0.8.3/drivers/lirc_i2c/lirc_i2c.c +--- lirc-0.8.3.orig/drivers/lirc_i2c/lirc_i2c.c 2008-05-04 15:49:53.000000000 +0200 ++++ lirc-0.8.3/drivers/lirc_i2c/lirc_i2c.c 2008-10-10 16:29:00.000000000 +0200 +@@ -54,7 +54,7 @@ + #include <linux/i2c.h> + #include <linux/i2c-algo-bit.h> + +-#include <asm/semaphore.h> ++#include <linux/semaphore.h> + + #include "drivers/kcompat.h" + #include "drivers/lirc_dev/lirc_dev.h" +--- lirc-0.8.3.orig/drivers/kcompat.h 2008/05/14 16:37:49 5.36 ++++ lirc-0.8.3.orig/drivers/kcompat.h 2008/09/27 08:16:15 5.37 +@@ -36,7 +36,7 @@ + class_simple_destroy(cls); + } + +-#define lirc_device_create(cs, parent, dev, fmt, args...) \ ++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \ + class_simple_device_add(cs, dev, parent, fmt, ## args) + + static inline void lirc_device_destroy(lirc_class_t *cls, dev_t devt) +@@ -48,20 +48,29 @@ + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) + +-#define lirc_device_create(cs, parent, dev, fmt, args...) \ ++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \ + class_device_create(cs, dev, parent, fmt, ## args) + + #else /* >= 2.6.15 */ + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + +-#define lirc_device_create(cs, parent, dev, fmt, args...) \ ++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \ + class_device_create(cs, NULL, dev, parent, fmt, ## args) + + #else /* >= 2.6.26 */ + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) ++ ++#define lirc_device_create(cs, parent, dev, drvdata, fmt, args...) \ ++ class_device_create(cs, parent, dev, fmt, ## args) ++ ++#else /* >= 2.6.27 */ ++ + #define lirc_device_create device_create + ++#endif /* >= 2.6.27 */ ++ + #endif /* >= 2.6.26 */ + + #define LIRC_DEVFS_PREFIX +--- lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c 2008/09/06 07:30:16 1.60 ++++ lirc-0.8.3.orig/drivers/lirc_dev/lirc_dev.c 2008/09/27 08:16:15 1.61 +@@ -397,7 +397,7 @@ + DEV_LIRC "/%u", ir->p.minor); + #endif + (void) lirc_device_create(lirc_class, ir->p.dev, +- MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), ++ MKDEV(IRCTL_DEV_MAJOR, ir->p.minor), NULL, + "lirc%u", ir->p.minor); + + if (p->sample_rate || p->get_queue) { diff --git a/abs/core-testing/lirc/lirc.install b/abs/core-testing/lirc/lirc.install index 704c341..1320758 100644 --- a/abs/core-testing/lirc/lirc.install +++ b/abs/core-testing/lirc/lirc.install @@ -10,7 +10,7 @@ pre_install() { post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.26-ARCH + KERNEL_VERSION=2.6.27-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } @@ -26,7 +26,7 @@ pre_upgrade() { post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.26-ARCH + KERNEL_VERSION=2.6.27-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } @@ -40,7 +40,7 @@ pre_remove() { post_remove() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.26-ARCH + KERNEL_VERSION=2.6.27-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 /bin/true } |