diff options
228 files changed, 5304 insertions, 1238 deletions
diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD index ca9a49322..4c795a861 100644 --- a/community-testing/shotwell/PKGBUILD +++ b/community-testing/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45192 2011-04-18 09:06:19Z spupykin $ +# $Id: PKGBUILD 45502 2011-04-22 15:22:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.9.2 -pkgrel=2 +pkgver=0.9.3 +pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" @@ -15,7 +15,7 @@ depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' makedepends=('intltool' 'vala') install=shotwell.install source=(http://yorba.org/download/shotwell/0.9/${pkgname}-${pkgver}.tar.bz2) -md5sums=('070e5792b450a1ada130f31da4829ac7') +md5sums=('b1a3281be7d4ff8eac98289bcd129387') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD index 1f5dcfa60..fb4501739 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') 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 c5fbddfba..f62122878 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') 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 88548b65d..c2406e9a1 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') 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 e3bc32c60..d801ab20d 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') 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 add91773e..dcd86193c 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) @@ -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 9f791f1df..71d5ca199 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') 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 fc997509f..822304f46 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') 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 d06f52aac..78e1c30c6 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') 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/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index ac1c9bcbe..d8ac7955a 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') 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/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 9c71fd891..b2b82e258 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') 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 290b7285a..4755f9e02 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') @@ -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 ca618a996..556c873d5 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') 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 0b4210aed..a9ea47daf 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') @@ -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 1e80f85e8..e7edf7dff 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) @@ -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 f821235b1..e95ef92be 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") 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 02f3552c0..e827525ea 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') 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 ef02a0050..16d1d2299 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') 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 f12c165ef..9c4e26186 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') 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 54bece439..99ea6e4a7 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') 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/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 1a8ecd1da..f5c46ecaa 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') 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/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index c21c04680..e641c24a1 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 +pkgrel=3 arch=(i686 x86_64) 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 0eee723cd..5b75c04df 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') @@ -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/PKGBUILD b/community/python-scipy/PKGBUILD index d0acce568..c0dbdcb4a 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') -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/python-scipy.changelog b/community/python-scipy/python-scipy.changelog new file mode 100644 index 000000000..77c6d43a5 --- /dev/null +++ b/community/python-scipy/python-scipy.changelog @@ -0,0 +1,44 @@ +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> + + * Updated to: 0.7.1 + +2009-02-11 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updating for i686: 0.7 + +2008-12-12 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updating for i686: 0.7.0 beta 1 + +2008-11-07 Douglas Soares de Andrade <douglas@archlinux.org> + + * Updated to svn as scipy 0.6 wont work with python 2.6 + +2008-02-21 Eric Belanger <eric@archlinux.org> + + * Added x86_64 arch tag + * Added license + +2007-10-29 Douglas Soares de Andrade <dsa@aur.archlinux.org> + + * 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 1c39d07ee..e478e9200 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') 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 a234d710d..4dc83e425 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') 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 9d87ac108..472b84759 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') @@ -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 be7ae595f..cc7906392 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') @@ -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 47b2f0cc8..ef391ad45 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') @@ -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 d34590a66..08c2653f8 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') @@ -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 823893a45..6f73fc6ef 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') 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 94a9aba4f..d73767ffb 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') url='http://virtualbox.org' license=('GPL' 'custom') @@ -15,7 +15,7 @@ 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) + 18-system-xorg.patch gcc46.patch) _kernver=2.6.38-ARCH build() { @@ -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 aabe8ab65..e4ee59003 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') 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 71c3c1ee0..425947720 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') 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 + diff --git a/core/bin86/PKGBUILD b/core/bin86/PKGBUILD index b068ab833..c3865a24e 100644 --- a/core/bin86/PKGBUILD +++ b/core/bin86/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 87909 2010-08-18 18:45:21Z andyrtr $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 119692 2011-04-13 17:22:23Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + pkgname=bin86 -pkgver=0.16.17 -pkgrel=5 +pkgver=0.16.18 +pkgrel=1 pkgdesc="A complete 8086 assembler and loader" arch=(i686 x86_64) license=('GPL') url="http://www.debath.co.uk/" depends=('glibc') -source=(http://homepage.ntlworld.com/robert.debath/dev86/$pkgname-$pkgver.tar.gz +source=(http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz bin86-0.16.17-x86_64-1.patch) -md5sums=('c9e8d72dd2e7457b52d0e3164fc199a1' '92bdce7b0655cd2e9f83c83fc56d128e') +md5sums=('914068fb649b93642d1cf21857b75699' + '92bdce7b0655cd2e9f83c83fc56d128e') build() { cd $srcdir/$pkgname-$pkgver if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch || return 1 + patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch fi make PREFIX=/usr } diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index da43e8b5e..fa5a47b64 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 109378 2011-02-09 08:54:49Z allan $ +# $Id: PKGBUILD 116976 2011-03-27 06:07:38Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.21 -pkgrel=4 -_date=20110209 +pkgrel=6 +_date=20110326 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" @@ -16,10 +16,8 @@ depends=('glibc>=2.13' 'zlib') makedepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 - binutils.git-39637246.patch) -md5sums=('673ef8f4fc0b497232b4458982e76179' - 'dd72cb6df5467bc6237cff2a886099d0') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) +md5sums=('884dcbc87d4722b152aea72312356da1') mksource() { mkdir ${pkgname}-${_date} @@ -32,9 +30,6 @@ mksource() { } build() { - cd ${srcdir}/binutils - patch -Np1 -i ${srcdir}/binutils.git-39637246.patch - cd ${srcdir} mkdir binutils-build && cd binutils-build @@ -49,6 +44,10 @@ build() { make configure-host make tooldir=${pkgdir}/usr +} + +check() { + cd ${srcdir}/binutils-build # do not abort on errors - manually check log files make -k -j1 check || true diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD new file mode 100644 index 000000000..39645a7e5 --- /dev/null +++ b/core/cloog/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 119094 2011-04-10 21:37:04Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=cloog +pkgver=0.16.2 +pkgrel=1 +pkgdesc="Library that generates loops for scanning polyhedra" +arch=('i686' 'x86_64') +url="http://www.bastoul.net/cloog/" +license=('GPL') +depends=('isl' 'gmp') +conflicts=('cloog-ppl<0.15.10-2') +options=('!libtool') +source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) +md5sums=('83877caaa879c7160063138bb18348e7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --with-isl=system --with-gmp=system + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index a994defcf..78b74c33f 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108936 2011-02-04 23:03:34Z allan $ +# $Id: PKGBUILD 119714 2011-04-14 01:48:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.10 +pkgver=8.11 pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz coreutils-uname.patch coreutils-pam.patch su.pam) -md5sums=('4bb81c051da6e5436fc1ad9a67ae44fe' +md5sums=('b623ee9b1b768a14e40dfd35ff446f4c' 'c4fcca138b6abf6d443d48a6f0cd8833' 'aad79a2aa6d566c375d7bdd1b0767278' 'fa85e5cce5d723275b14365ba71a8aad') @@ -39,6 +39,10 @@ build() { --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make RUN_EXPENSIVE_TESTS=yes check } diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index e81c14eb9..c7dd791be 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111169 2011-02-24 15:25:47Z stephane $ +# $Id: PKGBUILD 119819 2011-04-15 12:49:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.05 -pkgrel=2 +pkgver=5.06 +pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -13,11 +13,9 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch - file-5.05-python-3.2.patch) -md5sums=('0b429063710457be2bd17a18389cb018' - '385f020467debd98bd2d8df6143f93d0' - '3f5e147be5b9c36c74323a1317328538') + file-5.05-zip64.patch) +md5sums=('deb12b0fb9d09e7681be72bad6eba4e0' + '385f020467debd98bd2d8df6143f93d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,9 +24,6 @@ build() { # identify zip64 files patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - # identify python 3.2 files - patch -Np1 -i ../file-5.05-python-3.2.patch - ./configure --prefix=/usr --datadir=/usr/share/file make } diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index a88cd0a4f..61f6fbcb5 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 107993 2011-01-28 20:01:16Z allan $ +# $Id: PKGBUILD 119862 2011-04-16 05:35:51Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada') -pkgver=4.5.2 -pkgrel=6 -_snapshot=4.5-20110127 -_libstdcppmanver=4.5.2 # Note: check source directory name when updating this +pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') +pkgver=4.6.0 +pkgrel=3 +_snapshot=4.6-20110415 +_libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'custom') +license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.21' 'libmpc' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada' 'dejagnu') +makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,testsuite}-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,testsuite}-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api-${_libstdcppmanver}.man.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('7dbdf06186dc98955221b2f7b987645b' - '4893036a98d8bedf44fe0741dfec6e1f' - 'c741c614e975c858cffb9e78b0b5124f' - 'b141fadc984cc0c1c0f15feb16db14e5' - '067672b640d0b912298791c1837606bc' - 'daffd2ba5917a263cdff5f38dcf8c323' - '2776eab5ebb7f9cc62dd2199a3a24382' +md5sums=('aed037654091d1f478dfcb6e13444325' + '8d4b78c03c1d477c6cb562d42f461958' + 'c346e76014569b25e2869ff986d2ac2d' + '8376485de1c7aa90bb32f52f2372d451' + '0c2d89f9e2e614ad84c6e2aa239c5c1c' + '50bab6a0c9e5403ea77f57361dec5436' + '6e0032461f87ce60db6302ca652ae9d8' + '1e9fd2eaf0ee47ea64e82c48998f1999' '4030ee1c08dd1e843c0225b772360e76' - '6fd395bacbd7b6e47c7b74854b478363') - + '4df25b623799b148a0703eaeec8fdf3f') if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -40,9 +40,6 @@ fi build() { cd ${_basedir} - # "Add" ppl-0.11 compatibility - sed -i "/ppl_minor_version=/s#10#11#" configure - # Do not install libiberty sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in @@ -58,18 +55,26 @@ build() { cd ${srcdir} mkdir gcc-build && cd gcc-build + ${_basedir}/configure --prefix=/usr \ - --enable-languages=c,c++,fortran,objc,obj-c++,ada \ - --enable-shared --enable-threads=posix --enable-__cxa_atexit \ - --enable-clocale=gnu --enable-gnu-unique-object \ - --enable-lto --enable-plugin \ - --enable-gold --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libstdcxx-pch \ - --with-system-zlib --with-ppl \ - --with-cloog --with-cloog-include=/usr/include/cloog-ppl \ --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --enable-gnu-unique-object --enable-linker-build-id \ + --with-ppl --enable-cloog-backend=isl \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --disable-multilib --disable-libstdcxx-pch \ + --enable-checking=release make +} + +check() { + cd gcc-build # increase stack size to prevent test failures # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 @@ -95,11 +100,12 @@ package_gcc-libs() make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - # I thought I said to only install the lib... - rm -rf ${pkgdir}/usr/lib/gcc/ + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} # remove static libraries find ${pkgdir} -name *.a -delete @@ -112,21 +118,26 @@ package_gcc-libs() package_gcc() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils') + depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog' 'ppl') groups=('base-devel') install=gcc.install cd gcc-build - # much, much easier to install the lot and clean-up the mess + # unfortunately it is much, much easier to install the lot and clean-up the mess... make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{*gfortran,gnat*} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}/* - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a} - rm $pkgdir/usr/lib/{*.so*,lib{gfortran,objc}.a} - rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp}.info + rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm $pkgdir/usr/lib/*.so* + rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm $pkgdir/usr/lib/libgfortran.spec + rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} + rm -r $pkgdir/usr/lib/go + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/gfortran.1 + rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm $pkgdir/usr/share/man/man3/ffi* # many packages require these symlinks install -dm755 ${pkgdir}/lib @@ -165,8 +176,7 @@ EOF # install the libstdc++ man pages install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api-${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ + install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -180,13 +190,15 @@ package_gcc-fortran() install=gcc-fortran.install cd gcc-build + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=$pkgdir install-target-libgfortran make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libgfortran.so* + rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* + rm ${pkgdir}/usr/share/info/libquadmath.info # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -204,7 +216,7 @@ package_gcc-objc() install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libobjc.so* + rm ${pkgdir}/usr/lib/libobjc.so* # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -226,3 +238,18 @@ package_gcc-ada() ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION } +package_gcc-go() +{ + pkgdesc="Go front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-go.install + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libgo + make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION +} diff --git a/core/gcc/gcc-ada.install b/core/gcc/gcc-ada.install index 81794685f..df0553a4f 100644 --- a/core/gcc/gcc-ada.install +++ b/core/gcc/gcc-ada.install @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/core/gcc/gcc-fortran.install b/core/gcc/gcc-fortran.install index 2aeab7123..b15d89a97 100644 --- a/core/gcc/gcc-fortran.install +++ b/core/gcc/gcc-fortran.install @@ -14,5 +14,3 @@ pre_remove() { [ -x usr/bin/install-info ] || return 0 install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } - -# vim:set ts=2 sw=2 et: diff --git a/core/gcc/gcc-go.install b/core/gcc/gcc-go.install new file mode 100644 index 000000000..7dc50dee5 --- /dev/null +++ b/core/gcc/gcc-go.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gccgo.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/core/gcc/gcc-hash-style-both.patch b/core/gcc/gcc-hash-style-both.patch index fbb210598..8b59f4535 100644 --- a/core/gcc/gcc-hash-style-both.patch +++ b/core/gcc/gcc-hash-style-both.patch @@ -1,47 +1,6 @@ -#! /bin/sh -e - -# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2006-07-11 Jakub Jelinek <jakub@redhat.com> - - * config/i386/linux.h (LINK_SPEC): Add --hash-style=both. - * config/i386/linux64.h (LINK_SPEC): Likewise. - * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. - * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, - LINK_OS_LINUX_SPEC64): Likewise. - * config/s390/linux.h (LINK_SPEC): Likewise. - * config/ia64/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, - LINK_ARCH64_SPEC): Likewise. - * config/alpha/linux-elf.h (LINK_SPEC): Likewise. - ---- gcc/config/alpha/linux-elf.h.orig 2007-08-04 08:55:58.000000000 +0200 -+++ gcc/config/alpha/linux-elf.h 2007-09-01 15:47:26.605865578 +0200 -@@ -39,7 +39,7 @@ +--- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 +@@ -41,7 +41,7 @@ #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER @@ -50,8 +9,68 @@ exit 0 %{O*:-O3} %{!O*:-O1} \ %{shared:-shared} \ %{!shared: \ ---- gcc/config/s390/linux.h.orig 2007-08-04 08:55:59.000000000 +0200 -+++ gcc/config/s390/linux.h 2007-09-01 15:47:26.605865578 +0200 +--- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 ++++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -78,7 +78,7 @@ + %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + + #undef LINK_SPEC +-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ ++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 ++++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -104,7 +104,7 @@ + { "dynamic_linker", LINUX_DYNAMIC_LINKER } + + #undef LINK_SPEC +-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ ++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -64,7 +64,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "\ ++#define LINK_SPEC "--hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 ++++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 +@@ -389,11 +389,11 @@ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + + +-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" + +-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" + +--- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 ++++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 +@@ -830,7 +830,7 @@ + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + +-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" + +--- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 @@ -77,7 +77,7 @@ #undef LINK_SPEC @@ -61,103 +80,43 @@ exit 0 %{shared:-shared} \ %{!shared: \ %{static:-static} \ ---- gcc/config/sparc/linux.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -132,7 +132,7 @@ - - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!ibcs: \ ---- gcc/config/sparc/linux64.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux64.h 2007-09-01 15:47:26.605865578 +0200 -@@ -166,7 +166,7 @@ +--- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 ++++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -113,7 +113,7 @@ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ { "link_arch", LINK_ARCH_SPEC }, -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ +#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -175,7 +175,7 @@ - %{static:-static}}} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ " -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ +#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -256,7 +256,7 @@ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ #else /* !SPARC_BI_ARCH */ #undef LINK_SPEC -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ +#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -108,7 +108,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux64.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux64.h 2007-09-01 15:48:27.336781690 +0200 -@@ -65,7 +65,7 @@ - #endif - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ %{!static: \ ---- gcc/config/ia64/linux.h.orig 2006-12-12 18:59:53.000000000 +0100 -+++ gcc/config/ia64/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -40,7 +40,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + %{rdynamic:-export-dynamic} \ +--- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 ++++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -74,7 +74,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ %{!shared: \ %{!static: \ ---- gcc/config/rs6000/sysv4.h.orig 2007-08-08 23:37:49.000000000 +0200 -+++ gcc/config/rs6000/sysv4.h 2007-09-01 15:47:26.615865729 +0200 -@@ -901,7 +901,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" - ---- gcc/config/rs6000/linux64.h.orig 2007-08-04 08:56:12.000000000 +0200 -+++ gcc/config/rs6000/linux64.h 2007-09-01 15:47:26.615865729 +0200 -@@ -354,11 +354,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" - diff --git a/core/gcc/gcc-libs.install b/core/gcc/gcc-libs.install index b5fbf9211..23553b8f0 100644 --- a/core/gcc/gcc-libs.install +++ b/core/gcc/gcc-libs.install @@ -1,14 +1,16 @@ infodir=usr/share/info -file="libgomp.info" +filelist=(libgomp.info libquadmath.info) post_upgrade() { [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done } pre_remove() { [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done } - -# vim:set ts=2 sw=2 et: diff --git a/core/gcc/gcc.install b/core/gcc/gcc.install index a7a405288..3407a5e1f 100644 --- a/core/gcc/gcc.install +++ b/core/gcc/gcc.install @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 6ae2db02f..60aeb8ae6 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110236 2011-02-18 04:46:54Z allan $ +# $Id: PKGBUILD 116984 2011-03-27 06:35:25Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.13 -pkgrel=4 +pkgrel=5 _glibcdate=20110117 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -26,6 +26,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-prelink.patch + glibc-2.13-futex.patch nscd locale.gen.txt locale-gen) @@ -36,6 +37,7 @@ md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '24dfab6fd244f3773523412588ecc52c' + '7d0154b7e17ea218c9fa953599d24cc4' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -74,9 +76,7 @@ build() { patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - if [[ $CARCH == "x86_64" ]]; then - sed -i '/__ASSUME_PRIVATE_FUTEX/d' $srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h - fi + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -103,6 +103,10 @@ build() { --disable-multi-arch make +} + +check() { + cd ${srcdir}/glibc-build # some errors are expected - manually check log files make -k check || true diff --git a/core/glibc/glibc-2.13-futex.patch b/core/glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/core/glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD new file mode 100644 index 000000000..bba92fb24 --- /dev/null +++ b/core/isl/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 119089 2011-04-10 21:34:57Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=isl +pkgver=0.06 +pkgrel=1 +pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" +arch=('i686' 'x86_64') +url="http://www.kotnet.org/~skimo/isl/" +license=('LGPL2.1') +options=('!libtool') +source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) +md5sums=('504f054eaffdd8d07c497ebe3ebc7e04') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir/" install + + # this seems a better place for this file... + install -dm755 $pkgdir/usr/share/gdb/auto-load/ + mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.6.0.0-gdb.py +} diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index c84d7d787..707787bbb 100644 --- a/core/less/PKGBUILD +++ b/core/less/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100030 2010-11-20 00:42:11Z stephane $ +# $Id: PKGBUILD 119700 2011-04-13 21:50:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=less -pkgver=436 -pkgrel=2 +pkgver=443 +pkgrel=1 pkgdesc="A terminal based program for viewing text files" license=('GPL3') arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.greenwoodsoftware.com/less" groups=('base') depends=('ncurses' 'pcre') source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('817bf051953ad2dea825a1cdf460caa4') +md5sums=('47db098fb3cdaf847b3c4be05ee954fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/libfetch/Makefile b/core/libfetch/Makefile index 53bcee9c4..34f3b1d99 100644 --- a/core/libfetch/Makefile +++ b/core/libfetch/Makefile @@ -5,31 +5,23 @@ FETCH_WITH_INET6 = true FETCH_WITH_OPENSSL = true WARNINGS = -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \ - -Wpointer-arith -Wcast-align -CFLAGS = -O2 -pipe -I. -fPIC $(WARNINGS) \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES + -Wpointer-arith -Wcast-align -CFLAGS += -DFTP_COMBINE_CWDS -DNETBSD +CFLAGS ?= -O2 -pipe + +CFLAGS += -fPIC $(WARNINGS) +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES +CFLAGS += -DFTP_COMBINE_CWDS -DNETBSD ifeq ($(strip $(FETCH_WITH_INET6)), true) -CFLAGS+= -DINET6 +CFLAGS += -DINET6 endif ifeq ($(strip $(FETCH_WITH_OPENSSL)), true) -CFLAGS+= -DWITH_SSL -LDFLAGS= -lssl -lcrypto -endif - -ifeq ($(strip $(DEBUG)), true) -CFLAGS += -g -DDEBUG -else -CFLAGS += -UDEBUG +CFLAGS += -DWITH_SSL +LDADD += -Wl,-lssl -Wl,-lcrypto endif -CC = gcc -LD = gcc -AR = ar -RANLIB = ranlib INSTALL = install -c -D OBJS= fetch.o common.o ftp.o http.o file.o @@ -37,53 +29,40 @@ INCS= fetch.h common.h GEN = ftperr.h httperr.h MAN = libdownload.3 -#pretty print! -E = @/bin/echo -Q = @ - all: libfetch.so libfetch.a .PHONY: all %.o: %.c $(INCS) $(GEN) - $(E) " compile " $@ - $(Q) $(CC) $(CFLAGS) -c $< + $(CC) $(CFLAGS) -c $< ftperr.h: ftp.errors Makefile errlist.sh - $(E) " generate " $@ - $(Q) ./errlist.sh ftp_errlist FTP ftp.errors > $@ + ./errlist.sh ftp_errlist FTP ftp.errors > $@ httperr.h: http.errors Makefile errlist.sh - $(E) " generate " $@ - $(Q) ./errlist.sh http_errlist HTTP http.errors > $@ + ./errlist.sh http_errlist HTTP http.errors > $@ libfetch.so: $(GEN) $(INCS) $(OBJS) - $(E) " build " $@ - $(Q) rm -f $@ - $(Q) $(LD) $(LDFLAGS) *.o -shared -o $@ - $(E) " built with: " $(CFLAGS) + rm -f $@ + $(CC) $(LDFLAGS) $(OBJS) $(LDADD) -shared -fPIC -o $@ libfetch.a: $(GEN) $(INCS) $(OBJS) - $(E) " build " $@ - $(Q) rm -f $@ - $(Q) $(AR) rcs $@ *.o - $(Q) $(RANLIB) $@ - $(E) " built with: " $(CFLAGS) + rm -f $@ + $(AR) rcs $@ $(OBJS) clean: - $(E) " clean " - $(Q) rm -f libfetch.so libfetch.a *.o $(GEN) + rm -f libfetch.so libfetch.a *.o $(GEN) .PHONY: clean install: all - $(Q) $(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so - $(Q) $(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a - $(Q) $(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h - $(Q) $(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3 + $(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so + $(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a + $(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h + $(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3 .PHONY: install uninstall: - $(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.so - $(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.a - $(Q) rm -f $(DESTDIR)$(prefix)/include/fetch.h - $(Q) rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3 + rm -f $(DESTDIR)$(prefix)/lib/libfetch.so + rm -f $(DESTDIR)$(prefix)/lib/libfetch.a + rm -f $(DESTDIR)$(prefix)/include/fetch.h + rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3 .PHONY: uninstall diff --git a/core/libfetch/PKGBUILD b/core/libfetch/PKGBUILD index 641e7d42c..328ebcf88 100644 --- a/core/libfetch/PKGBUILD +++ b/core/libfetch/PKGBUILD @@ -1,19 +1,21 @@ -# $Id$ +# $Id:$ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Xavier Chantry <shiningxc@gmail.com> pkgname=libfetch pkgver=2.33 -pkgrel=1 +pkgrel=3 pkgdesc="URL based download library" arch=('i686' 'x86_64') license=('BSD') depends=('openssl>=1.0.0') url="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/" source=(Makefile - ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('5167d18db7660228e75290fc7d25fe56' - 'a176b94f7f30344ef8a71c047ca2136b') + ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz + fetch-handle-temp-redirect.patch) +md5sums=('7dffdd5a81bb32084a2f45e61f70dcf9' + 'a176b94f7f30344ef8a71c047ca2136b' + '2ee40d7e7d76c39ae5500d89075ef8a6') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' diff --git a/core/libfetch/fetch-handle-temp-redirect.patch b/core/libfetch/fetch-handle-temp-redirect.patch new file mode 100644 index 000000000..351cbcfd8 --- /dev/null +++ b/core/libfetch/fetch-handle-temp-redirect.patch @@ -0,0 +1,15 @@ +Index: http.c +=================================================================== +RCS file: /cvsroot/pkgsrc/net/libfetch/files/http.c,v +retrieving revision 1.29 +diff -u -r1.29 http.c +--- http.c 24 Jan 2010 19:10:35 -0000 1.29 ++++ http.c 19 Apr 2011 13:29:04 -0000 +@@ -974,6 +974,7 @@ + case HTTP_MOVED_PERM: + case HTTP_MOVED_TEMP: + case HTTP_SEE_OTHER: ++ case HTTP_TEMP_REDIRECT: + /* + * Not so fine, but we still have to read the + * headers to get the new location. diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD index 27dfd88f7..9dc5fb1f7 100644 --- a/core/linux-api-headers/PKGBUILD +++ b/core/linux-api-headers/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 106756 2011-01-19 00:34:07Z allan $ +# $Id: PKGBUILD 116973 2011-03-27 06:05:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=2.6.37 -_basever=2.6.37 +pkgver=2.6.38.1 +_basever=2.6.38 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64') @@ -14,13 +14,14 @@ license=('GPL2') provides=("kernel-headers=${pkgver}") conflicts=('kernel-headers') replaces=('kernel-headers') -source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2) - #http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) -md5sums=('c8ee37b4fdccdb651e0603d35350b434') +source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2 + http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) +md5sums=('7d471477bfa67546f902da62227fa976' + 'bd2be4d0465345e4e9355d6773f5f6fe') build() { cd ${srcdir}/linux-${_basever} - #patch -Np1 -i ${srcdir}/patch-${pkgver} + [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver} make mrproper make headers_check diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index d6c56b553..0455dce6e 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117346 2011-03-31 06:36:59Z tpowa $ +# $Id: PKGBUILD 120375 2011-04-23 07:42:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.1 -pkgrel=1 +pkgrel=3 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -16,17 +16,14 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm mdadm.conf mdadm_install - mdadm_hook) + mdadm_hook + segfault-3.2.1.patch) install=mdadm.install replaces=('raidtools') -md5sums=('d1e2549202bd79d9e99f1498d1109530' - '7bff0e506fb6017510c8ec4a01896952' - '00cbed931db4f15b6ce49e3e7d433966' - '865c3d39e5f5dae58388160b563981f1' - '1a3eb63832cecd6550f5b0a21d58cfdb') build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ../segfault-3.2.1.patch make CXFLAGS="$CFLAGS" } @@ -43,3 +40,9 @@ package() { make MDASSEMBLE_AUTO=1 mdassemble install -D -m755 mdassemble $pkgdir/sbin/mdassemble } +md5sums=('d1e2549202bd79d9e99f1498d1109530' + '6df172c8f77b280018cf87eb3d313f29' + '00cbed931db4f15b6ce49e3e7d433966' + '865c3d39e5f5dae58388160b563981f1' + '1a3eb63832cecd6550f5b0a21d58cfdb' + '2fd25605bd1836a33c689ac442cb73ed') diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm index 918a62537..e196f3642 100755 --- a/core/mdadm/mdadm +++ b/core/mdadm/mdadm @@ -13,7 +13,6 @@ case "$1" in if [ ! -z "$PID" -o $? -gt 0 ]; then stat_fail else - mdadm --monitor --oneshot --scan add_daemon mdadm stat_done fi diff --git a/core/mdadm/segfault-3.2.1.patch b/core/mdadm/segfault-3.2.1.patch new file mode 100644 index 000000000..6042d86c2 --- /dev/null +++ b/core/mdadm/segfault-3.2.1.patch @@ -0,0 +1,68 @@ +From 4019ad07013a5d8618b867f724d1c4a13c5cb05d Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Tue, 12 Apr 2011 18:28:01 +1000 +Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata + +0.90 array do not report the metadata type in /proc/mdstat, so +we cannot assume that mse->metadata_version is non-NULL. + +So add an appropriate check. + +This adds an additional check missed by commit +eb28e119b03fd5149886ed516fa4bb006ad3602e. + +Signed-off-by: NeilBrown <neilb@suse.de> +--- + Monitor.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Monitor.c b/Monitor.c +index a3ea724..55aebeb 100644 +--- a/Monitor.c ++++ b/Monitor.c +@@ -577,7 +577,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, + info[i].major = info[i].minor = 0; + } + +- if (strncmp(mse->metadata_version, "external:", 9) == 0 && ++ if (mse->metadata_version && ++ strncmp(mse->metadata_version, "external:", 9) == 0 && + is_subarray(mse->metadata_version+9)) + st->parent_dev = + devname2devnum(mse->metadata_version+10); +-- +1.7.2.3 + +From eb28e119b03fd5149886ed516fa4bb006ad3602e Mon Sep 17 00:00:00 2001 +From: NeilBrown <neilb@suse.de> +Date: Tue, 5 Apr 2011 09:16:57 +1000 +Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata + +0.90 array do not report the metadata type in /proc/mdstat, so +we cannot assume that mse->metadata_version is non-NULL. + +So add an appropriate check. + +Reported-by: Eugene <hdejin@yahoo.com> +Signed-off-by: NeilBrown <neilb@suse.de> +--- + Monitor.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Monitor.c b/Monitor.c +index 291e465..337785d 100644 +--- a/Monitor.c ++++ b/Monitor.c +@@ -688,7 +688,8 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, + st->devnum = mse->devnum; + st->percent = -2; + st->expected_spares = -1; +- if (strncmp(mse->metadata_version, "external:", 9) == 0 && ++ if (mse->metadata_version && ++ strncmp(mse->metadata_version, "external:", 9) == 0 && + is_subarray(mse->metadata_version+9)) + st->parent_dev = + devname2devnum(mse->metadata_version+10); +-- +1.7.2.3 + diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index 89a3b1b25..7e1f4c1a3 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 101731 2010-12-01 03:50:59Z allan $ +# $Id: PKGBUILD 118927 2011-04-09 13:01:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpfr -_basever=3.0.0 -_patchlevel=p8 -pkgver=${_basever}.${_patchlevel} +pkgver=3.0.1 pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') -license=('LGPL') url="http://www.mpfr.org/" +license=('LGPL') depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_basever}.tar.xz - mpfr-${_basever}-${_patchlevel}.patch) -md5sums=('8ab3bef2864b8c6e6a291f5603141bbd' - 'ac4591dea9abdd7573cd05a2fce2bb14') +source=(http://www.mpfr.org/mpfr-current/mpfr-${pkgver}.tar.xz) +md5sums=('645882d9d179113a70af84d27086ed9f') build() { - cd "${srcdir}/${pkgname}-${_basever}" - patch -Np1 -i ${srcdir}/${pkgname}-${_basever}-${_patchlevel}.patch + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-thread-safe --enable-shared make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd "${srcdir}/${pkgname}-${_basever}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index bd8023903..3e20b8186 100644 --- a/extra/avogadro/PKGBUILD +++ b/extra/avogadro/PKGBUILD @@ -1,35 +1,23 @@ -# $Id: PKGBUILD 111981 2011-03-02 21:41:10Z andrea $ +# $Id: PKGBUILD 120742 2011-04-26 09:43:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Nick B <Shirakawasuna at gmail _dot_com> pkgname=avogadro -pkgver=1.0.1 -pkgrel=8 +pkgver=1.0.3 +pkgrel=1 pkgdesc="An advanced molecular editor based on Qt" arch=('i686' 'x86_64') url="http://avogadro.openmolecules.net/wiki/Main_Page" license=('GPL2') depends=('eigen' 'openbabel' 'python2-qt' 'boost-libs' 'glew' 'python2-numpy') makedepends=('cmake' 'boost') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'sip-4.11.patch' - 'fix-pycapsule.patch') -md5sums=('0d5c391197101f0aab7be6b59f81e6fd' - 'e78c3f96d0dc702947f75de1c094f580' - '45b0f3be5913575311e92b74a5520966') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('92c2702c1980f70fb6d87a1a58147911') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/sip-4.11.patch - patch -Np1 -i ${srcdir}/fix-pycapsule.patch - cd ${srcdir} mkdir build cd build - - # use the cmake module in system to enable python 2.7 support - rm ../${pkgname}-${pkgver}/cmake/modules/FindPythonLibs.cmake - cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr @@ -39,7 +27,4 @@ build() { package() { cd ${srcdir}/build make DESTDIR=${pkgdir} install - - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/cmake/modules/FindAvogadro.cmake \ - ${pkgdir}/usr/share/cmake-2.8/Modules/FindAvogadro.cmake } diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD index 3a0709649..05c833387 100644 --- a/extra/cmus/PKGBUILD +++ b/extra/cmus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119600 2011-04-12 16:02:29Z eric $ +# $Id: PKGBUILD 120673 2011-04-25 22:55:12Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> pkgname=cmus -pkgver=2.3.5 +pkgver=2.4.0 pkgrel=1 pkgdesc="A very feature-rich ncurses-based music player" arch=('i686' 'x86_64') @@ -23,8 +23,8 @@ optdepends=('alsa-lib: for ALSA output plugin support' 'libvorbis: for vorbis input plugin support' 'flac: for flac input plugin support') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2") -md5sums=('535a7567ee4cbfa2de8957907a649908') -sha1sums=('90892d3ba6dc466e453daa091b055c30236813e8') +md5sums=('0c5a9f4032e632e5f6b6a49f53df1e7e') +sha1sums=('cbd80d1ff12be5dbf9a3b8b6494381f8b3073761') build() { cd "$srcdir/$pkgname-v$pkgver" diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index 42bf1aaa1..e9189d37e 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 99311 2010-11-14 07:31:31Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 120890 2011-04-27 03:29:01Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.7 +pkgver=1.0.8 _themever=1.0.1 pkgrel=1 pkgdesc="A fast, flexible, and very extensible Window Manager" @@ -15,12 +15,13 @@ makedepends=('xbitmaps') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) -md5sums=('c0594e9ace69497f5ab6b838dac8ed6f' 'bbd9cfd969610c29c7627c2ba1ce3094') -sha1sums=('69a38c68f680778c3689a4369bfcbdb907cfc8a6' 'ae34e2df1294198795736bf953bf695aba93b710') +md5sums=('bf2cf452ea838ebb0c68205215817ecf' + 'bbd9cfd969610c29c7627c2ba1ce3094') +sha1sums=('1ff5cfce00c67c866280de9824f0662953b9c552' + 'ae34e2df1294198795736bf953bf695aba93b710') build() { cd "${srcdir}/e16-${pkgver}" - sed -i 's|xsessiondir = $(datadir)/xsessions|xsessiondir = /etc/X11/sessions|' misc/Makefile.in ./configure --prefix=/usr --sysconfdir=/etc --enable-sound --enable-mans make diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 3accd6fde..3186db961 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 114758 2011-03-15 22:43:11Z ibiru $ +# $Id: PKGBUILD 120232 2011-04-21 15:58:14Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributer: Martin Kemp <mdkemp@elys.com> pkgname=ethtool pkgver=2.6.38 pkgrel=1 +epoch=1 pkgdesc="gkernel ethtool" arch=(i686 x86_64) url="http://www.kernel.org/pub/software/network/ethtool/" @@ -16,5 +17,9 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --mandir=/usr/share/man make - make DESTDIR="${pkgdir}" install +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD index eb89c9ea1..04aae2b74 100644 --- a/extra/faad2/PKGBUILD +++ b/extra/faad2/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 27495 2009-02-22 04:29:09Z eric $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Sarah Hay <sarah@archlinux.org> +# $Id: PKGBUILD 120668 2011-04-25 22:17:14Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=faad2 pkgver=2.7 -pkgrel=1 +pkgrel=2 pkgdesc="ISO AAC audio decoder" arch=('i686' 'x86_64') url="http://www.audiocoding.com/" @@ -12,15 +11,21 @@ license=('custom:GPL') depends=('glibc') options=('!libtool' '!makeflags') source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE) -md5sums=('4c332fa23febc0e4648064685a3d4332' 'ec95f38142e14fb46c849503897a37a0') -sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd') +md5sums=('4c332fa23febc0e4648064685a3d4332' + 'ec95f38142e14fb46c849503897a37a0') +sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5' + '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr || return 1 - make CFLAGS="${CFLAGS} -fPIC" || return 1 - make DESTDIR=${pkgdir} manmdir=/usr/share/man/man1 install || return 1 - install -m644 common/mp4ff/mp4ff_int_types.h ${pkgdir}/usr/include/mp4ff_int_types.h || return 1 - install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 - mv ${pkgdir}/usr/share/man/man1/faad.man ${pkgdir}/usr/share/man/man1/faad.1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make CFLAGS="${CFLAGS} -fPIC" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" manmdir=/usr/share/man/man1 install + mv "${pkgdir}/usr/share/man/man1/faad.man" "${pkgdir}/usr/share/man/man1/faad.1" + install -D -m644 common/mp4ff/mp4ff_int_types.h "${pkgdir}/usr/include/mp4ff_int_types.h" + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index c350b58d2..d7489ad85 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 114383 2011-03-12 22:41:05Z bisson $ +# $Id: PKGBUILD 120449 2011-04-23 22:47:50Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.12 +pkgver=1.13 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('0f0f6dec50d81f9765bef990018de44e411a7439') +sha1sums=('8b2c8250137edbda630b920e5eb7ca7ba5818a5e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 592a9b246..6ba26dd43 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 118880 2011-04-09 09:00:43Z andyrtr $ +# $Id: PKGBUILD 120489 2011-04-24 13:19:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=2.12.2 +pkgver=2.12.3 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ install=gnutls.install options=('!libtool' '!zipman') depends=('gcc-libs>=4.4.3' 'libtasn1>=2.5' 'readline>=6.0' 'zlib' 'libgcrypt>=1.4.5') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ca6903d99b2aca2a6a326bc8df805b61') +md5sums=('04b72b022b42b10df12cbbae051e2d55') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index 674351838..d26892a8a 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 116080 2011-03-22 18:18:49Z andrea $ +# $Id: PKGBUILD 116032 2011-03-22 16:23:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: Giacomo Rizzo <alt@free-os.it> pkgname=gpsd -pkgver=2.95 -pkgrel=8 +pkgver=2.96 +pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64') url="http://gpsd.berlios.de" @@ -20,7 +20,7 @@ options=('!libtool') install="${pkgname}.install" source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'gpsd' 'LICENSE') -md5sums=('12535a9ed9fecf9ea2c5bdc9840da5ae' +md5sums=('26a7a04d4298bc3a3a5d89fef4582b64' 'f929322fc4670543fcb36dafc7bb9e03' 'd217a23f408e91c94359447735bc1800') diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD index b8930a55e..fd95d6f4f 100644 --- a/extra/ilmbase/PKGBUILD +++ b/extra/ilmbase/PKGBUILD @@ -2,21 +2,34 @@ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=ilmbase -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 depends=('gcc-libs') -pkgdesc="IlmThread is a thread abstraction library for use with OpenEXR" +pkgdesc="Base libraries from ILM for OpenEXR" arch=(i686 x86_64) license=('custom') options=('!libtool') -source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz) -url="http://www.openexr.org" -md5sums=('f76f094e69a6079b0beb93d97e2a217e') +source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz + tests-compile-fixes.patch) +url="http://www.openexr.com" +md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4' + '2687ab9ac01b417ee5cf8c0174b72e43') build() { - cd $startdir/src/$pkgname-$pkgver + cd ${srcdir}/$pkgname-$pkgver + patch -Np1 -i ${srcdir}/tests-compile-fixes.patch ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make +} + +check() { + cd ${srcdir}/$pkgname-$pkgver + # one of the tests fails randomly for an unknown reason + make check || true +} + +package() { + cd ${srcdir}/$pkgname-$pkgver + make DESTDIR=${pkgdir} install install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING } diff --git a/extra/ilmbase/tests-compile-fixes.patch b/extra/ilmbase/tests-compile-fixes.patch new file mode 100644 index 000000000..27dc24ac6 --- /dev/null +++ b/extra/ilmbase/tests-compile-fixes.patch @@ -0,0 +1,12 @@ +diff -ur ilmbase-1.0.2/Imath/ImathMatrix.h ilmbase-1.0.2.new/Imath/ImathMatrix.h +--- ilmbase-1.0.2/Imath/ImathMatrix.h 2010-07-17 00:48:40.000000000 +0200 ++++ ilmbase-1.0.2.new/Imath/ImathMatrix.h 2011-04-25 10:15:21.121608420 +0200 +@@ -49,6 +49,8 @@ + #include "ImathVec.h" + #include "ImathShear.h" + ++#include <cstdlib> ++#include <cstring> + #include <iostream> + #include <iomanip> + diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD index 4de1a090c..d3c26577a 100644 --- a/extra/kdeedu/PKGBUILD +++ b/extra/kdeedu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118069 2011-04-05 10:08:07Z andrea $ +# $Id: PKGBUILD 119955 2011-04-17 11:47:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -26,7 +26,7 @@ pkgname=('kdeedu-blinken' 'kdeedu-rocs' 'kdeedu-step') pkgver=4.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -34,11 +34,16 @@ groups=('kde' 'kdeedu') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd' 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre' 'python2' 'docbook-xsl' 'avogadro') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'gpsd-2.96.patch') +sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05' + 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e') build() { - cd $srcdir + cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np1 -i ${srcdir}/gpsd-2.96.patch + + cd ${srcdir} mkdir build cd build # rpath is needed for cantor to find R diff --git a/extra/kdeedu/gpsd-2.96.patch b/extra/kdeedu/gpsd-2.96.patch new file mode 100644 index 000000000..ec515e99d --- /dev/null +++ b/extra/kdeedu/gpsd-2.96.patch @@ -0,0 +1,43 @@ +Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +=================================================================== +--- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp ++++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +@@ -18,6 +18,9 @@ using namespace Marble; + + GpsdConnection::GpsdConnection( QObject* parent ) + : QObject( parent ), ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ m_gpsd("localhost", DEFAULT_GPSD_PORT), ++#endif + m_timer( 0 ) + { + connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) ); +@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject* + void GpsdConnection::initialize() + { + m_timer.stop(); ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ gps_data_t* data; ++#else + gps_data_t* data = m_gpsd.open(); ++#endif + if ( data ) { + m_status = PositionProviderStatusAcquiring; + emit statusChanged( m_status ); +@@ -73,8 +80,16 @@ void GpsdConnection::initialize() + void GpsdConnection::update() + { + #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ if ( m_gpsd.waiting(0) ) { ++#else + if ( m_gpsd.waiting() ) { ++#endif ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ gps_data_t* data = m_gpsd.read(); ++#else + gps_data_t* data = m_gpsd.poll(); ++#endif + if ( data && data->set & PACKET_SET ) { + emit gpsdInfo( *data ); + } diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index b8adb55c2..208459210 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 107967 2011-01-28 08:04:50Z andrea $ +# $Id: PKGBUILD 120273 2011-04-22 00:22:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.4.10 +pkgver=4.4.11.1 pkgrel=1 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/kdepim-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('a0e74f95daf8c28f7b3bd1ee84b6a86fc509d0ff') +sha1sums=('e3105eb99ab0de47c617f8491774b2e3ee4cdd4a') build() { cd $srcdir diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 6fc1fd302..4b3e307b0 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118254 2011-04-06 08:33:32Z andrea $ +# $Id: PKGBUILD 120278 2011-04-22 00:23:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,23 +20,18 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim' 'kdepim-wizards') -pkgver=4.4.10 -pkgrel=2 +pkgver=4.4.11.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' - 'pilot-link' 'kde-agent' 'docbook-xsl') -source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" - 'asynchronous-start.patch') -sha1sums=('b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3' - '3816d618026b85500a21753395712cd91de6e31b') + 'pilot-link' 'kde-agent') +source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2') build() { - cd ${srcdir}/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/asynchronous-start.patch - cd ${srcdir} mkdir build cd build diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index ce8bce22c..5060e0ab5 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119050 2011-04-10 17:34:53Z andyrtr $ +# $Id: PKGBUILD 120340 2011-04-22 11:24:54Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.0.6.pl00 +pkgver=1.0.8.pl00 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" @@ -11,8 +11,9 @@ arch=('i686' 'x86_64') license=('GPL2') depends=('libburn>=1.0.6' 'libisofs>=1.0.6' 'readline>=6.1') options=('!libtool') +install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('f4eff76915c08dba533180d618df95a1') +md5sums=('e9d4c2916f591cdf3b7248366ba54506') build() { cd ${srcdir}/${pkgname}-${pkgver/.pl??/} diff --git a/extra/libisoburn/libisoburn.install b/extra/libisoburn/libisoburn.install new file mode 100644 index 000000000..7f8b83e67 --- /dev/null +++ b/extra/libisoburn/libisoburn.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(xorriso.info.gz xorrisofs.info.gz) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD index fc978b8e7..842fbe930 100644 --- a/extra/libmad/PKGBUILD +++ b/extra/libmad/PKGBUILD @@ -1,40 +1,39 @@ -# $Id: PKGBUILD 28155 2009-02-28 01:26:22Z giovanni $ -# Maintainer: Travis Willard <travis@archlinux.org> +# $Id: PKGBUILD 120663 2011-04-25 21:54:20Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + pkgname=libmad pkgver=0.15.1b -pkgrel=4 +pkgrel=5 pkgdesc="A high-quality MPEG audio decoder" -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://www.underbit.com/products/mad/" license=('GPL') depends=('glibc') makedepends=('autoconf') replaces=('mad') conflicts=('mad') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.gz +source=(http://downloads.sourceforge.net/sourceforge/mad/${pkgname}-${pkgver}.tar.gz libmad.patch amd64-64bit.diff frame_length.diff optimize.diff) -url="http://www.underbit.com/products/mad/" +md5sums=('1be543bc30c56fb6bea1d7bf6a64e66c' + 'fbcca0267a423bae45389666f4cb04d5' + '8d8bd64a2842dd59153b3a6642059e23' + '3329b032118a68e18908197e65b3198d' + '3e52afe2103f367810a18bef9e82eb9f') build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i $srcdir/libmad.patch || return 1 - patch -Np1 -i $srcdir/amd64-64bit.diff || return 1 - patch -Np1 -i $srcdir/frame_length.diff || return 1 - patch -Np1 -i $srcdir/optimize.diff || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/libmad.patch" + patch -p1 -i "${srcdir}/amd64-64bit.diff" + patch -p1 -i "${srcdir}/frame_length.diff" + patch -p1 -i "${srcdir}/optimize.diff" CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1" autoconf ./configure --prefix=/usr - make || return 1 - make DESTDIR=$startdir/pkg install + make } -md5sums=('1be543bc30c56fb6bea1d7bf6a64e66c' - 'fbcca0267a423bae45389666f4cb04d5' - '8d8bd64a2842dd59153b3a6642059e23' - '3329b032118a68e18908197e65b3198d' - '3e52afe2103f367810a18bef9e82eb9f') -sha256sums=('bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690' - '813634b07e72ccc23c5c5dc63f88fb789706477fa0a74f535115b8bd898b2ff4' - '0b506dc3c3a83837739f84f7b9db7497fd79b3623b5fb7e291ce44f79d7bf726' - '0e21f2c6b19337d0b237dacc04f7b90a56be7f359f4c9a2ee0b202d9af0cfa69' - 'f38216942a1e84fd5341394a56dc5e91117d168a660f3c07ebd59af9b907e6f2') +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD index 3f0c60ff1..75c770b91 100644 --- a/extra/libmspack/PKGBUILD +++ b/extra/libmspack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79261 2010-05-02 14:06:52Z andyrtr $ +# $Id: PKGBUILD 120819 2011-04-26 16:19:33Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmspack -pkgver=0.0.20060920alpha -pkgrel=2 +pkgver=0.2alpha +pkgrel=1 pkgdesc="A library for Microsoft compression formats" arch=('i686' 'x86_64') url="http://www.cabextract.org.uk/libmspack/" @@ -12,11 +12,15 @@ depends=('glibc') makedepends=() options=('!libtool') source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz) -md5sums=('72003dfa5da2e843e3d5ae0c18f7c969') +md5sums=('a51c65ba1dc9b53090d4e65e1f55d860') build() { cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static - make || return 1 - make DESTDIR="$pkgdir/" install || return 1 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 554fd4ec6..f2f5025d5 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113970 2011-03-11 00:06:49Z giovanni $ +# $Id: PKGBUILD 120268 2011-04-21 21:31:35Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: 03/08/04 <lefungus@altern.org> pkgname=mkvtoolnix -pkgver=4.6.0 +pkgver=4.7.0 pkgrel=1 pkgdesc="Set of tools to create, edit and inspect Matroska files" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('wxgtk' 'boost' 'ruby') optdepends=('wxgtk: mkvmerge,mkvinfo and mmg GUI') install=mkvtoolnix.install source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('ca4e5b226175a6df2f9fdad206abf0a8') +md5sums=('68200debce9570fc14d934a3d6a750b5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD index 0a272791b..9f071b61b 100644 --- a/extra/mpg123/PKGBUILD +++ b/extra/mpg123/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 110641 2011-02-20 21:15:21Z eric $ +# $Id: PKGBUILD 120652 2011-04-25 20:44:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=mpg123 -pkgver=1.13.2 +pkgver=1.13.3 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/mpg123" license=('GPL2' 'LGPL2.1') -depends=('glibc' 'libtool' 'alsa-lib') +depends=('libtool' 'alsa-lib') makedepends=('esound' 'sdl' 'jack' 'libpulse') optdepends=('esound: for esd audio support' 'sdl: for sdl audio support' @@ -16,11 +16,10 @@ optdepends=('esound: for esd audio support' 'libpulse: for pulse audio support') conflicts=('mpg321') provides=('mpg321') -replaces=('mpg321') options=('libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7cb959877d205f89215a32bf446f5737') -sha1sums=('31a9c27f5fa80f930dbe598846c847f9b35d9dc3') +md5sums=('b1f990ce76dcf2fdf9d53ac39fc6bc7e') +sha1sums=('899af289bfcbbb13cbe66d5d0541c25cecf5400d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index 582f3928f..a5c7d41c6 100644 --- a/extra/opengtl/PKGBUILD +++ b/extra/opengtl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111122 2011-02-24 06:35:03Z eric $ +# $Id: PKGBUILD 120658 2011-04-25 21:17:33Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andries Radu <admiral0@live.it> pkgname=opengtl -pkgver=0.9.15 +pkgver=0.9.15.1 pkgrel=1 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" url="http://www.opengtl.org" @@ -13,8 +13,8 @@ depends=('gcc-libs') makedepends=('cmake' 'llvm' 'libpng') optdepends=('libpng: for using the png extension') source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2) -md5sums=('9e59817fddfc7085a8d23a6bbea60bdc') -sha1sums=('12d53a6ba660d278906539f74d28b464601a08a3') +md5sums=('052fc8504ced601e356e4d20621699f7') +sha1sums=('ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a') build() { cd "${srcdir}" diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD index cd6309f45..717a857df 100644 --- a/extra/phonon-vlc/PKGBUILD +++ b/extra/phonon-vlc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 107138 2011-01-21 18:51:32Z andrea $ +# $Id: PKGBUILD 120790 2011-04-26 15:17:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon-vlc -pkgver=0.3.2 +pkgver=0.4.0 pkgrel=1 arch=('i686' 'x86_64') url="http://phonon.kde.org" @@ -12,7 +12,7 @@ depends=('vlc') makedepends=('cmake' 'automoc4' 'phonon') provides=('phonon-backend') source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.bz2") -md5sums=('40076298deb89a1f2fd7f43c95e344fb') +md5sums=('e6ef8c5b54a49610d4dad67754392420') build() { cd ${srcdir} diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index f6c50c036..5c5ffd2db 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120038 2011-04-18 17:35:03Z dan $ +# $Id: PKGBUILD 120393 2011-04-23 18:29:42Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.0.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.postgresql.org" license=('custom:PostgreSQL') @@ -130,7 +130,7 @@ package_postgresql() { } md5sums=('80390514d568a7af5ab61db1cda27e29' - '89ada7c282d9ffb82c6adc89bc2778ad' + 'eacf91f987d230f2dc2d040618ea1817' 'd63a05943cf0a2726aa2070f3033c569' '4d74f4227dc5e12bf95b3490758d86c9' '96f82c38f3f540b53f3e5144900acf17' diff --git a/extra/postgresql/postgresql b/extra/postgresql/postgresql index 3a8bf44f8..0fbe94036 100755 --- a/extra/postgresql/postgresql +++ b/extra/postgresql/postgresql @@ -9,26 +9,26 @@ PGROOT=${PGROOT:-/var/lib/postgres} PG_CTL="/usr/bin/pg_ctl -D $PGROOT/data -l /var/log/postgresql.log -s -w" postgres_init() { - # initialization - if [ ! -d $PGROOT/data ]; then - mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT - su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data" - fi - if [ ! -e /var/log/postgresql.log ]; then - touch /var/log/postgresql.log - chown postgres /var/log/postgresql.log - fi + # initialization + if [ ! -d $PGROOT/data ]; then + mkdir -p $PGROOT/data && chown -R postgres:postgres $PGROOT + su - postgres -c "/usr/bin/initdb $INITOPTS -D $PGROOT/data" + fi + if [ ! -e /var/log/postgresql.log ]; then + touch /var/log/postgresql.log + chown postgres /var/log/postgresql.log + fi } case "$1" in start) - postgres_init + postgres_init stat_busy "Starting PostgreSQL" su - postgres -c \ "$PG_CTL start" if [ $? -gt 0 ]; then stat_fail - exit 1 + exit 1 else add_daemon postgresql stat_done @@ -51,19 +51,19 @@ case "$1" in "$PG_CTL reload" if [ $? -gt 0 ]; then stat_fail - exit 1 + exit 1 else stat_done fi ;; restart) - postgres_init + postgres_init stat_busy "Restarting PostgreSQL" su - postgres -c \ "$PG_CTL restart -m fast" if [ $? -gt 0 ]; then stat_fail - exit 1 + exit 1 else add_daemon postgresql stat_done diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index 4a6f9b848..c3fa4fc3e 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -1,11 +1,16 @@ post_install() { getent group postgres >/dev/null || groupadd -g 88 postgres - getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /sbin/nologin postgres + getent passwd postgres >/dev/null || useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres passwd -l postgres >/dev/null } post_upgrade() { post_install $1 + # FS#23858, fix postgres user shell issue + postgres_shell=$(getent passwd postgres | cut -d: -f7) + if [ "$postgres_shell" = "/sbin/nologin" ]; then + chsh -s /bin/bash postgres + fi } post_remove() { diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index c7f6570e2..6f07433c0 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 114776 2011-03-15 23:09:15Z andrea $ +# $Id: PKGBUILD 120507 2011-04-24 15:55:09Z andrea $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> @@ -17,7 +17,11 @@ makedepends=('mysql' 'postgresql>=8.2.3' 'unixodbc' 'sqlite3') optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc') source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.bz2 qt3-png14.patch qt.profile \ qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 utf8-bug-qt3.diff \ - qt-font-default-subst.diff mysql.patch eastern_asian_languagues.diff qt-odbc.patch) + qt-font-default-subst.diff + mysql.patch + eastern_asian_languagues.diff + qt-odbc.patch + gcc-4.6.patch) options=(!libtool) md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85' '1dc671df42b9030dbdf68bb61cd3375e' @@ -28,7 +32,8 @@ md5sums=('cf3c43a7dfde5bfb76f8001102fe6e85' '9370d82e85f2c799335ed0dcc1d53189' '7d40ed1bd40d33d8b9b27a2076a5d22a' '616f1f3029cf8375256ad6a406de3549' - '2178ca88dfd75a230918593b30eb0dbe') + '2178ca88dfd75a230918593b30eb0dbe' + '75177de5b08e1efd437c887c6e606c5b') # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo @@ -42,24 +47,26 @@ build() { cd ${srcdir}/$pkgfqn # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do - patch -Np0 -i $i || return 1 + patch -Np0 -i $i done # apply other qt patches and one security fix from debian/gentoo for i in ../qt-patches/*; do - patch -Np1 -i $i || return 1 + patch -Np1 -i $i done # fix utf8 bug - patch -Np0 -i ../utf8-bug-qt3.diff || return 1 + patch -Np0 -i ../utf8-bug-qt3.diff # fix asia fonts - patch -Np0 -i ../qt-font-default-subst.diff || return 1 + patch -Np0 -i ../qt-font-default-subst.diff # fix segfaults on exit when using mysql DB driver - patch -Np0 -i ../mysql.patch || return 1 + patch -Np0 -i ../mysql.patch # fix CJK font/chars select error (FS#11245) - patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1 + patch -p1 -i ${srcdir}/eastern_asian_languagues.diff # fix build problem against new unixODBC - patch -p1 -i ${srcdir}/qt-odbc.patch || return 1 + patch -p1 -i ${srcdir}/qt-odbc.patch + # fix build with gcc 4.6.0 + patch -p1 -i ${srcdir}/gcc-4.6.patch - patch -p0 -i ${srcdir}/qt3-png14.patch || return 1 + patch -p0 -i ${srcdir}/qt3-png14.patch # start compiling qt sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix rm -rf doc/html examples tutorial @@ -91,7 +98,7 @@ build() { [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile cd ${srcdir}/$pkgfqn - make -C qmake || return 1 + make -C qmake cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql @@ -100,7 +107,11 @@ build() { cd ${srcdir}/$pkgfqn # fix the broken makefiles #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile - make || return 1 + make +} + +package() { + cd ${srcdir}/$pkgfqn make INSTALL_ROOT=${pkgdir} install rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations} sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl @@ -110,7 +121,7 @@ build() { rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH # install man pages - mkdir -p ${pkgdir}/opt/qt/man + install -d -m755 ${pkgdir}/opt/qt/man cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/ install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ diff --git a/extra/qt3/gcc-4.6.patch b/extra/qt3/gcc-4.6.patch new file mode 100644 index 000000000..bcbffcea6 --- /dev/null +++ b/extra/qt3/gcc-4.6.patch @@ -0,0 +1,33 @@ +diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h +--- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 +@@ -49,6 +49,7 @@ + #include "qvaluelist.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <map> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h +--- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 +@@ -47,6 +47,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <iterator> + #include <list> +diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h +--- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 ++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 +@@ -45,6 +45,7 @@ + #include "qdatastream.h" + #endif // QT_H + ++#include <cstddef> + #ifndef QT_NO_STL + #include <vector> + #endif diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD index 8f78015e3..6905293b6 100644 --- a/extra/slang/PKGBUILD +++ b/extra/slang/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106236 2011-01-15 15:15:05Z giovanni $ +# $Id: PKGBUILD 120537 2011-04-25 07:37:13Z remy $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=slang -pkgver=2.2.3 -pkgrel=2 +pkgver=2.2.4 +pkgrel=1 pkgdesc="S-Lang is a powerful interpreted language" arch=('i686' 'x86_64') url="http://www.jedsoft.org/slang/" @@ -12,17 +12,22 @@ license=('GPL') depends=('glibc' 'pcre' 'zlib') backup=('etc/slsh.rc') options=('!makeflags') -source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - ${pkgname}-2.2.3-faster-baud-rates.patch) -md5sums=('17e1864de999ae9535a9f7350a010427' - '4e22e58836100adfae34e824f5fbcb1c') +source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('7fcfd447e378f07dd0c0bae671fe6487') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}"/${pkgname}-2.2.3-faster-baud-rates.patch || return 1 - ./configure --prefix=/usr \ - --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install-all || return 1 + --sysconfdir=/etc + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install-all } diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 4df33bad0..e7a3f1d33 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 114612 2011-03-14 15:06:46Z jgc $ +# $Id: PKGBUILD 120497 2011-04-24 14:50:22Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler pkgver=0.1.21 -pkgrel=2 +pkgrel=3 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') arch=('i686' 'x86_64') groups=('xfce4') -depends=('poppler-glib' 'dbus-glib' 'ffmpegthumbnailer') -makedepends=( 'intltool' 'gtk-doc') +depends=('poppler-glib' 'dbus-glib') +makedepends=('intltool' 'ffmpegthumbnailer') +optdepends=('ffmpegthumbnailer: for video thunbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2) md5sums=('2ef0d30750f95efe345de4655049d4f6') @@ -22,8 +23,7 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ --disable-static \ - --disable-debug \ - --enable-gtk-doc + --disable-debug make } diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index 441603077..b6ffda70b 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 115532 2011-03-18 10:42:40Z andyrtr $ +# $Id: PKGBUILD 120502 2011-04-24 14:51:16Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-joystick -_gitdate=20110318 -pkgver=1.5.99_git${_gitdate} # see configure.ac +pkgver=1.6.0 pkgrel=1 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64) @@ -14,35 +13,21 @@ makedepends=('xorg-server-devel') conflicts=('xorg-server<1.10.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ftp://ftp.archlinux.org/other/$pkgname/${pkgname}-${_gitdate}.tar.bz2 +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 50-joystick.conf LICENSE) -sha1sums=('e1eb55c0556984530ab87836b5ade78085c7201b' +sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780' 'e1ff3699a0470c6bb78a53f718df9d8521621e11' 'ee4c79491b36a680ed9d86f5fc41ae447f26353e') -# source PKGBUILD && mksource -mksource() { - mkdir /tmp/${pkgname}-${_gitdate} - pushd /tmp/${pkgname}-${_gitdate} - git clone -v --depth 1 git://anongit.freedesktop.org/xorg/driver/xf86-input-joystick - cd xf86-input-joystick - git archive --prefix=xf86-video-joystick-${_gitdate}/ --format=tar HEAD | bzip2 > /tmp/${pkgname}-${_gitdate}/${pkgname}-${_gitdate}.tar.bz2 - popd -} - build() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# ./configure --prefix=/usr - cd ${srcdir}/xf86-video-joystick-${_gitdate} - ./autogen.sh --prefix=/usr + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr make } package() { -# cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/xf86-video-joystick-${_gitdate} + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 452135ebf..8359afd01 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 112928 2011-03-07 18:58:22Z andyrtr $ +# $Id: PKGBUILD 120363 2011-04-22 18:39:32Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') license=('GPL2') @@ -18,7 +18,7 @@ replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) -md5sums=('a3a255cc7756ddc2a0a6fdee9fb8b2c9') +md5sums=('ed25d59f478afda552d121e96657d16f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 886f106ff..0d7c0b367 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -1,36 +1,31 @@ -# $Id: PKGBUILD 100111 2010-11-20 11:25:37Z pierre $ +# $Id: PKGBUILD 120250 2011-04-21 17:00:05Z ibiru $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> +# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2011.02.1 -pkgrel=1 +pkgver=2011.04.1 +pkgrel=1.1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') url="http://parabolagnulinux.org" -license=('GPL') +license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('bash' 'awk' 'grep' 'coreutils' 'sed' 'udev' +depends=('bash' 'grep' 'coreutils' 'udev' 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'wireless_tools: Wireless networking') install=initscripts.install -source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz" - 'wireless.conf.d' - 'parabola-branding.patch') -md5sums=('22dcf8fc052deef0894d5caa0981419a' - '027576534885b8d5dded9be546057b12' - '030deb770293ea5a1e632934095af412') +source=("http://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" + 'wireless.conf.d') +md5sums=('9c9cca84f5601700f3f1d0303aa1e058' + '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} - - msg2 "Rebranding for Parabola" - patch -Np1 -i ${srcdir}/parabola-branding.patch - DESTDIR=${pkgdir} ./install.sh install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 22b381db4..89af2e32b 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Buil _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.38 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" @@ -241,9 +241,9 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } -md5sums=('ecc5aa47bbb433e48abade02824ba6ac' - '32053f02a898803ea9cf8cc7106473db' - 'b7b18adb9de35b4ecb4d8724f27a2924' - '25c5f33e6b086fcc2020f8b85a63e1c3' +md5sums=('0f1a5d184d4029c9d9b38a4b9407c392' + '8395aac2f31718b45afe57794c21ab81' + 'a6b673aead69b12f50b8ca53d1f14b14' + 'fa7d6abea1e2163b1ab2b1acfe117f51' '25584700a0a679542929c4bed31433b6' '2d68b4cf4caedd1f0188f4877eca1d43') diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index a8c4d4703..2269fd1d3 100644 --- a/libre/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.38 Kernel Configuration -# Sun Apr 17 12:35:51 2011 +# Fri Apr 22 17:32:05 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5320,6 +5320,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_KMEMCHECK is not set +CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index d98f24533..d89904aa7 100644 --- a/libre/kernel26-libre/config.x86_64 +++ b/libre/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.38 Kernel Configuration -# Sun Apr 17 14:31:49 2011 +# Fri Apr 22 19:25:29 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -5061,6 +5061,7 @@ CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y # CONFIG_KMEMCHECK is not set +CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD b/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD new file mode 100644 index 000000000..5aeb0f1bc --- /dev/null +++ b/multilib-testing/lib32-gdk-pixbuf2/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 91063 2010-09-21 19:21:24Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +_pkgbasename=gdk-pixbuf2 +pkgname=lib32-$_pkgbasename +pkgver=2.23.3 +pkgrel=1 +pkgdesc="An image loading library for gtk2 (32-bit)" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('lib32-glib2>=2.25.15' + lib32-lib{'png>=1.4.3','tiff>=3.9.4','jpeg>=8.0.2',x11} + $_pkgbasename) +makedepends=(gcc-multilib) +options=('!libtool' '!docs') +install=gdk-pixbuf2.install +source=(http://download.gnome.org/sources/gdk-pixbuf/2.23/gdk-pixbuf-${pkgver}.tar.bz2) +sha256sums=('9faba780151c02e13cb2029d512c975e9c41b98cd72de6d2cc50e4af10a5e76a') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/gdk-pixbuf-${pkgver}" + + ./configure --prefix=/usr --libdir=/usr/lib32 \ + --without-libjasper \ + --with-included-loaders=png + make +} + +package() { + cd "${srcdir}/gdk-pixbuf-${pkgver}" + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/etc + rm -rf "${pkgdir}"/usr/{include,share} + + cd "${pkgdir}"/usr/bin + mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32 + rm gdk-pixbuf-csource +} + +# vim:set ts=2 sw=2 et: diff --git a/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install new file mode 100644 index 000000000..92d58ef04 --- /dev/null +++ b/multilib-testing/lib32-gdk-pixbuf2/gdk-pixbuf2.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gdk-pixbuf-query-loaders-32 --update-cache +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache +} diff --git a/multilib-testing/lib32-glib2/PKGBUILD b/multilib-testing/lib32-glib2/PKGBUILD new file mode 100644 index 000000000..4d98d0693 --- /dev/null +++ b/multilib-testing/lib32-glib2/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 45657 2011-04-26 16:44:11Z svenstaro $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> +_pkgbasename=glib2 +pkgname=lib32-$_pkgbasename +pkgver=2.28.6 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" +url="http://www.gtk.org/" +arch=('x86_64') +license=('LGPL') +depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' $_pkgbasename) +makedepends=('gcc-multilib') +options=('!libtool' '!docs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.28/glib-${pkgver}.tar.bz2) +sha256sums=('557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/glib-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ + --enable-static --enable-shared --with-pcre=system --disable-fam + make +} + +package() { + cd "${srcdir}/glib-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/{etc,usr/{share,include}} + + cd "${pkgdir}"/usr/bin + mv gio-querymodules gio-querymodules-32 + rm -f gdbus glib* gobject-query gsettings gtester* +} diff --git a/multilib-testing/lib32-gtk2/PKGBUILD b/multilib-testing/lib32-gtk2/PKGBUILD new file mode 100644 index 000000000..ae67618c0 --- /dev/null +++ b/multilib-testing/lib32-gtk2/PKGBUILD @@ -0,0 +1,53 @@ +# $Id: PKGBUILD 45659 2011-04-26 16:47:39Z svenstaro $ +# Maintainer: Ionut Biru <ibiru@archlinux.org +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> + +_pkgbasename=gtk2 +pkgname=lib32-$_pkgbasename +pkgver=2.24.4 +pkgrel=1 +pkgdesc="The GTK+ Toolkit (v2) (32-bit)" +arch=('x86_64') +url="http://www.gtk.org/" +install=gtk2.install +depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','heimdal>=1.3.2','gnutls>=2.8.6','gdk-pixbuf2>=2.22.1'} + lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage} + $_pkgbasename) +makedepends=('pkgconfig' 'gcc-multilib') +options=('!libtool' '!docs') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.bz2 + xid-collision-debug.patch + gtk-modules-32.patch) +sha256sums=('7d3033ad83647079977466d3e8f1a7533f47abd5cc693f01b8797ff43dd407a5' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' + '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + patch -p1 -i ${srcdir}/gtk-modules-32.patch + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib32 \ + --with-xinput=yes + make +} + +package() { + cd "${srcdir}/gtk+-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/etc + rm -rf "${pkgdir}"/usr/{include,share} + + cd "${pkgdir}"/usr/bin + mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32 + rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache +} diff --git a/multilib-testing/lib32-gtk2/gtk-modules-32.patch b/multilib-testing/lib32-gtk2/gtk-modules-32.patch new file mode 100644 index 000000000..a2530c3bf --- /dev/null +++ b/multilib-testing/lib32-gtk2/gtk-modules-32.patch @@ -0,0 +1,12 @@ +diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c +--- gtk+-2.20.1/gtk/gtkrc.c 2010-05-03 01:28:21.000000000 +0200 ++++ gtk+-2.20.1-32/gtk/gtkrc.c 2010-08-26 07:22:42.316920033 +0200 +@@ -450,7 +450,7 @@ + if (im_module_file) + result = g_strdup (im_module_file); + else +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL); + } + + return result; diff --git a/multilib-testing/lib32-gtk2/gtk2.install b/multilib-testing/lib32-gtk2/gtk2.install new file mode 100644 index 000000000..49f86f550 --- /dev/null +++ b/multilib-testing/lib32-gtk2/gtk2.install @@ -0,0 +1,16 @@ +post_install() { + GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32 +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null + rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null +} diff --git a/multilib-testing/lib32-gtk2/xid-collision-debug.patch b/multilib-testing/lib32-gtk2/xid-collision-debug.patch new file mode 100644 index 000000000..d61238c3b --- /dev/null +++ b/multilib-testing/lib32-gtk2/xid-collision-debug.patch @@ -0,0 +1,15 @@ +--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 ++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 +@@ -56,10 +56,10 @@ + if (!display_x11->xid_ht) + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); +- ++/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); +- ++*/ + g_hash_table_insert (display_x11->xid_ht, xid, data); + } + diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD index b65338bef..817b07a14 100644 --- a/multilib/binutils-multilib/PKGBUILD +++ b/multilib/binutils-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 39366 2011-02-09 12:53:42Z heftig $ +# $Id: PKGBUILD 43542 2011-03-27 14:09:06Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,8 +6,8 @@ pkgname=binutils-multilib pkgver=2.21 -pkgrel=4 -_date=20110209 +pkgrel=6 +_date=20110326 pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" arch=('x86_64') url="http://www.gnu.org/software/binutils/" @@ -19,15 +19,10 @@ depends=('glibc>=2.13' 'zlib') makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2 - binutils.git-39637246.patch) -md5sums=('673ef8f4fc0b497232b4458982e76179' - 'dd72cb6df5467bc6237cff2a886099d0') +source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) +md5sums=('884dcbc87d4722b152aea72312356da1') build() { - cd ${srcdir}/binutils - patch -Np1 -i ${srcdir}/binutils.git-39637246.patch - cd ${srcdir} mkdir binutils-build && cd binutils-build @@ -41,6 +36,10 @@ build() { make configure-host make tooldir=${pkgdir}/usr +} + +check() { + cd ${srcdir}/binutils-build # do not abort on errors - manually check log files make -k -j1 check || true diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index b3ec427ea..5a1bfbd26 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 38863 2011-02-02 11:14:23Z ibiru $ +# $Id: PKGBUILD 45100 2011-04-16 13:45:55Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -6,32 +6,33 @@ # NOTE: libtool requires rebuilt with each new gcc version pkgbase='gcc-multilib' -pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib') -pkgver=4.5.2 -pkgrel=6 -_snapshot=4.5-20110127 -_libstdcppmanver=4.5.2 # Note: check source directory name when updating this +pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') +pkgver=4.6.0 +pkgrel=3 +_snapshot=4.6-20110415 +_libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') -license=('GPL' 'LGPL' 'custom') +license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada-multilib' 'dejagnu' - 'glibc>=2.11.1-2' 'lib32-glibc>=2.12.1') +makedepends=('binutils-multilib>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu' + 'lib32-glibc>=2.12.1') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,testsuite}-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,testsuite}-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api-${_libstdcppmanver}.man.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('7dbdf06186dc98955221b2f7b987645b' - '4893036a98d8bedf44fe0741dfec6e1f' - 'c741c614e975c858cffb9e78b0b5124f' - 'b141fadc984cc0c1c0f15feb16db14e5' - '067672b640d0b912298791c1837606bc' - 'daffd2ba5917a263cdff5f38dcf8c323' - '2776eab5ebb7f9cc62dd2199a3a24382' +md5sums=('aed037654091d1f478dfcb6e13444325' + '8d4b78c03c1d477c6cb562d42f461958' + 'c346e76014569b25e2869ff986d2ac2d' + '8376485de1c7aa90bb32f52f2372d451' + '0c2d89f9e2e614ad84c6e2aa239c5c1c' + '50bab6a0c9e5403ea77f57361dec5436' + '6e0032461f87ce60db6302ca652ae9d8' + '1e9fd2eaf0ee47ea64e82c48998f1999' '22cec272f9cc2801d3cd348feaca888b' - '6fd395bacbd7b6e47c7b74854b478363') + '4df25b623799b148a0703eaeec8fdf3f') if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -42,9 +43,6 @@ fi build() { cd ${_basedir} - # "Add" ppl-0.11 compatibility - sed -i "/ppl_minor_version=/s#10#11#" configure - # Do not install libiberty sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in @@ -58,18 +56,26 @@ build() { cd ${srcdir} mkdir gcc-build && cd gcc-build + ${_basedir}/configure --prefix=/usr \ - --enable-languages=c,c++,fortran,objc,obj-c++,ada \ - --enable-shared --enable-threads=posix --enable-__cxa_atexit \ - --enable-clocale=gnu --enable-gnu-unique-object \ - --enable-lto --enable-plugin \ - --enable-gold --with-plugin-ld=ld.gold \ - --enable-multilib --disable-libstdcxx-pch \ - --with-system-zlib --with-ppl \ - --with-cloog --with-cloog-include=/usr/include/cloog-ppl \ --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --enable-gnu-unique-object --enable-linker-build-id \ + --with-ppl --enable-cloog-backend=isl \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --enable-multilib --disable-libstdcxx-pch \ + --enable-checking=release make +} + +check() { + cd gcc-build # increase stack size to prevent test failures # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 @@ -96,11 +102,14 @@ package_gcc-libs-multilib() make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - # I thought I said to only install the lib... - rm -rf ${pkgdir}/usr/lib/gcc/ + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} + + # remove stuff in lib32-gcc-libs rm -rf ${pkgdir}/usr/lib32 # remove static libraries @@ -122,12 +131,16 @@ package_lib32-gcc-libs() make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - # I thought I said to only install the lib... + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm ${pkgdir}/usr/lib32/libgfortran.spec + + # remove stuff in gcc-libs-multilib rm -rf ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/share/info # remove static libraries find ${pkgdir} -name *.a -delete @@ -140,7 +153,7 @@ package_lib32-gcc-libs() package_gcc-multilib() { pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=('binutils-multilib>=2.21' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils' \ + depends=('binutils-multilib>=2.21' 'libmpc>=0.8.1-2' 'cloog' 'ppl' "gcc-libs-multilib=$pkgver-$pkgrel") groups=('multilib-devel') provides=("gcc=$pkgver-$pkgrel") @@ -149,15 +162,20 @@ package_gcc-multilib() cd gcc-build - # much, much easier to install the lot and clean-up the mess + # unfortunately it is much, much easier to install the lot and clean-up the mess... make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{*gfortran,gnat*} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}/* - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,{,32/}libgfortranbegin.a} - rm $pkgdir/usr/lib{,32}/{*.so*,lib{gfortran,objc}.a} - rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp}.info + rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm $pkgdir/usr/lib{,32}/*.so* + rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm $pkgdir/usr/lib{,32}/libgfortran.spec + rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a} + rm -r $pkgdir/usr/lib{,32}/go + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/gfortran.1 + rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm $pkgdir/usr/share/man/man3/ffi* # many packages require these symlinks install -dm755 ${pkgdir}/lib @@ -196,8 +214,7 @@ EOF # install the libstdc++ man pages install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api-${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ + install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -213,13 +230,15 @@ package_gcc-fortran-multilib() install=gcc-fortran.install cd gcc-build + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=$pkgdir install-target-libgfortran make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib{,32}/libgfortran.so* + rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* + rm ${pkgdir}/usr/share/info/libquadmath.info # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -239,7 +258,7 @@ package_gcc-objc-multilib() install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib{,32}/libobjc.so* + rm ${pkgdir}/usr/lib{,32}/libobjc.so* # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -254,14 +273,33 @@ package_gcc-ada-multilib() conflicts=('gcc-ada') install=gcc-ada.install - cd gcc-build - make -j1 -C gcc DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gcc/gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - make -j1 -C $CHOST/32/libada DESTDIR=${pkgdir} \ - INSTALL="install" INSTALL_DATA="install -m644" install-gnatlib + cd gcc-build/gcc + make -j1 DESTDIR=$pkgdir ada.install-{common,info} + install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver + + cd ../$CHOST/32/libada + make -j1 DESTDIR=${pkgdir} INSTALL="install" \ + INSTALL_DATA="install -m644" install-gnatlib # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION } +package_gcc-go-multilib() +{ + pkgdesc="Go front-end for GCC for multilib" + depends=("gcc-multilib=$pkgver-$pkgrel") + provides=("gcc-go=$pkgver-$pkgrel") + conflicts=('gcc-go') + install=gcc-go.install + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libgo + make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION +} diff --git a/multilib/gcc-multilib/gcc-ada.install b/multilib/gcc-multilib/gcc-ada.install index 81794685f..df0553a4f 100644 --- a/multilib/gcc-multilib/gcc-ada.install +++ b/multilib/gcc-multilib/gcc-ada.install @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/multilib/gcc-multilib/gcc-fortran.install b/multilib/gcc-multilib/gcc-fortran.install index 2aeab7123..b15d89a97 100644 --- a/multilib/gcc-multilib/gcc-fortran.install +++ b/multilib/gcc-multilib/gcc-fortran.install @@ -14,5 +14,3 @@ pre_remove() { [ -x usr/bin/install-info ] || return 0 install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } - -# vim:set ts=2 sw=2 et: diff --git a/multilib/gcc-multilib/gcc-go.install b/multilib/gcc-multilib/gcc-go.install new file mode 100644 index 000000000..7dc50dee5 --- /dev/null +++ b/multilib/gcc-multilib/gcc-go.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gccgo.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/multilib/gcc-multilib/gcc-hash-style-both.patch b/multilib/gcc-multilib/gcc-hash-style-both.patch index fbb210598..8b59f4535 100644 --- a/multilib/gcc-multilib/gcc-hash-style-both.patch +++ b/multilib/gcc-multilib/gcc-hash-style-both.patch @@ -1,47 +1,6 @@ -#! /bin/sh -e - -# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2006-07-11 Jakub Jelinek <jakub@redhat.com> - - * config/i386/linux.h (LINK_SPEC): Add --hash-style=both. - * config/i386/linux64.h (LINK_SPEC): Likewise. - * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. - * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, - LINK_OS_LINUX_SPEC64): Likewise. - * config/s390/linux.h (LINK_SPEC): Likewise. - * config/ia64/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, - LINK_ARCH64_SPEC): Likewise. - * config/alpha/linux-elf.h (LINK_SPEC): Likewise. - ---- gcc/config/alpha/linux-elf.h.orig 2007-08-04 08:55:58.000000000 +0200 -+++ gcc/config/alpha/linux-elf.h 2007-09-01 15:47:26.605865578 +0200 -@@ -39,7 +39,7 @@ +--- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 +@@ -41,7 +41,7 @@ #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER @@ -50,8 +9,68 @@ exit 0 %{O*:-O3} %{!O*:-O1} \ %{shared:-shared} \ %{!shared: \ ---- gcc/config/s390/linux.h.orig 2007-08-04 08:55:59.000000000 +0200 -+++ gcc/config/s390/linux.h 2007-09-01 15:47:26.605865578 +0200 +--- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 ++++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -78,7 +78,7 @@ + %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + + #undef LINK_SPEC +-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ ++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 ++++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -104,7 +104,7 @@ + { "dynamic_linker", LINUX_DYNAMIC_LINKER } + + #undef LINK_SPEC +-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ ++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -64,7 +64,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "\ ++#define LINK_SPEC "--hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 ++++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 +@@ -389,11 +389,11 @@ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + + +-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" + +-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" + +--- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 ++++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 +@@ -830,7 +830,7 @@ + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + +-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" + +--- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 @@ -77,7 +77,7 @@ #undef LINK_SPEC @@ -61,103 +80,43 @@ exit 0 %{shared:-shared} \ %{!shared: \ %{static:-static} \ ---- gcc/config/sparc/linux.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -132,7 +132,7 @@ - - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!ibcs: \ ---- gcc/config/sparc/linux64.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux64.h 2007-09-01 15:47:26.605865578 +0200 -@@ -166,7 +166,7 @@ +--- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 ++++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -113,7 +113,7 @@ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ { "link_arch", LINK_ARCH_SPEC }, -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ +#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -175,7 +175,7 @@ - %{static:-static}}} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ " -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ +#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -256,7 +256,7 @@ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ #else /* !SPARC_BI_ARCH */ #undef LINK_SPEC -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ +#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -108,7 +108,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux64.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux64.h 2007-09-01 15:48:27.336781690 +0200 -@@ -65,7 +65,7 @@ - #endif - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ %{!static: \ ---- gcc/config/ia64/linux.h.orig 2006-12-12 18:59:53.000000000 +0100 -+++ gcc/config/ia64/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -40,7 +40,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + %{rdynamic:-export-dynamic} \ +--- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 ++++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -74,7 +74,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ %{!shared: \ %{!static: \ ---- gcc/config/rs6000/sysv4.h.orig 2007-08-08 23:37:49.000000000 +0200 -+++ gcc/config/rs6000/sysv4.h 2007-09-01 15:47:26.615865729 +0200 -@@ -901,7 +901,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" - ---- gcc/config/rs6000/linux64.h.orig 2007-08-04 08:56:12.000000000 +0200 -+++ gcc/config/rs6000/linux64.h 2007-09-01 15:47:26.615865729 +0200 -@@ -354,11 +354,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" - diff --git a/multilib/gcc-multilib/gcc-libs.install b/multilib/gcc-multilib/gcc-libs.install index b5fbf9211..23553b8f0 100644 --- a/multilib/gcc-multilib/gcc-libs.install +++ b/multilib/gcc-multilib/gcc-libs.install @@ -1,14 +1,16 @@ infodir=usr/share/info -file="libgomp.info" +filelist=(libgomp.info libquadmath.info) post_upgrade() { [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done } pre_remove() { [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done } - -# vim:set ts=2 sw=2 et: diff --git a/multilib/gcc-multilib/gcc.install b/multilib/gcc-multilib/gcc.install index a7a405288..3407a5e1f 100644 --- a/multilib/gcc-multilib/gcc.install +++ b/multilib/gcc-multilib/gcc.install @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD index 2308cb13a..36c6c00a9 100644 --- a/multilib/lib32-glibc/PKGBUILD +++ b/multilib/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 39932 2011-02-18 23:00:49Z heftig $ +# $Id: PKGBUILD 43540 2011-03-27 14:07:50Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.13 -pkgrel=4 +pkgrel=5 _glibcdate=20110117 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -25,6 +25,7 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-prelink.patch + glibc-2.13-futex.patch lib32-glibc.conf) md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' '4dadb9203b69a3210d53514bb46f41c3' @@ -33,6 +34,7 @@ md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '24dfab6fd244f3773523412588ecc52c' + '7d0154b7e17ea218c9fa953599d24cc4' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -59,6 +61,10 @@ build() { # http://sourceware.org/bugzilla/show_bug.cgi?id=12489 # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch + + # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch + cd ${srcdir} mkdir glibc-build cd glibc-build diff --git a/multilib/lib32-glibc/glibc-2.13-futex.patch b/multilib/lib32-glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD index 289c0baad..44f3e60a9 100644 --- a/multilib/lib32-mpg123/PKGBUILD +++ b/multilib/lib32-mpg123/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 26707 2010-09-15 22:56:36Z bluewind $ +# $Id: PKGBUILD 45641 2011-04-26 13:38:33Z bluewind $ # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> _pkgbasename=mpg123 pkgname=lib32-$_pkgbasename -pkgver=1.12.3 -pkgrel=5 +pkgver=1.13.3 +pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bit)" arch=('x86_64') url="http://sourceforge.net/projects/mpg123" @@ -15,8 +15,8 @@ makedepends=('lib32-sdl' gcc-multilib libtool-multilib) optdepends=('lib32-sdl: for additional audio support') options=('libtool') source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('c1568be2d1715786bd6b1a89ec6fa7ef') -sha1sums=('5e92d3c918f6095264089f711a9f38a5d2168b31') +md5sums=('b1f990ce76dcf2fdf9d53ac39fc6bc7e') +sha1sums=('899af289bfcbbb13cbe66d5d0541c25cecf5400d') build() { export CC="gcc -m32" @@ -34,6 +34,4 @@ package() { make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" } diff --git a/multilib/lib32-pcre/PKGBUILD b/multilib/lib32-pcre/PKGBUILD index 277e397df..93a5a36a0 100644 --- a/multilib/lib32-pcre/PKGBUILD +++ b/multilib/lib32-pcre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 26731 2010-09-15 23:01:13Z bluewind $ +# $Id: PKGBUILD 45653 2011-04-26 16:31:21Z svenstaro $ # Maintainer: Ionut Biru <ibiru@archlinux.org> _pkgbasename=pcre pkgname=lib32-$_pkgbasename -pkgver=8.10 -pkgrel=3 +pkgver=8.12 +pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)" arch=('x86_64') url="http://pcre.sourceforge.net" @@ -13,7 +13,7 @@ depends=('lib32-gcc-libs' $_pkgbasename) makedepends=('gcc-multilib') options=('!libtool') source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('780867a700e9d4e4b9cb47aa5453e4b2') +md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3') build() { cd "${srcdir}"/${_pkgbasename}-${pkgver} diff --git a/testing/alex/PKGBUILD b/testing/alex/PKGBUILD new file mode 100644 index 000000000..d49dc3d6f --- /dev/null +++ b/testing/alex/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 120390 2011-04-23 17:05:09Z vesa $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Philip Nilsson <pnilsson@nullref.se> + +pkgname=alex +pkgver=2.3.5 +pkgrel=1.2 +pkgdesc='a lexical analyser generator for Haskell' +arch=('i686' 'x86_64') +url='http://www.haskell.org/alex/' +license=('custom:BSD3') +depends=('gmp') +makedepends=('ghc=7.0.3') +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") + +build() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname + runghc Setup.lhs build +} + +package() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs copy --destdir=$pkgdir + install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 + + # doc/ contains only license which already installed into proper place + rm -rf $pkgdir/usr/share/doc +} +md5sums=('5e08c688ded0dcff98eaad6fc03a9402') diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD index 307cf08ce..f6999d183 100644 --- a/testing/anjuta/PKGBUILD +++ b/testing/anjuta/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117921 2011-04-04 21:31:08Z heftig $ +# $Id: PKGBUILD 120797 2011-04-26 15:26:51Z ibiru $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Harley Laue <losinggeneration@yahoo.com> pkgname=anjuta -pkgver=3.0.0.0 +pkgver=3.0.1.0 pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" arch=('i686' 'x86_64') @@ -11,12 +11,12 @@ license=('GPL') depends=('vte3' 'gdl' 'autogen' 'devhelp' 'gtksourceview3' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'hicolor-icon-theme' 'vala' 'graphviz' 'python2' 'shared-mime-info' 'desktop-file-utils') -makedepends=('gnome-doc-utils' 'intltool') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') url="http://anjuta.sourceforge.net/" install=anjuta.install source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('f0b7b4ad77479e02f181f52adf1b2b866d6ed1463f401dac905bb55c606492c9') +sha256sums=('dbda189f453e0f9baecb35e85d59df92613668f7f4be08207d635cff3abb7261') build() { cd "${srcdir}/anjuta-${pkgver}" diff --git a/testing/ardour/PKGBUILD b/testing/ardour/PKGBUILD new file mode 100644 index 000000000..cee3fc185 --- /dev/null +++ b/testing/ardour/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 110738 2011-02-21 22:15:44Z schiv $ +# Maintainer: tobias <tobias@archlinux.org> +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +# ardour, liblrdf and raptor are heavily dependent on each other. Updating of +# one package mostly will require an update of all the other packages. I vote +# for fixed dependencies speaking in terms of versions + +pkgname=ardour +pkgver=2.8.11 +pkgrel=3 +pkgdesc="A multichannel hard disk recorder and digital audio workstation" +arch=('i686' 'x86_64') +url="http://ardour.org" +license=('GPL') +depends=('liblrdf>=0.4.0-7' 'liblo' 'aubio' 'libusb-compat' + 'slv2>=0.6.6-3' 'rubberband' 'libgnomecanvas') +makedepends=('scons' 'boost' 'pkg-config') +changelog=${pkgname}.changelog +source=(ftp://ftp.archlinux.org/other/ardour/${pkgname}-${pkgver}.tar.bz2 + ${pkgname}.desktop) +md5sums=('f451a8d0abc133a1700c3932e07a5612' + '8aeaf433ebf781733db48e5a16b0c4da') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '/-O3/d' SConstruct + + scons ${MAKEFLAGS} ARCH="${CFLAGS}" \ + PREFIX="/usr" \ + DIST_LIBDIR="lib" \ + FREEDESKTOP=0 \ + FREESOUND=1 \ + DESTDIR="${pkgdir}" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + scons PREFIX="/usr" \ + FREEDESKTOP=0 \ + FREESOUND=1 \ + DESTDIR="${pkgdir}" install + + # install some freedesktop.org compatibility + install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/ardour/ardour.changelog b/testing/ardour/ardour.changelog new file mode 100644 index 000000000..ee9cf00bf --- /dev/null +++ b/testing/ardour/ardour.changelog @@ -0,0 +1,26 @@ +22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-2 : + raptor rebuild + +9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 2.8.11-1 : + Testing build. + Removed libgnomecanvasmm depend (ardour internal). + Removed soundtouch makedepend (ardour internal, unneded). + Added new depends + - slv2 ("LV2" plug-ins support) + - rubberband (can "do more" than soundtouch) + - libgnomecanvas + Not using SYSLIBS because upstream does not support it. + Namcap warnings can be ignored; they're ardour internals. + + * PKGBUILD : + Minor cosmetic ammendments. + + * ardour.changelog : + Added this changelog. + + * ardour.install : + Removed install scriptlet; old and deprecated information. diff --git a/testing/ardour/ardour.desktop b/testing/ardour/ardour.desktop new file mode 100644 index 000000000..b50f6c952 --- /dev/null +++ b/testing/ardour/ardour.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Ardour +Comment=Multitrack hard disk recorder +Exec=ardour2 +Icon=/usr/share/ardour2/icons/ardour_icon_48px.png +Terminal=false +Type=Application +X-MultipleArgs=false +Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; diff --git a/testing/at-spi/PKGBUILD b/testing/at-spi/PKGBUILD index 0f35d26ee..0970c90f4 100644 --- a/testing/at-spi/PKGBUILD +++ b/testing/at-spi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 114880 2011-03-16 10:52:19Z ibiru $ +# $Id: PKGBUILD 120762 2011-04-26 14:25:06Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=at-spi pkgver=1.32.0 -pkgrel=3 +pkgrel=4 pkgdesc="Assistive Technology Service Provider Interface" arch=('i686' 'x86_64') license=('GPL') @@ -19,14 +19,17 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/at-spi + --libexecdir=/usr/lib/at-spi \ + --enable-relocate make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + 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" --domain at-spi "${pkgdir}"/etc/gconf/schemas/*.schemas rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas - - #remove conflicting file - rm -f "${pkgdir}/usr/lib/gtk-2.0/modules/libatk-bridge.so" } diff --git a/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD index 64c56d592..493ed8cd4 100644 --- a/testing/at-spi2-atk/PKGBUILD +++ b/testing/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117977 2011-04-05 06:31:48Z heftig $ +# $Id: PKGBUILD 120714 2011-04-26 05:27:06Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ install=at-spi2-atk.install options=('!libtool') groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1c846f1ef11485c49af8eb3850ee379ea5e775a1fc981c99291e6f5d110acc52') +sha256sums=('d78a88067a53db479d3c7c1ce31f095b1d4962e44e653800a12599ade397dafc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD index 2151c5a6c..30d380643 100644 --- a/testing/at-spi2-core/PKGBUILD +++ b/testing/at-spi2-core/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117972 2011-04-05 06:30:35Z heftig $ +# $Id: PKGBUILD 120767 2011-04-26 14:35:02Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -12,13 +12,12 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') groups=('gnome') source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('29bff48785301653ba8899978169f803370bc4b29f160db82d6a4410c4624389') +sha256sums=('f0880d816a554c0560e9f6aea786614e8ab439e17189d383a83ed7eebd9e328b') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i -e '/AC_PATH_XTRA/d' configure.ac - sed -i -e '/--pkg dbus-glib-1/s/-glib//' atspi/Makefile.am autoreconf --force --install ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD index ef3354084..a727c4ca0 100644 --- a/testing/cheese/PKGBUILD +++ b/testing/cheese/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117987 2011-04-05 06:35:35Z heftig $ +# $Id: PKGBUILD 120785 2011-04-26 15:12:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('006df646d7141d455b95621fe99ef351aa88754239d28a27b2f57887449a8746') +sha256sums=('a2e947146c83d60db2e4f858917c906733037f77067a7081de7a2ff3716fbe7a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD new file mode 100644 index 000000000..6ae8c0714 --- /dev/null +++ b/testing/cronie/PKGBUILD @@ -0,0 +1,62 @@ +# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> + +pkgname='cronie' +pkgver=1.4.7 +pkgrel=5 +pkgdesc='Daemon that runs specified programs at scheduled times and related tools' +url='https://fedorahosted.org/cronie/' +license=('custom:BSD') +arch=('i686' 'x86_64') +depends=('pam' 'bash' 'run-parts') + +source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'pam.d' + 'rc.d') +sha1sums=('c6644ba0e58bcb14e0bb3f925e3e8cc3f0d47a7f' + '6d8aef6880935b3dcc3e28481111d036544eeae5' + 'c08c040ed5cb12bc4fd15639a5242d31ec247ef5') + +backup=('etc/anacrontab' + 'etc/conf.d/crond' + 'etc/pam.d/crond' + 'etc/cron.deny') + +conflicts=('dcron') +replaces=('dcron') +provides=('cron') +groups=('base') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-anacron \ + --with-inotify \ + --with-pam \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} + install -d "${pkgdir}"/var/spool/{ana,}cron + chmod u+s "${pkgdir}"/usr/bin/crontab + + install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond + install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond + install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond + install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly + install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron + install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab + touch "${pkgdir}"/etc/cron.deny + + install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING +} diff --git a/testing/cronie/pam.d b/testing/cronie/pam.d new file mode 100644 index 000000000..094051b5e --- /dev/null +++ b/testing/cronie/pam.d @@ -0,0 +1,7 @@ +account required pam_access.so +account required pam_time.so +account required pam_unix.so + +session required pam_limits.so +session required pam_env.so +session required pam_unix.so diff --git a/testing/cronie/rc.d b/testing/cronie/rc.d new file mode 100755 index 000000000..d0659685c --- /dev/null +++ b/testing/cronie/rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=crond +. /etc/conf.d/crond +PID=$(pidof -o %PPID /usr/sbin/crond) + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +reload) + stat_busy "Reloading $name daemon" + [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + ;; +esac +exit 0 diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD index 9c291afb7..2e1f2dd4e 100644 --- a/testing/curl/PKGBUILD +++ b/testing/curl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 120010 2011-04-18 10:28:14Z pierre $ +# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.21.5 -pkgrel=2 +pkgver=7.21.6 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -14,16 +14,15 @@ license=('MIT') depends=('zlib' 'openssl' 'bash' 'ca-certificates') options=('!libtool') source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 - curlbuild.h curl-config-fix-version.patch) -md5sums=('dadd6353c9407161ddd62c0943718d59' - '751bd433ede935c8fae727377625a8ae' - 'b1c1705887db11e4a04f4dcd997a768a') + curlbuild.h) [[ $CARCH == "x86_64" ]] && _curlbuild=curlbuild-64.h [[ $CARCH == "i686" ]] && _curlbuild=curlbuild-32.h +md5sums=('6611989a81ebd7b03a35adc3001ddee0' + '751bd433ede935c8fae727377625a8ae') + build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/curl-config-fix-version.patch ./configure \ --with-random=/dev/urandom \ diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD index 45a84941d..6f7271d19 100644 --- a/testing/empathy/PKGBUILD +++ b/testing/empathy/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117698 2011-04-04 16:37:19Z ibiru $ +# $Id: PKGBUILD 120614 2011-04-25 18:12:59Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e409d764805a4501f8c9efa44ffb1a398820d6928b825932baa5447bc628ed5c') +sha256sums=('4e29feb9f1100db2b4183b6f3aeccca85b0c89e7806c28adff0cb365b55c3809') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/eog-plugins/PKGBUILD b/testing/eog-plugins/PKGBUILD index 62231711d..d59b6c7f7 100644 --- a/testing/eog-plugins/PKGBUILD +++ b/testing/eog-plugins/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 116276 2011-03-22 21:02:48Z heftig $ +# $Id: PKGBUILD 120414 2011-04-23 21:13:06Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=eog-plugins -pkgver=2.91.90 +pkgver=3.0.0 pkgrel=1 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('GPL2') depends=('eog' 'libpeas' 'libchamplain' 'libexif') makedepends=('intltool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('efb0a40359e1a86639389705d900015a754ad570f141318c52a924a2a2e2748d') +sha256sums=('87cced9baf3c8ba84dcad95d774686694f5cb140a187a7bad3891bc50bc4c7bd') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD index 83d6f0204..f1a7abfae 100644 --- a/testing/eog/PKGBUILD +++ b/testing/eog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117962 2011-04-05 06:26:50Z heftig $ +# $Id: PKGBUILD 120830 2011-04-26 16:59:37Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('785ee969dbd17c52b2b18c42464247703fa9511d84381e88c81830d7ac7f24a7') +sha256sums=('97e40b0e0b618a53dffa83e30ff9add1563d54356e6ab1d588d510cedbc148d2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD index 26a6d4115..798ec14fe 100644 --- a/testing/evolution-data-server/PKGBUILD +++ b/testing/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117543 2011-04-04 10:30:17Z ibiru $ +# $Id: PKGBUILD 120574 2011-04-25 17:24:21Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-data-server -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Central location for addressbook and calendar storage in the GNOME Desktop" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool') url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2fa5d11dffa18e7161db35237aed46476a58e20ef895f74455f01e36484c063f') +sha256sums=('8592be94027a9848ac18670a0e86e48e857539cd2813eb345eda0ace19688dd0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD index 45e4313b1..2364818a9 100644 --- a/testing/evolution-exchange/PKGBUILD +++ b/testing/evolution-exchange/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117572 2011-04-04 11:16:57Z ibiru $ +# $Id: PKGBUILD 120624 2011-04-25 18:31:36Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution-exchange -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Ximian Connector Exchange plugin for Evolution" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'evolution') options=('!libtool' '!emptydirs') install=evolution-exchange.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('841f4edc16979724d2b42210e422f24698aea406e3450df9db2a84fffd8febdb') +sha256sums=('4c020f7946f534e3245806f29f48dbc9ccb98afdbc92d7bb5b14a5410668ad02') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD index c150bb950..3b5e8544c 100644 --- a/testing/evolution/PKGBUILD +++ b/testing/evolution/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117567 2011-04-04 11:05:37Z ibiru $ +# $Id: PKGBUILD 120599 2011-04-25 17:55:43Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evolution -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Integrated Workgroup and Personal Information Management for Gnome" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs') install=evolution.install url=http://www.gnome.org/projects/evolution/ source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2969c999cf995dd434598a366ae9c51a43d119bfe36e3de40ad2f82832210957') +sha256sums=('d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/file-roller/PKGBUILD b/testing/file-roller/PKGBUILD index 903630f8c..c9d6b8bbd 100644 --- a/testing/file-roller/PKGBUILD +++ b/testing/file-roller/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117857 2011-04-04 20:20:23Z heftig $ +# $Id: PKGBUILD 120737 2011-04-26 09:07:12Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=file-roller -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Archive manipulator for GNOME2" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0c294d34493fc67577f70f73ada455f77634857e904b1dcaded59e3dcd092f8e') +sha256sums=('805f5fb77fa8c2f982a2cee0db1b56fbc335f63a1eed34e0bac228ce8349d3ce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD index 99e939541..dd0ec3824 100644 --- a/testing/folks/PKGBUILD +++ b/testing/folks/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 116448 2011-03-23 21:53:28Z ibiru $ +# $Id: PKGBUILD 120851 2011-04-26 21:20:48Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=folks -pkgver=0.4.2 +pkgver=0.4.3 pkgrel=1 pkgdesc="Library to aggregates people into metacontacts " arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('telepathy-glib' 'libgee' 'libxml2') makedepends=('gobject-introspection' 'vala' 'intltool') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('269426df3896c07581067d3ead6aa2669c5895cfd3568e9e83abda5016b08e54') +sha256sums=('e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/gcalctool/PKGBUILD b/testing/gcalctool/PKGBUILD index ecc313858..6c027742d 100644 --- a/testing/gcalctool/PKGBUILD +++ b/testing/gcalctool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117557 2011-04-04 10:43:54Z ibiru $ +# $Id: PKGBUILD 120856 2011-04-26 21:28:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gcalctool -pkgver=6.0.0 +pkgver=6.0.1 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gcalctool.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('efada505801df4fc046ef22e9786d9ba535935d07e87f45f5a10f7624836c036') +sha256sums=('be11a7c36a1ec20bd0b190e572aefedea13fb2cb8479b06673e182c7461cadfe') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gconf/PKGBUILD b/testing/gconf/PKGBUILD index 401219689..7fee8d8da 100644 --- a/testing/gconf/PKGBUILD +++ b/testing/gconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117612 2011-04-04 13:02:11Z ibiru $ +# $Id: PKGBUILD 120561 2011-04-25 17:06:15Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gconf -pkgver=2.32.2 +pkgver=2.32.3 pkgrel=1 pkgdesc="A configuration database system" arch=(i686 x86_64) @@ -17,7 +17,7 @@ source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.32/GConf-${pkgver}.tar.bz gconfpkg gconf-reload.patch 01_xml-gettext-domain.patch) -sha256sums=('6bff392b9d1ca52502f0c6dac5506260800e43d72ca1fa77a4524af1a3cc1330' +sha256sums=('63e249d16b1b50820e9c32f1d85ff2c94498afdd45544fa5f37b8e1d084c5bae' 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD index 3dfe599ac..b486d3c7f 100644 --- a/testing/gdl/PKGBUILD +++ b/testing/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117816 2011-04-04 18:07:45Z heftig $ +# $Id: PKGBUILD 120644 2011-04-25 20:32:25Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdl -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ depends=('gtk3') makedepends=('pkgconfig' 'intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2b84b1ff4d798920ff04ba1f89f2e20468d706d9f4aab19d03241f32b16bec96') +sha256sums=('e0c3d855c7f8b115ec10f34db1291cb09db48a24281c3f9242d8348b189d5b09') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD index 5c07b6f2a..de4b341b8 100644 --- a/testing/gedit/PKGBUILD +++ b/testing/gedit/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 119639 2011-04-12 22:52:16Z heftig $ +# $Id: PKGBUILD 120727 2011-04-26 07:34:29Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="A text editor for GNOME" arch=('i686' 'x86_64') license=('GPL') depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'pygobject') -makedepends=('gnome-doc-utils' 'intltool' 'pygobject-devel') +makedepends=('gnome-doc-utils' 'intltool') groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('5a362f05325f4d47e31e5e9d3689a37d4a597e218965be9a39a193c847beaa87') +sha256sums=('a91fcfe321d8d5d8fe5c6c11f3b05389febe396efa2172b5ea6cb79d2f16b2db') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD index ad861af66..deda6ad62 100644 --- a/testing/glib-networking/PKGBUILD +++ b/testing/glib-networking/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 118259 2011-04-06 10:03:20Z ibiru $ +# $Id: PKGBUILD 120846 2011-04-26 21:09:53Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=glib-networking -pkgver=2.28.5 -pkgrel=2 +pkgver=2.28.6.1 +pkgrel=1 pkgdesc="Network-related giomodules for glib" arch=('i686' 'x86_64') url="http://www.gtk.org/" license=('GPL2') depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates') -makedepends=('intltool') +makedepends=('intltool' 'gsettings-desktop-schemas') options=('!libtool') install=glib-networking.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*.*}/$pkgname-${pkgver}.tar.bz2) +sha256sums=('50f9aac36ce49b0e16f84a9f516cf59d0a1f9b3199634787fd9db7470ab6c65b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD index 019d63290..6b8d4b321 100644 --- a/testing/gnome-control-center/PKGBUILD +++ b/testing/gnome-control-center/PKGBUILD @@ -1,12 +1,14 @@ -# $Id: PKGBUILD 119658 2011-04-13 10:50:33Z ibiru $ +# $Id: PKGBUILD 120752 2011-04-26 11:03:14Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=3.0.0.1 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') -depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper') +depends=('gtk3' 'gsettings-desktop-schemas' 'gconf' 'gnome-menus' 'gnome-desktop' 'gnome-settings-daemon' 'upower' 'libgtop' 'cups-pk-helper' 'accountsservice') +optdepends=('mesa-demos: provides glxinfo for graphics information' + 'apg: adds password generation for user accounts') makedepends=('gnome-doc-utils' 'intltool' 'networkmanager') url="http://www.gnome.org" groups=('gnome') @@ -14,7 +16,7 @@ install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9f3e95ba559d73cfe714d4dbc7ac70a342cfd9999d506552b79f9e61a171e1d9') +sha256sums=('90dde4b3db8b7a9c973f71e15601fd176ad6746cfef63c818fbdfd2254a8e99f') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -33,3 +35,4 @@ package() { gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-control-center-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } + diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD index 7947b8a6b..c393fcc30 100644 --- a/testing/gnome-desktop/PKGBUILD +++ b/testing/gnome-desktop/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117888 2011-04-04 21:07:12Z heftig $ +# $Id: PKGBUILD 120873 2011-04-26 21:57:00Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-desktop -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('daa46b85e17dad57bbce1f99e1ad4fd2195fea3d91ba8fdf49d2d3f9badeba69') +sha256sums=('6d5e140a0d5f9bc131caff505bc4a2afa11e1839437f7fc3da73238b37a3f0a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD index 82d4b8dcd..0864fb792 100644 --- a/testing/gnome-games/PKGBUILD +++ b/testing/gnome-games/PKGBUILD @@ -1,14 +1,13 @@ -# $Id: PKGBUILD 120100 2011-04-19 21:50:39Z ibiru $ +# $Id: PKGBUILD 120383 2011-04-23 09:47:40Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-games pkgver=3.0.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Some Games for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' - 'clutter-gtk' 'hicolor-icon-theme' 'librsvg') +depends=('libsm' 'gconf' 'guile' 'desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'seed') makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') provides=('glchess') conflicts=('glchess') diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD index eb2f2b449..99056b0f7 100644 --- a/testing/gnome-keyring/PKGBUILD +++ b/testing/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 117585 2011-04-04 11:31:32Z ibiru $ +#$Id: PKGBUILD 120584 2011-04-25 17:40:10Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gnome-keyring -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -10,11 +10,11 @@ license=('GPL' 'LGPL') depends=('gtk3' 'dconf') makedepends=('intltool' 'pkgconfig' 'python2') groups=('gnome') -options=('!libtool' '!emptydirs') +options=('!libtool' '!emptydirs' '!makeflags') url="http://www.gnome.org" install=gnome-keyring.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('63bbe53031620d8514cf4ebd7705e2360d37679e785c4588f66b88f919e56c20') +sha256sums=('1b296fc58fb189c9632fdd8a8a8a2dbb0af97db1529af87d73e21a96c4b78c03') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,7 +22,7 @@ build() { --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gnome-keyring \ --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ - --disable-schemas-compile --with-gtk=3.0 + --disable-schemas-compile make } diff --git a/testing/gnome-menus/PKGBUILD b/testing/gnome-menus/PKGBUILD index 69d5daa70..0a0067d13 100644 --- a/testing/gnome-menus/PKGBUILD +++ b/testing/gnome-menus/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 117898 2011-04-04 21:10:54Z heftig $ +# $Id: PKGBUILD 120868 2011-04-26 21:47:42Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64') depends=('glib2' 'python2') makedepends=('intltool' 'gobject-introspection') -options=('!libtool' '!makeflags') +options=('!libtool') license=('GPL' 'LGPL') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 menus.patch) -sha256sums=('4a92233c2f6ce0e5e484ddee33e01ae12b33133651ce486a4d944fd358de8f3b' +sha256sums=('579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0' 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') build() { diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD index 1b1a6daec..035aaac79 100644 --- a/testing/gnome-session/PKGBUILD +++ b/testing/gnome-session/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 119211 2011-04-11 11:17:04Z heftig $ +# $Id: PKGBUILD 120864 2011-04-26 21:44:03Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-session -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=('GPL' 'LGPL') -depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' - 'libxtst' 'polkit-gnome' 'libgl' 'librsvg' 'gsettings-desktop-schemas' - 'consolekit' 'libsm' 'dconf') +depends=('upower' 'gtk3' 'gconf' 'startup-notification' 'hicolor-icon-theme' 'libxtst' 'polkit-gnome' 'libgl' 'librsvg' + 'gsettings-desktop-schemas' 'consolekit' 'libsm' 'dconf') makedepends=('intltool' 'mesa' 'xtrans') options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('687f2f1daeae3614c36724c7d0f8a5a2eed61e941b11bc3b0f1b156293e51024') +sha256sums=('8a553569d500e84e5815e5b0b2eb1ac1bf4064ef9afb0e16f28d948978efbd25') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD index 2eadb3556..a65f24d5a 100644 --- a/testing/gnome-settings-daemon/PKGBUILD +++ b/testing/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119216 2011-04-11 11:19:21Z heftig $ +# $Id: PKGBUILD 120747 2011-04-26 10:46:20Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-settings-daemon -pkgver=3.0.0.1 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -17,8 +17,8 @@ url="http://www.gnome.org" groups=('gnome') replaces=(gnome-settings-daemon-pulse) conflicts=(gnome-settings-daemon-pulse) -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('4872b8ac4f85ee036539c433046de32017a4e3ac2bc2a49f62dc3bf152399cb3') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('51cdd0842b907e95c79d4e2b26f554e26fc626f7c2e6c3a14e3fc7954ca91117') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD index 2720c84bd..847a2570b 100644 --- a/testing/gnome-shell/PKGBUILD +++ b/testing/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119226 2011-04-11 12:11:48Z ibiru $ +# $Id: PKGBUILD 120693 2011-04-25 23:29:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.0.0.2 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -17,9 +17,9 @@ optdepends=('network-manager-applet: shell integration for networkmanager' options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.bz2 +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 arch.patch) -sha256sums=('5563b6374e84795526928ab398316611f94385ce0b278ef71769ff12498e4532' +sha256sums=('01f7ae942ba9687a5e67d62423843ed404d77b35f74acc212a5f391beed8e079' 'a35d5e5f9f781728070aecae3bfe329f49dadcd50ca2984e0fbdd2219825a0db') build() { diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD index 4d4dc22d2..1bf70f0a6 100644 --- a/testing/gnome-terminal/PKGBUILD +++ b/testing/gnome-terminal/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117627 2011-04-04 13:16:04Z ibiru $ +# $Id: PKGBUILD 120609 2011-04-25 18:07:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-terminal -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('16a3420176bbe5d58ad432306bfc40edb1423d43e311dd1d0de6da16559943f8') +sha256sums=('388eda40663566cb785e2d92180e0b584c2c89acc3e7bcd30605601710fddc48') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD index 0e53a5ebe..0bc006cf1 100644 --- a/testing/gnome-themes-standard/PKGBUILD +++ b/testing/gnome-themes-standard/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117713 2011-04-04 17:01:29Z ibiru $ +# $Id: PKGBUILD 120589 2011-04-25 17:43:37Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('gnome') replaces=('gnome-themes') conflicts=('gnome-themes') source=(http://download.gnome.org/sources/$pkgname/3.0/$pkgname-${pkgver}.tar.bz2) -sha256sums=('ea6215d814da2301e4a287e454693ee62616c0e42b57b0576c2489786e3487f3') +sha256sums=('9630b12c02d8a05a328cb0bef111bb776b86639c9c582475943f71666ab82677') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/gnome-utils/PKGBUILD b/testing/gnome-utils/PKGBUILD index 6021cd8f2..fdfbac8c8 100644 --- a/testing/gnome-utils/PKGBUILD +++ b/testing/gnome-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117775 2011-04-04 17:51:42Z heftig $ +# $Id: PKGBUILD 120619 2011-04-25 18:27:58Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-utils -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Common utilities for GNOME" arch=(i686 x86_64) @@ -14,7 +14,7 @@ url="http://www.gnome.org" groups=('gnome-extra') install=gnome-utils.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1cc095f69f4e224509727f648797fdee2190405a0f9005a65e4a0c53ae6547a6') +sha256sums=('7debe9ca4ba8b8852f67c1a359c613dbfa10e10abfaa2235261cbc2520daf218') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gobject-introspection/PKGBUILD b/testing/gobject-introspection/PKGBUILD index 28bfa503e..a2063056c 100644 --- a/testing/gobject-introspection/PKGBUILD +++ b/testing/gobject-introspection/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 117813 2011-04-04 18:05:41Z heftig $ +# $Id: PKGBUILD 120263 2011-04-21 19:51:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gobject-introspection -pkgver=0.10.7 +pkgver=0.10.8 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="http://live.gnome.org/GObjectInstrospection" @@ -13,7 +13,7 @@ conflicts=('gir-repository') replaces=('gir-repository') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.10/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('a20a0e28f4dfb770f05718eb25d20055c853f2b041f03802008bd2040d13cb57') +sha256sums=('5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD index 9a75dcee1..9bb6bc140 100644 --- a/testing/gtkhtml4/PKGBUILD +++ b/testing/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117533 2011-04-04 10:22:45Z ibiru $ +# $Id: PKGBUILD 120569 2011-04-25 17:16:30Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.0.0 +pkgver=4.0.1 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -13,12 +13,12 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('6e2f267e3de5fe689310ad61c0ecc35faa8ba79d69d77b80addc6e94ebf3c297') +sha256sums=('13fd845ce2ebc837fd4771d2dd0c103bde20faad9f77f6c7a62ff7d8099557ff') build() { cd "${srcdir}/${_pkgbasename}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gtkhtml3 \ + --libexecdir=/usr/lib/gtkhtml4 \ --localstatedir=/var --disable-static make } diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD index 584f1a00b..fb98d197d 100644 --- a/testing/gtksourceview3/PKGBUILD +++ b/testing/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117783 2011-04-04 17:54:27Z heftig $ +# $Id: PKGBUILD 120698 2011-04-25 23:34:40Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.bz2) -sha256sums=('5d871c62cd9fe4dcd0386f69bdb6c7f308a4d3122f27cbb1b7bcc9e03c9ac08d') +sha256sums=('4e76f037184d56767e09df909490f10ee417a5265febae8a4d23255a902ae20a') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD index 6ea02f64f..d1678816e 100644 --- a/testing/gucharmap/PKGBUILD +++ b/testing/gucharmap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117673 2011-04-04 16:06:31Z ibiru $ +# $Id: PKGBUILD 120594 2011-04-25 17:46:45Z ibiru $ # Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=gucharmap -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') install=gucharmap.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e95c161f7c229e27a7acb3d5212a95ec3564b5bc2964c1607ab32ef24f093bf0') +sha256sums=('948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD index a063990d5..2d2f0d321 100644 --- a/testing/gvfs/PKGBUILD +++ b/testing/gvfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117736 2011-04-04 17:38:08Z ibiru $ +# $Id: PKGBUILD 120775 2011-04-26 14:51:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.8.0 +pkgver=1.8.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -13,7 +13,7 @@ makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('45e741fdb7c7a9b4d6605851429775a1e9e7262506a4bd7b353c3b0d857c3626') +sha256sums=('7d305320d881d914d88286a72a311587ea33fbe5075101729cb5766f01832ff7') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/testing/libgda/PKGBUILD b/testing/libgda/PKGBUILD index 61d8dce99..e7c22e05f 100644 --- a/testing/libgda/PKGBUILD +++ b/testing/libgda/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113377 2011-03-08 13:22:49Z heftig $ +# $Id: PKGBUILD 120419 2011-04-23 21:33:28Z ibiru $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=libgda -pkgver=4.2.5 +pkgver=4.2.6 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64) @@ -11,12 +11,12 @@ license=('GPL') depends=('gtksourceview2' 'libunique' 'libxslt' 'db' 'ncurses' 'libsoup' 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' 'hicolor-icon-theme' 'desktop-file-utils') -makedepends=('intltool') -options=('!libtool' '!makeflags') +makedepends=('intltool' 'gobject-introspection' 'namcap') +options=('!libtool') url="http://www.gnome-db.org" install=libgda.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b98d6063469a1ba8226d94800732544be629c55132516de741c937e8bf175f13') +sha256sums=('141259e19ba163500963bd5bd512cfa4eb542b24c99f2fa14a2ef27643308cd3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD index 3162e66be..5e3fa45bc 100644 --- a/testing/libgnome-keyring/PKGBUILD +++ b/testing/libgnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 117577 2011-04-04 11:19:35Z ibiru $ +#$Id: PKGBUILD 120579 2011-04-25 17:26:49Z ibiru $ #Maintainer: Jan De Groot <jgc@archlinux.org> pkgname=libgnome-keyring -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig') options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('165e653d93e6ab74ea0a32e6fbbcd2b38a18aeadccf6f7082a0fa3d21bf1ce01') +sha256sums=('9d748842dab86914488bef039ca2c25f8ff5510daae3815643e6e00a2f69cacb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/libgtop/PKGBUILD b/testing/libgtop/PKGBUILD new file mode 100644 index 000000000..889f6e279 --- /dev/null +++ b/testing/libgtop/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 120401 2011-04-23 20:45:46Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=libgtop +pkgver=2.28.3 +pkgrel=1 +pkgdesc="A library that read information about processes and the running system" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('glib2' 'libxau' 'texinfo') +makedepends=('intltool' 'gobject-introspection') +install=libgtop.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool') +url="http://www.gnome.org/" +sha256sums=('2c866bd14b3cd78f78504cfb65baa105d62b8085c90e433ab9db97e050efea42') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-libgtop-smp + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/libgtop/libgtop.install b/testing/libgtop/libgtop.install new file mode 100644 index 000000000..15690f125 --- /dev/null +++ b/testing/libgtop/libgtop.install @@ -0,0 +1,13 @@ +info_dir=/usr/share/info + +post_install() { + install-info ${info_dir}/libgtop2.info.gz ${info_dir}/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + install-info --delete ${info_dir}/libgtop2.info.gz ${info_dir}/dir 2> /dev/null +} diff --git a/testing/liblrdf/PKGBUILD b/testing/liblrdf/PKGBUILD new file mode 100644 index 000000000..f4e0141da --- /dev/null +++ b/testing/liblrdf/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 110602 2011-02-20 15:55:20Z andyrtr $ +# Maintainer: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=liblrdf +pkgver=0.4.0 +pkgrel=7 +pkgdesc="A library for the manipulation of RDF file in LADSPA plugins" +arch=('i686' 'x86_64') +url="http://sourceforge.net/projects/lrdf" +depends=('raptor1' 'ladspa') +makedepends=('pkgconfig') +license=('GPL') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/lrdf/${pkgname}-${pkgver}.tar.gz + md5.patch) +groups=('ladspa-plugins') +md5sums=('327a5674f671c4b360c6353800226877' + 'a6d231d052dc188cbc4c1039cf3a2003') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/md5.patch" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/liblrdf/md5.patch b/testing/liblrdf/md5.patch new file mode 100644 index 000000000..1c43b12e9 --- /dev/null +++ b/testing/liblrdf/md5.patch @@ -0,0 +1,18 @@ +--- liblrdf-0.4.0.orig/src/lrdf_md5.h ++++ liblrdf-0.4.0/src/lrdf_md5.h +@@ -32,6 +32,15 @@ + #ifndef __MD5_H__ + #define __MD5_H__ + ++/* Change function names to prevent symbol conflicts */ ++#define md5_init _lrdf_md5_init ++#define md5_buffer _lrdf_md5_buffer ++#define md5_sig_from_string _lrdf_md5_sig_from_string ++#define md5_finish _lrdf_md5_finish ++#define md5_process _lrdf_md5_process ++#define md5_sig_to_string _lrdf_md5_sig_to_string ++#define md5_get_result _lrdf_md5_get_result ++ + /* + * Size of a standard MD5 signature in bytes. This definition is for + * external programs only. The MD5 routines themselves reference the diff --git a/testing/libsocialweb/PKGBUILD b/testing/libsocialweb/PKGBUILD index 86b78ce16..b0a66654b 100644 --- a/testing/libsocialweb/PKGBUILD +++ b/testing/libsocialweb/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 111152 2011-02-24 12:01:51Z ibiru $ +# $Id: PKGBUILD 120409 2011-04-23 20:56:42Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=libsocialweb -pkgver=0.25.11 +pkgver=0.25.16 pkgrel=1 pkgdesc="A personal social data server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring' makedepends=('intltool' 'gtk-doc') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('b3d225fef41ec92869fa5fb1f422b5534b0437192d99cb3039ddb8b7b908afc0') +sha256sums=('2726c29c5e334294df81d2d57c750ed86866c64a6b0e14eae7f8c7cc7b033064') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD index 6043259ee..8b8970795 100644 --- a/testing/libsoup/PKGBUILD +++ b/testing/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117754 2011-04-04 17:41:27Z ibiru $ +# $Id: PKGBUILD 120683 2011-04-25 23:06:22Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.34.0 +pkgver=2.34.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject- url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) options=('!libtool' '!emptydirs') -sha256sums=('bb7b8f4ab72923c8bdaf83ad9655e946c4c68ee6957b82eb0e20586c1ad627e7') +sha256sums=('a2f846af2c4c08e15eacc9879c8c9be4d85f8105f960f96a9ba3dbabd9ee517b') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD index 91494f962..4add473fa 100644 --- a/testing/mutter/PKGBUILD +++ b/testing/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117916 2011-04-04 21:28:47Z heftig $ +# $Id: PKGBUILD 120688 2011-04-25 23:12:25Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A window manager for GNOME3" arch=(i686 x86_64) @@ -16,7 +16,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2560c8b3b5d47f0f4d4440c3087da76765b6ad9de6010662983846a3fed87eb2') +sha256sums=('6c3190789f935a2c982e78447726e87cf1d4b7af2f0b407cb6d6aca636e3d708') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD index baf2066cb..a3c62d58e 100644 --- a/testing/nautilus/PKGBUILD +++ b/testing/nautilus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117910 2011-04-04 21:21:38Z heftig $ +# $Id: PKGBUILD 120629 2011-04-25 18:36:29Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="The GNOME shell and file manager" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6842be325c7acd5bb889ed93dfb1ed8b9ccc4a1ff7e034cb083895e74e59ebe3') +sha256sums=('f759d615c880caebf84290bc00c354488266bd7292479d88b8811a9c4f3106e8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/raptor/PKGBUILD b/testing/raptor/PKGBUILD new file mode 100644 index 000000000..01239bbc0 --- /dev/null +++ b/testing/raptor/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 115794 2011-03-21 16:03:23Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr at archlinux.org> +# Contributor: eric <eric@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=raptor +pkgver=2.0.2 +pkgrel=1 +pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" +arch=('i686' 'x86_64') +url="http://librdf.org/raptor" +depends=('libxml2>=2.7.8' 'curl>=7.21.2' 'zlib>=1.2.5' 'libxslt>=1.1.26') +license=('LGPL') +options=('!libtool') +source=(http://librdf.org/dist/source/raptor2-$pkgver.tar.gz) +md5sums=('b0f874c200c4b3214b5bf4806ae82353') + +build() { + cd ${srcdir}/raptor2-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd ${srcdir}/raptor2-${pkgver} + make prefix=${pkgdir}/usr install +} diff --git a/testing/raptor1/PKGBUILD b/testing/raptor1/PKGBUILD new file mode 100644 index 000000000..c50886bde --- /dev/null +++ b/testing/raptor1/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 110599 2011-02-20 15:52:07Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr at archlinux.org> +# Contributor: eric <eric@archlinux.org> +# Contributor: Damir Perisa <damir.perisa@bluewin.ch> + +pkgname=raptor1 +pkgver=1.4.21 +pkgrel=3 +pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples - old V1 api for compatibility" +arch=('i686' 'x86_64') +url="http://librdf.org/raptor" +depends=('libxml2' 'curl' 'zlib' 'libxslt') +license=('LGPL') +options=('!libtool' '!docs') +source=(http://librdf.org/dist/source/raptor-$pkgver.tar.gz) +md5sums=('992061488af7a9e2d933df6b694bb876') + +build() { + cd ${srcdir}/raptor-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd ${srcdir}/raptor-${pkgver} + make prefix=${pkgdir}/usr install + + mv ${pkgdir}/usr/bin/rapper ${pkgdir}/usr/bin/rapperV1 + rm -f ${pkgdir}/usr/share/man/man1/rapper.1 +} diff --git a/testing/rasqal-compat/PKGBUILD b/testing/rasqal-compat/PKGBUILD new file mode 100644 index 000000000..df8ab86fe --- /dev/null +++ b/testing/rasqal-compat/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 120512 2011-04-24 17:16:36Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Lawrence Lee <valheru@facticius.net> + +pkgbase=rasqal-compat +pkgname=('rasqal-compat' 'rasqal-compat-devel') +_pkgname=rasqal +pkgver=0.9.21 +pkgrel=2 +url="http://librdf.org/rasqal" +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +options=('!libtool') +makedepends=('raptor1>=1.4.21' 'mpfr') +source=(http://download.librdf.org/source/${_pkgname}-${pkgver}.tar.gz) +md5sums=('55b67ec92a059ef8979d46486b00a032') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + ./configure --prefix=/usr \ + --disable-static \ + --enable-release + make +} + +package_rasqal-compat() { + + pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings; compatibility version providing an older API" + depends=('raptor1>=1.4.21' 'mpfr') + + cd ${srcdir}/${_pkgname}-${pkgver} + make -C src DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librasqal.so + rm -rf ${pkgdir}/usr/{bin,include,share} +} + +package_rasqal-compat-devel() { + + pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings; compatibility version providing an older API - devel files" + depends=('rasqal-compat') + + cd ${srcdir}/${_pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librasqal.so.* + rm -rf ${pkgdir}/usr/share +} diff --git a/testing/rasqal/PKGBUILD b/testing/rasqal/PKGBUILD new file mode 100644 index 000000000..6844bb6b5 --- /dev/null +++ b/testing/rasqal/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 110912 2011-02-23 06:19:55Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Lawrence Lee <valheru@facticius.net> + +pkgname=rasqal +pkgver=0.9.25 +pkgrel=1 +pkgdesc="a free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings" +url="http://librdf.org/rasqal" +license=('GPL' 'LGPL') +arch=('i686' 'x86_64') +depends=('raptor>=2.0.0' 'mpfr') +options=('!libtool') +source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz) +md5sums=('ee12d7ad59c581eb65db89c851672c0a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --disable-static \ + --enable-release \ + --with-raptor=system + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/redland-compat/PKGBUILD b/testing/redland-compat/PKGBUILD new file mode 100644 index 000000000..571b3d6d6 --- /dev/null +++ b/testing/redland-compat/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 120522 2011-04-24 17:36:18Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgbase=redland-compat +pkgname=('redland-compat' 'redland-compat-devel') +pkgver=1.0.12 +pkgrel=3 +url="http://librdf.org/" +license=("GPL") +arch=('i686' 'x86_64') +makedepends=('rasqal-compat-devel>=0.9.21-2' 'raptor1>=1.4.21' 'libtool' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +options=('!libtool' '!emptydirs') +source=(http://download.librdf.org/source/"${pkgbase/-compat/}"-$pkgver.tar.gz + rpath.diff) +md5sums=('40f37a5ad97fdfbf984f78dcea0c6115' + 'acc85e784f01a656bd56777f95880787') + +build() { + cd ${srcdir}/"${pkgname/-compat/}"-${pkgver} + ./configure --prefix=/usr \ + --enable-release \ + --disable-static \ + --with-sqlite=3 \ + --disable-modular + + # nuke rpath + patch -Np0 -i ${srcdir}/rpath.diff + + make +} + +package_redland-compat() { + + pkgdesc="Library that provides a high-level interface to RDF data; compatibility version providing an older API" + depends=('rasqal-compat>=0.9.21' 'raptor1>=1.4.21' 'libtool' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') + replaces=('redland-compat-storage-mysql' 'redland-compat-storage-postgresql' 'redland-compat-storage-virtuoso' 'redland-compat-storage-sqlite') + + cd ${srcdir}/"${pkgbase/-compat/}"-${pkgver} + make -C src DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librdf.so + rm -rf ${pkgdir}/usr/{include,share} +} + +package_redland-compat-devel() { + + pkgdesc="Library that provides a high-level interface to RDF data; compatibility version providing an older API - devel files" + depends=('redland-compat') + + cd ${srcdir}/"${pkgbase/-compat/}"-${pkgver} + #make -C src DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install + rm ${pkgdir}/usr/lib/librdf.so.* + rm -rf ${pkgdir}/usr/share +} diff --git a/testing/redland-compat/rpath.diff b/testing/redland-compat/rpath.diff new file mode 100644 index 000000000..831bc80ed --- /dev/null +++ b/testing/redland-compat/rpath.diff @@ -0,0 +1,11 @@ +--- libtool 2011-02-20 10:46:47.000000000 +0100 ++++ libtool.new 2011-02-20 10:52:58.285764909 +0100 +@@ -324,7 +324,7 @@ + + # Flag to hardcode $libdir into a binary during linking. + # This must work even if $libdir does not exist +-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" ++hardcode_libdir_flag_spec=" " + + # If ld is used when linking, flag to hardcode $libdir into a binary + # during linking. This must work even if $libdir does not exist. diff --git a/testing/redland/PKGBUILD b/testing/redland/PKGBUILD new file mode 100644 index 000000000..f2a25aaa0 --- /dev/null +++ b/testing/redland/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 110595 2011-02-20 10:39:16Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Contributor: Francois Charette <francois.archlinux.org> + +pkgbase=redland +pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite') +pkgver=1.0.13 +pkgrel=1 +url="http://librdf.org/" +license=("GPL") +arch=('i686' 'x86_64') +makedepends=('rasqal>=0.9.24' 'raptor>=2.0.0' 'db>=5.1' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3') +options=('!libtool') +source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz + rpath.diff) +md5sums=('96c15f36f842ad7e1c9d225e4ca97b68' + 'acc85e784f01a656bd56777f95880787') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --enable-release \ + --disable-static \ + --with-raptor=system \ + --with-rasqal=system \ + --with-sqlite=3 + + # nuke rpath + patch -Np0 -i ${srcdir}/rpath.diff + + make +} + +package_redland() { + pkgdesc="Library that provides a high-level interface to RDF data" + depends=('rasqal>=0.9.24' 'raptor>=2.0.0' 'libtool') + + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + rm -rf ${pkgdir}/usr/lib/redland +} + +package_redland-storage-mysql() { + pkgdesc="MySQL storage support for Redland" + depends=('redland' 'libmysqlclient') + + cd ${srcdir}/${pkgname}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_mysql.so ${pkgdir}/usr/lib/redland/librdf_storage_mysql.so +} + +package_redland-storage-postgresql() { + pkgdesc="PostgreSQL storage support for Redland" + depends=('redland' 'postgresql-libs') + + cd ${srcdir}/${pkgname}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_postgresql.so ${pkgdir}/usr/lib/redland/ +} + +package_redland-storage-virtuoso() { + pkgdesc="Virtuoso storage support for Redland" + depends=('redland' 'unixodbc' 'db') + + cd ${srcdir}/${pkgname}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_virtuoso.so ${pkgdir}/usr/lib/redland/ +} + +package_redland-storage-sqlite() { + pkgdesc="SQLite storage support for Redland" + depends=('redland' 'sqlite3' 'db') + + cd ${srcdir}/${pkgname}-${pkgver} + install -dm755 ${pkgdir}/usr/lib/redland + install -m755 src/.libs/librdf_storage_sqlite.so ${pkgdir}/usr/lib/redland/ +} diff --git a/testing/redland/rpath.diff b/testing/redland/rpath.diff new file mode 100644 index 000000000..831bc80ed --- /dev/null +++ b/testing/redland/rpath.diff @@ -0,0 +1,11 @@ +--- libtool 2011-02-20 10:46:47.000000000 +0100 ++++ libtool.new 2011-02-20 10:52:58.285764909 +0100 +@@ -324,7 +324,7 @@ + + # Flag to hardcode $libdir into a binary during linking. + # This must work even if $libdir does not exist +-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" ++hardcode_libdir_flag_spec=" " + + # If ld is used when linking, flag to hardcode $libdir into a binary + # during linking. This must work even if $libdir does not exist. diff --git a/testing/rest/PKGBUILD b/testing/rest/PKGBUILD index 85efd2c9a..dd780e748 100644 --- a/testing/rest/PKGBUILD +++ b/testing/rest/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 116337 2011-03-22 22:12:01Z heftig $ +# $Id: PKGBUILD 120404 2011-04-23 20:50:45Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=rest -pkgver=0.7.8 +pkgver=0.7.10 pkgrel=1 pkgdesc="rest" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ depends=('glib2' 'libxml2' 'libsoup-gnome') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.bz2) -sha256sums=('39b53ef984e90636afeda05c38d238f2371c83a55fdbb3f699f878a7afb879c4') +sha256sums=('2908f974ae6cc71af1152d419209f307bcce8ca2dfe0b4b55b3fad8ba4a646a5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD index 422c4bc01..9c44a32f3 100644 --- a/testing/rhythmbox/PKGBUILD +++ b/testing/rhythmbox/PKGBUILD @@ -1,41 +1,43 @@ -# $Id: PKGBUILD 117414 2011-04-01 17:30:03Z ibiru $ +# $Id: PKGBUILD 120732 2011-04-26 08:35:51Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox pkgver=2.90.1 -pkgrel=2 +pkgrel=3 pkgdesc="An iTunes-like music player/libary" arch=('i686' 'x86_64') license=('GPL') url="http://www.rhythmbox.org" -depends=('libgpod' 'gvfs-afc' 'gconf' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify' - 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins' - 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils') -makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection' 'pygobject-devel') +depends=('libgpod' 'gvfs-afc' 'libgnome-media-profiles' 'totem-plparser' 'libsoup-gnome' 'gtk3' 'libmusicbrainz3' 'libmtp' 'libnotify' + 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'pygobject' 'gstreamer0.10-python' 'python-gnomekeyring' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako') +makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' 'gstreamer0.10-ffmpeg: Extra media codecs' 'brasero: cd burning') -options=('!libtool' '!emptydirs') +options=('!libtool' '!emptydirs' '!strip') install=rhythmbox.install #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2) -source=(${pkgname}-${pkgver}.tar.xz) -sha256sums=('070452540c869d6f73feb715683c8534aa29e15e27dd8485db751c42ce21718a') +source=(ftp://ftp.archlinux.org/others/${pkgname}/${pkgname}-${pkgver}-20110426.tar.xz) +sha256sums=('513cfa653cf68a05b1fe5f6e41744af4baed0d0fff169000b3153effa232e23d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + export CFLAGS="$CFLAGS -g -O1" + export CXXFLAGS="$CXXFLAGS -g -O1" PYTHON=/usr/bin/python2 ./autogen.sh PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ --enable-daap --enable-python \ --with-mdns=avahi --disable-scrollkeeper - make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain rhythmbox ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make DESTDIR="${pkgdir}" install } diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install index 10c4f2229..cbea0e6b3 100644 --- a/testing/rhythmbox/rhythmbox.install +++ b/testing/rhythmbox/rhythmbox.install @@ -1,24 +1,22 @@ pkgname=rhythmbox post_install() { - usr/sbin/gconfpkg --install ${pkgname} - update-desktop-database -q - gtk-update-icon-cache -f -q -t usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor } pre_upgrade() { - pre_remove + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi } post_upgrade() { - post_install $1 + post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} post_remove() { - update-desktop-database -q - gtk-update-icon-cache -f -q -t usr/share/icons/hicolor + post_install $1 } diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD new file mode 100644 index 000000000..c0bbfb4ac --- /dev/null +++ b/testing/run-parts/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 120288 2011-04-22 06:59:00Z pierre $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgname=run-parts +pkgver=3.4.4 +pkgrel=1 +pkgdesc='run scripts or programs in a directory' +arch=('i686' 'x86_64') +url='http://packages.qa.debian.org/d/debianutils.html' +license=('GPL') +depends=('glibc') +source=("http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.gz") +sha256sums=('f5d6f6116bb2b474399c07f519c3a30bcda5c85994b43195fdf09508031c72fe') + +build() { + cd $srcdir/debianutils-$pkgver + ./configure --prefix=/usr + make run-parts +} + +package() { + cd $srcdir/debianutils-$pkgver + install -D -m755 run-parts $pkgdir/usr/bin/run-parts + install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8 +} diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD index 1d255d018..514b0a30d 100644 --- a/testing/seahorse/PKGBUILD +++ b/testing/seahorse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118482 2011-04-07 10:50:49Z heftig $ +# $Id: PKGBUILD 120604 2011-04-25 18:04:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') groups=('gnome-extra') install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('93df5c39755e6d87b72fa3a17ded2d5f99d153701613cb2c7d2ab6221dc93e26') +sha256sums=('79efc22f9fe7db3d53a02be8bcf910be25aef0e321a49ec87a3a709f8aaaa912') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,8 +23,7 @@ build() { --localstatedir=/var --disable-static \ --enable-ldap --enable-hkp \ --disable-scrollkeeper \ - --disable-update-mime-database \ - --with-gtk=3.0 + --disable-update-mime-database make } diff --git a/testing/seed/PKGBUILD b/testing/seed/PKGBUILD new file mode 100644 index 000000000..daa22e565 --- /dev/null +++ b/testing/seed/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 120380 2011-04-23 09:20:16Z ibiru $ +#Maintainer : Ionut Biru <ibiru@archlinux.org> +#Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=seed +pkgver=3.0.0 +pkgrel=1 +pkgdesc="Library and interpreter for JavaScript with GObject type system bindings." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Seed/" +license=('LGPL') +options=('!libtool') +depends=('mpfr' 'libwebkit3' 'gnome-js-common' 'gobject-introspection') +makedepends=('intltool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('c7ef8e0c7cfe633c6bf9bfc13ab56458f053dfb12b784c75cc50dfa7cf828be6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/slv2/PKGBUILD b/testing/slv2/PKGBUILD new file mode 100644 index 000000000..300d19d08 --- /dev/null +++ b/testing/slv2/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 110735 2011-02-21 22:14:42Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Leslie P. Polzer <polzer@stardawn.org> + +pkgname=slv2 +pkgver=0.6.6 +pkgrel=3 +pkgdesc="Library for LV2 hosts" +arch=('i686' 'x86_64') +url="http://drobilla.net/software/slv2" +license=('GPL') +depends=('redland>=1.0.13' 'lv2core' 'jack') +makedepends=('python2') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2) +md5sums=('b8e8e0e82dd04324fcd533e8acd1ce85') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf configure --prefix=/usr + python2 waf build $MAKEFLAGS +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 waf install --destdir="$pkgdir/" +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/slv2/slv2.changelog b/testing/slv2/slv2.changelog new file mode 100644 index 000000000..f394a5067 --- /dev/null +++ b/testing/slv2/slv2.changelog @@ -0,0 +1,23 @@ +22 Feb 2011 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.6.6-3: + raptor rebuild + +24 Nov 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * PKGBUILD : + Get rid of sed and use python2 directly for waf. + waf fix for python transition already included previously (unlogged). + Release only (no need binary update; no runtime python requirement). + +9 Aug 2010 (GMT+8) Ray Rashif <schiv@archlinux.org> + + * 0.6.6-2 : + Brought into extra from community for ardour + - adds "LV2" plug-ins support + + * PKGBUILD : + Minor cosmetic ammendments. + + * slv2.changelog : + Added this changelog. diff --git a/testing/slv2/slv2.install b/testing/slv2/slv2.install new file mode 100644 index 000000000..c980ddfab --- /dev/null +++ b/testing/slv2/slv2.install @@ -0,0 +1,14 @@ +post_install() { + echo "Updating Shared Library Links" + /sbin/ldconfig +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/soprano/PKGBUILD b/testing/soprano/PKGBUILD new file mode 100644 index 000000000..d5ebcdb44 --- /dev/null +++ b/testing/soprano/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 120527 2011-04-24 17:41:42Z andyrtr $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=soprano +pkgver=2.6.0 +pkgrel=3 +pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' +arch=('i686' 'x86_64') +url='http://soprano.sourceforge.net/' +license=('GPL' 'LGPL') +depends=('qt' 'clucene' 'redland-compat' 'libiodbc' 'raptor1') +makedepends=('cmake' 'openjdk6' 'doxygen' 'redland-compat-devel>=>=1.0.12-3' 'rasqal-compat-devel>=>=0.9.21-2') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('03ae49e87c6ec99e57d0433c2650846f') + +build() { + cd ${srcdir} + mkdir build + cd build + . /etc/profile.d/openjdk6.sh + # we need the rpath + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + make DESTDIR="${pkgdir}" install +} diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD new file mode 100644 index 000000000..add4a025c --- /dev/null +++ b/testing/sudo/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 120368 2011-04-22 22:01:28Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=sudo +_ver=1.8.1p1 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +pkgrel=1 +pkgdesc="Give certain users the ability to run some commands as root" +arch=('i686' 'x86_64') +url="http://www.sudo.ws/sudo/" +license=('custom') +depends=('glibc' 'pam') +backup=('etc/sudoers' 'etc/pam.d/sudo') +source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz + sudo.pam) +options=('!libtool' '!makeflags') +md5sums=('318337804d976c9419cf3004b707945c' + '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') + +build() { + cd $srcdir/$pkgname-$_ver + + ./configure --prefix=/usr --with-pam --libexecdir=/usr/lib \ + --with-env-editor --with-all-insults --with-logfac=auth + make +} + +package() { + cd $srcdir/$pkgname-$_ver + install -dm755 $pkgdir/var/lib + + make DESTDIR=$pkgdir install + install -Dm644 $srcdir/sudo.pam $pkgdir/etc/pam.d/sudo + + install -Dm644 doc/LICENSE $pkgdir/usr/share/licenses/sudo/LICENSE +} diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam new file mode 100644 index 000000000..4e586cd22 --- /dev/null +++ b/testing/sudo/sudo.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so diff --git a/testing/syslinux/PKGBUILD b/testing/syslinux/PKGBUILD new file mode 100644 index 000000000..03f529f11 --- /dev/null +++ b/testing/syslinux/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 120229 2011-04-21 12:44:04Z tpowa $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=syslinux +pkgver=4.04 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" +url="http://syslinux.zytor.com/" +license=('GPL2') +depends=('perl' 'glibc') +optdepends=('perl-passwd-md5: For md5pass' + 'perl-digest-sha1: For sha1pass' + 'mtools: For mkdiskimage and syslinux' + ) +makedepends=('nasm') +backup=('boot/syslinux/syslinux.cfg') +install=syslinux.install +source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 + syslinux-dont-build-dos-windows-targets.patch + syslinux.cfg + syslinux-install_update) +md5sums=('a3936208767eb7ced65320abe2e33a10' + '5274062f91931eae6573f1ec3cd5b640' + '5ad0a9cccd60ada4fd5a93380c76d5df' + 'b5b4953c0a5a01cd16441402f6321765') + +build() { + # Do not try to build syslinux with our default LDFLAGS, it will fail + unset LDFLAGS + cd "$srcdir"/$pkgname-${pkgver} + # Do not try to build the Windows or DOS installers + patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch + # Fix FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i MCONFIG + make +} + +package() { + cd "$srcdir"/$pkgname-${pkgver} + make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install + + # Install the default configuration + install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg + # Install the installation and update script + # This script is maintained at git://gist.github.com/772138.git + install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update +} diff --git a/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch new file mode 100644 index 000000000..7355e4acb --- /dev/null +++ b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -0,0 +1,12 @@ +diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile +--- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 ++++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 +@@ -55,7 +55,7 @@ + # files that depend only on the B phase, but may have to be regenerated + # for "make installer". + BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil ++ libinstaller + ITARGET = + IOBJECTS = $(ITARGET) \ + utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/testing/syslinux/syslinux-install_update b/testing/syslinux/syslinux-install_update new file mode 100644 index 000000000..f7cd123e1 --- /dev/null +++ b/testing/syslinux/syslinux-install_update @@ -0,0 +1,459 @@ +#!/bin/bash +# +# Sylinux Installer / Updater Scripts +# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net> +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +#----------------- +# Exit Codes: +# 1 - get_boot_device or other function failed +# 2 - install/update failed +# 3 - set_active failed +# 4 - install_mbr failed +# +shopt -s nullglob + +libpath="/usr/lib/syslinux" +bootpath="/boot/syslinux" +extlinux="/sbin/extlinux" + +autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE +com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) +pciids_file=/usr/share/hwdata/pci.ids + +## Helper functions ## +# Taken from libui-sh +# $1 needle +# $2 set (array) haystack +check_is_in() { + local needle="$1" element + shift + for element; do + [[ $element = $needle ]] && return 0 + done + return 1 +} + +# return true when blockdevice is an md raid, otherwise return a unset value +# get all devices that are part of raid device $1 +device_is_raid() { + [[ $1 && -f /proc/mdstat ]] || return 1 + local devmajor=$(stat -c %t "$1") + (( devmajor == 9 )) +} + +mdraid_all_slaves() { + local slave slaves + for slave in /sys/class/block/${1##*/}/slaves/*; do + source "$slave/uevent" + slaves="$slaves/dev/$DEVNAME " + unset DEVNAME + done + echo $slaves +} + +# Check /sys/block to see if device is partitioned +# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist +# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist +dev_is_part() { + # $1 - blockdevice + local dev=$1 + + # If block device uevent file should be found + # If a partition is passed in path shouldn't exist + if [[ $dev = *cciss* ]]; then + [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1 + elif [[ $dev = *ida* ]]; then + [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1 + else + [[ -f /sys/block/${dev##*/}/dev ]] && return 1 + fi + + return 0 +} + +# If EFI PART is present in the first 8 bytes then it must be a GPT disk +device_is_gpt() { + local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null) + [[ $partsig = "EFI PART" ]] +} + +clear_gpt_attr2() { + # $1 - Block Device, no partitions + local disk=$1 + + # Special Exception for cciss controllers + if [[ $disk = *cciss* ]]; then + for part in /dev/cciss/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + # Smart 2 Controllers + elif [[ $disk = *ida* ]]; then + for part in /dev/ida/${disk##*/}*p*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + else + for part in /sys/block/${disk##*/}/${disk##*/}*; do + local partnum="${part##*[[:alpha:]]}" + sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null + done + fi + return 0 +} + +usage() { +cat << EOF +usage: $0 options + +This script will install or upgrade Syslinux + +OPTIONS: + -h Show this message + -i Install Syslinux + -u Update Syslinux + -a Set Boot flag on boot partiton + -m Install Syslinux MBR + -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + + Arguments Required: + -c Chroot install (ex: -c /mnt) + +Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) + syslinux-install_update.sh -u (update) +EOF +} + +# Trys to find the partition that /boot resides on +# This will either be on /boot or / (root) +getBoot() { + if [[ ! -d "$bootpath" ]]; then + echo "Could not find $bootpath" + echo "Is boot mounted? Is Syslinux installed?" + exit 1 + fi + + syslinux_fs=(ext2 ext3 ext4 btrfs vfat) + + # Use DATA from findmnt see rc.sysint for more info + if [[ -f /proc/self/mountinfo ]]; then + read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/") + read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot") + else + echo "Could not find /proc/self/mountinfo" + echo "Are you running a kernel greater than 2.6.24?" + exit 1 + fi + + if [[ $bootfs ]]; then + if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then + echo "/boot file system is not supported by Syslinux" + exit 1 + fi + boot="boot" + bootpart="$bootdev" + elif [[ $rootfs ]]; then + if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then + echo "/ (root) file system is not supported by Syslinux" + exit 1 + fi + boot="root" + bootpart="$rootdev" + else + echo "Could not find filesystem on / (root) or /boot." + exit 1 + fi +} + +# We store the partition table type either gpt or mbr in var ptb +# In rare cases a user could have one raid disk using mbr and another using gpt +# In such cases we accept that the output may be incomplete + +# Calls get_ptb() for $bootpart or for all device in RAID +declare -A bootdevs +get_boot_devices() { + if device_is_raid "$bootpart"; then + slaves=$(mdraid_all_slaves "$bootpart") + + for slave in ${slaves[@]}; do + local disk="${slave%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$slave]="$ptb" + done + else + local disk="${bootpart%%[[:digit:]]*}" + device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" + bootdevs[$bootpart]="$ptb" + fi +} + +# Function Assumes the boot partition should be marked as active +# All other partitions should not have the boot flag set +set_active() { + # If any bootdev is a block device without partitions bail + # we want to set the boot flag on partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; } + done + + # Clear BIOS Bootable Legacy Attribute for GPT drives + # In rare cases where a RAID device has slaves on the same block device + # Attribute 2 will be cleared for each partition multiple times + for dev in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$dev]}" + if [[ "$ptb" = GPT ]]; then + local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda + clear_gpt_attr2 "$disk" + fi + done + + # Set the boot flag on bootdevs (generated from get_boot_devices) + for part in "${!bootdevs[@]}"; do + local ptb="${bootdevs[$part]}" + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + + if [[ "$ptb" = MBR ]]; then + if sfdisk "$disk" -A "$partnum" &>/dev/null; then + echo "Boot Flag Set - $part" + else + echo "FAILED to Set the boot flag on $part" + exit 3 + fi + elif [[ "$ptb" = GPT ]]; then + if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then + echo "Attribute Legacy Bios Bootable Set - $part" + else + echo "FAILED to set attribute Legacy BIOS Bootable on $part" + exit 3 + fi + fi + done + return 0 +} + +install_mbr() { + # If any bootdev is a block device without partitions bail + # we want to install the mbr to a partitioned disk + for dev in "${!bootdevs[@]}"; do + dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; } + done + + for part in "${!bootdevs[@]}"; do + local partnum="${part##*[[:alpha:]]}" + case "$part" in + *[[:digit:]]p[[:digit:]]*) + local disk="${part%%p$partnum}" # get everything before p1 + ;; + *) + local disk="${part%%[[:digit:]]*}" + ;; + esac + local ptb="${bootdevs[$part]}" + + # We want to install to the root of the block device + # If the device is a partition - ABORT! + dev_is_part "$disk" && \ + { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} + + if [[ "$ptb" = MBR ]]; then + mbrfile="$libpath/mbr.bin" + elif [[ "$ptb" = GPT ]]; then + mbrfile="$libpath/gptmbr.bin" + fi + + if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then + echo "Installed MBR ($mbrfile) to $disk" + else + echo "Error Installing MBR ($mbrfile) to $disk" + exit 4 + fi + done + return 0 +} + +_install() { + # Copy files to /boot + for file in "${com32_files[@]}"; do + # Symlink files even if links exist + if [[ "$boot" = root ]]; then + ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$libpath/$file" "$bootpath/$file" + fi + done + + # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS + if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + if [[ "$boot" = root ]]; then + ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + elif [[ "$boot" = boot ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid "$bootpart"; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + else + "$extlinux" --install "$bootpath" > /dev/null 2>&1 + fi + + if (( $? )); then + echo "Syslinux install failed" + exit 2 + else + echo "Syslinux install successful" + fi + + touch "$CHROOT/$autoupdate_file" +} + +update() { + # Update any com and c32 files in /boot + if [[ "$boot" = boot ]]; then + for file in "$bootpath"/*.{c32,com}; do + file=$(basename "$file") + cp "$libpath/$file" "$bootpath/$file" &> /dev/null + done + if [[ -f "$bootpath/pci.ids" ]]; then + cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + fi + fi + + if device_is_raid $bootpart; then + echo "Detected RAID on /boot - installing Syslinux with --raid" + "$extlinux" --update "$bootpath" -r &> /dev/null + else + "$extlinux" --update "$bootpath" &> /dev/null + fi + + if (($?)); then + echo "Syslinux update failed" + exit 2 + else + echo "Syslinux update successful" + fi +} + +# Make sure only root can run our script +if (( $(id -u) != 0 )); then + echo "This script must be run as root" 1>&2 + exit 1 +fi + +if (( $# == 0 )); then + usage + exit 1 +fi + +while getopts "c:uihmas" opt; do + case $opt in + c) + CHROOT=$(readlink -e "$OPTARG") + if [[ -z $CHROOT ]]; then + echo "error: chroot path ``$OPTARG does not exist"; + exit 1 + fi + ;; + h) + usage + exit 0 + ;; + i) + INSTALL="True" + ;; + u) + UPDATE="True" + ;; + m) + MBR="True" + ;; + a) + SET_ACTIVE="True" + ;; + s) + # If AUTOUPDATE_FILE does not exist exit the script + if [[ -f $autoupdate_file ]]; then + UPDATE="True" + else + exit 0 + fi + ;; + *) + usage + exit 1 + ;; + esac +done + +# Display Usage Information if both Install and Update are passed +if [[ $INSTALL && $UPDATE ]]; then + usage + exit 1 +fi + +# If a chroot dir is path set variables to reflect chroot +if [[ "$CHROOT" ]]; then + libpath="$CHROOT$libpath" + bootpath="$CHROOT$bootpath" + extlinux="$CHROOT$extlinux" +fi + +# Exit if no /boot path exists +if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bootpath is empty!" + echo "Is /boot mounted?" + exit 1 +fi + +# Get the boot device if any of these options are passed +if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then + getBoot +fi + +# Install or Update +if [[ $INSTALL ]]; then + _install || exit +elif [[ $UPDATE ]]; then + update || exit +fi + + +# SET_ACTIVE and MBR +if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then + get_boot_devices + + if [[ $SET_ACTIVE ]]; then + set_active || exit + fi + + if [[ $MBR ]]; then + install_mbr || exit + fi +fi + +exit 0 + +# vim: set et sw=4: diff --git a/testing/syslinux/syslinux.cfg b/testing/syslinux/syslinux.cfg new file mode 100644 index 000000000..2212283a8 --- /dev/null +++ b/testing/syslinux/syslinux.cfg @@ -0,0 +1,79 @@ +# Config file for Syslinux - +# /boot/syslinux/syslinux.cfg +# +# Comboot modules: +# * menu.c32 - provides a text menu +# * vesamenu.c32 - provides a graphical menu +# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders +# * hdt.c32 - hardware detection tool +# * reboot.c32 - reboots the system +# * poweroff.com - shutdown the system +# +# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. +# If /usr and /boot are on the same file system, symlink the files instead +# of copying them. +# +# If you do not use a menu, a 'boot:' prompt will be shown and the system +# will boot automatically after 5 seconds. +# +# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux +# The wiki provides further configuration examples + +DEFAULT arch +PROMPT 0 # Change to 1 if you do not want to use a menu +TIMEOUT 50 +# You can create syslinux keymaps with the keytab-lilo tool +#KBDMAP de.ktl + +# Menu Configuration +# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux +UI menu.c32 +#UI vesamenu.c32 + +# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu +MENU TITLE Arch Linux +#MENU BACKGROUND splash.png +MENU COLOR border 30;44 #40ffffff #a0000000 std +MENU COLOR title 1;36;44 #9033ccff #a0000000 std +MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all +MENU COLOR unsel 37;44 #50ffffff #a0000000 std +MENU COLOR help 37;40 #c0ffffff #a0000000 std +MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std +MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std +MENU COLOR msg07 37;40 #90ffffff #a0000000 std +MENU COLOR tabmsg 31;40 #30ffffff #00000000 std + +# boot sections follow +# +# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. +# +#-* + +LABEL arch + MENU LABEL Arch Linux + LINUX ../vmlinuz26 + APPEND root=/dev/sda3 ro + INITRD ../kernel26.img + +LABEL archfallback + MENU LABEL Arch Linux Fallback + LINUX ../vmlinuz26 + APPEND root=/dev/sda3 ro + INITRD ../kernel26-fallback.img + +#LABEL windows +# MENU LABEL Windows +# COM32 chain.c32 +# APPEND hd0 1 + +LABEL hdt + MENU LABEL HDT (Hardware Detection Tool) + COM32 hdt.c32 + +LABEL reboot + MENU LABEL Reboot + COM32 reboot.c32 + +LABEL off + MENU LABEL Power Off + COMBOOT poweroff.com diff --git a/testing/syslinux/syslinux.install b/testing/syslinux/syslinux.install new file mode 100644 index 000000000..0dc0ece36 --- /dev/null +++ b/testing/syslinux/syslinux.install @@ -0,0 +1,13 @@ +post_install() { + echo "==> If you want to use syslinux as your bootloader" + echo "==> edit /boot/syslinux/syslinux.cfg and run" + echo "==> # /usr/sbin/syslinux-install_update -i -a -m" + echo "==> to install it." +} + +post_upgrade() { + # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists + /usr/sbin/syslinux-install_update -s +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/telepathy-farsight/PKGBUILD b/testing/telepathy-farsight/PKGBUILD new file mode 100644 index 000000000..c324c9e43 --- /dev/null +++ b/testing/telepathy-farsight/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 120813 2011-04-26 16:12:15Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Ju Liu <liuju86 at gmail dot com> +# Contributor: Denis Zawada <deno@rootnode.net> +pkgname=telepathy-farsight +pkgver=0.0.17 +pkgrel=1 +pkgdesc="A telepathy-backend to use stream engine." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +license=('GPL') +depends=('telepathy-glib' 'farsight2' 'gstreamer0.10-base') +makedepends=('libxslt' 'python2') +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('f98377802d38333924f6f1a955a2d42a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-static=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD index aea1eee98..0eaff4907 100644 --- a/testing/telepathy-gabble/PKGBUILD +++ b/testing/telepathy-gabble/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117604 2011-04-04 12:56:08Z ibiru $ +# $Id: PKGBUILD 120355 2011-04-22 18:03:17Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org> pkgname=telepathy-gabble -pkgver=0.11.10 -pkgrel=1 +pkgver=0.12.0 +pkgrel=2 pkgdesc="A Jabber/XMPP connection manager for Telepathy" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" @@ -15,12 +15,12 @@ makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-gabble/${pkgname}-${pkgver}.tar.gz) install=telepathy-gabble.install -md5sums=('2a8ee3038bd1c9ee40c1b8b48becfa16') +md5sums=('89e47b131911a969cc2a2ccefa1fc015') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr \ - --libexecdir=/usr/lib/telepathy + --libexecdir=/usr/lib/telepathy --with-tls=openssl make } diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD index 07b7dd632..1fc08ac55 100644 --- a/testing/telepathy-glib/PKGBUILD +++ b/testing/telepathy-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119800 2011-04-15 11:36:23Z ibiru $ +# $Id: PKGBUILD 120253 2011-04-21 18:20:55Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.14.4 +pkgver=0.14.5 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('011c7357c8d85bea8b1f402a4f5eb02a') +md5sums=('2911d33b45744cdc41774c91f6b837c2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/telepathy-idle/PKGBUILD b/testing/telepathy-idle/PKGBUILD new file mode 100644 index 000000000..2a177d64d --- /dev/null +++ b/testing/telepathy-idle/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 120807 2011-04-26 15:59:24Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> +# Contributor: Samuel Mendes <heka.lok@gmail.com> +pkgname=telepathy-idle +pkgver=0.1.9 +pkgrel=1 +pkgdesc="An IRC connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +groups=('telepathy') +license=('LGPL') +depends=('telepathy-glib' 'openssl') +makedepends=('libxslt' 'python2') +install=telepathy-idle.install +source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz + python27.patch) +md5sums=('423f2cc0481bdb32facb850eaf586ff2' + '03661efde8f768417e224720e1346d7b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/python27.patch" + autoreconf -fi + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/telepathy-idle/python27.patch b/testing/telepathy-idle/python27.patch new file mode 100644 index 000000000..f8abffb57 --- /dev/null +++ b/testing/telepathy-idle/python27.patch @@ -0,0 +1,21 @@ +diff -Nur telepathy-idle-0.1.7.orig/configure.ac telepathy-idle-0.1.7/configure.ac +--- telepathy-idle-0.1.7.orig/configure.ac 2010-12-07 03:52:29.000000000 -0800 ++++ telepathy-idle-0.1.7/configure.ac 2010-12-07 09:41:21.179715253 -0800 +@@ -103,7 +103,7 @@ + AC_MSG_ERROR([xsltproc (from the libxslt source package) is required]) + fi + PYTHON= +-AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python]) ++AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python2.7 python]) + if test -z "$PYTHON"; then + AC_MSG_ERROR([Python is required to compile this package]) + fi +@@ -111,7 +111,7 @@ + + dnl check for a version of python that can run the twisted tests + AC_MSG_CHECKING([for Python with Twisted and IRC protocol support]) +-for TEST_PYTHON in python2.5 python2.6 python; do ++for TEST_PYTHON in python2.5 python2.6 python2.7 python; do + if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then + if $TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then + AM_CONDITIONAL([WANT_TWISTED_TESTS], true) diff --git a/testing/telepathy-idle/telepathy-idle.install b/testing/telepathy-idle/telepathy-idle.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/testing/telepathy-idle/telepathy-idle.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD index ee6f03791..1b086ce5f 100644 --- a/testing/telepathy-mission-control/PKGBUILD +++ b/testing/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 113465 2011-03-08 18:20:27Z ibiru $ +# $Id: PKGBUILD 120802 2011-04-26 15:50:07Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.7.6 +pkgver=5.7.9 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('fcfc077949d910e3c619d2193f236606') +md5sums=('df7e63d857676fab9ec2261cffe5eb4a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/telepathy-qt4/PKGBUILD b/testing/telepathy-qt4/PKGBUILD new file mode 100644 index 000000000..6d3b6e5d1 --- /dev/null +++ b/testing/telepathy-qt4/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 120824 2011-04-26 16:25:58Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +pkgname=telepathy-qt4 +pkgver=0.5.15 +pkgrel=1 +pkgdesc="A library for Qt-based Telepathy clients." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +license=('LGPL') +options=('!libtool') +depends=('qt' 'telepathy-farsight') +makedepends=('libxslt' 'python2' 'cmake') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('2066d447a46ca3d767ff82ca562244a0') + +build() { + cd "${srcdir}" + + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="$pkgdir" install +} diff --git a/testing/telepathy-sofiasip/PKGBUILD b/testing/telepathy-sofiasip/PKGBUILD new file mode 100644 index 000000000..7704eac95 --- /dev/null +++ b/testing/telepathy-sofiasip/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 120816 2011-04-26 16:16:06Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Timm Preetz <timm@preetz.us> +pkgname=telepathy-sofiasip +pkgver=0.7.1 +pkgrel=1 +pkgdesc="a SIP-protocol connection manager for the Telepathy framework based on SofiaSIP-stack." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +license=('LGPL') +depends=('telepathy-glib' 'sofia-sip') +makedepends=('libxslt' 'python2') +install=telepathy-sofiasip.install +groups=('telepathy') +source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('4139027790aae97d8a18260e09a747c6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/telepathy-sofiasip/telepathy-sofiasip.install b/testing/telepathy-sofiasip/telepathy-sofiasip.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/testing/telepathy-sofiasip/telepathy-sofiasip.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/texlive-bin/09-texlive-fonts.conf b/testing/texlive-bin/09-texlive-fonts.conf new file mode 100644 index 000000000..f870fbd7a --- /dev/null +++ b/testing/texlive-bin/09-texlive-fonts.conf @@ -0,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> +<fontconfig> + <dir>/usr/share/texmf-dist/fonts/opentype</dir> + <dir>/usr/share/texmf-dist/fonts/truetype</dir> + <dir>/usr/local/share/texmf/fonts/opentype</dir> + <dir>/usr/local/share/texmf/fonts/truetype</dir> +</fontconfig> + diff --git a/testing/texlive-bin/PKGBUILD b/testing/texlive-bin/PKGBUILD new file mode 100644 index 000000000..980aac315 --- /dev/null +++ b/testing/texlive-bin/PKGBUILD @@ -0,0 +1,348 @@ +# Maintainer: francois <francois.archlinux.org> + +pkgname=texlive-bin +pkgver=2010.1 +_luatex_ver=0.66.0 +pkgrel=8 +pkgdesc="TeX Live binaries" +license=('GPL') +arch=('i686' 'x86_64') +depends=('t1lib' 'gd' 'libgraphite' 'poppler' 'libsigsegv' 'zziplib') +makedepends=('perl' 'clisp' 'ffcall') +optdepends=('ed: for texconfig') +provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam') +conflicts=('pdfjam') +options=('!libtool') +url='http://tug.org/texlive/' +source=('texmf.cnf' + 'fix-fontforge-encoding.patch' + '09-texlive-fonts.conf' + 'dvipng-fix-options.patch' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-20100926.tar.xz' + 'http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-texmf-20101105.tar.xz' + #"http://foundry.supelec.fr/gf/download/frsrelease/387/1715/luatex-beta-${_luatex_ver}-source.tar.bz2" + "ftp://ftp.archlinux.org/other/texlive/luatex-svn4193.tar.xz" +) +backup=(etc/texmf/web2c/texmf.cnf \ + etc/texmf/chktex/chktexrc \ + etc/texmf/web2c/mktex.cnf \ + etc/texmf/web2c/updmap.cfg \ + etc/texmf/web2c/fmtutil.cnf \ + etc/texmf/tex/generic/config/language.dat \ + etc/texmf/tex/generic/config/language.def \ + etc/texmf/tex/generic/config/pdftexconfig.tex \ + etc/texmf/ttf2pk/ttf2pk.cfg \ + etc/texmf/dvips/config/config.ps \ + etc/texmf/dvipdfmx/dvipdfmx.cfg \ + etc/texmf/dvipdfm/config/config \ + etc/texmf/xdvi/XDvi) + +md5sums=('626f900fb59f036d6fea95f08c74b00b' + 'bfb9716aa00c86c08cd31e5b32edeb98' + '393a4bf67adc7ca5df2b386759d1a637' + '60e405158f53519348d9783e8d420670' + '0b2c3a4a1b1e4befb90d7fbb5f08a6e9' + '7ae1400dafdb079dcd08d233de83ec44' + '523802a23bc174374403415d9cc87946') + +build() { + if [ "${CARCH}" = "x86_64" ]; then + export CFLAGS="${CFLAGS} -fPIC" + export CXXFLAGS="${CXXFLAGS} -fPIC" + fi + + cd $srcdir + # Building LuaTeX + #cd luatex-beta-${_luatex_ver} + cd luatex + patch -p0 -i ../fix-fontforge-encoding.patch + mkdir build + cd build + ../source/configure --prefix=/usr -C \ + --disable-native-texlive-build \ + --with-banner-add="/Arch Linux" \ + --enable-cxx-runtime-hack \ + --disable-all-pkgs \ + --disable-dump-share \ + --disable-ptex \ + --enable-luatex \ + --without-system-ptexenc \ + --with-system-graphite \ + --without-system-icu \ + --without-system-kpathsea \ + --with-system-freetype2 \ + --with-system-poppler \ + --with-freetype2-libdir=/usr/lib \ + --with-freetype2-include=/usr/include/freetype2 \ + --with-system-gd \ + --with-system-libpng \ + --without-system-teckit \ + --with-system-zlib \ + --with-system-zziplib \ + --with-system-t1lib \ + --disable-shared \ + --disable-largefile \ + --disable-ipc \ + --without-mf-x-toolkit \ + --without-x + make + make -C libs/obsdcompat + make -C texk/kpathsea + make -C texk/web2c luatex + + cd "$srcdir" + # this patch removes spurious error message with locale "xx_YY.utf8" + patch -p0 -i fix-fontforge-encoding.patch + ## fix dvipng (bug #20157) + pushd "source/texk/dvipng/dvipng-1.13" + patch -p0 -i "$srcdir/dvipng-fix-options.patch" + popd + + ############################################################# + ### configure + cd source + ## prevent compiling Xdvi with libXp + sed -i~ 's|-lXp ||' texk/xdvik/configure + test ! -d Work && mkdir Work + cd Work + echo "--> Initial configuration..." + # we use temporary prefix to avoid messing the existing $pkgdir/usr/share/texmf tree + ../configure --prefix=/usr -C \ + --datarootdir=$srcdir/inst/usr/share \ + --datadir=$srcdir/inst/usr/share \ + --mandir=$srcdir/inst/usr/share/man \ + --disable-native-texlive-build \ + --with-banner-add="/Arch Linux" \ + --disable-multiplatform \ + --disable-dialog \ + --disable-psutils \ + --disable-t1utils \ + --disable-bibtexu \ + --disable-xz \ + --with-system-zlib \ + --with-system-pnglib \ + --with-system-ncurses \ + --with-system-t1lib \ + --with-system-gd \ + --with-system-xpdf \ + --with-system-freetype2 \ + --with-system-graphite \ + --with-freetype2-libdir=/usr/lib \ + --with-freetype2-include=/usr/include/freetype2 \ + --with-xdvi-x-toolkit=xaw \ + --disable-dump-share \ + --disable-aleph \ + --disable-luatex \ + --with-clisp-runtime=default \ + --enable-xindy --disable-xindy-rules --disable-xindy-docs + ############################################################# + ### make + echo "-------------------------------------------------------" + echo "--> Building the whole beast ..." + echo "-------------------------------------------------------" + make +} + +package() { + cd $srcdir + ############################################################# + ### install texmf tree + echo "-------------------------------------------------------" + echo "--> installing the texmf tree" + echo "-------------------------------------------------------" + install -m755 -d $pkgdir/usr/share + cp -r texmf $pkgdir/usr/share/ + install -d -m755 $pkgdir/etc/texmf/web2c + install -d -m755 $pkgdir/etc/texmf/chktex + install -d -m755 $pkgdir/etc/texmf/dvips/config + install -d -m755 $pkgdir/etc/texmf/dvipdfm/config + install -d -m755 $pkgdir/etc/texmf/dvipdfmx + install -d -m755 $pkgdir/etc/texmf/tex/generic/config + install -d -m755 $pkgdir/etc/texmf/ttf2pk + install -d -m755 $pkgdir/etc/texmf/xdvi + install -d -m755 $pkgdir/etc/fonts/conf.avail + install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/ + # replace upstream texmf.cnf with ours + rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf + install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf + # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c + # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter + ln -s /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf + # fix location of TEXMFCACHE for luatools + sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua + ## remove aleph from fmtutil.cnf + sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf + # move man files to /usr/share/man + for i in 1 5; do + install -d -m755 $pkgdir/usr/share/man/man$i + mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/ + done + # move info files to /usr/share/info + install -d -m755 $pkgdir/usr/share/info + mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/ + rm -rf $pkgdir/usr/share/texmf/doc/{man,info} + # copy config files to $TEXMFCONFIG tree + cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \ + $pkgdir/etc/texmf/chktex/ + cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \ + $pkgdir/etc/texmf/web2c/ + cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \ + $pkgdir/etc/texmf/web2c/ + cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \ + $pkgdir/etc/texmf/web2c/ + cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \ + $pkgdir/etc/texmf/dvips/config/ + cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \ + $pkgdir/etc/texmf/dvipdfm/config/ + cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \ + $pkgdir/etc/texmf/dvipdfmx/ + cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \ + $pkgdir/etc/texmf/tex/generic/config/ + cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \ + $pkgdir/etc/texmf/tex/generic/config/ + cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \ + $pkgdir/etc/texmf/tex/generic/config/ + cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \ + $pkgdir/etc/texmf/ttf2pk/ + cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \ + $pkgdir/etc/texmf/xdvi/ + # remove TL specific warnings in the language.{dat,def} files: + sed -i -e '/DO NOT EDIT/,+3 d' $pkgdir/etc/texmf/tex/generic/config/language.* + # clean updmap.cfg + sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg + sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg + + ############################################################# + ### install + cd source + # fixes for xindy + find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgdir/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \; + + echo "-------------------------------------------------------" + echo "--> Proceeding with make install ..." + echo "-------------------------------------------------------" + cd Work + make prefix=$srcdir/inst/usr texmf=$pkgdir/usr/share/texmf install + + # restore install location of bin/lib/include + mv -f $srcdir/inst/usr/bin $pkgdir/usr/bin + mv -f $srcdir/inst/usr/lib $pkgdir/usr/lib + mv -f $srcdir/inst/usr/include $pkgdir/usr/include + # add symlinks to manpages since they are not included in the original texmf tree + for m in $srcdir/inst/usr/share/man/man1/*; do + bm=$(basename $m) + test -f $pkgdir/usr/share/man/man1/$bm || mv -f $m $pkgdir/usr/share/man/man1/ + done + + ## install luatex binary + #install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/ + install -m755 $srcdir/luatex/build/texk/web2c/luatex $pkgdir/usr/bin/ + cd $pkgdir/usr/bin + /bin/ln -s luatex texlua + /bin/ln -s luatex texluac + + # symlinks in $pkgdir/usr/bin are incorrect + echo "--> Fixing symlinks for scripts ..." + for f in $pkgdir/usr/bin/* ; do + if [ -L $f ]; then + target=`ls -l "$f" | sed 's/^.\+ -> //'` + if [[ "$target" == ..* ]]; then + newtarget=`echo $target | sed -e 's#../#/usr/share/#'` + rm -f $f + ln -s $newtarget $f + test -f $pkgdir/$newtarget && chmod a+x $pkgdir/$newtarget + fi + fi + done + + # create symlinks for formats + echo "--> Create symlinks for TeX formats ..." + PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/ + ############################################################# + # remove dangling symlinks + _bibtexextra_scripts="bibexport" + _core_scripts=" +afm2afm +arlatex +autoinst +bundledoc +cmap2enc +de-macro +dviasm +epstopdf +findhyph +font2afm +fragmaster +installfont-tl +latex2man +latexdiff +latexdiff-vc +latexmk +latexrevise +listings-ext.sh +mkjobtexmf +mkluatexfontdb +mkt1font +mptopdf +ot2kpx +pdf180 +pdf270 +pdf90 +pdfatfi +pdfbook +pdfcrop +pdfflip +pdfjam +pdfjam-pocketmod +pdfjam-slides3up +pdfjam-slides6up +pdfjoin +pdfnup +pdfpun +pfm2kpx +pkfix +pkfix-helper +purifyeps +repstopdf +rpdfcrop +showglyphs +texcount +texdiff +texdirflatten +texloganalyser +thumbpdf +vpl2ovp +vpl2vpl +" + _htmlxml_scripts="ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht" + _langextra_scripts="ebong" + _langgreek_scripts="mkgrkindex" + _latexextra_scripts="authorindex \ +makeglossaries \ +pdfannotextractor \ +pdfthumb \ +perltex \ +ppower4 \ +ps4pdf \ +splitindex \ +svn-multi \ +vpe" + _pictures_scripts="cachepic epspdf epspdftk fig4latex mathspic" + _pstricks_scripts="pst2pdf" + _science_scripts="ulqda" + for s in \ + ${_bibtexextra_scripts} \ + ${_core_scripts} \ + ${_htmlxml_scripts} \ + ${_langextra_scripts} \ + ${_langgreek_scripts} \ + ${_latexextra_scripts} \ + ${_pictures_scripts} \ + ${_pstricks_scripts} \ + ${_science_scripts} \ + tlmgr; do + rm -f $pkgdir/usr/bin/$s + done + ################################################################### +} + diff --git a/testing/texlive-bin/dvipng-fix-options.patch b/testing/texlive-bin/dvipng-fix-options.patch new file mode 100644 index 000000000..c0eda1d90 --- /dev/null +++ b/testing/texlive-bin/dvipng-fix-options.patch @@ -0,0 +1,10 @@ +--- papersiz.c 2010/03/17 21:40:00 1.16 ++++ papersiz.c 2010/09/29 21:14:40 1.17 +@@ -52,6 +52,7 @@ + while (*q != ',' && *q !='\0') + q++; + tmp = tmp*lengthsp[i]*dpi/4736286L; /* sp * dots/in / (sp/in), convert sp to pixels */ ++ *p=q; + return((int32_t) tmp); + } + diff --git a/testing/texlive-bin/fix-fontforge-encoding.patch b/testing/texlive-bin/fix-fontforge-encoding.patch new file mode 100644 index 000000000..8104b3289 --- /dev/null +++ b/testing/texlive-bin/fix-fontforge-encoding.patch @@ -0,0 +1,12 @@ +--- source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c.orig 2009-09-30 19:27:00.935039526 +0200 ++++ source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/noprefs.c 2009-09-30 19:28:04.908364646 +0200 +@@ -495,6 +495,9 @@ + { "Big5HKSCS", e_big5hkscs }, + { "Big5-HKSCS", e_big5hkscs }, + { "UTF-8", e_utf8 }, ++ { "utf-8", e_utf8 }, ++ { "UTF8", e_utf8 }, ++ { "utf8", e_utf8 }, + { "ISO-10646/UTF-8", e_utf8 }, + { "ISO_10646/UTF-8", e_utf8 }, + { "UCS2", e_unicode }, diff --git a/testing/texlive-bin/texmf.cnf b/testing/texlive-bin/texmf.cnf new file mode 100644 index 000000000..b9d51682a --- /dev/null +++ b/testing/texlive-bin/texmf.cnf @@ -0,0 +1,663 @@ +% texmf.cnf for TeXLive/Arch Linux -- runtime path configuration file for kpathsea. +% Public domain. +% +% What follows is a super-summary of what this .cnf file can +% contain. Please read the Kpathsea manual for more information. +% +% Any identifier (sticking to A-Za-z_ for names is safest) can be assigned. +% The `=' (and surrounding spaces) is optional. +% $foo (or ${foo}) in a value expands to the envvar or cnf value of foo. +% Long lines can be continued with a \. +% +% Earlier entries (in the same or another file) override later ones, and +% an environment variable foo overrides any texmf.cnf definition of foo. +% +% All definitions are read before anything is expanded, so you can use +% variables before they are defined. +% +% If a variable assignment is qualified with `.PROGRAM', it is ignored +% unless the current executable (last filename component of argv[0]) is +% named PROGRAM. This foo.PROGRAM construct is not recognized on the +% right-hand side. For environment variables, use FOO_PROGRAM. +% +% Which file formats use which paths for searches is described in the +% various programs' and the Kpathsea documentation (http://tug.org/kpathsea). +% +% // means to search subdirectories (recursively). +% A leading !! means to look only in the ls-R db, never on the disk. +% In this file, either ; or : can be used to separate path components. +% A leading/trailing/doubled path separator in the paths will be +% expanded into the compile-time default. Probably not what you want. +% + +% Brace notation is supported, for example: /usr/local/{mytex,othertex} +% expands to /usr/local/mytex:/usr/local/othertex. You can use the path +% separator as well as the comma for this: /usr/local/{mytex:othertex} +% also expands to /usr/local/mytex:/usr/local/othertex. We make +% extensive use of this. + +% Part 1: Search paths and directories. + +% You can set an environment variable to override TEXMF if you're testing +% a new TeX tree, without changing anything else. +% +% You may wish to use one of the $SELFAUTO... variables here so TeX will +% find where to look dynamically. See the manual and the definition +% below of TEXMFCNF. + +% The tree containing the runtime files closely related to the specific +% program version used: +TEXMFMAIN = /usr/share/texmf + +% The main distribution tree: +TEXMFDIST = /usr/share/texmf-dist + +% Our documentation-only tree, arranged by language: +TEXMFDOC = /usr/share/texmf-doc + +% A place for local additions to a "standard" texmf tree. +% This tree is not used for local configuration maintained by +% texconfig, it uses TEXMFCONFIG below. +TEXMFLOCAL = /usr/local/share/texmf + +% TEXMFSYSVAR, where texconfig-sys stores variable runtime data. +TEXMFSYSVAR = /var/lib/texmf + +% TEXMFSYSCONFIG, where texconfig-sys stores configuration data. +TEXMFSYSCONFIG = /etc/texmf + +% User texmf trees are allowed as follows. +TEXMFHOME = ~/texmf + +% TEXMFVAR, where texconfig stores variable runtime data. +TEXMFVAR = ~/.texlive/texmf-var + +% TEXMFCONFIG, where texconfig stores configuration data. +TEXMFCONFIG = ~/.texlive/texmf-config + +% Now, list all the texmf trees. If you have multiple trees you can +% use shell brace notation, like this: +% TEXMF = {$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFMAIN} +% The braces are necessary. +% +% For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named +% explicitly and before all other trees. +% +% TEXMFLOCAL follows TEXMFMAIN (and precedes TEXMFDIST) because the +% files in TEXMFMAIN are tightly coupled with the particular version of +% the distribution, such as format files. Overriding them would be more +% likely to cause trouble than help. On the other hand, all the +% standard packages and fonts are in TEXMFDIST, and locally-installed +% versions should take precedence over those (although it is generally a +% source of confusion to have different versions of a package installed, +% whatever the trees, so try to avoid it). +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} + +% Where to look for ls-R files. There need not be an ls-R in the +% directories in this path, but if there is one, Kpathsea will use it. +% By default, this is only the !! elements of TEXMF, so that mktexlsr +% does not create ls-R files in the non-!! elements -- because if an +% ls-R is present, it will be used, and the disk will not be searched. +% This is arguably a bug in kpathsea. +TEXMFDBS = {!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} + +% The system trees. These are the trees that are shared by all the users. +% If a tree appears in this list, the mktex* scripts will use +% VARTEXFONTS for generated files, if the original tree isn't writable; +% otherwise the current working directory is used. +SYSTEXMF = $TEXMFSYSVAR;$TEXMFMAIN;$TEXMFLOCAL;$TEXMFDIST + +% Where generated fonts may be written. This tree is used when the sources +% were found in a system tree and either that tree wasn't writable, or the +% varfonts feature was enabled in MT_FEATURES in mktex.cnf. +VARTEXFONTS = $TEXMFVAR/fonts + +% On some systems, there will be a system tree which contains all the font +% files that may be created as well as the formats. For example +% TEXMFVAR = /var/lib/texmf +% is used in many distros. In this case, set VARTEXFONTS like this +% VARTEXFONTS = $TEXMFVAR/fonts +% and do not mention it in TEXMFDBS (but _do_ mention TEXMFVAR). +% +% Remove $VARTEXFONTS from TEXMFDBS if the VARTEXFONTS directory is below +% one of the TEXMF directories (avoids overlapping ls-R files). + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Usually you will not need to edit any of the following variables. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +% WEB2C is for Web2C specific files. The current directory may not be +% a good place to look for them. +WEB2C = $TEXMF/web2c + +% TEXINPUTS is for TeX input files -- i.e., anything to be found by \input +% or \openin, including .sty, .eps, etc. We specify paths for all known +% formats, past or present. Not all of them are built these days. + +% Plain TeX. Have the command tex check all directories as a last +% resort, we may have plain-compatible stuff anywhere. +TEXINPUTS.tex = .;$TEXMF/tex/{plain,generic,}// + +% Fontinst needs to read afm files. +TEXINPUTS.fontinst = .;$TEXMF/{tex,fonts/afm}// + +% Other plain-based formats. +TEXINPUTS.amstex = .;$TEXMF/tex/{amstex,plain,generic,}// +TEXINPUTS.csplain = .;$TEXMF/tex/{csplain,plain,generic,}// +TEXINPUTS.eplain = .;$TEXMF/tex/{eplain,plain,generic,}// +TEXINPUTS.ftex = .;$TEXMF/tex/{formate,plain,generic,}// +TEXINPUTS.mex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.texinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// + +% LaTeX 2e specific macros are stored in latex/, macros that can only be +% used with 2.09 in latex209/. In addition, we look in the directory +% latex209, useful for macros that were written for 2.09 and do not +% mention 2e at all, but can be used with 2e. +TEXINPUTS.cslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// +TEXINPUTS.latex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.latex209 = .;$TEXMF/tex/{latex209,generic,latex,}// +TEXINPUTS.olatex = .;$TEXMF/tex/{latex,generic,}// + +% MLTeX. +TEXINPUTS.frlatex = .;$TEXMF/tex/{french,latex,generic,}// +TEXINPUTS.frtex = .;$TEXMF/tex/{french,plain,generic,}// +TEXINPUTS.mllatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.mltex = .;$TEXMF/tex/{plain,generic,}// + +% e-TeX. +TEXINPUTS.elatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.etex = .;$TEXMF/tex/{plain,generic,}// + +% pdfTeX. +TEXINPUTS.pdfcslatex = .;$TEXMF/tex/{cslatex,csplain,latex,generic,}// +TEXINPUTS.pdfcsplain = .;$TEXMF/tex/{csplain,plain,generic,}// +TEXINPUTS.pdflatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfmex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.utf8mex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.pdftex = .;$TEXMF/tex/{plain,generic,}// +TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// +TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// + +% pdfeTeX. +TEXINPUTS.pdfelatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}// + +% pdfxTeX. +TEXINPUTS.pdfxlatex = .;$TEXMF/tex/{latex,generic,}// +TEXINPUTS.pdfxmex = .;$TEXMF/tex/{mex,plain,generic,}// +TEXINPUTS.pdfxtex = .;$TEXMF/tex/{plain,generic,}// + +% LuaTeX. +TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}// +TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}// +TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}// + +% XeTeX. +TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}// +TEXINPUTS.xeplain = .;$TEXMF/tex/{xeplain,eplain,plain,xetex,generic,}// +TEXINPUTS.xetex = .;$TEXMF/tex/{xetex,plain,generic,}// + + +% ConTeXt. +TEXINPUTS.context = .;$TEXMF/tex/{context,plain,generic,}// + +% jadetex +TEXINPUTS.jadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// +TEXINPUTS.pdfjadetex = .;$TEXMF/tex/{jadetex,latex,generic,}// + +% XMLTeX. +TEXINPUTS.xmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// +TEXINPUTS.pdfxmltex = .;$TEXMF/tex/{xmltex,latex,generic,}// + +% Miscellany, no longer built. +TEXINPUTS.lamstex = .;$TEXMF/tex/{lamstex,plain,generic,}// +TEXINPUTS.lollipop = .;$TEXMF/tex/{lollipop,plain,generic,}// +TEXINPUTS.frpdflatex = .;$TEXMF/tex/{french,latex,generic,}// +TEXINPUTS.frpdftex = .;$TEXMF/tex/{french,plain,generic,}// + +% Earlier entries override later ones, so put this generic one last. +TEXINPUTS = .;$TEXMF/tex/{$progname,generic,}// + +% ttf2tfm. +TTF2TFMINPUTS = .;$TEXMF/ttf2pk// + +% Metafont, MetaPost inputs. +MFINPUTS = .;$TEXMF/metafont//;{$TEXMF/fonts,$VARTEXFONTS}/source// +MPINPUTS = .;$TEXMF/metapost// + +% Dump files (fmt/base/mem) for vir{tex,mf,mp} to read. +% We want to find the engine-specific file, e.g., cont-en.fmt can +% exist under both pdftex/ and xetex/. But just in case some formats +% end up without an engine directory, look directly in web2c/ too. +% We repeat the same definition three times because of the way fmtutil +% is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats +% will not be found. +TEXFORMATS = .;$TEXMF/web2c{/$engine,} +MFBASES = .;$TEXMF/web2c{/$engine,} +MPMEMS = .;$TEXMF/web2c{/$engine,} +% +% As of 2008, pool files don't exist any more (the strings are compiled +% into the binaries), but just in case something expects to find these: +TEXPOOL = .;$TEXMF/web2c +MFPOOL = ${TEXPOOL} +MPPOOL = ${TEXPOOL} + +% support the original xdvi. Must come before the generic settings. +PKFONTS.XDvi = .;$TEXMF/%s;$VARTEXFONTS/pk/{%m,modeless}// +VFFONTS.XDvi = .;$TEXMF/%s +PSHEADERS.XDvi = .;$TEXMF/%q{dvips,fonts/type1}// +TEXPICTS.XDvi = .;$TEXMF/%q{dvips,tex}// + +% Device-independent font metric files. +VFFONTS = .;$TEXMF/fonts/vf// +TFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/tfm// + +% The $MAKETEX_MODE below means the drivers will not use a cx font when +% the mode is ricoh. If no mode is explicitly specified, kpse_prog_init +% sets MAKETEX_MODE to /, so all subdirectories are searched. See the manual. +% The modeless part guarantees that bitmaps for PostScript fonts are found. +PKFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/pk/{$MAKETEX_MODE,modeless}// + +% Similarly for the GF format, which only remains in existence because +% Metafont outputs it (and MF isn't going to change). +GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MODE// + +% A backup for PKFONTS and GFFONTS. Not used for anything. +GLYPHFONTS = .;$TEXMF/fonts + +% A place to puth everything that doesn't fit the other font categories. +MISCFONTS = .;$TEXMF/fonts/misc// + +% font name map files. This isn't just fonts/map// because ConTeXt +% wants support for having files with the same name in the different +% subdirs. Maybe if the programs ever get unified to accepting the same +% map file syntax the definition can be simplified again. +TEXFONTMAPS = .;$TEXMF/fonts/map/{$progname,pdftex,dvips,}// + +% BibTeX bibliographies and style files. bibtex8 also uses these. +BIBINPUTS = .;$TEXMF/bibtex/bib// +BSTINPUTS = .;$TEXMF/bibtex/{bst,csf}// + +% MlBibTeX. +MLBIBINPUTS = .;$TEXMF/bibtex/bib/{mlbib,}// +MLBSTINPUTS = .;$TEXMF/bibtex/{mlbst,bst}// + +% MFT style files. +MFTINPUTS = .;$TEXMF/mft// + +% PostScript headers and prologues (.pro); unfortunately, some programs +% also use this for acessing font files (enc, type1, truetype) +TEXPSHEADERS = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3}}// +TEXPSHEADERS.gsftopk = .;$TEXMF/{dvips,fonts/{enc,type1,type42,type3,truetype}}// + +% OSFONTDIR is to provide a convenient hook for allowing TeX to find +% fonts installed on the system (outside of TeX). An empty default +% value would add "//" to the search paths, so we give it a dummy value. +% OSFONTDIR = /usr/share/fonts + +% PostScript Type 1 outline fonts. +T1FONTS = .;$TEXMF/fonts/type1//;$OSFONTDIR// + +% PostScript AFM metric files. +AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR// + +% TrueType outline fonts. +TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR// + +% Opentype outline fonts. +OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR// + +% Type 42 outline fonts. +T42FONTS = .;$TEXMF/fonts/type42// + +% Ligature definition files. +LIGFONTS = .;$TEXMF/fonts/lig// + +% Dvips' config.* files (this name should not start with `TEX'!). +TEXCONFIG = $TEXMF/dvips// + +% Makeindex style (.ist) files. +INDEXSTYLE = .;$TEXMF/makeindex// + +% Font encoding files (.enc). +ENCFONTS = .;$TEXMF/fonts/enc// + +% CMap files. +CMAPFONTS = .;$TEXMF/fonts/cmap// + +% Subfont definition files. +SFDFONTS = .;$TEXMF/fonts/sfd// + +% OpenType outline fonts. +OPENTYPEFONTS = .;$TEXMF/fonts/opentype// + +% OpenType feature files (.fea). +FONTFEATURES=.;$TEXMF/fonts/fea// + +% .cid and .cidmap +FONTCIDMAPS=.;$TEXMF/fonts/cid// + +% pdftex config files: +PDFTEXCONFIG = .;$TEXMF/pdftex/{$progname,}// + +% Used by DMP (ditroff-to-mpx), called by makempx -troff. +TRFONTS = /usr{/local,}/share/groff/{current/font,site-font}/devps +MPSUPPORT = .;$TEXMF/metapost/support + +% For xdvi to find mime.types and .mailcap, if they do not exist in +% ~. These are single directories, not paths. +% (But the default mime.types, at least, may well suffice.) +MIMELIBDIR = /etc +MAILCAPLIBDIR = /etc + +% Default settings for fontconfig library, used by Windows versions of +% xetex/xdvipdfmx. On Unixish systems, fontconfig ignores this. +FONTCONFIG_FILE=fonts.conf +FONTCONFIG_PATH=$TEXMFSYSVAR/fonts/conf +FC_CACHEDIR=$TEXMFSYSVAR/fonts/cache + +% TeX documentation and source files, for use with texdoc and kpsewhich. +TEXDOCS = $TEXMF/doc// +TEXSOURCES = .;$TEXMF/source// + +% Web and CWeb input paths. +WEBINPUTS = .;$TEXMF/web// +CWEBINPUTS = .;$TEXMF/cweb// + +% Omega-related fonts and other files. +OFMFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ofm,tfm}// +OPLFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/opl// +OVFFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/{ovf,vf}// +OVPFONTS = .;{$TEXMF/fonts,$VARTEXFONTS}/ovp// +OTPINPUTS = .;$TEXMF/omega/otp// +OCPINPUTS = .;$TEXMF/omega/ocp// + +% Some additional input variables for several programs. If you add +% a program that uses the `other text files' or `other binary files' +% search formats, you'll want to add their variables here as well. +T4HTINPUTS = .;$TEXMF/tex4ht// + +%% t4ht utility, sharing files with TeX4ht +TEX4HTFONTSET=alias,iso8859,unicode +TEX4HTINPUTS = .;$TEXMF/tex4ht/base//;$TEXMF/tex4ht/ht-fonts/{$TEX4HTFONTSET}// + +% TeXworks editor configuration and settings +TW_LIBPATH = $TEXMFCONFIG/texworks +TW_INIPATH = $TW_LIBPATH + +% Find scripts that are distributed/installed in the texmf tree. + +% Lua needs to look in TEXINPUTS for lua scripts distributed with packages. +LUAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/{lua,}//;$TEXINPUTS + +% Lua needs to look for binary lua libraries distributed with packages. +CLUAINPUTS = .;$SELFAUTOLOC/lib/{$progname,$engine,}/lua// + +% Architecture independent executables. +TEXMFSCRIPTS = $TEXMF/scripts/{$progname,$engine,}// + +% Other languages. +JAVAINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/java// +PERLINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/perl// +PYTHONINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/python// +RUBYINPUTS = .;$TEXMF/scripts/{$progname,$engine,}/ruby// + + +%% The mktex* scripts rely on KPSE_DOT. Do not set it in the environment. +% KPSE_DOT = . + +% This definition isn't used from this .cnf file itself (that would be +% paradoxical), but the compile-time default in paths.h is built from it. +% The SELFAUTO* variables are set automatically from the location of +% argv[0], in kpse_set_program_name. +% +% This main texmf.cnf file is installed, for a release YYYY, in a +% directory such as /usr/local/texlive/YYYY/texmf/web2c/texmf.cnf. +% Since this file is subject to future updates, the TeX Live installer +% or human administrator may also create a file +% /usr/local/texlive/YYYY/texmf.cnf; any settings in this latter file +% will take precedence over the distributed one under texmf/web2c. +% +% For security reasons, it is better not to include . in this path. +% +TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c} + +% kpathsea 3.5.3 and later sets these at runtime. To avoid empty +% expansions from binaries linked against an earlier version of the +% library, we set $progname and $engine to something non-empty: +progname = unsetprogname +engine = unsetengine + + +% Part 2: Options. + +% If this option is set to true, `tex a.b' will look first for a.b.tex +% (within each path element), and then for a.b, i.e., we try standard +% extensions first. If this is false, we first look for a.b and then +% a.b.tex, i.e., we try the name as-is first. +% +% Both names are always tried; the difference is the order in which they +% are tried. The setting applies to all searches, not just .tex. +% +% This setting only affects names being looked up which *already* have +% an extension. A name without an extension (e.g., `tex story') will +% always have an extension added first. +% +% The default is true, because we already avoid adding the standard +% extension(s) in the usual cases. E.g., babel.sty will only look for +% babel.sty, not babel.sty.tex, regardless of this setting. +try_std_extension_first = t + +% Enable system commands via \write18{...}. When enabled fully (set to +% t), obviously insecure. When enabled partially (set to p), only the +% commands listed in shell_escape_commands are allowed. Although this +% is not fully secure either, it is much better, and so useful that we +% enable it for everything but bare tex. +shell_escape = p + +% No spaces in this command list. +% +% The programs listed here are as safe as any we know: they either do +% not write any output files, respect openout_any, or have hard-coded +% restrictions similar or higher to openout_any=p. They also have no +% features to invoke arbitrary other programs, and no known exploitable +% bugs. All to the best of our knowledge. They also have practical use +% for being called from TeX. +% +shell_escape_commands = \ +bibtex,bibtex8,\ +kpsewhich,\ +makeindex,\ +repstopdf,\ + +% we'd like to allow: +% dvips - but external commands can be executed, need at least -R1. +% epspdf, ps2pdf, pstopdf - need to respect openout_any, +% and gs -dSAFER must be used and check for shell injection with filenames. +% (img)convert (ImageMagick) - delegates.mgk possible misconfig, besides, +% without Unix convert it hardly seems worth it, and Windows convert +% is something completely different that destroys filesystems, so skip. +% pygmentize - but is the filter feature insecure? +% ps4pdf - but it calls an unrestricted latex. +% rpdfcrop - maybe ok, but let's get experience with repstopdf first. +% texindy,xindy - but is the module feature insecure? +% ulqda - but requires optional SHA1.pm, so why bother. +% tex, latex, etc. - need to forbid --shell-escape, and inherit openout_any. + +% plain TeX should remain unenhanced. +shell_escape.tex = f + +% Allow TeX \openin, \openout, or \input on filenames starting with `.' +% (e.g., .rhosts) or outside the current tree (e.g., /etc/passwd)? +% a (any) : any file can be opened. +% r (restricted) : disallow opening "dotfiles". +% p (paranoid) : as `r' and disallow going to parent directories, and +% restrict absolute paths to be under $TEXMFOUTPUT. +openout_any = p +openin_any = a + +% Write .log/.dvi/etc. files here, if the current directory is unwritable. +% TEXMFOUTPUT = /tmp + +% If a dynamic file creation fails, log the command to this file, in +% either the current directory or TEXMFOUTPUT. Set to the +% empty string or 0 to avoid logging. +MISSFONT_LOG = missfont.log + +% Set to a colon-separated list of words specifying warnings to suppress. +% To suppress everything, use TEX_HUSH = all; this is currently equivalent to +% TEX_HUSH = checksum:lostchar:readable:special +% To suppress nothing, use TEX_HUSH = none or do not set the variable at all. +TEX_HUSH = none + +% Allow TeX, and MF to parse the first line of an input file for +% the %&format construct. +parse_first_line = t + +% But don't parse the first line if invoked as "tex", since we want that +% to remain Knuth-compatible. The src_specials and +% file_line_error_style settings, as well as the options -enctex, +% -mltex, -8bit, etc., also affect this, but they are all off by default. +parse_first_line.tex = f + +% Control file:line:error style messages. +file_line_error_style = f + +% Enable the mktex... scripts by default? These must be set to 0 or 1. +% Particular programs can and do override these settings, for example +% dvips's -M option. Your first chance to specify whether the scripts +% are invoked by default is at configure time. +% +% These values are ignored if the script names are changed; e.g., if you +% set DVIPSMAKEPK to `foo', what counts is the value of the environment +% variable/config value `FOO', not the `MKTEXPK' value. +% +% MKTEXTEX = 0 +% MKTEXPK = 0 +% MKTEXMF = 0 +% MKTEXTFM = 0 +% MKTEXFMT = 0 +% MKOCP = 0 +% MKOFM = 0 + +% Used by makempx to run TeX. We use "etex" because MetaPost is +% expecting DVI, and not "tex" because we want first line parsing. +TEX = etex + +% These variables specify the external program called for the +% interactive `e' option. %d is replaced by the line number and %s by +% the current filename. The default is specified at compile-time, and +% we let that stay in place since different platforms like different values. +%TEXEDIT = vi +%d "%s" +%MFEDIT = ${TEXEDIT} +%MPEDIT = ${TEXEDIT} + +% The default `codepage and sort order' file for BibTeX8, when none is +% given as command line option or environment variable. +BIBTEX_CSFILE = 88591lat.csf + +% Part 3: Array and other sizes for TeX (and Metafont). +% +% If you want to change some of these sizes only for a certain TeX +% variant, the usual dot notation works, e.g., +% main_memory.hugetex = 20000000 +% +% If a change here appears to be ignored, try redumping the format file. + +% Memory. Must be less than 8,000,000 total. +% +% main_memory is relevant only to initex, extra_mem_* only to non-ini. +% Thus, have to redump the .fmt file after changing main_memory; to add +% to existing fmt files, increase extra_mem_*. (To get an idea of how +% much, try \tracingstats=2 in your TeX source file; +% web2c/tests/memtest.tex might also be interesting.) +% +% To increase space for boxes (as might be needed by, e.g., PiCTeX), +% increase extra_mem_bot. +% +% For some xy-pic samples, you may need as much as 700000 words of memory. +% For the vast majority of documents, 60000 or less will do. +% +main_memory = 3000000 % words of inimemory available; also applies to inimf&mp +extra_mem_top = 0 % extra high memory for chars, tokens, etc. +extra_mem_bot = 0 % extra low memory for boxes, glue, breakpoints, etc. + +% ConTeXt needs lots of memory. +extra_mem_top.context = 2000000 +extra_mem_bot.context = 4000000 + +% Words of font info for TeX (total size of all TFM files, approximately). +% Must be >= 20000 and <= 147483647 (without tex.ch changes). +font_mem_size = 3000000 + +% Total number of fonts. Must be >= 50 and <= 9000 (without tex.ch changes). +font_max = 9000 + +% Extra space for the hash table of control sequences. +hash_extra = 200000 + +% Max number of characters in all strings, including all error messages, +% help texts, font names, control sequences. These values apply to TeX. +pool_size = 3250000 +% Minimum pool space after TeX's own strings; must be at least +% 25000 less than pool_size, but doesn't need to be nearly that large. +string_vacancies = 90000 +% Maximum number of strings. +max_strings = 500000 +% min pool space left after loading .fmt +pool_free = 47500 + +% Buffer size. TeX uses the buffer to contain input lines, but macro +% expansion works by writing material into the buffer and reparsing the +% line. As a consequence, certain constructs require the buffer to be +% very large, even though most documents can be handled with a small value. +buf_size = 200000 + +% Hyphenation trie. The maximum possible is 4194303 (ssup_trie_size in +% the sources), but we don't need that much. The value here suffices +% for all known free hyphenation patterns to be loaded simultaneously +% (as TeX Live does). +% +trie_size = 1000000 + +hyph_size = 8191 % prime number of hyphenation exceptions, >610, <32767. + % http://primes.utm.edu/curios/page.php/8191.html +nest_size = 500 % simultaneous semantic levels (e.g., groups) +max_in_open = 15 % simultaneous input files and error insertions, + % also applies to MetaPost +param_size = 10000 % simultaneous macro parameters, also applies to MP +save_size = 50000 % for saving values outside current group +stack_size = 5000 % simultaneous input sources + +% These work best if they are the same as the I/O buffer size, but it +% doesn't matter much. Must be a multiple of 8. +dvi_buf_size = 16384 % TeX +gf_buf_size = 16384 % MF + +% It's probably inadvisable to change these. At any rate, we must have: +% 45 < error_line < 255; +% 30 < half_error_line < error_line - 15; +% 60 <= max_print_line; +% These apply to TeX, Metafont, and MetaPost. +error_line = 79 +half_error_line = 50 +max_print_line = 79 + +% Metafont only. +screen_width.mf = 1664 +screen_depth.mf = 1200 + +% BibTeX only (max_strings also determines hash_size and hash_prime). +ent_str_size = 250 +glob_str_size = 5000 +max_strings.bibtex = 35307 +max_strings.bibtex8 = 35307 +max_strings.bibtexu = 35307 +max_strings.pbibtex = 35307 + +% GFtype only. +line_length.gftype = 500 +max_rows.gftype = 8191 +max_cols.gftype = 8191 diff --git a/testing/tomboy/PKGBUILD b/testing/tomboy/PKGBUILD index 51612dc2f..c773a5fce 100644 --- a/testing/tomboy/PKGBUILD +++ b/testing/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 118031 2011-04-05 06:53:56Z ibiru $ +# $Id: PKGBUILD 120780 2011-04-26 15:03:27Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=tomboy -pkgver=1.6.0 +pkgver=1.6.1 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs' '!makeflags') groups=('gnome-extra') install=tomboy.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.6/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('df68f0a087eaf582c408cf9915b7e6460bb020fcdea74b9bed63154d151108e5') +sha256sums=('4c0b5e0103682711e1cd620c9c617716a33b3520d62c22a2f6ab7bab2a54e61c') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD index b5516bb90..ed89d82b6 100644 --- a/testing/totem/PKGBUILD +++ b/testing/totem/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119221 2011-04-11 11:48:41Z ibiru $ +# $Id: PKGBUILD 120757 2011-04-26 11:04:01Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 url="http://www.hadess.net/totem.php3" arch=('i686' 'x86_64') license=('GPL2' 'custom') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gstreamer0.10-base-plugins' 'gstreame 'xulrunner' 'lirc-utils' 'libepc' 'bluez' 'vala') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('cfcd884d73ee7ac7a2ffd1c1191314d76fa738494621985ab865c47002cb481d') +sha256sums=('013b6cfedac6ff264aa27de7346597d0b8da7f4ed1f91b2c966a13d3fdff679a') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/testing/tzdata/Makefile.patch b/testing/tzdata/Makefile.patch new file mode 100644 index 000000000..e88f9d907 --- /dev/null +++ b/testing/tzdata/Makefile.patch @@ -0,0 +1,140 @@ +diff -Naur src/Makefile src-p/Makefile +--- src/Makefile 2007-08-20 16:47:41.000000000 +0200 ++++ src-p/Makefile 2007-10-02 04:07:44.000000000 +0200 +@@ -34,17 +34,17 @@ + + # Everything gets put in subdirectories of. . . + +-TOPDIR= /usr/local ++TOPDIR= $(DESTDIR)/usr + + # "Compiled" time zone information is placed in the "TZDIR" directory + # (and subdirectories). + # Use an absolute path name for TZDIR unless you're just testing the software. + +-TZDIR= $(TOPDIR)/etc/zoneinfo ++TZDIR= $(TOPDIR)/share/zoneinfo + + # The "tzselect", "zic", and "zdump" commands get installed in. . . + +-ETCDIR= $(TOPDIR)/etc ++SBINDIR= $(TOPDIR)/sbin + + # If you "make INSTALL", the "date" command gets installed in. . . + +@@ -52,7 +52,7 @@ + + # Manual pages go in subdirectories of. . . + +-MANDIR= $(TOPDIR)/man ++MANDIR= $(TOPDIR)/share/man + + # Library functions are put in an archive in LIBDIR. + +@@ -83,7 +83,7 @@ + + # Non-default libraries needed to link. + # Add -lintl if you want to use `gettext' on Solaris. +-LDLIBS= ++LDLIBS=$(LDFLAGS) + + # Add the following to the end of the "CFLAGS=" line as needed. + # -Dconst= if `const' does not work (SunOS 4.x cc, OSF1 V5.0 cc) +@@ -211,7 +211,7 @@ + # before the first Monday in January when a "%V" format is used and January 1 + # falls on a Friday, Saturday, or Sunday. + +-CFLAGS= ++CFLAGS += -std=gnu99 + + # If you want zic's -s option used when installing, uncomment the next line + # ZFLAGS= -s +@@ -220,7 +220,7 @@ + ZIC= $(zic) $(ZFLAGS) + + # The name of a Posix-compliant `awk' on your system. +-AWK= nawk ++AWK= awk + + # The path where SGML DTDs are kept. + SGML_SEARCH_PATH= $(TOPDIR)/share/doc/sgml-lib/REC-html401-19991224/ +@@ -241,8 +241,10 @@ + + ############################################################################### + +-cc= cc +-CC= $(cc) -DTZDIR=\"$(TZDIR)\" ++CC+= -DTZDIR=\"$(TZDIR)\" ++ifeq ($(NLS),1) ++CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" ++endif + + TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c + TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o +@@ -282,14 +284,16 @@ + + ALL: all date + +-install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) ++install: all $(DATA) $(REDO) $(MANS) $(TABDATA) + $(ZIC) -y $(YEARISTYPE) \ + -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) + -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab + cp iso3166.tab zone.tab $(TZDIR)/. +- -mkdir $(TOPDIR) $(ETCDIR) +- cp tzselect zic zdump $(ETCDIR)/. +- -mkdir $(TOPDIR) $(MANDIR) \ ++ -mkdir -p $(TOPDIR) $(SBINDIR) ++ cp zic zdump $(SBINDIR)/. ++ -mkdir -p $(TOPDIR) $(BINDIR) ++ cp tzselect $(BINDIR)/. ++ -mkdir -p $(TOPDIR) $(MANDIR) \ + $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 + -rm -f $(MANDIR)/man3/newctime.3 \ + $(MANDIR)/man3/newtzset.3 \ +@@ -298,13 +302,11 @@ + $(MANDIR)/man8/zdump.8 \ + $(MANDIR)/man8/zic.8 + cp newctime.3 newtzset.3 $(MANDIR)/man3/. +- cp tzfile.5 $(MANDIR)/man5/. +- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. + + INSTALL: ALL install date.1 +- -mkdir $(TOPDIR) $(BINDIR) ++ -mkdir -p $(TOPDIR) $(BINDIR) + cp date $(BINDIR)/. +- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 ++ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 + -rm -f $(MANDIR)/man1/date.1 + cp date.1 $(MANDIR)/man1/. + +@@ -334,9 +336,9 @@ + # You must replace all of $(TZDIR) to switch from not using leap seconds + # to using them, or vice versa. + other_two: zic leapseconds $(TDATA) +- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) ++ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) + $(ZIC) -y $(YEARISTYPE) \ +- -d $(TZDIR)-leaps -L leapseconds $(TDATA) ++ -d $(TZDIR)/right -L leapseconds $(TDATA) + + posix_right: posix_only other_two + +@@ -367,7 +369,7 @@ + <$? >$@ + chmod +x $@ + +-check: check_tables check_web ++check: check_tables + + check_tables: checktab.awk $(PRIMARY_YDATA) + $(AWK) -f checktab.awk $(PRIMARY_YDATA) +diff -Naur src/tzselect.ksh src-p/tzselect.ksh +--- src/tzselect.ksh 2007-08-20 16:47:42.000000000 +0200 ++++ src-p/tzselect.ksh 2007-10-02 04:07:44.000000000 +0200 +@@ -1,4 +1,4 @@ +-#! /bin/ksh ++#! /bin/bash + + # '@(#)tzselect.ksh 8.1' + diff --git a/testing/tzdata/PKGBUILD b/testing/tzdata/PKGBUILD new file mode 100644 index 000000000..c4f0f1267 --- /dev/null +++ b/testing/tzdata/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 120332 2011-04-22 11:15:12Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=tzdata +pkgver=2011f +pkgrel=1 +_tzcode=2011e +_tzdata=2011f +pkgdesc="Sources for time zone and daylight saving time data" +arch=('i686' 'x86_64') +url="http://www.twinsun.com/tz/tz-link.htm" +license=('GPL') +depends=() +makedepends=() +optdepends=('bash: required by tzselect') +options=('!emptydirs') +source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ + ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ + Makefile.patch) +md5sums=('fbfc05dbf9ebcfe7c4bba18549870173' + 'cc8136284ae1e6c720a18e0f080242e0' + 'a64ed97d1fc03c66ee8612c0d9f40507') + +build() { + cd ${srcdir} + + tar -xf tzcode${_tzcode}.tar.gz + tar -xf ${pkgname}${_tzdata}.tar.gz + + patch -Np1 -i "${srcdir}/Makefile.patch" + + make +} + +check() { + cd ${srcdir} + make check +} + +package() { + cd ${srcdir} + make DESTDIR="${pkgdir}" install + + rm "${pkgdir}/usr/share/zoneinfo/localtime" +} diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD index 53f03b189..b81b7c470 100644 --- a/testing/vinagre/PKGBUILD +++ b/testing/vinagre/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 117798 2011-04-04 17:59:09Z heftig $ +# $Id: PKGBUILD 120639 2011-04-25 18:49:25Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Allan McRae <mcrae_allan@hotmail.com> # Contributor: lp76 <l.peduto@gmail.com> pkgname=vinagre -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/vinagre/" install=vinagre.install -depends=('libgnome-keyring' 'gtk-vnc' 'avahi' 'desktop-file-utils' 'hicolor-icon-theme' 'telepathy-glib' 'dconf' 'libpeas' 'shared-mime-info') +depends=('libgnome-keyring' 'gtk-vnc' 'avahi' 'desktop-file-utils' 'hicolor-icon-theme' 'telepathy-glib' 'dconf' 'libpeas' 'shared-mime-info' 'gnome-icon-theme') optdepends=('rdesktop: RDP plugin') makedepends=('gtk-doc' 'intltool' 'rdesktop') groups=('gnome-extra') options=('!emptydirs' '!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c454b47264bbd424f345a79079f2651600ac8335d428c899e2b28d297450c124') +sha256sums=('a4c2ec5935c0cea0da1958e7f27a925a03867854cdcaf904ce8c7e405ebe2e5b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD index c797a3457..b3a5a76fb 100644 --- a/testing/vino/PKGBUILD +++ b/testing/vino/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117782 2011-04-04 17:53:52Z heftig $ +# $Id: PKGBUILD 120634 2011-04-25 18:44:11Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=vino -pkgver=3.0.0 +pkgver=3.0.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url="http://www.gnome.org" options=(!emptydirs) install=vino.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('15d511bc63a63f63b3bb182a9c7f48dd2d7c619fdb4305379d1018c5211314aa') +sha256sums=('d2111f1f8dbcb78005cce3d28ea42b5deabe5ced83eb11030e4a74874fdfdfca') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD index d0ff1cab4..1fb51459d 100644 --- a/testing/yelp/PKGBUILD +++ b/testing/yelp/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 119186 2011-04-11 08:24:47Z ibiru $ +# $Id: PKGBUILD 120703 2011-04-26 05:18:34Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64') depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' - 'xz' 'bzip2' 'desktop-file-utils') + 'xz' 'bzip2' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gtk-doc') groups=('gnome') license=('GPL') @@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('a7882da0d3efaf9491f6a7a5dbd2d2508a30e3856bce458e6ff58124ddce2eb3') +sha256sums=('6de6c45439b21a3042236d5d836de9dd44d59c2d4c324982c316b4b6834ce0a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" |