diff options
Diffstat (limited to 'community')
58 files changed, 988 insertions, 768 deletions
diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD index e651baa3d..ba7cc79c7 100644 --- a/community/addresses/PKGBUILD +++ b/community/addresses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 18081 2010-05-31 08:52:52Z spupykin $ +# $Id: PKGBUILD 44420 2011-04-07 13:06:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=addresses pkgver=0.4.6 -pkgrel=5 +pkgrel=6 pkgdesc="A versatile address book application for GNUstep" arch=('i686' 'x86_64' 'mips64el') url="http://giesler.biz/bjoern/en/sw_addr.html" @@ -17,12 +17,12 @@ md5sums=('2d6b6bf9a1578a5b3a13cb0bd2c60fad') build() { . /etc/profile.d/GNUstep.sh cd $srcdir/Addresses-$pkgver - sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile || return 1 + sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile export PATH=$startdir/gcc-objc/src/gcc-4.2.1/build/qwe/usr/bin:$PATH - make || return 1 - make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$startdir/pkg install || return 1 + make + make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$pkgdir install # buggy install scripts cd $pkgdir/opt/GNUstep/System/Library/Headers/ diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index c9bacdea9..ec00c2965 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 36776 2011-01-07 21:59:47Z svenstaro $ +# $Id: PKGBUILD 45481 2011-04-22 06:49:32Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -pkgver=2.77 -pkgrel=3 +pkgver=2.78 +pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64' 'mips64el') url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=('freeglut') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}.tgz \ +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r2387.tgz \ ${pkgbase}.pc) -md5sums=('2f5074a1a29b618c672f1da4748e374b' +md5sums=('3611456232f1c01dea8094213382d0b3' 'd1da06deba3b08b884d2212f6838905c') build() { diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index f61bc69c8..ced4e3c5e 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45260 2011-04-18 21:38:03Z giovanni $ +# $Id: PKGBUILD 45564 2011-04-24 10:21:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.7.56 -pkgrel=2 +pkgver=0.7.57 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre.kovidgoyal.net/" @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('876fd29039f473b92dbeb2f0918502e8' +md5sums=('62879f10d2d4ab72b22ad744a44dbf67' 'bcc538a3b004429bf8f5a0ac1d89a37f') build() { diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 9aefd46da..35134a563 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45121 2011-04-16 15:59:33Z foutrelis $ +# $Id: PKGBUILD 45620 2011-04-26 00:57:42Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64' 'mips64el') url='http://collectd.org/' @@ -43,10 +43,12 @@ depends=('libtool') source=("${url}files/$pkgname-$pkgver.tar.gz" 'libnotify-0.7.patch' - 'rc.d') + 'rc.d' + 'yajl-2.x.patch') sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7' 'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337' - '0f441718d5519cb043b1130e5a1d0379078adbcc') + '0f441718d5519cb043b1130e5a1d0379078adbcc' + '2586559fc8d2b54f3d242a3e815ed81e81e0341b') install=install @@ -54,9 +56,17 @@ build() { cd "$srcdir/$pkgname-$pkgver" unset LDFLAGS # or perl not found patch -p1 -i ../libnotify-0.7.patch + + # fixes for yajl 2.x API changes + patch -Np0 < "$srcdir/yajl-2.x.patch" + sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-static=no --with-python=/usr/bin/python2 + + # avoid -Werror with gcc 4.6 + sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile + make all } diff --git a/community/collectd/yajl-2.x.patch b/community/collectd/yajl-2.x.patch new file mode 100644 index 000000000..6cd208006 --- /dev/null +++ b/community/collectd/yajl-2.x.patch @@ -0,0 +1,57 @@ +--- src/curl_json.c 2011-04-25 20:43:00.972938855 -0400 ++++ src/curl_json.c 2011-04-25 20:46:03.859938860 -0400 +@@ -98,8 +98,7 @@ + return (0); + + status = yajl_parse(db->yajl, (unsigned char *)buf, len); +- if ((status != yajl_status_ok) +- && (status != yajl_status_insufficient_data)) ++ if ((status != yajl_status_ok)) + { + unsigned char *msg = + yajl_get_error(db->yajl, /* verbose = */ 1, +@@ -130,7 +129,7 @@ + /* "number" may not be null terminated, so copy it into a buffer before + * parsing. */ + static int cj_cb_number (void *ctx, +- const char *number, unsigned int number_len) ++ const char *number, size_t number_len) + { + char buffer[number_len + 1]; + +@@ -159,7 +158,7 @@ + } /* int cj_cb_number */ + + static int cj_cb_map_key (void *ctx, const unsigned char *val, +- unsigned int len) ++ size_t len) + { + cj_t *db = (cj_t *)ctx; + c_avl_tree_t *tree; +@@ -187,7 +186,7 @@ + } + + static int cj_cb_string (void *ctx, const unsigned char *val, +- unsigned int len) ++ size_t len) + { + cj_t *db = (cj_t *)ctx; + char str[len + 1]; +@@ -697,7 +696,7 @@ + char *url; + yajl_handle yprev = db->yajl; + +- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); ++ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db); + if (db->yajl == NULL) + { + ERROR ("curl_json plugin: yajl_alloc failed."); +@@ -730,7 +729,7 @@ + return (-1); + } + +- status = yajl_parse_complete (db->yajl); ++ status = yajl_complete_parse (db->yajl); + if (status != yajl_status_ok) + { + unsigned char *errmsg; diff --git a/community/cross-arm-wince-cegcc-gcc/PKGBUILD b/community/cross-arm-wince-cegcc-gcc/PKGBUILD index c645a2ea6..4185152dc 100644 --- a/community/cross-arm-wince-cegcc-gcc/PKGBUILD +++ b/community/cross-arm-wince-cegcc-gcc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 23529 2010-08-12 13:44:06Z spupykin $ +# $Id: PKGBUILD 45499 2011-04-22 14:57:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cross-arm-wince-cegcc-gcc pkgver=0.59.1 -pkgrel=2 +pkgrel=3 _prefix=/opt/cegcc pkgdesc="CE GCC bundle - cross compilation tools for WinCE" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ depends=(cross-arm-wince-cegcc-binutils) makedepends=(cross-arm-wince-cegcc-newlib cross-arm-wince-cegcc-w32api cross-arm-wince-cegcc-importlibs) conflicts=(cross-arm-wince-cegcc-gcc-base) groups=('cegcc') -source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) +source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b') build() { @@ -30,32 +30,30 @@ build() { mkdir build-gcc || true cd build-gcc -if [ $NOEXTRACT -ne 1 ]; then - ../gcc-4.4.0/configure \ + [ -f Makefile ] || ../gcc-4.4.0/configure \ --prefix=${_prefix} \ --exec-prefix=${_prefix} \ --bindir=${_prefix}/bin \ - --target=arm-wince-cegcc \ - --build=$CARCH \ - --host=$CARCH \ + --target=$TARGET \ + --build=$CARCH \ + --host=$CARCH \ --disable-nls \ --includedir=${_prefix}/include \ - --with-gcc \ - --with-ld=/opt/cegcc/bin/arm-wince-cegcc-ld \ - --with-as=/opt/cegcc/bin/arm-wince-cegcc-as \ - --enable-threads=win32 \ - --enable-languages=c,c++ \ - --disable-win32-registry \ - --disable-multilib \ - --disable-interwork \ - --without-newlib \ - --enable-checking \ - --with-headers \ + --with-gcc \ + --with-ld=/opt/cegcc/bin/arm-wince-cegcc-ld \ + --with-as=/opt/cegcc/bin/arm-wince-cegcc-as \ + --enable-threads=win32 \ + --enable-languages=c,c++ \ + --disable-win32-registry \ + --disable-multilib \ + --disable-interwork \ + --without-newlib \ + --enable-checking \ + --with-headers \ --disable-libssp -fi - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make + make DESTDIR=$pkgdir install rm -f $pkgdir/$_prefix/lib/libiberty.a find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \; } diff --git a/community/espeak/PKGBUILD b/community/espeak/PKGBUILD index 39008ff1c..450892dba 100644 --- a/community/espeak/PKGBUILD +++ b/community/espeak/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 28906 2010-10-07 13:37:38Z cbrannon $ +# $Id: PKGBUILD 45579 2011-04-24 17:47:21Z mherych $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: niQo # Contributor: Christoph Siegenthaler <csi@gmx.ch> pkgname=espeak -pkgver=1.44.05 -pkgrel=2 +pkgver=1.45.03 +pkgrel=1 pkgdesc="Text to Speech engine for good quality English, with support for other languages" arch=('i686' 'x86_64' 'mips64el') url="http://espeak.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'portaudio') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-source.zip) -md5sums=('603b3e5fc8510a82b76f51a94cb3c7a1') +md5sums=('68fbabb4e2021b83f606ad6a019e98df') build() { cd $srcdir/$pkgname-$pkgver-source/src diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 93f630d66..0492984ba 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=0.7.1 -pkgrel=2 +pkgver=0.7.2 +pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') url="http://paste.xinu.at" @@ -24,4 +24,4 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('a14be40bb23986c45a26b3cdb56d04f6') +md5sums=('bbe2402e8e7bd0e39047793ab7a488a9') diff --git a/community/gcc-avr/PKGBUILD b/community/gcc-avr/PKGBUILD index be1ae43be..0fbb6721c 100644 --- a/community/gcc-avr/PKGBUILD +++ b/community/gcc-avr/PKGBUILD @@ -1,30 +1,27 @@ +# $Id: PKGBUILD 43891 2011-03-30 19:48:35Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=gcc-avr -pkgver=4.5.2 -pkgrel=1 +pkgver=4.6.0 +pkgrel=3 pkgdesc="The GNU avr Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'custom') url="http://gcc.gnu.org/" -depends=('binutils-avr>=2.21' 'cloog-ppl' 'gcc-libs>=4.5.2' 'libmpc' 'elfutils') +depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc') options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') -source=(http://ftp.gnu.org/gnu/gcc/${pkgname/-avr}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 - 'add-more-mcus.patch') -md5sums=('aa9e36bec080452372bfba793428ee82' - '9821f1c61e43755866861485ff364e90' - 'b2c3418c571f7c9b794dcf44eb186548') +source=(http://ftp.gnu.org/gnu/gcc/${pkgname/-avr}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2) +md5sums=('b1957f3209080b2f55bc3756d3a62b7c' + 'a30090fa655d0db4c970740d353c81f1') + build() { export CFLAGS="-O2 -pipe" export CXXFLAGS="-O2 -pipe" cd "${srcdir}/${pkgname/-avr}-${pkgver}" - # http://gcc.gnu.org/ml/gcc-patches/2010-04/msg01210.html - patch -p0 -i ${srcdir}/add-more-mcus.patch - mkdir build cd build ../configure --disable-libssp \ @@ -50,6 +47,9 @@ package() { cd build make -j1 DESTDIR=${pkgdir} install + install -Dm644 "${srcdir}/${pkgname/-avr}-${pkgver}/COPYING.RUNTIME" \ + "${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION" + rm -f ${pkgdir}/usr/lib/libiberty.a rm -rf ${pkgdir}/usr/share/man/man7 rm -rf ${pkgdir}/usr/share/info diff --git a/community/gcc-avr/add-more-mcus.patch b/community/gcc-avr/add-more-mcus.patch deleted file mode 100644 index 826487d32..000000000 --- a/community/gcc-avr/add-more-mcus.patch +++ /dev/null @@ -1,316 +0,0 @@ -tHE ATTAChed patch adds support for a number of new AVR devices, -and also removes support for some devices (where the devices -were never manufactured, or incorrect names). Patch committed. - -A separate patch for the web pages will be forthcoming. - -Eric Weddington - - -2010-04-19 Eric B. Weddington <eric.weddington@atmel.com> - -* config/avr/avr-devices.c (avr_mcu_types): Add support for new -devices atmega644pa, attiny2313a, attiny24a, attiny261a, attiny4313, -attiny44a, attiny861a, atmega16a, atmega168a, atmega164a, atmega165a, -atmega169a, atmega169pa, atmega16hva2, atmega324a, atmega324pa, -atmega325a, atmega3250a, atmega328, atmega329a, atmega329pa, -atmega3290a, atmega48a, atmega644a, atmega645a, atmega645p, -atmega6450a, atmega6450p, atmega649a, atmega649p, atmega6490a, -atmega6490p, atmega64hve, atmega88a, atmega88pa, attiny461a, attiny84a, -m3000. Remove support for devices atmega8m1, atmega8c1, atmega16c1, -atmega4hvd, atmega8hvd, attiny327, m3000f, m3000s, m3001b. -* config/avr/t-avr.c (MULTILIB_MATCHES): Same. - - -Index: gcc/config/avr/avr-devices.c -=================================================================== ---- gcc/config/avr/avr-devices.c (revision 158526) -+++ gcc/config/avr/avr-devices.c (working copy) -@@ -23,7 +23,7 @@ - #include "coretypes.h" - #include "tm.h" - --/* List of all known AVR MCU architectyres. */ -+/* List of all known AVR MCU architectures. */ - - const struct base_arch_s avr_arch_types[] = { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0060, NULL, "avr2" }, /* unknown device specified */ -@@ -67,15 +67,23 @@ - { "attiny13", ARCH_AVR25, "__AVR_ATtiny13__", 1, 0x0060, "tn13" }, - { "attiny13a", ARCH_AVR25, "__AVR_ATtiny13A__", 1, 0x0060, "tn13a" }, - { "attiny2313", ARCH_AVR25, "__AVR_ATtiny2313__", 1, 0x0060, "tn2313" }, -+ { "attiny2313a", ARCH_AVR25, "__AVR_ATtiny2313A__", 1, 0x0060, "tn2313a" }, - { "attiny24", ARCH_AVR25, "__AVR_ATtiny24__", 1, 0x0060, "tn24" }, -+ { "attiny24a", ARCH_AVR25, "__AVR_ATtiny24A__", 1, 0x0060, "tn24a" }, -+ { "attiny4313", ARCH_AVR25, "__AVR_ATtiny4313__", 1, 0x0060, "tn4313" }, - { "attiny44", ARCH_AVR25, "__AVR_ATtiny44__", 0, 0x0060, "tn44" }, -+ { "attiny44a", ARCH_AVR25, "__AVR_ATtiny44A__", 0, 0x0060, "tn44a" }, - { "attiny84", ARCH_AVR25, "__AVR_ATtiny84__", 0, 0x0060, "tn84" }, -+ { "attiny84a", ARCH_AVR25, "__AVR_ATtiny84A__", 0, 0x0060, "tn84" }, - { "attiny25", ARCH_AVR25, "__AVR_ATtiny25__", 1, 0x0060, "tn25" }, - { "attiny45", ARCH_AVR25, "__AVR_ATtiny45__", 0, 0x0060, "tn45" }, - { "attiny85", ARCH_AVR25, "__AVR_ATtiny85__", 0, 0x0060, "tn85" }, - { "attiny261", ARCH_AVR25, "__AVR_ATtiny261__", 1, 0x0060, "tn261" }, -+ { "attiny261a", ARCH_AVR25, "__AVR_ATtiny261A__", 1, 0x0060, "tn261a" }, - { "attiny461", ARCH_AVR25, "__AVR_ATtiny461__", 0, 0x0060, "tn461" }, -+ { "attiny461a", ARCH_AVR25, "__AVR_ATtiny461A__", 0, 0x0060, "tn461a" }, - { "attiny861", ARCH_AVR25, "__AVR_ATtiny861__", 0, 0x0060, "tn861" }, -+ { "attiny861a", ARCH_AVR25, "__AVR_ATtiny861A__", 0, 0x0060, "tn861a" }, - { "attiny43u", ARCH_AVR25, "__AVR_ATtiny43U__", 0, 0x0060, "tn43u" }, - { "attiny87", ARCH_AVR25, "__AVR_ATtiny87__", 0, 0x0100, "tn87" }, - { "attiny48", ARCH_AVR25, "__AVR_ATtiny48__", 0, 0x0100, "tn48" }, -@@ -97,21 +105,19 @@ - { "atmega16u2", ARCH_AVR35, "__AVR_ATmega16U2__", 0, 0x0100, "m16u2" }, - { "atmega32u2", ARCH_AVR35, "__AVR_ATmega32U2__", 0, 0x0100, "m32u2" }, - { "attiny167", ARCH_AVR35, "__AVR_ATtiny167__", 0, 0x0100, "tn167" }, -- { "attiny327", ARCH_AVR35, "__AVR_ATtiny327__", 0, 0x0100, "tn327" }, - /* Enhanced, <= 8K. */ - { "avr4", ARCH_AVR4, NULL, 0, 0x0060, "m8" }, - { "atmega8", ARCH_AVR4, "__AVR_ATmega8__", 0, 0x0060, "m8" }, - { "atmega48", ARCH_AVR4, "__AVR_ATmega48__", 0, 0x0100, "m48" }, -+ { "atmega48a", ARCH_AVR4, "__AVR_ATmega48A__", 0, 0x0100, "m48a" }, - { "atmega48p", ARCH_AVR4, "__AVR_ATmega48P__", 0, 0x0100, "m48p" }, - { "atmega88", ARCH_AVR4, "__AVR_ATmega88__", 0, 0x0100, "m88" }, -+ { "atmega88a", ARCH_AVR4, "__AVR_ATmega88A__", 0, 0x0100, "m88a" }, - { "atmega88p", ARCH_AVR4, "__AVR_ATmega88P__", 0, 0x0100, "m88p" }, -+ { "atmega88pa", ARCH_AVR4, "__AVR_ATmega88PA__", 0, 0x0100, "m88pa" }, - { "atmega8515", ARCH_AVR4, "__AVR_ATmega8515__", 0, 0x0060, "m8515" }, - { "atmega8535", ARCH_AVR4, "__AVR_ATmega8535__", 0, 0x0060, "m8535" }, -- { "atmega8c1", ARCH_AVR4, "__AVR_ATmega8C1__", 0, 0x0100, "m8c1" }, -- { "atmega8m1", ARCH_AVR4, "__AVR_ATmega8M1__", 0, 0x0100, "m8m1" }, - { "atmega8hva", ARCH_AVR4, "__AVR_ATmega8HVA__", 0, 0x0100, "m8hva" }, -- { "atmega4hvd", ARCH_AVR4, "__AVR_ATmega4HVD__", 0, 0x0100, "m4hvd" }, -- { "atmega8hvd", ARCH_AVR4, "__AVR_ATmega8HVD__", 0, 0x0100, "m8hvd" }, - { "at90pwm1", ARCH_AVR4, "__AVR_AT90PWM1__", 0, 0x0100, "90pwm1" }, - { "at90pwm2", ARCH_AVR4, "__AVR_AT90PWM2__", 0, 0x0100, "90pwm2" }, - { "at90pwm2b", ARCH_AVR4, "__AVR_AT90PWM2B__", 0, 0x0100, "90pwm2b" }, -@@ -121,45 +127,68 @@ - /* Enhanced, > 8K, <= 64K. */ - { "avr5", ARCH_AVR5, NULL, 0, 0x0060, "m16" }, - { "atmega16", ARCH_AVR5, "__AVR_ATmega16__", 0, 0x0060, "m16" }, -+ { "atmega16a", ARCH_AVR5, "__AVR_ATmega16A__", 0, 0x0060, "m16a" }, - { "atmega161", ARCH_AVR5, "__AVR_ATmega161__", 0, 0x0060, "m161" }, - { "atmega162", ARCH_AVR5, "__AVR_ATmega162__", 0, 0x0100, "m162" }, - { "atmega163", ARCH_AVR5, "__AVR_ATmega163__", 0, 0x0060, "m163" }, -+ { "atmega164a", ARCH_AVR5, "__AVR_ATmega164A__", 0, 0x0060, "m164a" }, - { "atmega164p", ARCH_AVR5, "__AVR_ATmega164P__", 0, 0x0100, "m164p" }, - { "atmega165", ARCH_AVR5, "__AVR_ATmega165__", 0, 0x0100, "m165" }, -+ { "atmega165a", ARCH_AVR5, "__AVR_ATmega165A__", 0, 0x0100, "m165a" }, - { "atmega165p", ARCH_AVR5, "__AVR_ATmega165P__", 0, 0x0100, "m165p" }, - { "atmega168", ARCH_AVR5, "__AVR_ATmega168__", 0, 0x0100, "m168" }, -+ { "atmega168a", ARCH_AVR5, "__AVR_ATmega168A__", 0, 0x0100, "m168a" }, - { "atmega168p", ARCH_AVR5, "__AVR_ATmega168P__", 0, 0x0100, "m168p" }, - { "atmega169", ARCH_AVR5, "__AVR_ATmega169__", 0, 0x0100, "m169" }, -+ { "atmega169a", ARCH_AVR5, "__AVR_ATmega169A__", 0, 0x0100, "m169a" }, - { "atmega169p", ARCH_AVR5, "__AVR_ATmega169P__", 0, 0x0100, "m169p" }, -+ { "atmega169pa", ARCH_AVR5, "__AVR_ATmega169PA__", 0, 0x0100, "m169pa" }, - { "atmega32", ARCH_AVR5, "__AVR_ATmega32__", 0, 0x0060, "m32" }, - { "atmega323", ARCH_AVR5, "__AVR_ATmega323__", 0, 0x0060, "m323" }, -+ { "atmega324a", ARCH_AVR5, "__AVR_ATmega324A__", 0, 0x0100, "m324a" }, - { "atmega324p", ARCH_AVR5, "__AVR_ATmega324P__", 0, 0x0100, "m324p" }, -+ { "atmega324pa", ARCH_AVR5, "__AVR_ATmega324PA__", 0, 0x0100, "m324pa" }, - { "atmega325", ARCH_AVR5, "__AVR_ATmega325__", 0, 0x0100, "m325" }, -+ { "atmega325a", ARCH_AVR5, "__AVR_ATmega325A__", 0, 0x0100, "m325a" }, - { "atmega325p", ARCH_AVR5, "__AVR_ATmega325P__", 0, 0x0100, "m325p" }, - { "atmega3250", ARCH_AVR5, "__AVR_ATmega3250__", 0, 0x0100, "m3250" }, -+ { "atmega3250a", ARCH_AVR5, "__AVR_ATmega3250A__", 0, 0x0100, "m3250a" }, - { "atmega3250p", ARCH_AVR5, "__AVR_ATmega3250P__", 0, 0x0100, "m3250p" }, -+ { "atmega328", ARCH_AVR5, "__AVR_ATmega328__", 0, 0x0100, "m328" }, - { "atmega328p", ARCH_AVR5, "__AVR_ATmega328P__", 0, 0x0100, "m328p" }, - { "atmega329", ARCH_AVR5, "__AVR_ATmega329__", 0, 0x0100, "m329" }, -+ { "atmega329a", ARCH_AVR5, "__AVR_ATmega329A__", 0, 0x0100, "m329a" }, - { "atmega329p", ARCH_AVR5, "__AVR_ATmega329P__", 0, 0x0100, "m329p" }, -+ { "atmega329pa", ARCH_AVR5, "__AVR_ATmega329PA__", 0, 0x0100, "m329pa" }, - { "atmega3290", ARCH_AVR5, "__AVR_ATmega3290__", 0, 0x0100, "m3290" }, -+ { "atmega3290a", ARCH_AVR5, "__AVR_ATmega3290A__", 0, 0x0100, "m3290a" }, - { "atmega3290p", ARCH_AVR5, "__AVR_ATmega3290P__", 0, 0x0100, "m3290p" }, - { "atmega406", ARCH_AVR5, "__AVR_ATmega406__", 0, 0x0100, "m406" }, - { "atmega64", ARCH_AVR5, "__AVR_ATmega64__", 0, 0x0100, "m64" }, - { "atmega640", ARCH_AVR5, "__AVR_ATmega640__", 0, 0x0200, "m640" }, - { "atmega644", ARCH_AVR5, "__AVR_ATmega644__", 0, 0x0100, "m644" }, -+ { "atmega644a", ARCH_AVR5, "__AVR_ATmega644A__", 0, 0x0100, "m644a" }, - { "atmega644p", ARCH_AVR5, "__AVR_ATmega644P__", 0, 0x0100, "m644p" }, -+ { "atmega644pa", ARCH_AVR5, "__AVR_ATmega644PA__", 0, 0x0100, "m644pa" }, - { "atmega645", ARCH_AVR5, "__AVR_ATmega645__", 0, 0x0100, "m645" }, -+ { "atmega645a", ARCH_AVR5, "__AVR_ATmega645A__", 0, 0x0100, "m645a" }, -+ { "atmega645p", ARCH_AVR5, "__AVR_ATmega645P__", 0, 0x0100, "m645p" }, - { "atmega6450", ARCH_AVR5, "__AVR_ATmega6450__", 0, 0x0100, "m6450" }, -+ { "atmega6450a", ARCH_AVR5, "__AVR_ATmega6450A__", 0, 0x0100, "m6450a" }, -+ { "atmega6450p", ARCH_AVR5, "__AVR_ATmega6450P__", 0, 0x0100, "m6450p" }, - { "atmega649", ARCH_AVR5, "__AVR_ATmega649__", 0, 0x0100, "m649" }, -+ { "atmega649a", ARCH_AVR5, "__AVR_ATmega649A__", 0, 0x0100, "m649a" }, -+ { "atmega649p", ARCH_AVR5, "__AVR_ATmega649P__", 0, 0x0100, "m649p" }, - { "atmega6490", ARCH_AVR5, "__AVR_ATmega6490__", 0, 0x0100, "m6490" }, - { "atmega16hva", ARCH_AVR5, "__AVR_ATmega16HVA__", 0, 0x0100, "m16hva" }, -+ { "atmega16hva2", ARCH_AVR5, "__AVR_ATmega16HVA2__", 0, 0x0100, "m16hva2" }, - { "atmega16hvb", ARCH_AVR5, "__AVR_ATmega16HVB__", 0, 0x0100, "m16hvb" }, -- { "atmega32hvb", ARCH_AVR5, "__AVR_ATmega32HVB__", 0, 0x0100, "m23hvb" }, -+ { "atmega32hvb", ARCH_AVR5, "__AVR_ATmega32HVB__", 0, 0x0100, "m32hvb" }, -+ { "atmega64hve", ARCH_AVR5, "__AVR_ATmega64HVE__", 0, 0x0100, "m64hve" }, - { "at90can32", ARCH_AVR5, "__AVR_AT90CAN32__", 0, 0x0100, "can32" }, - { "at90can64", ARCH_AVR5, "__AVR_AT90CAN64__", 0, 0x0100, "can64" }, - { "at90pwm216", ARCH_AVR5, "__AVR_AT90PWM216__", 0, 0x0100, "90pwm216" }, - { "at90pwm316", ARCH_AVR5, "__AVR_AT90PWM316__", 0, 0x0100, "90pwm316" }, -- { "atmega16c1", ARCH_AVR5, "__AVR_ATmega16C1__", 0, 0x0100, "m16c1" }, - { "atmega32c1", ARCH_AVR5, "__AVR_ATmega32C1__", 0, 0x0100, "m32c1" }, - { "atmega64c1", ARCH_AVR5, "__AVR_ATmega64C1__", 0, 0x0100, "m64c1" }, - { "atmega16m1", ARCH_AVR5, "__AVR_ATmega16M1__", 0, 0x0100, "m16m1" }, -@@ -172,6 +201,7 @@ - { "at90usb646", ARCH_AVR5, "__AVR_AT90USB646__", 0, 0x0100, "usb646" }, - { "at90usb647", ARCH_AVR5, "__AVR_AT90USB647__", 0, 0x0100, "usb647" }, - { "at94k", ARCH_AVR5, "__AVR_AT94K__", 0, 0x0060, "at94k" }, -+ { "m3000", ARCH_AVR5, "__AVR_M3000__", 0, 0x1000, "m3000" }, - /* Enhanced, == 128K. */ - { "avr51", ARCH_AVR51, NULL, 0, 0x0100, "m128" }, - { "atmega128", ARCH_AVR51, "__AVR_ATmega128__", 0, 0x0100, "m128" }, -@@ -182,9 +212,6 @@ - { "at90can128", ARCH_AVR51, "__AVR_AT90CAN128__", 0, 0x0100, "can128" }, - { "at90usb1286", ARCH_AVR51, "__AVR_AT90USB1286__", 0, 0x0100, "usb1286" }, - { "at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__", 0, 0x0100, "usb1286" }, -- { "m3000f", ARCH_AVR51, "__AVR_M3000F__", 0, 0x1000, "m3000f" }, -- { "m3000s", ARCH_AVR51, "__AVR_M3000S__", 0, 0x1000, "m3000f" }, -- { "m3001b", ARCH_AVR51, "__AVR_M3001B__", 0, 0x1000, "m3000f" }, - /* 3-Byte PC. */ - { "avr6", ARCH_AVR6, NULL, 0, 0x0200, "m2561" }, - { "atmega2560", ARCH_AVR6, "__AVR_ATmega2560__", 0, 0x0200, "m2561" }, -Index: gcc/config/avr/t-avr -=================================================================== ---- gcc/config/avr/t-avr (revision 158526) -+++ gcc/config/avr/t-avr (working copy) -@@ -81,15 +81,23 @@ - mmcu?avr25=mmcu?attiny13 \ - mmcu?avr25=mmcu?attiny13a \ - mmcu?avr25=mmcu?attiny2313 \ -+ mmcu?avr25=mmcu?attiny2313a \ -+ mmcu?avr25=mmcu?attiny4313 \ - mmcu?avr25=mmcu?attiny24 \ -+ mmcu?avr25=mmcu?attiny24a \ - mmcu?avr25=mmcu?attiny44 \ -+ mmcu?avr25=mmcu?attiny44a \ - mmcu?avr25=mmcu?attiny84 \ -+ mmcu?avr25=mmcu?attiny84a \ - mmcu?avr25=mmcu?attiny25 \ - mmcu?avr25=mmcu?attiny45 \ - mmcu?avr25=mmcu?attiny85 \ - mmcu?avr25=mmcu?attiny261 \ -+ mmcu?avr25=mmcu?attiny261a \ - mmcu?avr25=mmcu?attiny461 \ -+ mmcu?avr25=mmcu?attiny461a \ - mmcu?avr25=mmcu?attiny861 \ -+ mmcu?avr25=mmcu?attiny861a \ - mmcu?avr25=mmcu?attiny43u \ - mmcu?avr25=mmcu?attiny87 \ - mmcu?avr25=mmcu?attiny48 \ -@@ -105,19 +113,17 @@ - mmcu?avr35=mmcu?atmega16u2 \ - mmcu?avr35=mmcu?atmega32u2 \ - mmcu?avr35=mmcu?attiny167 \ -- mmcu?avr35=mmcu?attiny327 \ - mmcu?avr4=mmcu?atmega48 \ -+ mmcu?avr4=mmcu?atmega48a \ - mmcu?avr4=mmcu?atmega48p \ - mmcu?avr4=mmcu?atmega8 \ - mmcu?avr4=mmcu?atmega8515 \ - mmcu?avr4=mmcu?atmega8535 \ - mmcu?avr4=mmcu?atmega88 \ -+ mmcu?avr4=mmcu?atmega88a \ - mmcu?avr4=mmcu?atmega88p \ -+ mmcu?avr4=mmcu?atmega88pa \ - mmcu?avr4=mmcu?atmega8hva \ -- mmcu?avr4=mmcu?atmega4hvd \ -- mmcu?avr4=mmcu?atmega8hvd \ -- mmcu?avr4=mmcu?atmega8c1 \ -- mmcu?avr4=mmcu?atmega8m1 \ - mmcu?avr4=mmcu?at90pwm1 \ - mmcu?avr4=mmcu?at90pwm2 \ - mmcu?avr4=mmcu?at90pwm2b \ -@@ -125,45 +131,70 @@ - mmcu?avr4=mmcu?at90pwm3b \ - mmcu?avr4=mmcu?at90pwm81 \ - mmcu?avr5=mmcu?atmega16 \ -+ mmcu?avr5=mmcu?atmega16a \ - mmcu?avr5=mmcu?atmega161 \ - mmcu?avr5=mmcu?atmega162 \ - mmcu?avr5=mmcu?atmega163 \ -+ mmcu?avr5=mmcu?atmega164a \ - mmcu?avr5=mmcu?atmega164p \ - mmcu?avr5=mmcu?atmega165 \ -+ mmcu?avr5=mmcu?atmega165a \ - mmcu?avr5=mmcu?atmega165p \ - mmcu?avr5=mmcu?atmega168 \ -+ mmcu?avr5=mmcu?atmega168a \ - mmcu?avr5=mmcu?atmega168p \ - mmcu?avr5=mmcu?atmega169 \ -+ mmcu?avr5=mmcu?atmega169a \ - mmcu?avr5=mmcu?atmega169p \ -+ mmcu?avr5=mmcu?atmega169pa \ - mmcu?avr5=mmcu?atmega32 \ - mmcu?avr5=mmcu?atmega323 \ -+ mmcu?avr5=mmcu?atmega324a \ - mmcu?avr5=mmcu?atmega324p \ -+ mmcu?avr5=mmcu?atmega324pa \ - mmcu?avr5=mmcu?atmega325 \ -+ mmcu?avr5=mmcu?atmega325a \ - mmcu?avr5=mmcu?atmega325p \ - mmcu?avr5=mmcu?atmega3250 \ -+ mmcu?avr5=mmcu?atmega3250a \ - mmcu?avr5=mmcu?atmega3250p \ -+ mmcu?avr5=mmcu?atmega328 \ - mmcu?avr5=mmcu?atmega328p \ - mmcu?avr5=mmcu?atmega329 \ -+ mmcu?avr5=mmcu?atmega329a \ - mmcu?avr5=mmcu?atmega329p \ -+ mmcu?avr5=mmcu?atmega329pa \ - mmcu?avr5=mmcu?atmega3290 \ -+ mmcu?avr5=mmcu?atmega3290a \ - mmcu?avr5=mmcu?atmega3290p \ - mmcu?avr5=mmcu?atmega406 \ - mmcu?avr5=mmcu?atmega64 \ - mmcu?avr5=mmcu?atmega640 \ - mmcu?avr5=mmcu?atmega644 \ -+ mmcu?avr5=mmcu?atmega644a \ - mmcu?avr5=mmcu?atmega644p \ -+ mmcu?avr5=mmcu?atmega644pa \ - mmcu?avr5=mmcu?atmega645 \ -+ mmcu?avr5=mmcu?atmega645a \ -+ mmcu?avr5=mmcu?atmega645p \ - mmcu?avr5=mmcu?atmega6450 \ -+ mmcu?avr5=mmcu?atmega6450a \ -+ mmcu?avr5=mmcu?atmega6450p \ - mmcu?avr5=mmcu?atmega649 \ -+ mmcu?avr5=mmcu?atmega649a \ -+ mmcu?avr5=mmcu?atmega649p \ - mmcu?avr5=mmcu?atmega6490 \ -+ mmcu?avr5=mmcu?atmega6490a \ -+ mmcu?avr5=mmcu?atmega6490p \ - mmcu?avr5=mmcu?atmega16hva \ -+ mmcu?avr5=mmcu?atmega16hva2 \ - mmcu?avr5=mmcu?atmega16hvb \ - mmcu?avr5=mmcu?atmega32hvb \ -+ mmcu?avr5=mmcu?atmega64hve \ - mmcu?avr5=mmcu?at90can32 \ - mmcu?avr5=mmcu?at90can64 \ - mmcu?avr5=mmcu?at90pwm216 \ - mmcu?avr5=mmcu?at90pwm316 \ -- mmcu?avr5=mmcu?atmega16c1 \ - mmcu?avr5=mmcu?atmega32c1 \ - mmcu?avr5=mmcu?atmega64c1 \ - mmcu?avr5=mmcu?atmega16m1 \ -@@ -176,6 +207,7 @@ - mmcu?avr5=mmcu?at90usb646 \ - mmcu?avr5=mmcu?at90usb647 \ - mmcu?avr5=mmcu?at94k \ -+ mmcu?avr5=mmcu?m3000 \ - mmcu?avr51=mmcu?atmega128 \ - mmcu?avr51=mmcu?atmega1280 \ - mmcu?avr51=mmcu?atmega1281 \ -@@ -184,9 +216,6 @@ - mmcu?avr51=mmcu?at90can128 \ - mmcu?avr51=mmcu?at90usb1286 \ - mmcu?avr51=mmcu?at90usb1287 \ -- mmcu?avr51=mmcu?m3000f \ -- mmcu?avr51=mmcu?m3000s \ -- mmcu?avr51=mmcu?m3001b \ - mmcu?avr6=mmcu?atmega2560 \ - mmcu?avr6=mmcu?atmega2561 - diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 77995ef1d..7a291ddb0 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 37852 2011-01-18 18:27:55Z ibiru $ +# $Id: PKGBUILD 45665 2011-04-26 21:32:06Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=2.32.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://live.gnome.org/GeditPlugins" -depends=('gedit' 'vte' 'gucharmap' 'python2-gconf' 'dbus-python') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.0') +depends=('gedit' 'dbus-python') +makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.32/$pkgname-$pkgver.tar.bz2) -sha256sums=('2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107') +source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2) +sha256sums=('7152d3f5639258a0b5fb873521d36fc9919dee4c00ce9fb414045a2d8b0c06f6') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all + ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ + --disable-schemas-compile make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install +} - install -m755 -d $pkgdir/usr/share/gconf/schemas - gconf-merge-schema $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/gedit-plugins/gedit-plugins.install b/community/gedit-plugins/gedit-plugins.install index 5a2fca03e..d5bcc00ae 100644 --- a/community/gedit-plugins/gedit-plugins.install +++ b/community/gedit-plugins/gedit-plugins.install @@ -1,23 +1,22 @@ pkgname=gedit-plugins post_install() { - usr/sbin/gconfpkg --install ${pkgname} + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi } post_upgrade() { post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} post_remove() { - /bin/true + post_install $1 } diff --git a/community/gedit-plugins/libtool.patch b/community/gedit-plugins/libtool.patch deleted file mode 100644 index d00b97b36..000000000 --- a/community/gedit-plugins/libtool.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac 2008-10-25 11:13:17.000000000 +0200 -+++ configure.ac.new 2008-11-13 20:45:39.000000000 +0100 -@@ -20,6 +20,7 @@ - IT_PROG_INTLTOOL([0.35.0]) - - AC_PROG_LIBTOOL -+m4_ifdef([LT_OUTPUT],[LT_OUTPUT]) - - AC_ISC_POSIX - AC_PROG_CC diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD new file mode 100644 index 000000000..88aaacd92 --- /dev/null +++ b/community/gluon/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ivan Sichmann Freitas <ivansichfreitas@gmail.com> + +pkgname=gluon +pkgver=0.71.0 +_pkgver=0.71 +pkgrel=2 +pkgdesc="A free and open source platform for creating and distributing games" +arch=('i686' 'x86_64') +url="http://gluon.gamingfreedom.org/" +license=('LGPL') +depends=('qt' 'kdebase-runtime' 'libsndfile' 'openal' 'alure' 'attica') +makedepends=('cmake' 'automoc4' 'mesa' 'kdevplatform') +install=gluon.install +source=("http://download.kde.org/download.php?url=unstable/$pkgname/$_pkgver/src/$pkgname-$pkgver.tar.gz") +md5sums=('e4f284c0ae00e5b8a58cc3e6201857fe') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + [[ -d build ]] && rm -rf build + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + cd build + make DESTDIR="$pkgdir/" install +} diff --git a/community/gluon/gluon.install b/community/gluon/gluon.install new file mode 100644 index 000000000..bf97c58a3 --- /dev/null +++ b/community/gluon/gluon.install @@ -0,0 +1,15 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD index 6f3175ef4..6d4ea1590 100644 --- a/community/gnumail/PKGBUILD +++ b/community/gnumail/PKGBUILD @@ -1,30 +1,23 @@ -# $Id: PKGBUILD 18211 2010-06-01 12:53:53Z spupykin $ +# $Id: PKGBUILD 44415 2011-04-07 13:04:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnumail pkgver=1.2.0pre3 -pkgrel=3 +pkgrel=4 pkgdesc="A complete and fast mail application for GNUstep" arch=('i686' 'x86_64' 'mips64el') url="http://www.collaboration-world.com/gnumail" license=('GPL') depends=('pantomime' 'addresses' 'gcc' 'gnustep-gui') options=('!makeflags') -source=(http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103) +source=(GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103) md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b') build() { - cd $srcdir - mv GNUMail-$pkgver.tar.gz?rid=103 GNUMail-$pkgver.tar.gz - tar xfz GNUMail-$pkgver.tar.gz cd $srcdir/GNUMail - - if [ -z "$GNUSTEP_USER_CONFIG_FILE" ] ; then - . /etc/profile.d/GNUstep.sh - fi - - make || return 1 + . /etc/profile.d/GNUstep.sh + make make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install } diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD index afc343152..80dbecc6d 100644 --- a/community/gnustep-back/PKGBUILD +++ b/community/gnustep-back/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 16999 2010-05-16 20:53:17Z spupykin $ +# $Id: PKGBUILD 45208 2011-04-18 12:44:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-back -pkgver=0.18.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,12 @@ makedepends=('gnustep-gui' 'libffi' 'gcc-objc') conflicts=('gnustep-back-svn') groups=('gnustep-core') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('fb428c936dc16b2db7f085514a7bde7c') +md5sums=('a28ba696419eeab17f14c2a75b21c3a7') build() { - cd $startdir/src/$pkgname-$pkgver - - ./configure --prefix=/opt/GNUstep - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install } diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD index 81904d0da..7839af753 100644 --- a/community/gnustep-base/PKGBUILD +++ b/community/gnustep-base/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 22746 2010-07-29 11:42:29Z spupykin $ +# $Id: PKGBUILD 45211 2011-04-18 12:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-base -pkgver=1.20.1 +pkgver=1.22.0 pkgrel=1 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=("GPL" "LGPL") -depends=(libxslt avahi gmp gcc-libs openssl ffcall gnustep-make gnutls) +depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls) makedepends=(gcc-objc) conflicts=('gnustep-base-svn') groups=('gnustep-core') options=('!emptydirs' '!makeflags') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('8ade7c698159df7a43c7b5052321e4e0') +md5sums=('7faab4891ae6c1e7a6c806d6da368410') build() { cd $srcdir/$pkgname-$pkgver source /etc/profile.d/GNUstep.sh - # need this stupid hack - mkdir -p $pkgdir/opt/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones - ./configure --prefix=/opt/GNUstep --enable-ffcall --disable-libffi + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ # fix file ownership sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble - make VERBOSE=1 || return 1 - make DESTDIR=$pkgdir install || return 1 + make VERBOSE=1 + make DESTDIR=$pkgdir install chown -R root.root $pkgdir/ } diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index b5fb29d49..677f7fd80 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 17005 2010-05-16 20:54:38Z spupykin $ +# $Id: PKGBUILD 45216 2011-04-18 12:46:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui -pkgver=0.18.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') @@ -16,12 +16,12 @@ conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('1726eef8bcb7b25d561cf8263242c6e7') +md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b') build() { - cd $startdir/src/$pkgname-$pkgver - - ./configure --prefix=/opt/GNUstep --disable-gsnd - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install } diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD index d657c7a23..b2e2e4e37 100644 --- a/community/gnustep-make/PKGBUILD +++ b/community/gnustep-make/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 17008 2010-05-16 20:55:25Z spupykin $ +# $Id: PKGBUILD 45214 2011-04-18 12:46:00Z spupykin $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-make -pkgver=2.4.0 +pkgver=2.6.0 pkgrel=1 pkgdesc="The GNUstep make package" arch=(i686 x86_64 'mips64el') @@ -13,17 +13,14 @@ depends=('glibc') conflicts=('gnustep-make-svn') groups=('gnustep-core') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('bc2138e6256665e55b00fb0ffac766f1') +md5sums=('71a6c6d9a0b341495e67c915fe6722c1') build() { - cd $startdir/src/$pkgname-$pkgver - - ./configure --prefix=/opt/GNUstep - make || return 1 - - make DESTDIR=$pkgdir install || return 1 - + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install install -D -m755 \ - $startdir/pkg/opt/GNUstep/System/Library/Makefiles/GNUstep.sh \ - $startdir/pkg/etc/profile.d/GNUstep.sh + $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ + $pkgdir/etc/profile.d/GNUstep.sh } diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index 19299adb4..f3f104163 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41051 2011-03-03 15:12:22Z tdziedzic $ +# $Id: PKGBUILD 45236 2011-04-18 13:25:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -pkgrel=5 +pkgrel=7 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" @@ -16,8 +16,10 @@ depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' ' ) # already in core ('sqlite3') makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') install="gpsdrive.install" -source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz") -md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c') +source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" + "gpsd-2.96.patch") +md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' + '5769e12c6d8932fb721212434c64f505') build() { cd "$srcdir" @@ -57,6 +59,11 @@ build() { -DWITH_DBUS=OFF \ -DLIBGPS_OLD=OFF \ "$srcdir/gpsdrive-$pkgver" + (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) make +} + +package() { + cd "$srcdir/build" make DESTDIR="$pkgdir" install } diff --git a/community/gpsdrive/gpsd-2.96.patch b/community/gpsdrive/gpsd-2.96.patch new file mode 100644 index 000000000..bc6c7475f --- /dev/null +++ b/community/gpsdrive/gpsd-2.96.patch @@ -0,0 +1,44 @@ +diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c +--- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 ++++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 +@@ -264,7 +264,8 @@ + #define GPS_TIMER 500 + + static gint gps_timeout_source = 0; +-static struct gps_data_t *gpsdata; ++static struct gps_data_t __gd; ++static struct gps_data_t *gpsdata = &__gd; + + /* SYMBOLS USED IN LIBGPS: + * +@@ -410,9 +411,10 @@ + */ + gps_query (gpsdata, "oys\n"); + #else +- if (gps_waiting(gpsdata)) ++ if (gps_waiting(gpsdata, 1000000)) + { +- gps_poll (gpsdata); ++ gps_read (gpsdata); ++ gps_hook_cb(gpsdata, NULL); + } + #endif + +@@ -447,7 +449,7 @@ + } + + /* try to open connection */ +- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); ++ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; + if (!gpsdata) + { + g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", +@@ -466,7 +468,7 @@ + gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); + + /* set hook function to handle gps data */ +- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); ++// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); + + #ifndef LIBGPS_OLD + /* enable watch mode to get data stream from gpsd */ diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index dfdabb0e5..740c7a989 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 37999 2011-01-20 08:04:31Z ttopper $ +# $Id: PKGBUILD 45625 2011-04-26 00:58:22Z dreisner $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 pkgver=3.e_bf2 _pkgver=3.e-bf2 -pkgrel=1 +pkgrel=2 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3.zekjur.net/" @@ -17,12 +17,17 @@ makedepends=('bison' 'flex') optdepends=('rxvt-unicode: The terminal emulator used in the default config.' 'dmenu: As menu.') options=('docs' '!strip') -source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2) -md5sums=('dc2c59623fdc9e69003b8807a0443544') +source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2 + yajl-2.x.patch) +md5sums=('dc2c59623fdc9e69003b8807a0443544' + '8c2a58e743ee0f8d76455d2afbeedd6f') build() { cd "$srcdir/$_pkgsourcename-$_pkgver" - + + # fixes for yajl 2.x API + patch -Np1 < "$srcdir/yajl-2.x.patch" + make } diff --git a/community/i3-wm/yajl-2.x.patch b/community/i3-wm/yajl-2.x.patch new file mode 100644 index 000000000..dae2ac4da --- /dev/null +++ b/community/i3-wm/yajl-2.x.patch @@ -0,0 +1,61 @@ +From b095db986c7a22c03e2766180e053817563ef244 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Mon, 25 Apr 2011 17:06:51 -0400 +Subject: [PATCH] ipc: fixup for yajl 2.0 API changes + +--- + src/ipc.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/ipc.c b/src/ipc.c +index 1937d55..ab0a265 100644 +--- a/src/ipc.c ++++ b/src/ipc.c +@@ -182,7 +182,7 @@ IPC_HANDLER(get_workspaces) { + if (last_focused == SLIST_END(&(c_ws->focus_stack))) + last_focused = NULL; + +- yajl_gen gen = yajl_gen_alloc(NULL, NULL); ++ yajl_gen gen = yajl_gen_alloc(NULL); + y(array_open); + + TAILQ_FOREACH(ws, workspaces, workspaces) { +@@ -226,7 +226,7 @@ IPC_HANDLER(get_workspaces) { + y(array_close); + + const unsigned char *payload; +- unsigned int length; ++ size_t length; + y(get_buf, &payload, &length); + + ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_WORKSPACES, length); +@@ -241,7 +241,7 @@ IPC_HANDLER(get_workspaces) { + IPC_HANDLER(get_outputs) { + Output *output; + +- yajl_gen gen = yajl_gen_alloc(NULL, NULL); ++ yajl_gen gen = yajl_gen_alloc(NULL); + y(array_open); + + TAILQ_FOREACH(output, &outputs, outputs) { +@@ -276,7 +276,7 @@ IPC_HANDLER(get_outputs) { + y(array_close); + + const unsigned char *payload; +- unsigned int length; ++ size_t length; + y(get_buf, &payload, &length); + + ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_OUTPUTS, length); +@@ -338,7 +338,7 @@ IPC_HANDLER(subscribe) { + memset(&callbacks, 0, sizeof(yajl_callbacks)); + callbacks.yajl_string = add_subscription; + +- p = yajl_alloc(&callbacks, NULL, NULL, (void*)client); ++ p = yajl_alloc(&callbacks, NULL, (void*)client); + stat = yajl_parse(p, (const unsigned char*)message, message_size); + if (stat != yajl_status_ok) { + unsigned char *err; +-- +1.7.4.4 + diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 4f9e43c51..bed806c4e 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,7 +6,7 @@ pkgname=john pkgver=1.7.6 -pkgrel=2 +pkgrel=3 pkgdesc="John The Ripper - A fast password cracker. Additional patches (NTLM, MySQL, Kerberos V5, etc.) included." arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -14,18 +14,18 @@ license=('GPL2' 'custom') depends=('openssl') backup=('etc/john/john.conf') source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 - http://www.openwall.com/john/contrib/john-$pkgver-jumbo-7.diff.gz - http://www2.psy.uq.edu.au/~ftp/Crypto/DES/libdes-4.04b.tar.gz + http://www.openwall.com/john/g/john-$pkgver-jumbo-12.diff.gz + ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('321ac0793f1aa4f0603b33a393133756' - 'bc87e7dd5c4ac1bb3d84bed87614028b' - 'e83785f17fde1f362b030792f1269bf1' + '405750a1d8f5c62d434e97cd2775843b' + 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') build() { # jumbo patch cd ${srcdir}/$pkgname-$pkgver - patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-7.diff + patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-12.diff cd ${srcdir}/john-$pkgver/src/ # patch default params diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 8494b2150..065716d36 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45197 2011-04-18 09:53:26Z spupykin $ +# $Id: PKGBUILD 45630 2011-04-26 00:59:03Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -35,12 +35,14 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.rc.d libvirtd.conf.d openbsd-netcat-default.patch - unixperms.patch) + unixperms.patch + yajl-2.x.patch) md5sums=('53d005e6f3732aba1fd6b2718f9cec99' '018d97dafc0049075fba6f2850f17a12' '3ed0e24f5b5e25bf553f5427d64915e6' '7d5a841d51321be56ad3c4f93d112fb0' - 'db95aecdf2ccf3693fef5821cdcb7eba') + 'db95aecdf2ccf3693fef5821cdcb7eba' + '5745bb8d0b254abb7a3528c66e03b0f9') build() { cd "$srcdir/$pkgname-$pkgver" @@ -59,6 +61,9 @@ build() { [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch + # fixes for yajl 2.0 API changes + [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch" + export LDFLAGS=-lX11 [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ --with-storage-lvm --without-xen --with-udev --without-hal diff --git a/community/libvirt/yajl-2.x.patch b/community/libvirt/yajl-2.x.patch new file mode 100644 index 000000000..80d3edce0 --- /dev/null +++ b/community/libvirt/yajl-2.x.patch @@ -0,0 +1,66 @@ +--- a/src/util/json.c 2011-03-24 03:10:26.000000000 -0400 ++++ b/src/util/json.c 2011-04-25 20:01:29.354939116 -0400 +@@ -709,7 +709,7 @@ + + static int virJSONParserHandleNumber(void * ctx, + const char * s, +- unsigned int l) ++ size_t l) + { + virJSONParserPtr parser = ctx; + char *str = strndup(s, l); +@@ -735,7 +735,7 @@ + + static int virJSONParserHandleString(void * ctx, + const unsigned char * stringVal, +- unsigned int stringLen) ++ size_t stringLen) + { + virJSONParserPtr parser = ctx; + virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, +@@ -756,7 +756,7 @@ + + static int virJSONParserHandleMapKey(void * ctx, + const unsigned char * stringVal, +- unsigned int stringLen) ++ size_t stringLen) + { + virJSONParserPtr parser = ctx; + virJSONParserStatePtr state; +@@ -894,14 +894,14 @@ + /* XXX add an incremental streaming parser - yajl trivially supports it */ + virJSONValuePtr virJSONValueFromString(const char *jsonstring) + { +- yajl_parser_config cfg = { 1, 1 }; + yajl_handle hand; + virJSONParser parser = { NULL, NULL, 0 }; + virJSONValuePtr ret = NULL; + + VIR_DEBUG("string=%s", jsonstring); + +- hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); ++ hand = yajl_alloc(&parserCallbacks, NULL, &parser); ++ yajl_config(hand, yajl_allow_comments, 1); + + if (yajl_parse(hand, + (const unsigned char *)jsonstring, +@@ -1002,15 +1002,16 @@ + + char *virJSONValueToString(virJSONValuePtr object) + { +- yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ + yajl_gen g; + const unsigned char *str; + char *ret = NULL; +- unsigned int len; ++ size_t len; + + VIR_DEBUG("object=%p", object); + +- g = yajl_gen_alloc(&conf, NULL); ++ g = yajl_gen_alloc(NULL); ++ yajl_gen_config(g, yajl_gen_beautify, 0); ++ yajl_gen_config(g, yajl_gen_indent_string, " "); + + if (virJSONValueToStringOne(object, g) < 0) { + virReportOOMError(); diff --git a/community/llvm/PKGBUILD b/community/llvm/PKGBUILD index 0bdd941a0..ad8dc556b 100644 --- a/community/llvm/PKGBUILD +++ b/community/llvm/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 44403 2011-04-07 11:36:47Z foutrelis $ +# $Id: PKGBUILD 44752 2011-04-11 14:36:48Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> # Contributor: Tobias Kieslich <tobias@justdreams.de> @@ -10,20 +11,28 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=2.9 -_gcc_ver=4.5.2 -pkgrel=1 +_gcc_ver=4.6.0 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz http://llvm.org/releases/$pkgver/clang-$pkgver.tgz + ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz clang-plugin-loader-registry.patch - cindexer-clang-path.patch) + cindexer-clang-path.patch + clang-toolchains-gcc-versions.patch + clang-pure64.patch + enable-lto.patch) md5sums=('793138412d2af2c7c7f54615f8943771' '634de18d04b7a4ded19ec4c17d23cfca' + '70e23a3dc2b38ecb2bb4d2c48f47295d' '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0') + '87a7162dbe99e9ffce6c40bd09f5f4f0' + '8da236120a9a287a977b575b8b905c93' + '225ee6b531f8327f34f344a18cb4ec81' + '8f7582d7440e4a8342c3aea9ec714fb4') build() { cd "$srcdir/$pkgname-$pkgver" @@ -52,21 +61,55 @@ build() { # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" + # Add GCC 4.6.0 to GccVersions (FS#23631) + patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" + + if [[ $CARCH == x86_64 ]]; then + # Adjust lib paths + patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" + fi + + # Make -flto work + # Use gold instead of default linker, and always use the plugin + patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" + # Apply strip option to configure - _optimize_flag="--enable-optimize" - [ "$(check_option strip)" = "n" ] && _optimize_flag="--disable-optimize" + _optimized_switch="enable" + [[ $(check_option strip) == n ]] && _optimized_switch="disable" # Include location of libffi headers in CPPFLAGS export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - ./configure --prefix=/usr --libdir=/usr/lib/llvm --sysconfdir=/etc \ - --enable-shared --enable-libffi \ - --enable-bindings=ocaml --enable-targets=all \ - --disable-expensive-checks --disable-debug-runtime \ - --disable-assertions --with-binutils-include=/usr/include \ - $_optimize_flag \ - --with-cxx-include-root=/usr/include/c++/$_gcc_ver \ - --with-cxx-include-arch=$CHOST + # TODO: Uncomment when clang works with GCC 4.6+ + #_cxx_headers="/usr/include/c++/$_gcc_ver" + #if [[ ! -d $_cxx_headers ]]; then + # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" + # return 1 + #fi + _cxx_headers="/usr/include/c++/clang-$pkgver" + + _32bit_headers="" + if [[ $CARCH == x86_64 ]]; then + # Important for multilib + _32bit_headers="32" + fi + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --disable-expensive-checks \ + --disable-debug-runtime \ + --disable-assertions \ + --with-binutils-include=/usr/include \ + --with-cxx-include-root=$_cxx_headers \ + --with-cxx-include-arch=$CHOST \ + --with-cxx-include-32bit-dir=$_32bit_headers \ + --$_optimized_switch-optimized + make REQUIRES_RTTI=1 } @@ -100,7 +143,7 @@ package_llvm() { rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* # Symlink the gold plugin where clang expects it - ln -s "llvm/libLLVMgold.so" "$pkgdir/usr/lib/LLVMgold.so" + ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" # Add ld.so.conf.d entry install -d "$pkgdir/etc/ld.so.conf.d" @@ -146,6 +189,11 @@ package_clang() { sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ "$srcdir/llvm-$pkgver/Makefile.config" + # Install old libstdc++ headers. Contains combined headers from + # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 + install -d "$pkgdir/usr/include/c++" + cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" } @@ -157,9 +205,9 @@ package_clang-analyzer() { cd "$srcdir/llvm-$pkgver/tools/clang" install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} - for tool in scan-{build,view}; do - cp -r tools/$tool "$pkgdir/usr/lib/clang-analyzer" - ln -s /usr/lib/clang-analyzer/$tool/$tool "$pkgdir/usr/bin" + for _tool in scan-{build,view}; do + cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" + ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" done # Use Python 2 diff --git a/community/llvm/clang-pure64.patch b/community/llvm/clang-pure64.patch new file mode 100644 index 000000000..da6178519 --- /dev/null +++ b/community/llvm/clang-pure64.patch @@ -0,0 +1,38 @@ +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3306,7 +3306,7 @@ + else if (ToolChain.getArch() == llvm::Triple::arm) + CmdArgs.push_back("/lib/ld-linux.so.3"); + else +- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); ++ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); + } + + CmdArgs.push_back("-o"); +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1317,18 +1317,10 @@ + if (Arch == llvm::Triple::x86) + Suffix64 = "/64"; + +- std::string Lib32 = "lib"; +- +- bool Exists; +- if (!llvm::sys::fs::exists("/lib32", Exists) && Exists) +- Lib32 = "lib32"; +- ++ std::string Lib32 = "lib32"; + std::string Lib64 = "lib"; +- bool Symlink; +- if (!llvm::sys::fs::exists("/lib64", Exists) && Exists && +- (llvm::sys::fs::is_symlink("/lib64", Symlink) || !Symlink)) +- Lib64 = "lib64"; + ++ bool Exists; + std::string GccTriple = ""; + if (Arch == llvm::Triple::arm) { + if (!llvm::sys::fs::exists("/usr/lib/gcc/arm-linux-gnueabi", Exists) && diff --git a/community/llvm/clang-toolchains-gcc-versions.patch b/community/llvm/clang-toolchains-gcc-versions.patch new file mode 100644 index 000000000..2e527300d --- /dev/null +++ b/community/llvm/clang-toolchains-gcc-versions.patch @@ -0,0 +1,12 @@ +diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp +--- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200 ++++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300 +@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const + GccTriple = "i586-suse-linux"; + } + +- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", ++ const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4", + "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2", + "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1", + "4.2"}; diff --git a/community/llvm/enable-lto.patch b/community/llvm/enable-lto.patch new file mode 100644 index 000000000..40d93104a --- /dev/null +++ b/community/llvm/enable-lto.patch @@ -0,0 +1,36 @@ +Index: lib/Driver/ToolChains.cpp +=================================================================== +--- lib/Driver/ToolChains.cpp (revision 123373) ++++ lib/Driver/ToolChains.cpp (working copy) +@@ -1398,11 +1398,11 @@ + Lib = Lib64; + } + +- llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld"); ++ llvm::sys::Path LinkerPath(Base + "/../../../../" + GccTriple + "/bin/ld.gold"); + if (!llvm::sys::fs::exists(LinkerPath.str(), Exists) && Exists) + Linker = LinkerPath.str(); + else +- Linker = GetProgramPath("ld"); ++ Linker = GetProgramPath("ld.gold"); + + LinuxDistro Distro = DetectLinuxDistro(Arch); + +Index: lib/Driver/Tools.cpp +=================================================================== +--- lib/Driver/Tools.cpp (revision 123373) ++++ lib/Driver/Tools.cpp (working copy) +@@ -3412,11 +3412,11 @@ + } + } + +- if (Args.hasArg(options::OPT_use_gold_plugin)) { ++ // if (Args.hasArg(options::OPT_use_gold_plugin)) { + CmdArgs.push_back("-plugin"); + std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; + CmdArgs.push_back(Args.MakeArgString(Plugin)); +- } ++ // } + + C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); + } diff --git a/community/lua-yajl-git/LICENSE b/community/lua-yajl-git/LICENSE deleted file mode 100644 index 89de35479..000000000 --- a/community/lua-yajl-git/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/community/lua-yajl-git/PKGBUILD b/community/lua-yajl-git/PKGBUILD deleted file mode 100644 index ca2289b9e..000000000 --- a/community/lua-yajl-git/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=lua-yajl-git -pkgver=20101121 -pkgrel=1 -pkgdesc="Lua interface to yajl." -arch=('i686' 'x86_64' 'mips64el') -url="http://github.com/brimworks/lua-yajl" -license=('MIT') -depends=('yajl' 'lua') -makedepends=('git' 'cmake') -options=(!libtool) -source=(LICENSE) -md5sums=('838c366f69b72c5df05c96dff79b35f2') - -_gitroot="git://github.com/brimworks/lua-yajl.git" -_gitname="lua-yajl" - -build() { - cd ${srcdir} - msg 'Connecting to GIT server....' - - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin - msg 'The local files are updated.' - else - git clone ${_gitroot} ${_gitname} - fi - - msg 'GIT checkout done or server timeout' - msg 'Starting make...' - - rm -rf ${srcdir}/${_gitname}-build - git clone ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build - cd ${srcdir}/${_gitname}-build - - cmake . || return 1 - make || return 1 -} - -package(){ - cd ${srcdir}/${_gitname}-build - make DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/usr/lib/lua/5.1 - mv ${pkgdir}/usr/local/share/lua/cmod/* ${pkgdir}/usr/lib/lua/5.1/ - rm -R ${pkgdir}/usr/local - install -Dm644 ${srcdir}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/medit/capsule.diff b/community/medit/capsule.diff deleted file mode 100644 index 7ce4edab8..000000000 --- a/community/medit/capsule.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- medit-1.0.0.orig/moo/moopython/moopython-pygtkmod.h 2010-12-22 05:11:46.000000000 +0100 -+++ medit-1.0.0/moo/moopython/moopython-pygtkmod.h 2011-02-08 16:14:10.000000000 +0100 -@@ -20,7 +20,7 @@ - G_GNUC_UNUSED static void - init_pygtk_mod (void) - { -- PyObject *gobject, *pygtk; -+ PyObject *gobject; - PyObject *mdict; - PyObject *cobject; - -@@ -29,7 +29,7 @@ - - mdict = PyModule_GetDict (gobject); - cobject = PyDict_GetItemString (mdict, "_PyGObject_API"); -- -+ - if (!cobject || !PyCObject_Check (cobject)) - { - PyErr_SetString (PyExc_RuntimeError, -@@ -38,21 +38,13 @@ - } - - _PyGObject_API = (struct _PyGObject_Functions *) PyCObject_AsVoidPtr (cobject); -- -- if (!(pygtk = PyImport_ImportModule("gtk._gtk"))) -- return; -- -- mdict = PyModule_GetDict (pygtk); -- cobject = PyDict_GetItemString (mdict, "_PyGtk_API"); -- -- if (!cobject || !PyCObject_Check (cobject)) -- { -- PyErr_SetString (PyExc_RuntimeError, -- "could not find _PyGtk_API object"); -+ -+ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); -+ if (!capsule) { - return; - } -- -- _PyGtk_API = (struct _PyGtk_FunctionStruct*) PyCObject_AsVoidPtr (cobject); -+ -+ _PyGtk_API = (struct _PyGtk_FunctionStruct*) capsule; - } - - diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index f0210c3ae..204d82fac 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,32 +1,24 @@ -# $Id: PKGBUILD 45343 2011-04-20 13:49:48Z svenstaro $ +# $Id: PKGBUILD 45457 2011-04-22 00:47:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.5.0 -pkgrel=1 +pkgrel=3 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" -license=('GPL2') +license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu') makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake') source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.bz2" - "http://downloads.sourceforge.net/project/${pkgname}/current_release/megaglest-data-${pkgver}.7z" - "megaglest.png" - "megaglest.desktop" "megaglest.sh") -md5sums=('5c84966ee6657274eeb5a28ce8b702c0' - '4405134d91d8303e9485de42ffc53e09' - '5622ce716033d9afb62a3291b47844ed' - '97dc7ea865efbea5daaf300207dad518' +md5sums=('03cb7e67be3e72ac0147b23c6b91eb2a' 'e3d6abbe79263d2fa5edb0bcbcf8755a') build() { cd ${srcdir}/${pkgname}-source-${pkgver}/ - 7z x -y ${srcdir}/megaglest-data-${pkgver}.7z - [[ -d build ]] && rm -r build mkdir build && cd build cmake .. \ @@ -48,8 +40,12 @@ package() { install -m 0755 mk/linux/megaglest_editor "${pkgdir}"/usr/bin/megaglest_editor install -m 0644 glest.ini glestkeys.ini servers.ini "${pkgdir}"/usr/share/$pkgname - install -D -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop - install -D -m 0644 "${srcdir}"/${pkgname}.png "${pkgdir}"/usr/share/pixmaps/${pkgname}.png + sed -i s/Exec=.*/Exec=${pkgname}/g ${pkgname}.desktop + sed -i s/Icon=.*/Icon=${pkgname}/g ${pkgname}.desktop + install -D -m 0644 "${pkgname}.desktop" "${pkgdir}"/usr/share/applications/${pkgname}.desktop + install -D -m 0644 "${pkgname}.png" "${pkgdir}"/usr/share/pixmaps/${pkgname}.png + + install -Dm755 code_license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } # vim: sw=2:ts=2 et: diff --git a/community/megaglest/megaglest.desktop b/community/megaglest/megaglest.desktop deleted file mode 100644 index 267dbf358..000000000 --- a/community/megaglest/megaglest.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Categories=Application;Game; -Name=Megaglest -Icon=megaglest -Exec=megaglest -Terminal=false -Type=Application diff --git a/community/megaglest/megaglest.png b/community/megaglest/megaglest.png Binary files differdeleted file mode 100644 index 65e5d9862..000000000 --- a/community/megaglest/megaglest.png +++ /dev/null diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index d1554a1bb..b42d83c86 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 39743 2011-02-15 21:13:52Z spupykin $ +# $Id: PKGBUILD 45471 2011-04-22 05:36:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc pkgver=4.5.2 -pkgrel=2 -arch=(i686 x86_64 'mips64el') +pkgrel=3 +arch=(i686 x86_64 mips64el) pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" -depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils cloog-ppl gmp) +depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils gmp) replaces=(mingw32-gcc-base) provides=(mingw32-gcc-base) -options=(!strip force) +options=(!strip) url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/" license=(GPL LGPL) source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma) @@ -29,7 +29,8 @@ build() chmod ugo+x $srcdir/gcc-$pkgver/configure chmod ugo+x $srcdir/gcc-$pkgver/move-if-change - [ $NOEXTRACT -eq 1 ] || $srcdir/gcc-$pkgver/configure \ + msg "gcc" + [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ --target=i486-mingw32 \ --host=$CHOST \ --build=$CHOST \ @@ -39,16 +40,37 @@ build() --enable-sjlj-exceptions \ --enable-hash-synchronization \ --disable-nls \ - --disable-libssp \ + --disable-libssp make make install DESTDIR=$pkgdir + msg "libgcc" make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install + + msg "libstdc++" make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install +# msg "libgomp" +# mkdir -p i486-mingw32/libgomp +# cd i486-mingw32/libgomp +# [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ +# --target=i486-mingw32 \ +# --host=$CHOST \ +# --build=$CHOST \ +# --prefix=/usr \ +# --enable-languages=c,c++ \ +# --enable-shared \ +# --enable-sjlj-exceptions \ +# --enable-hash-synchronization \ +# --disable-nls \ +# --disable-libssp +# make -j1 DESTDIR=$pkgdir all install + + msg "fixes" mkdir -p $pkgdir/usr/i486-mingw32/bin/ - mv $pkgdir/usr/bin/*.dll $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/ + mv $pkgdir/usr/bin/*.dll $pkgdir/usr/i486-mingw32/bin/ + mv $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/ cd $pkgdir rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index 648261581..40ffbb985 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 36886 2011-01-09 21:17:22Z mherych $ +# $Id: PKGBUILD 45584 2011-04-24 17:56:50Z mherych $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com> pkgname=ncmpcpp -pkgver=0.5.6 +pkgver=0.5.7 pkgrel=1 pkgdesc="An almost exact clone of ncmpc with some new features." arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('curl' 'libmpdclient' 'taglib' 'ncurses') install=ncmpcpp.install source=(http://unkart.ovh.org/ncmpcpp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('cdaf82694c0a1f5e9de65bb0a191e403') +md5sums=('6632c76f2f0836c5aa5a1a2fbb1c921c') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch b/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch deleted file mode 100644 index c58a943b5..000000000 --- a/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8ed781828b1d8e1692105c0c0c130858d47a28ce Mon Sep 17 00:00:00 2001 -From: Fabian Pedregosa <fabian.pedregosa@inria.fr> -Date: Sun, 25 Jul 2010 14:35:35 +0200 -Subject: [PATCH] FIX: define macro to access C99 extensions from C++. - -This prevented scipy.sparse.sparsetools to compile correctly under -python2.7, because the wrappers are C++ files but ndarraytypes.h -references some C99 macros in inttypes.h. ---- - scipy/sparse/sparsetools/SConscript | 1 + - scipy/sparse/sparsetools/setup.py | 4 +++- - 2 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/scipy/sparse/sparsetools/SConscript b/scipy/sparse/sparsetools/SConscript -index 1aa5557..85d9e05 100644 ---- a/scipy/sparse/sparsetools/SConscript -+++ b/scipy/sparse/sparsetools/SConscript -@@ -3,6 +3,7 @@ - from numscons import GetNumpyEnvironment - - env = GetNumpyEnvironment(ARGUMENTS) -+env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS') - - for fmt in ['csr','csc','coo','bsr','dia']: - sources = [ fmt + '_wrap.cxx' ] -diff --git a/scipy/sparse/sparsetools/setup.py b/scipy/sparse/sparsetools/setup.py -index f4027a7..c4c4636 100755 ---- a/scipy/sparse/sparsetools/setup.py -+++ b/scipy/sparse/sparsetools/setup.py -@@ -9,7 +9,9 @@ def configuration(parent_package='',top_path=None): - for fmt in ['csr','csc','coo','bsr','dia']: - sources = [ fmt + '_wrap.cxx' ] - depends = [ fmt + '.h' ] -- config.add_extension('_' + fmt, sources=sources, depends=depends) -+ config.add_extension('_' + fmt, sources=sources, -+ define_macros=[('__STDC_FORMAT_MACROS', 1)], -+ depends=depends) - - return config - --- -1.7.1.1 - diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 771194b20..f726054ca 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -1,40 +1,85 @@ -#$Id: PKGBUILD 27301 2010-09-19 16:29:18Z schuay $ +# $Id: PKGBUILD 45545 2011-04-24 06:08:32Z schiv $ # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> +# Contributor: Andrzej Giniewicz <gginiu@gmail.com> -pkgname=python-scipy -pkgver=0.8.0 -pkgrel=4 -pkgdesc="SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering." +pkgbase=python-scipy +_app=scipy +pkgname=('python-scipy' 'python2-scipy') +pkgver=0.9.0 +_theapp=$_app-$pkgver +pkgrel=1 +pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') -url="http://www.scipy.org" +url="http://www.scipy.org/" license=('BSD') -depends=('lapack' 'blas' 'python2' 'python-numpy') -makedepends=('gcc' 'gcc-fortran') -conflicts=('scipy' 'scipy_core') -source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" - '0001-FIX-define-macro-to-access-C99-extensions-from-C.patch') -md5sums=('f0bfc6141b90e6a31555b31486602251' - '609759549d0571fc04d52c89b16258ed') +depends=('python3-numpy') +makedepends=('gcc-fortran' 'python2-numpy') +changelog=$pkgbase.changelog +source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz") +md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd') build() { - unset LDFLAGS - unset FFLAGS + cd "$srcdir" - cd ${srcdir}/scipy-${pkgver} - #Changing the arithmetic parameter (Thanks to Fabrizio Castellano) - sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" $srcdir/scipy-$pkgver/scipy/special/cephes/mconf.h + unset LDFLAGS + unset FFLAGS - # fix build with python 2.7 (see http://projects.scipy.org/scipy/ticket/1180) - patch -p1 < ${srcdir}/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch + # Compatibility symlinks for current stable numpy + # - no need to patch numpy just for this + # see http://projects.scipy.org/numpy/ticket/1749 + ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so + ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so + export LAPACK="$srcdir" + export BLAS="$srcdir" - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done + # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) + sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ + $_theapp/$_app/special/cephes/mconf.h - python2 setup.py config_fc --fcompiler=gnu95 build - python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root=${pkgdir} - install -D -m644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt + # 2 builds + cp -r $_theapp $_theapp-py2 + + # build for python3 + cd $_theapp + python setup.py config_fc --fcompiler=gnu95 build + + # build for python2 + cd ../$_theapp-py2 + + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + python2 setup.py config_fc --fcompiler=gnu95 build } + +package_python-scipy() { + provides=('python3-scipy' 'scipy') + + cd "$srcdir/$_theapp" + + python setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-scipy() { + depends=('python2-numpy') + conflicts=('python-scipy<0.9.0') + + cd "$srcdir/$_theapp-py2" + + python2 setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python-scipy/ChangeLog b/community/python-scipy/python-scipy.changelog index 00071d2a7..77c6d43a5 100644 --- a/community/python-scipy/ChangeLog +++ b/community/python-scipy/python-scipy.changelog @@ -1,3 +1,18 @@ +2011-04-24 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Couldn't release previous update due to lapack/blas issues + See http://mailman.archlinux.org/pipermail/arch-general/2011-April/019677.html + Hopefully symlink trick from AUR/python3-scipy fixes that + +2011-04-05 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Upstream release + SciPy now supports Python 3 + Package split for python(3), python2 + PKGBUILD cleanup + 2010-07-29 Angel 'angvp' Velasquez <angvp@archlinux.org> * Updated to: 0.8.0 2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> @@ -23,7 +38,7 @@ 2007-10-29 Douglas Soares de Andrade <dsa@aur.archlinux.org> - * Changed email + * Changed email * Fixed some problems in the PKGBUILD * Updated to new release - 0.6.0 diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 21ebfb84c..3fa7ecf2b 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 42859 2011-03-21 21:26:54Z jlichtblau $ +# $Id: PKGBUILD 45140 2011-04-17 12:03:02Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" @@ -15,14 +15,18 @@ makedepends=('cmake' 'garmindev') optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \ - $pkgname-mimetypes.xml) +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-mimetypes.xml + gpsd-2.96.patch) sha256sums=('0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + 'b641c94c6db4087c9ae1a79e31e2ea126830abf7ff1b05c27953edc6afebf8c7') build() { cd ${srcdir}/$pkgname-$pkgver + patch -Np0 -i ${srcdir}/gpsd-2.96.patch + install -d ${srcdir}/$pkgname-$pkgver/build cd ${srcdir}/$pkgname-$pkgver/build diff --git a/community/qlandkartegt/gpsd-2.96.patch b/community/qlandkartegt/gpsd-2.96.patch new file mode 100644 index 000000000..634e9ad7e --- /dev/null +++ b/community/qlandkartegt/gpsd-2.96.patch @@ -0,0 +1,49 @@ +$NetBSD: patch-ab,v 1.1 2011/03/31 20:21:34 drochner Exp $ + +for gpsd-2.96 + +--- src/CDeviceGPSD.h.orig 2011-03-15 20:13:04.000000000 +0000 ++++ src/CDeviceGPSD.h +@@ -56,7 +56,7 @@ class CGPSDThread : public QThread + protected: + virtual void run(); + +- gps_data_t* gpsdata; ++ gps_data_t* gpsdata, gpsdata_store; + + bool decodeData(); + +$NetBSD: patch-ac,v 1.1 2011/03/31 20:21:34 drochner Exp $ + +for gpsd-2.96 + +--- src/CDeviceGPSD.cpp.orig 2011-03-15 20:13:04.000000000 +0000 ++++ src/CDeviceGPSD.cpp +@@ -138,6 +138,7 @@ CGPSDThread::CGPSDThread( int _pipe_fd ) + log_mutex( new QMutex() ), + pipe_fd( _pipe_fd ) + { ++ gpsdata = &gpsdata_store; + } + + +@@ -149,8 +150,8 @@ CGPSDThread::~CGPSDThread() + + void CGPSDThread::run() + { +- gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT ); +- if( !gpsdata ) ++ int res = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata ); ++ if( res ) + { + // TODO: message box (from other thread) + qDebug() << "gps_open failed."; +@@ -187,7 +188,7 @@ void CGPSDThread::run() + } // if + else if( FD_ISSET( gpsdata->gps_fd, &fds ) ) + { +- gps_poll( gpsdata ); ++ gps_read( gpsdata ); + if( !decodeData() ) break; + } // else if + } // else if diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 1b76a44f2..e9ce6ed22 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,13 +2,12 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.28.00b +pkgver=5.28.00c pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' license=('LGPL2.1') -# TODO: add gcc-fortran to optdepends after figuring out what to describe it for depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') makedepends=('fftw') @@ -18,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('ee7e6339de8fe99b0f9c9fe1a5692fe8' +md5sums=('0e997f14cb1c671987e1780d2b6375f8' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 7ae611d33..78f067a76 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=2.24 +pkgver=2.25 pkgrel=1 pkgdesc='A generally useful editor with facilities for building and running programs.' arch=('i686' 'x86_64' 'mips64el') @@ -16,11 +16,10 @@ install=scite.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz" 'SciTE.desktop' 'makefile.patch') -md5sums=('f180cc1045e245dc0e55d3a764bd5968' +md5sums=('58767cfbdcb4ad99cc9460f36f958995' '48526532ef677982a4b156ae90f25b6f' '87005d4c7262a1a698cde0628dc7e2a2') - build() { sed "s/CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)/CXXTFLAGS=-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)/" -i scite/gtk/makefile diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index ef0dec24f..4294925be 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=2.32.0.1 +pkgver=2.32.0.2 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('sane' 'gconf') makedepends=('gnome-doc-utils' 'intltool') install="${pkgname}.install" source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9c0682f1aa6b338222b973fec6162e87') +md5sums=('8435b0a31aba1255caf685eb57b18e06') build() { cd ${pkgname}-${pkgver} diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index a78fe6f4c..0c3dd6d60 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44777 2011-04-11 19:41:39Z svenstaro $ +# $Id: PKGBUILD 45554 2011-04-24 08:25:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.128 +pkgver=0.129 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('14a67b499366f500645d6174f7753674' +md5sums=('ff6573d21f6720f693312dca7fd31d5a' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index 5b53eb243..782762d64 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44716 2011-04-11 12:23:36Z spupykin $ +# $Id: PKGBUILD 45591 2011-04-25 08:40:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=0.10.8 +pkgver=0.10.10 pkgrel=1 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ conflicts=('libtracker') provides=("libtracker") install=tracker.install source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2) -md5sums=('58407c7ee04df4043cadd9095d64da5d') +md5sums=('57f475814cfbf9b2e6bf9e5202ec85fc') build() { cd "$srcdir/$pkgname-$pkgver" @@ -40,7 +40,6 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \ --enable-video-extractor=gstreamer --disable-unac --disable-hal \ --disable-devkit-power --disable-miner-evolution - make } diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index 55b74a8d5..6b5afa13e 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 40427 2011-02-23 20:48:09Z jlichtblau $ +# $Id: PKGBUILD 45239 2011-04-18 13:40:23Z spupykin $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64' 'mips64el') url="http://viking.sourceforge.net/" @@ -16,12 +16,17 @@ optdepends=('gpsbabel: for GPS management') options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/viking/$pkgname-$pkgver.tar.gz) -sha256sums=('5c34a76c09b6fda092e8170f7546606814382cf9d13174e87c4ee43fffa36743') +source=(http://downloads.sourceforge.net/viking/$pkgname-$pkgver.tar.gz + gpsd-2.96.patch) +sha256sums=('5c34a76c09b6fda092e8170f7546606814382cf9d13174e87c4ee43fffa36743' + '7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902') build() { cd ${srcdir}/$pkgname-$pkgver + patch -p1 <$srcdir/gpsd-2.96.patch + autoreconf + ./configure --prefix=/usr make } diff --git a/community/viking/gpsd-2.96.patch b/community/viking/gpsd-2.96.patch new file mode 100644 index 000000000..01b117312 --- /dev/null +++ b/community/viking/gpsd-2.96.patch @@ -0,0 +1,47 @@ +diff -wbBur viking-1.1/configure.ac viking-1.1.my/configure.ac +--- viking-1.1/configure.ac 2011-02-08 21:29:01.000000000 +0000 ++++ viking-1.1.my/configure.ac 2011-04-18 13:31:07.000000000 +0000 +@@ -244,7 +244,7 @@ + [ac_cv_enable_realtimegpstracking], [ac_cv_enable_realtimegpstracking=yes]) + case $ac_cv_enable_realtimegpstracking in + yes) +- AC_CHECK_LIB(gps,gps_poll,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) ++ AC_CHECK_LIB(gps,gps_read,,AC_MSG_ERROR([libgps is needed for Realtime GPS Tracking feature[,] but not found. The feature can be disable with --disable-realtime-gps-tracking])) + AC_DEFINE(VIK_CONFIG_REALTIME_GPS_TRACKING, [], [REALTIME GPS TRACKING STUFF]) + ;; + esac +diff -wbBur viking-1.1/src/vikgpslayer.c viking-1.1.my/src/vikgpslayer.c +--- viking-1.1/src/vikgpslayer.c 2011-02-08 21:09:00.000000000 +0000 ++++ viking-1.1.my/src/vikgpslayer.c 2011-04-18 13:35:48.000000000 +0000 +@@ -1377,8 +1377,11 @@ + { + VikGpsLayer *vgl = data; + if (condition == G_IO_IN) { +- if (!gps_poll(&vgl->vgpsd->gpsd)) ++ if (!gps_read(&vgl->vgpsd->gpsd)) ++ { ++ gpsd_raw_hook(&vgl->vgpsd->gpsd, NULL); + return TRUE; ++ } + else { + g_warning("Disconnected from gpsd. Trying to reconnect"); + rt_gpsd_disconnect(vgl); +@@ -1408,7 +1411,8 @@ + { + VikGpsLayer *vgl = (VikGpsLayer *)data; + #ifndef HAVE_GPS_OPEN_R +- struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); ++ static struct gps_data_t __gd; ++ struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port, &__gd) ? NULL : &__gd; + + if (gpsd == NULL) { + #else +@@ -1439,7 +1443,7 @@ + vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); + } + +- gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); ++// gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); + vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); + vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, + G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl); diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk index 1a17127a0..d0e939ad4 100644 --- a/community/virtualbox/LocalConfig.kmk +++ b/community/virtualbox/LocalConfig.kmk @@ -15,3 +15,5 @@ VBOX_WITH_UPDATE_REQUEST = VBOX_WITH_VNC := 1 VBOX_BLD_PYTHON = python2 VBOX_JAVA_HOME = /opt/java +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 4dc9a2aae..1d7a68e1d 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44881 2011-04-12 11:57:31Z ibiru $ +# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.4 -pkgrel=4 +pkgver=4.0.6 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtualbox.org' license=('GPL' 'custom') @@ -15,8 +15,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh - 18-system-xorg.patch) -_kernver=2.6.38-ARCH + 18-system-xorg.patch gcc46.patch) +_kernver=2.6.38-LIBRE build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -25,6 +25,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/18-system-xorg.patch" + patch -Np1 -i "$srcdir/gcc46.patch" cp "$srcdir/LocalConfig.kmk" . @@ -202,13 +203,14 @@ package_virtualbox-guest-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" } -md5sums=('b4770ca14d1a8cbad9b3eb0e0028ff4b' - 'bf8007eea0042f745b3c252bbe7586c2' +md5sums=('cf274f0585c35c5c137e2bd9b48b462a' + '7d3ee86e998fa24b07a157add9fb7766' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' - '94514e006e73cc2fa90259a4e0eec04b' - '0f3f273cdbc54db221f737ad4f761c11' + '9bde5b7dfba5abcd49768052c5409800' + 'c1a07f044c476a190af8486fe78bee0f' '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b') + '8a22b33c9dfaf8fb79bb2d26304e650b' + 'a28b48ff01149acbca4bbe6a676a06da') diff --git a/community/virtualbox/gcc46.patch b/community/virtualbox/gcc46.patch new file mode 100644 index 000000000..9786a7287 --- /dev/null +++ b/community/virtualbox/gcc46.patch @@ -0,0 +1,15 @@ +diff -Nur VirtualBox-4.0.6_OSE.orig//configure VirtualBox-4.0.6_OSE/configure +--- VirtualBox-4.0.6_OSE.orig//configure 2011-04-21 03:29:30.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/configure 2011-04-21 11:42:57.517216676 -0700 +@@ -412,9 +412,9 @@ + elif [ $cc_maj -lt 3 \ + -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ +- -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \ ++ -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \ + -o $cc_maj -gt 4 ]; then +- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5" ++ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<=6" + fail really + else + log_success "found version $cc_ver" diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch index ed5e7f377..e7a9179a9 100644 --- a/community/virtualbox/vboxdrv-reference.patch +++ b/community/virtualbox/vboxdrv-reference.patch @@ -1,5 +1,6 @@ ---- VirtualBox-4.0.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp -+++ VirtualBox-4.0.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 03:31:05.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 11:10:00.503832646 -0700 @@ -75,9 +75,8 @@ "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " @@ -21,8 +22,9 @@ "may correct this. Make sure that you do not mix the " "OSE version and the PUEL version of VirtualBox." ); ---- VirtualBox-4.0.2_OSE/src/VBox/Installer/linux/VBox.sh -+++ VirtualBox-4.0.2_OSE/src/VBox/Installer/linux/VBox.sh +diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh 2011-04-21 03:31:18.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-04-21 11:10:00.503832646 -0700 @@ -34,7 +34,7 @@ available for the current kernel (`uname -r`) or it failed to load. Please recompile the kernel module and install it by @@ -40,4 +42,4 @@ + /etc/rc.d/vboxdrv restart and if that is not successful, try to re-install the package. -
\ No newline at end of file + diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index b497c66aa..d4268ee38 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 41384 2011-03-05 15:36:57Z lcarlier $ +# $Id: PKGBUILD 45573 2011-04-24 16:51:07Z lcarlier $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux -pkgver=11.01 -pkgrel=1 +pkgver=11.04 +pkgrel=2 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64' 'mips64el') url="http://www.wormux.org/" license=('GPL') -depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') -makedepends=('pkgconfig') +makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ecf98ff1a91899d35d0ba8266ace9787') +md5sums=('668cd4c22afde352c566454e65fc4144') build() { cd "${srcdir}/${pkgname}-${pkgver}" + #gcc 4.6.0 fix + sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h + ./configure --prefix=/usr make } package() { + depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver}") + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rm -r ${pkgdir}/usr/share/warmux } diff --git a/community/yajl/PKGBUILD b/community/yajl/PKGBUILD index 1f1941d13..0204af458 100644 --- a/community/yajl/PKGBUILD +++ b/community/yajl/PKGBUILD @@ -1,33 +1,37 @@ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Maintainer: Dave Reisner <d@falconindy.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=yajl -pkgver=1.0.11 -pkgrel=3 +pkgver=2.0.0 +pkgrel=2 pkgdesc='Yet Another JSON Library.' arch=('i686' 'x86_64' 'mips64el') url='http://lloyd.github.com/yajl/' -license=('BSD') +license=('ISC') makedepends=('cmake') -source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/lloyd/${pkgname}/tarball/${pkgver}") -md5sums=('5b60f4d59b3b1fb42d7808d08460fb12') +source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/tarball/$pkgver" + "handle-null-case.patch") +md5sums=('ff3bb8531d1f3c48441a57220919c8e7' + 'dd6ad7386f6d19f1d68357d8a2d48f3e') build() { - cd lloyd-${pkgname}-f4baae0 + dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); + cd "$dirname" - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - . + patch -Np1 < "$srcdir/handle-null-case.patch" + + cmake -DCMAKE_INSTALL_PREFIX=/usr . make } package() { - cd lloyd-${pkgname}-f4baae0 + dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); + cd "$dirname" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install - install -D -m644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/yajl/handle-null-case.patch b/community/yajl/handle-null-case.patch new file mode 100644 index 000000000..923e23961 --- /dev/null +++ b/community/yajl/handle-null-case.patch @@ -0,0 +1,78 @@ +From 615924b7bf68791c166149a9f76bec740dacefd6 Mon Sep 17 00:00:00 2001 +From: Lloyd Hilaiel <lloyd@hilaiel.com> +Date: Tue, 26 Apr 2011 09:47:13 -0600 +Subject: [PATCH] crash fix, handle the case where yajl_alloc() is followed by + yajl_complete_parse() without a call to yajl_parse() in the + middle. closes #27. + +--- + src/yajl.c | 18 +++++++++++++++--- + src/yajl_parser.c | 2 +- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/yajl.c b/src/yajl.c +index 793eea3..293e545 100644 +--- a/src/yajl.c ++++ b/src/yajl.c +@@ -49,7 +49,7 @@ yajl_alloc(const yajl_callbacks * callbacks, + { + yajl_handle hand = NULL; + yajl_alloc_funcs afsBuffer; +- ++ + /* first order of business is to set up memory allocation routines */ + if (afs != NULL) { + if (afs->malloc == NULL || afs->realloc == NULL || afs->free == NULL) +@@ -73,7 +73,7 @@ yajl_alloc(const yajl_callbacks * callbacks, + hand->decodeBuf = yajl_buf_alloc(&(hand->alloc)); + hand->flags = 0; + yajl_bs_init(hand->stateStack, &(hand->alloc)); +- yajl_bs_push(hand->stateStack, yajl_state_start); ++ yajl_bs_push(hand->stateStack, yajl_state_start); + + return hand; + } +@@ -120,7 +120,7 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText, + { + yajl_status status; + +- // lazy allocate the lexer ++ /* lazy allocation of the lexer */ + if (hand->lexer == NULL) { + hand->lexer = yajl_lex_alloc(&(hand->alloc), + hand->flags & yajl_allow_comments, +@@ -135,6 +135,18 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText, + yajl_status + yajl_complete_parse(yajl_handle hand) + { ++ /* The lexer is lazy allocated in the first call to parse. if parse is ++ * never called, then no data was provided to parse at all. This is a ++ * "premature EOF" error unless yajl_allow_partial_values is specified. ++ * allocating the lexer now is the simplest possible way to handle this ++ * case while preserving all the other semantics of the parser ++ * (multiple values, partial values, etc). */ ++ if (hand->lexer == NULL) { ++ hand->lexer = yajl_lex_alloc(&(hand->alloc), ++ hand->flags & yajl_allow_comments, ++ !(hand->flags & yajl_dont_validate_strings)); ++ } ++ + return yajl_do_finish(hand); + } + +diff --git a/src/yajl_parser.c b/src/yajl_parser.c +index 20d73bf..3903b38 100644 +--- a/src/yajl_parser.c ++++ b/src/yajl_parser.c +@@ -155,7 +155,7 @@ yajl_status + yajl_do_finish(yajl_handle hand) + { + yajl_status stat; +- stat = yajl_do_parse(hand,(const unsigned char *)" ",1); ++ stat = yajl_do_parse(hand,(const unsigned char *) " ",1); + + if (stat != yajl_status_ok) return stat; + +-- +1.7.4.4 + |
