diff options
355 files changed, 4338 insertions, 11163 deletions
diff --git a/community-testing/addresses/PKGBUILD b/community-testing/addresses/PKGBUILD deleted file mode 100644 index ba7cc79c7..000000000 --- a/community-testing/addresses/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $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=6 -pkgdesc="A versatile address book application for GNUstep" -arch=('i686' 'x86_64' 'mips64el') -url="http://giesler.biz/bjoern/en/sw_addr.html" -license=('LGPL') -depends=('gnustep-back') -source=(http://giesler.biz/bjoern/downloads/Addresses-$pkgver.tar.gz) -md5sums=('2d6b6bf9a1578a5b3a13cb0bd2c60fad') - -build() { - . /etc/profile.d/GNUstep.sh - cd $srcdir/Addresses-$pkgver - 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 - make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$pkgdir install - - # buggy install scripts - cd $pkgdir/opt/GNUstep/System/Library/Headers/ - rm AddressBook - ln -sf Addresses AddressBook -} diff --git a/community-testing/cronie/PKGBUILD b/community-testing/cronie/PKGBUILD deleted file mode 100644 index 15b7e1dd0..000000000 --- a/community-testing/cronie/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 45295 2011-04-19 04:31:20Z kchen $ -# Maintainer: Kaiting Chen <kaiting.chen@kiwilight.com> - -pkgname=cronie -pkgver=1.4.7 -pkgrel=1 -pkgdesc='Fedora fork of vixie-cron with PAM support' -arch=('i686' 'x86_64') -url='https://fedorahosted.org/cronie/' -license=('custom:ISC') -backup=( - 'etc/crontab' 'etc/anacrontab' 'etc/pam.d/crond') -provides=('cron' 'dcron') -depends=('pam') -source=("https://fedorahosted.org/releases/c/r/$pkgname/$pkgname-$pkgver.tar.gz" - 'crontab' 'anacrontab' 'crond.pam.d' 'crond.rc.d' 'run-cron') -md5sums=('dfc26c47756d0c40ee27ae3c7ee98e0d' - '213994f8404ad2d2da18a9e0ce878a16' - 'b87041532eb123a3194b95dbe7fb284c' - 'd688904def891b8037dc3a06ab047f03' - '9b415c8a1faa44aa0538dcea88b432ec' - '00ede56aadf073c839e600033fbd6cb4') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-anacron \ - --without-audit \ - --without-selinux \ - --with-pam --with-inotify - make; make DESTDIR=$pkgdir install - - # Must set suid bit on file manually - chmod u+s $pkgdir/usr/bin/crontab - - # Install `run-cron` script - install -Dm755 $srcdir/run-cron $pkgdir/usr/bin/run-cron - - # Install system crontab and anacrontab and directories - install -Dm644 $srcdir/crontab $pkgdir/etc/crontab - install -Dm644 $srcdir/anacrontab $pkgdir/etc/anacrontab - install -d $pkgdir/etc/cron.d - install -d $pkgdir/etc/cron.{hour,dai,week,month}ly - - # Replaced Fedora PAM configuration - install -Dm644 $srcdir/crond.pam.d $pkgdir/etc/pam.d/crond - - # Install crond initscript - install -Dm755 $srcdir/crond.rc.d $pkgdir/etc/rc.d/crond - - # Install custom:ISC license - install -Dm644 COPYING $pkgdir/usr/share/licenses/cronie/COPYING -} diff --git a/community-testing/cronie/anacrontab b/community-testing/cronie/anacrontab deleted file mode 100644 index e9985b053..000000000 --- a/community-testing/cronie/anacrontab +++ /dev/null @@ -1,15 +0,0 @@ -### /etc/anacrontab: Main configuration for `anacron` -# See anacron(8) and anacrontab(5) for details - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -SHELL=/bin/bash -HOME=/var/empty -RANDOM_DELAY=45 -START_HOURS_RANGE=3-22 - -# Format: Period(day) Delay(minute) Name Command -30 15 cron.monthly run-cron /etc/cron.monthly - 1 5 cron.daily run-cron /etc/cron.daily - 7 10 cron.weekly run-cron /etc/cron.weekly - -### /etc/anacrontab: Main configuration for `anacron` diff --git a/community-testing/cronie/crond.rc.d b/community-testing/cronie/crond.rc.d deleted file mode 100755 index 8b05e65d7..000000000 --- a/community-testing/cronie/crond.rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -### /etc/rc.d/crond: Initscript for Cron Daemon - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/crond` -case "$1" in - start) - stat_busy "Starting Cron Daemon" - [ -z "$PID" ] && \ - /usr/sbin/crond &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else stat_done; add_daemon crond - echo $PID > /var/run/crond.pid - fi ;; - stop) - stat_busy "Stopping Cron Daemon" - [ ! -z "$PID" ] \ - && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - stat_done; rm_daemon crond - fi ;; - restart) - $0 stop - sleep 1 - $0 start ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 - -### /etc/rc.d/crond: Initscript for Cron Daemon diff --git a/community-testing/cronie/crontab b/community-testing/cronie/crontab deleted file mode 100644 index 4e8b66397..000000000 --- a/community-testing/cronie/crontab +++ /dev/null @@ -1,13 +0,0 @@ -### /etc/crontab: Master crontab for system `crond` - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -SHELL=/bin/bash -HOME=/var/empty - -# Format: Minute Hour Date Month Wday User Command - -01 * * * * root run-cron /etc/cron.hourly -@reboot root anacron -s -04 4 * * * root anacron -s - -### /etc/crontab: Master crontab for system `crond` diff --git a/community-testing/cronie/run-cron b/community-testing/cronie/run-cron deleted file mode 100755 index 5c62e3377..000000000 --- a/community-testing/cronie/run-cron +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -# run-parts - concept taken from Debian - -# keep going when something fails -set +e - -if [ $# -lt 1 ]; then - echo "Usage: run-parts <dir>" - exit 1 -fi - -if [ ! -d $1 ]; then - echo "Not a directory: $1" - exit 1 -fi - -# Ignore *~ and *, scripts -for i in $1/*[^~,] ; do - [ -d $i ] && continue - # Don't run *.{pacsave,pacorig,pacnew,swp} scripts - [ "${i%.pacsave}" != "${i}" ] && continue - [ "${i%.pacorig}" != "${i}" ] && continue - [ "${i%.pacnew}" != "${i}" ] && continue - [ "${i%.swp}" != "${i}" ] && continue - [ "${i%,v}" != "${i}" ] && continue - - if [ -x $i ]; then - $i 2>&1 | awk -v "progname=$i" \ - 'progname { - print progname ":\n" - progname=""; - } - { print; }' - fi -done - -exit 0 diff --git a/community-testing/gcc-avr/PKGBUILD b/community-testing/gcc-avr/PKGBUILD deleted file mode 100644 index 0fbb6721c..000000000 --- a/community-testing/gcc-avr/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $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.6.0 -pkgrel=3 -pkgdesc="The GNU avr Compiler Collection" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'custom') -url="http://gcc.gnu.org/" -depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.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) -md5sums=('b1957f3209080b2f55bc3756d3a62b7c' - 'a30090fa655d0db4c970740d353c81f1') - -build() { - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - cd "${srcdir}/${pkgname/-avr}-${pkgver}" - - mkdir build - cd build - ../configure --disable-libssp \ - --disable-nls \ - --enable-languages=c,c++ \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --target=avr \ - --with-gnu-as \ - --with-gnu-ld \ - --with-as=/usr/bin/avr-as \ - --with-ld=/usr/bin/avr-ld - - make -} - -package() { - cd "${srcdir}/${pkgname/-avr}-${pkgver}" - - 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-testing/gnumail/PKGBUILD b/community-testing/gnumail/PKGBUILD deleted file mode 100644 index 6d4ea1590..000000000 --- a/community-testing/gnumail/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $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=4 -pkgdesc="A complete and fast mail application for GNUstep" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.collaboration-world.com/gnumail" -license=('GPL') -depends=('pantomime' 'addresses' 'gcc' 'gnustep-gui') -options=('!makeflags') -source=(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/GNUMail - . /etc/profile.d/GNUstep.sh - make - make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install -} diff --git a/community-testing/gnustep-back/ChangeLog b/community-testing/gnustep-back/ChangeLog deleted file mode 100644 index 15622ab88..000000000 --- a/community-testing/gnustep-back/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-27 tardo <tardo@nagi-fanboi.net> -* version upgrade diff --git a/community-testing/gnustep-back/PKGBUILD b/community-testing/gnustep-back/PKGBUILD deleted file mode 100644 index 80dbecc6d..000000000 --- a/community-testing/gnustep-back/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $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.20.0 -pkgrel=1 -pkgdesc="The GNUstep GUI Backend" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnustep.org/" -license=('LGPL') -depends=(libgl libxmu gcc-libs freetype2 libart-lgpl) -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=('a28ba696419eeab17f14c2a75b21c3a7') - -build() { - cd $srcdir/$pkgname-$pkgver - . /etc/profile.d/GNUstep.sh - ./configure --prefix=/usr --sysconfdir=/etc/GNUstep - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/gnustep-base/ChangeLog b/community-testing/gnustep-base/ChangeLog deleted file mode 100644 index 590f23f5e..000000000 --- a/community-testing/gnustep-base/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -2007-07-24 Snowman <eric@archlinux> - * rebuilt against toolchain in current - * fixed SMP build - * fixed file ownership -2007-06-26 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 diff --git a/community-testing/gnustep-base/PKGBUILD b/community-testing/gnustep-base/PKGBUILD deleted file mode 100644 index 7839af753..000000000 --- a/community-testing/gnustep-base/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $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.22.0 -pkgrel=1 -pkgdesc="The GNUstep base package" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnustep.org/" -license=("GPL" "LGPL") -depends=(libxslt avahi gmp gcc-libs openssl 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=('7faab4891ae6c1e7a6c806d6da368410') - -build() { - cd $srcdir/$pkgname-$pkgver - source /etc/profile.d/GNUstep.sh - ./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 - make DESTDIR=$pkgdir install - chown -R root.root $pkgdir/ -} diff --git a/community-testing/gnustep-gui/ChangeLog b/community-testing/gnustep-gui/ChangeLog deleted file mode 100644 index 15622ab88..000000000 --- a/community-testing/gnustep-gui/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-27 tardo <tardo@nagi-fanboi.net> -* version upgrade diff --git a/community-testing/gnustep-gui/PKGBUILD b/community-testing/gnustep-gui/PKGBUILD deleted file mode 100644 index 677f7fd80..000000000 --- a/community-testing/gnustep-gui/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $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.20.0 -pkgrel=1 -pkgdesc="The GNUstep GUI class library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnustep.org/" -license=('LGPL') -depends=(gnustep-base libungif aspell gcc-libs libcups audiofile libsndfile giflib libao) -makedepends=(gcc-objc) -conflicts=('gnustep-gui-svn') -groups=('gnustep-core') -options=('!makeflags') -source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b') - -build() { - cd $srcdir/$pkgname-$pkgver - . /etc/profile.d/GNUstep.sh - ./configure --prefix=/usr --sysconfdir=/etc/GNUstep - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/gnustep-make/ChangeLog b/community-testing/gnustep-make/ChangeLog deleted file mode 100644 index 15622ab88..000000000 --- a/community-testing/gnustep-make/ChangeLog +++ /dev/null @@ -1,2 +0,0 @@ -2007-06-27 tardo <tardo@nagi-fanboi.net> -* version upgrade diff --git a/community-testing/gnustep-make/PKGBUILD b/community-testing/gnustep-make/PKGBUILD deleted file mode 100644 index e7edf7dff..000000000 --- a/community-testing/gnustep-make/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $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.6.0 -pkgrel=1 -pkgdesc="The GNUstep make package" -arch=(i686 x86_64) -url="http://www.gnustep.org/" -license=('GPL') -depends=('glibc') -conflicts=('gnustep-make-svn') -groups=('gnustep-core') -source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('71a6c6d9a0b341495e67c915fe6722c1') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc/GNUstep - make - make DESTDIR=$pkgdir install - install -D -m755 \ - $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ - $pkgdir/etc/profile.d/GNUstep.sh -} diff --git a/community-testing/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD deleted file mode 100644 index e95ef92be..000000000 --- a/community-testing/gpsdrive/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $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=7 -pkgdesc="A car (bike, ship, plane) navigation system" -arch=("i686" "x86_64") -url="http://www.gpsdrive.de/" -license=('GPL2') -depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn' - 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri' - 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer' - ) # already in core ('sqlite3') -makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') -install="gpsdrive.install" -source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" - "gpsd-2.96.patch") -md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' - '5769e12c6d8932fb721212434c64f505') - -build() { - cd "$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 - - rm -rf build - mkdir build - cd build - - # fix the mapnik default values - sed -i 's|"/usr/lib/mapnik/0.7/input/"|"/usr/lib/mapnik/input/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" - sed -i 's|"/usr/share/fonts/truetype/ttf-dejavu/"|"/usr/share/fonts/TTF/"|' "${srcdir}/gpsdrive-${pkgver}/src/gpsdrive_config.c" - - export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/ - - export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" - - # see DefineOptions.cmake for a list of common options and defaults - # cmake -L for a more in-depth listing - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \ - -DWITH_SCRIPTS=ON \ - -DWITH_MAPNIK=ON \ - -DWITH_POSTGIS=ON \ - -DWITH_GDAL=ON \ - -DWITH_BASEMAPS=ON \ - -DWITH_FRIENDSD=ON \ - -DWITH_KISMET=ON \ - -DWITH_NAVIGATION=ON \ - -DWITH_SPEECH=OFF \ - -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-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install deleted file mode 100644 index 8ea63912e..000000000 --- a/community-testing/gpsdrive/gpsdrive.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "Don't forget to generate geoinfo.db with geoinfo.pl script" - echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive" -} diff --git a/community-testing/llvm/PKGBUILD b/community-testing/llvm/PKGBUILD deleted file mode 100644 index ad8dc556b..000000000 --- a/community-testing/llvm/PKGBUILD +++ /dev/null @@ -1,225 +0,0 @@ -# $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> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') -pkgver=2.9 -_gcc_ver=4.6.0 -pkgrel=4 -arch=('i686' 'x86_64' 'mips64el') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") -source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz - http://llvm.org/releases/$pkgver/clang-$pkgver.tgz - ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz - clang-plugin-loader-registry.patch - cindexer-clang-path.patch - clang-toolchains-gcc-versions.patch - clang-pure64.patch - enable-lto.patch) -md5sums=('793138412d2af2c7c7f54615f8943771' - '634de18d04b7a4ded19ec4c17d23cfca' - '70e23a3dc2b38ecb2bb4d2c48f47295d' - '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0' - '8da236120a9a287a977b575b8b905c93' - '225ee6b531f8327f34f344a18cb4ec81' - '8f7582d7440e4a8342c3aea9ec714fb4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # At the present, clang must reside inside the LLVM source code tree to build - # See http://llvm.org/bugs/show_bug.cgi?id=4840 - rm -rf tools/clang - cp -r "$srcdir/clang-$pkgver" tools/clang - - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in - - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Get the correct list of symbols to export - # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html - patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" - - # 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 - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - # 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 -} - -package_llvm() { - pkgdesc="Low Level Virtual Machine" - depends=('perl' 'libffi') - - cd "$srcdir/$pkgname-$pkgver" - - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - mv tools/clang "$srcdir" - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - mv "$srcdir/clang" tools - - # OCaml bindings go to a separate package - rm -rf "$srcdir"/{ocaml,ocamldoc} - mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir" - - # Remove duplicate files installed by the OCaml bindings - rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz} - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* - - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm-ocaml() { - pkgdesc="OCaml bindings for LLVM" - depends=("llvm=$pkgver-$pkgrel" 'ocaml') - - cd "$srcdir/llvm-$pkgver" - - install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm} - cp -r "$srcdir/ocaml" "$pkgdir/usr/lib" - cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm" - - # Remove execute bit from static libraries - chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE" -} - -package_clang() { - pkgdesc="C language family frontend for LLVM" - url="http://clang.llvm.org/" - # It looks like clang still needs GCC to assemble and link object files - # See http://old.nabble.com/%22clang--v%22-shows-a-GCC-call-td28378453.html - depends=("llvm=$pkgver-$pkgrel" "gcc=$_gcc_ver") - - # Fix installation path for clang docs - sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \ - "$srcdir/llvm-$pkgver/Makefile.config" - - cd "$srcdir/llvm-$pkgver/tools/clang" - make DESTDIR="$pkgdir" install - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/llvm/*.a - - # Revert the path change in case we want to do a repackage later - 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" -} - -package_clang-analyzer() { - pkgdesc="A source code analysis framework" - url="http://clang-analyzer.llvm.org/" - depends=("clang=$pkgver-$pkgrel" 'python2') - - 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/" - done - - # Use Python 2 - sed -i 's/env python$/\02/' \ - "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \ - "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer" - - # Compile Python scripts - python2 -m compileall "$pkgdir/usr/lib/clang-analyzer" - python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/llvm/cindexer-clang-path.patch b/community-testing/llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/community-testing/llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/community-testing/llvm/clang-plugin-loader-registry.patch b/community-testing/llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9fce..000000000 --- a/community-testing/llvm/clang-plugin-loader-registry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map ---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 -+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 -@@ -2,6 +2,7 @@ - global: main; - __progname; - environ; -+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; - - local: *; - }; diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD deleted file mode 100644 index e478e9200..000000000 --- a/community-testing/qlandkartegt/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $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=2 -pkgdesc="Use your GPS with Linux" -arch=('i686' 'x86_64') -url="http://www.qlandkarte.org/" -license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs' 'qt' 'shared-mime-info') -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 - gpsd-2.96.patch) -sha256sums=('0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9' - '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 - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. - make -} - -package(){ - cd ${srcdir}/$pkgname-$pkgver/build - - make DESTDIR=${pkgdir} install - - install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \ - ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml -} diff --git a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml deleted file mode 100644 index 46d3d402c..000000000 --- a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/vnd.qlandkartegt.qlb"> - <comment>QLandkarteGT File</comment> - <glob pattern="*.qlb"/> - </mime-type> -</mime-info> diff --git a/community-testing/qlandkartegt/qlandkartegt.changelog b/community-testing/qlandkartegt/qlandkartegt.changelog deleted file mode 100644 index c832cc8d2..000000000 --- a/community-testing/qlandkartegt/qlandkartegt.changelog +++ /dev/null @@ -1,9 +0,0 @@ -2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.1.1-1 - -2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.1.0-1 - -2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.0.1-2 - * moved to [community] with 59 AUR votes diff --git a/community-testing/qlandkartegt/qlandkartegt.install b/community-testing/qlandkartegt/qlandkartegt.install deleted file mode 100644 index aacc9e6a8..000000000 --- a/community-testing/qlandkartegt/qlandkartegt.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { -update-mime-database usr/share/mime > /dev/null -} - -post_remove() { -update-mime-database usr/share/mime > /dev/null -} diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD index 40e6e4c9f..978b33d71 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' 'mips64el') 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-testing/systemd/PKGBUILD b/community-testing/systemd/PKGBUILD deleted file mode 100644 index 44d23a795..000000000 --- a/community-testing/systemd/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 44387 2011-04-06 23:47:15Z dreisner $ -# Maintainer: Dave Reisner <d@falconindy.com> - -pkgname=systemd -pkgver=24 -pkgrel=1 -pkgdesc="Session and Startup manager" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2') -depends=('dbus-core' 'initscripts' 'sysvinit' 'util-linux>=2.19') -makedepends=('docbook-xsl' 'libxslt' 'cryptsetup' 'gtk2' 'libnotify') -optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'gtk2: systemadm' - 'initscripts-systemd: native boot and initialization scripts' - 'libnotify: systemadm' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') -groups=('systemd') -options=('!libtool') -backup=(etc/systemd/system.conf - etc/tmpfiles.d/systemd.conf - etc/tmpfiles.d/x11.conf) -install=systemd.install -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" - "os-release") -md5sums=('4a6b7d99f35bdae21d7f9b698792b8d3' - 'f9922299150b4adda7b89e10bca33033') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr \ - --with-rootdir=/ \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-audit \ - --disable-tcpwrap - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - install -dm755 "$pkgdir/etc/modules-load.d" "$pkgdir/run" - printf "d /var/run/console 755 root root\n" > "$pkgdir/etc/tmpfiles.d/console.conf" - - # fix systemd-analyze for python2 - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # install target doesn't bring in plymouth units - install -m644 units/plymouth-* "$pkgdir/lib/systemd/system" - - # rename man pages to avoid conflicts with sysvinit - cd "$pkgdir/usr/share/man/man8" - for manpage in telinit halt reboot poweroff runlevel shutdown; do - mv {,systemd.}"$manpage.8" - done -} - diff --git a/community-testing/systemd/os-release b/community-testing/systemd/os-release deleted file mode 100644 index 0b45d5265..000000000 --- a/community-testing/systemd/os-release +++ /dev/null @@ -1,4 +0,0 @@ -NAME=Arch Linux -ID=arch -PRETTY_NAME=Arch Linux -ANSI_COLOR=1;36
\ No newline at end of file diff --git a/community-testing/systemd/systemd.install b/community-testing/systemd/systemd.install deleted file mode 100644 index 259d09b9e..000000000 --- a/community-testing/systemd/systemd.install +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -checkgroups() { - getent group lock >/dev/null || groupadd -g 54 lock - - utmpent=$(getent group utmp) - if [ -z $utmpent ]; then - getent group utmp >/dev/null || groupadd -g 32 utmp - elif [ $(echo $utmpent | cut -d: -f3) = '22' ]; then - groupmod -g 32 utmp - fi -} - -post_install() { - checkgroups - - [ -f /etc/machine-id ] || /bin/systemd-machine-id-setup - - # Try to read default runlevel from the old inittab if it exists - runlevel=$(/bin/awk -F':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null) - if [ -z "$runlevel" ]; then - target="/lib/systemd/system/graphical.target" - else - target="/lib/systemd/system/runlevel$runlevel.target" - fi - - # And symlink what we found to the new-style default.target - /bin/ln -sf "$target" /etc/systemd/system/default.target - - echo "systemd has been installed to /bin/systemd. Please ensure you append" - echo "init=/bin/systemd to your kernel command line in your bootloader." -} - -post_upgrade() { - checkgroups - - [ -f /etc/machine-id ] || /bin/systemd-machine-id-setup - /bin/systemctl daemon-reexec >/dev/null || : -} - -pre_remove() { - /bin/rm -f /etc/systemd/system/default.target -} - -post_remove() { - getent group lock >/dev/null && groupdel lock - getent group utmp >/dev/null && groupdel utmp -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/viking/PKGBUILD b/community-testing/viking/PKGBUILD deleted file mode 100644 index 6f73fc6ef..000000000 --- a/community-testing/viking/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $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=2 -pkgdesc="GTK+2 application to manage GPS data" -arch=('i686' 'x86_64') -url="http://viking.sourceforge.net/" -license=('GPL2') -depends=('curl' 'gpsd' 'gtk2' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') -optdepends=('gpsbabel: for GPS management') -options=('!emptydirs') -install=$pkgname.install -changelog=$pkgname.changelog -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 -} - -package(){ - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/viking/viking.changelog b/community-testing/viking/viking.changelog deleted file mode 100644 index d38e25a9e..000000000 --- a/community-testing/viking/viking.changelog +++ /dev/null @@ -1,6 +0,0 @@ -2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * gebabbel 1.1-1 - -2011-02-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * gebabbel 1.0.2-2 - * moved to [community] with 62 AUR votes diff --git a/community-testing/viking/viking.install b/community-testing/viking/viking.install deleted file mode 100644 index 8de1998bf..000000000 --- a/community-testing/viking/viking.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/addresses/PKGBUILD b/community/addresses/PKGBUILD index e651baa3d..ba7cc79c7 100644 --- a/community/addresses/PKGBUILD +++ b/community/addresses/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 18081 2010-05-31 08:52:52Z spupykin $ +# $Id: PKGBUILD 44420 2011-04-07 13:06:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=addresses pkgver=0.4.6 -pkgrel=5 +pkgrel=6 pkgdesc="A versatile address book application for GNUstep" arch=('i686' 'x86_64' 'mips64el') url="http://giesler.biz/bjoern/en/sw_addr.html" @@ -17,12 +17,12 @@ md5sums=('2d6b6bf9a1578a5b3a13cb0bd2c60fad') build() { . /etc/profile.d/GNUstep.sh cd $srcdir/Addresses-$pkgver - sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile || return 1 + sed -i -e 's|Versions/A|Versions/0|g' {Test,AddressManager}/GNUmakefile export PATH=$startdir/gcc-objc/src/gcc-4.2.1/build/qwe/usr/bin:$PATH - make || return 1 - make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$startdir/pkg install || return 1 + make + make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System INSTALL_ROOT_DIR=$pkgdir install # buggy install scripts cd $pkgdir/opt/GNUstep/System/Library/Headers/ diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD index c9bacdea9..ec00c2965 100644 --- a/community/bullet/PKGBUILD +++ b/community/bullet/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 36776 2011-01-07 21:59:47Z svenstaro $ +# $Id: PKGBUILD 45481 2011-04-22 06:49:32Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgbase=bullet pkgname=('bullet' 'bullet-docs') -pkgver=2.77 -pkgrel=3 +pkgver=2.78 +pkgrel=1 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation" arch=('i686' 'x86_64' 'mips64el') url="http://www.bulletphysics.com/Bullet/" license=('custom:zlib') depends=('freeglut') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu') -source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}.tgz \ +source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r2387.tgz \ ${pkgbase}.pc) -md5sums=('2f5074a1a29b618c672f1da4748e374b' +md5sums=('3611456232f1c01dea8094213382d0b3' 'd1da06deba3b08b884d2212f6838905c') build() { diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index f61bc69c8..ced4e3c5e 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 45260 2011-04-18 21:38:03Z giovanni $ +# $Id: PKGBUILD 45564 2011-04-24 10:21:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.7.56 -pkgrel=2 +pkgver=0.7.57 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre.kovidgoyal.net/" @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('876fd29039f473b92dbeb2f0918502e8' +md5sums=('62879f10d2d4ab72b22ad744a44dbf67' 'bcc538a3b004429bf8f5a0ac1d89a37f') build() { diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 9aefd46da..35134a563 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45121 2011-04-16 15:59:33Z foutrelis $ +# $Id: PKGBUILD 45620 2011-04-26 00:57:42Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Daemon which collects system performance statistics periodically' arch=('i686' 'x86_64' 'mips64el') url='http://collectd.org/' @@ -43,10 +43,12 @@ depends=('libtool') source=("${url}files/$pkgname-$pkgver.tar.gz" 'libnotify-0.7.patch' - 'rc.d') + 'rc.d' + 'yajl-2.x.patch') sha1sums=('026e5121348f0e525dedb3844fe61c7713994bb7' 'f6fed097c16f6c9c90b9a32a5b8e48d54b35b337' - '0f441718d5519cb043b1130e5a1d0379078adbcc') + '0f441718d5519cb043b1130e5a1d0379078adbcc' + '2586559fc8d2b54f3d242a3e815ed81e81e0341b') install=install @@ -54,9 +56,17 @@ build() { cd "$srcdir/$pkgname-$pkgver" unset LDFLAGS # or perl not found patch -p1 -i ../libnotify-0.7.patch + + # fixes for yajl 2.x API changes + patch -Np0 < "$srcdir/yajl-2.x.patch" + sed -i 's/ipt_error_target/bozo_error_target/g' src/owniptc/libiptc.c ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-static=no --with-python=/usr/bin/python2 + + # avoid -Werror with gcc 4.6 + sed -i '/^AM_CFLAGS/s/ -Werror//' src/Makefile + make all } diff --git a/community/collectd/yajl-2.x.patch b/community/collectd/yajl-2.x.patch new file mode 100644 index 000000000..6cd208006 --- /dev/null +++ b/community/collectd/yajl-2.x.patch @@ -0,0 +1,57 @@ +--- src/curl_json.c 2011-04-25 20:43:00.972938855 -0400 ++++ src/curl_json.c 2011-04-25 20:46:03.859938860 -0400 +@@ -98,8 +98,7 @@ + return (0); + + status = yajl_parse(db->yajl, (unsigned char *)buf, len); +- if ((status != yajl_status_ok) +- && (status != yajl_status_insufficient_data)) ++ if ((status != yajl_status_ok)) + { + unsigned char *msg = + yajl_get_error(db->yajl, /* verbose = */ 1, +@@ -130,7 +129,7 @@ + /* "number" may not be null terminated, so copy it into a buffer before + * parsing. */ + static int cj_cb_number (void *ctx, +- const char *number, unsigned int number_len) ++ const char *number, size_t number_len) + { + char buffer[number_len + 1]; + +@@ -159,7 +158,7 @@ + } /* int cj_cb_number */ + + static int cj_cb_map_key (void *ctx, const unsigned char *val, +- unsigned int len) ++ size_t len) + { + cj_t *db = (cj_t *)ctx; + c_avl_tree_t *tree; +@@ -187,7 +186,7 @@ + } + + static int cj_cb_string (void *ctx, const unsigned char *val, +- unsigned int len) ++ size_t len) + { + cj_t *db = (cj_t *)ctx; + char str[len + 1]; +@@ -697,7 +696,7 @@ + char *url; + yajl_handle yprev = db->yajl; + +- db->yajl = yajl_alloc (&ycallbacks, NULL, NULL, (void *)db); ++ db->yajl = yajl_alloc (&ycallbacks, NULL, (void *)db); + if (db->yajl == NULL) + { + ERROR ("curl_json plugin: yajl_alloc failed."); +@@ -730,7 +729,7 @@ + return (-1); + } + +- status = yajl_parse_complete (db->yajl); ++ status = yajl_complete_parse (db->yajl); + if (status != yajl_status_ok) + { + unsigned char *errmsg; diff --git a/community/cross-arm-wince-cegcc-gcc/PKGBUILD b/community/cross-arm-wince-cegcc-gcc/PKGBUILD index c645a2ea6..4185152dc 100644 --- a/community/cross-arm-wince-cegcc-gcc/PKGBUILD +++ b/community/cross-arm-wince-cegcc-gcc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 23529 2010-08-12 13:44:06Z spupykin $ +# $Id: PKGBUILD 45499 2011-04-22 14:57:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cross-arm-wince-cegcc-gcc pkgver=0.59.1 -pkgrel=2 +pkgrel=3 _prefix=/opt/cegcc pkgdesc="CE GCC bundle - cross compilation tools for WinCE" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ depends=(cross-arm-wince-cegcc-binutils) makedepends=(cross-arm-wince-cegcc-newlib cross-arm-wince-cegcc-w32api cross-arm-wince-cegcc-importlibs) conflicts=(cross-arm-wince-cegcc-gcc-base) groups=('cegcc') -source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) +source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2) md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b') build() { @@ -30,32 +30,30 @@ build() { mkdir build-gcc || true cd build-gcc -if [ $NOEXTRACT -ne 1 ]; then - ../gcc-4.4.0/configure \ + [ -f Makefile ] || ../gcc-4.4.0/configure \ --prefix=${_prefix} \ --exec-prefix=${_prefix} \ --bindir=${_prefix}/bin \ - --target=arm-wince-cegcc \ - --build=$CARCH \ - --host=$CARCH \ + --target=$TARGET \ + --build=$CARCH \ + --host=$CARCH \ --disable-nls \ --includedir=${_prefix}/include \ - --with-gcc \ - --with-ld=/opt/cegcc/bin/arm-wince-cegcc-ld \ - --with-as=/opt/cegcc/bin/arm-wince-cegcc-as \ - --enable-threads=win32 \ - --enable-languages=c,c++ \ - --disable-win32-registry \ - --disable-multilib \ - --disable-interwork \ - --without-newlib \ - --enable-checking \ - --with-headers \ + --with-gcc \ + --with-ld=/opt/cegcc/bin/arm-wince-cegcc-ld \ + --with-as=/opt/cegcc/bin/arm-wince-cegcc-as \ + --enable-threads=win32 \ + --enable-languages=c,c++ \ + --disable-win32-registry \ + --disable-multilib \ + --disable-interwork \ + --without-newlib \ + --enable-checking \ + --with-headers \ --disable-libssp -fi - make || return 1 - make DESTDIR=$pkgdir install || return 1 + make + make DESTDIR=$pkgdir install rm -f $pkgdir/$_prefix/lib/libiberty.a find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \; } diff --git a/community/espeak/PKGBUILD b/community/espeak/PKGBUILD index 39008ff1c..450892dba 100644 --- a/community/espeak/PKGBUILD +++ b/community/espeak/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 28906 2010-10-07 13:37:38Z cbrannon $ +# $Id: PKGBUILD 45579 2011-04-24 17:47:21Z mherych $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: niQo # Contributor: Christoph Siegenthaler <csi@gmx.ch> pkgname=espeak -pkgver=1.44.05 -pkgrel=2 +pkgver=1.45.03 +pkgrel=1 pkgdesc="Text to Speech engine for good quality English, with support for other languages" arch=('i686' 'x86_64' 'mips64el') url="http://espeak.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'portaudio') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}-source.zip) -md5sums=('603b3e5fc8510a82b76f51a94cb3c7a1') +md5sums=('68fbabb4e2021b83f606ad6a019e98df') build() { cd $srcdir/$pkgname-$pkgver-source/src diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 93f630d66..0492984ba 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=0.7.1 -pkgrel=2 +pkgver=0.7.2 +pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') url="http://paste.xinu.at" @@ -24,4 +24,4 @@ package() { } # vim:set ts=2 sw=2 et: -md5sums=('a14be40bb23986c45a26b3cdb56d04f6') +md5sums=('bbe2402e8e7bd0e39047793ab7a488a9') diff --git a/community/gcc-avr/PKGBUILD b/community/gcc-avr/PKGBUILD index be1ae43be..0fbb6721c 100644 --- a/community/gcc-avr/PKGBUILD +++ b/community/gcc-avr/PKGBUILD @@ -1,30 +1,27 @@ +# $Id: PKGBUILD 43891 2011-03-30 19:48:35Z bfanella $ # Maintainer: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: danst0 <danst0@west.de> pkgname=gcc-avr -pkgver=4.5.2 -pkgrel=1 +pkgver=4.6.0 +pkgrel=3 pkgdesc="The GNU avr Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'custom') url="http://gcc.gnu.org/" -depends=('binutils-avr>=2.21' 'cloog-ppl' 'gcc-libs>=4.5.2' 'libmpc' 'elfutils') +depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc') options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') -source=(http://ftp.gnu.org/gnu/gcc/${pkgname/-avr}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 - 'add-more-mcus.patch') -md5sums=('aa9e36bec080452372bfba793428ee82' - '9821f1c61e43755866861485ff364e90' - 'b2c3418c571f7c9b794dcf44eb186548') +source=(http://ftp.gnu.org/gnu/gcc/${pkgname/-avr}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2) +md5sums=('b1957f3209080b2f55bc3756d3a62b7c' + 'a30090fa655d0db4c970740d353c81f1') + build() { export CFLAGS="-O2 -pipe" export CXXFLAGS="-O2 -pipe" cd "${srcdir}/${pkgname/-avr}-${pkgver}" - # http://gcc.gnu.org/ml/gcc-patches/2010-04/msg01210.html - patch -p0 -i ${srcdir}/add-more-mcus.patch - mkdir build cd build ../configure --disable-libssp \ @@ -50,6 +47,9 @@ package() { cd build make -j1 DESTDIR=${pkgdir} install + install -Dm644 "${srcdir}/${pkgname/-avr}-${pkgver}/COPYING.RUNTIME" \ + "${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION" + rm -f ${pkgdir}/usr/lib/libiberty.a rm -rf ${pkgdir}/usr/share/man/man7 rm -rf ${pkgdir}/usr/share/info diff --git a/community/gcc-avr/add-more-mcus.patch b/community/gcc-avr/add-more-mcus.patch deleted file mode 100644 index 826487d32..000000000 --- a/community/gcc-avr/add-more-mcus.patch +++ /dev/null @@ -1,316 +0,0 @@ -tHE ATTAChed patch adds support for a number of new AVR devices, -and also removes support for some devices (where the devices -were never manufactured, or incorrect names). Patch committed. - -A separate patch for the web pages will be forthcoming. - -Eric Weddington - - -2010-04-19 Eric B. Weddington <eric.weddington@atmel.com> - -* config/avr/avr-devices.c (avr_mcu_types): Add support for new -devices atmega644pa, attiny2313a, attiny24a, attiny261a, attiny4313, -attiny44a, attiny861a, atmega16a, atmega168a, atmega164a, atmega165a, -atmega169a, atmega169pa, atmega16hva2, atmega324a, atmega324pa, -atmega325a, atmega3250a, atmega328, atmega329a, atmega329pa, -atmega3290a, atmega48a, atmega644a, atmega645a, atmega645p, -atmega6450a, atmega6450p, atmega649a, atmega649p, atmega6490a, -atmega6490p, atmega64hve, atmega88a, atmega88pa, attiny461a, attiny84a, -m3000. Remove support for devices atmega8m1, atmega8c1, atmega16c1, -atmega4hvd, atmega8hvd, attiny327, m3000f, m3000s, m3001b. -* config/avr/t-avr.c (MULTILIB_MATCHES): Same. - - -Index: gcc/config/avr/avr-devices.c -=================================================================== ---- gcc/config/avr/avr-devices.c (revision 158526) -+++ gcc/config/avr/avr-devices.c (working copy) -@@ -23,7 +23,7 @@ - #include "coretypes.h" - #include "tm.h" - --/* List of all known AVR MCU architectyres. */ -+/* List of all known AVR MCU architectures. */ - - const struct base_arch_s avr_arch_types[] = { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x0060, NULL, "avr2" }, /* unknown device specified */ -@@ -67,15 +67,23 @@ - { "attiny13", ARCH_AVR25, "__AVR_ATtiny13__", 1, 0x0060, "tn13" }, - { "attiny13a", ARCH_AVR25, "__AVR_ATtiny13A__", 1, 0x0060, "tn13a" }, - { "attiny2313", ARCH_AVR25, "__AVR_ATtiny2313__", 1, 0x0060, "tn2313" }, -+ { "attiny2313a", ARCH_AVR25, "__AVR_ATtiny2313A__", 1, 0x0060, "tn2313a" }, - { "attiny24", ARCH_AVR25, "__AVR_ATtiny24__", 1, 0x0060, "tn24" }, -+ { "attiny24a", ARCH_AVR25, "__AVR_ATtiny24A__", 1, 0x0060, "tn24a" }, -+ { "attiny4313", ARCH_AVR25, "__AVR_ATtiny4313__", 1, 0x0060, "tn4313" }, - { "attiny44", ARCH_AVR25, "__AVR_ATtiny44__", 0, 0x0060, "tn44" }, -+ { "attiny44a", ARCH_AVR25, "__AVR_ATtiny44A__", 0, 0x0060, "tn44a" }, - { "attiny84", ARCH_AVR25, "__AVR_ATtiny84__", 0, 0x0060, "tn84" }, -+ { "attiny84a", ARCH_AVR25, "__AVR_ATtiny84A__", 0, 0x0060, "tn84" }, - { "attiny25", ARCH_AVR25, "__AVR_ATtiny25__", 1, 0x0060, "tn25" }, - { "attiny45", ARCH_AVR25, "__AVR_ATtiny45__", 0, 0x0060, "tn45" }, - { "attiny85", ARCH_AVR25, "__AVR_ATtiny85__", 0, 0x0060, "tn85" }, - { "attiny261", ARCH_AVR25, "__AVR_ATtiny261__", 1, 0x0060, "tn261" }, -+ { "attiny261a", ARCH_AVR25, "__AVR_ATtiny261A__", 1, 0x0060, "tn261a" }, - { "attiny461", ARCH_AVR25, "__AVR_ATtiny461__", 0, 0x0060, "tn461" }, -+ { "attiny461a", ARCH_AVR25, "__AVR_ATtiny461A__", 0, 0x0060, "tn461a" }, - { "attiny861", ARCH_AVR25, "__AVR_ATtiny861__", 0, 0x0060, "tn861" }, -+ { "attiny861a", ARCH_AVR25, "__AVR_ATtiny861A__", 0, 0x0060, "tn861a" }, - { "attiny43u", ARCH_AVR25, "__AVR_ATtiny43U__", 0, 0x0060, "tn43u" }, - { "attiny87", ARCH_AVR25, "__AVR_ATtiny87__", 0, 0x0100, "tn87" }, - { "attiny48", ARCH_AVR25, "__AVR_ATtiny48__", 0, 0x0100, "tn48" }, -@@ -97,21 +105,19 @@ - { "atmega16u2", ARCH_AVR35, "__AVR_ATmega16U2__", 0, 0x0100, "m16u2" }, - { "atmega32u2", ARCH_AVR35, "__AVR_ATmega32U2__", 0, 0x0100, "m32u2" }, - { "attiny167", ARCH_AVR35, "__AVR_ATtiny167__", 0, 0x0100, "tn167" }, -- { "attiny327", ARCH_AVR35, "__AVR_ATtiny327__", 0, 0x0100, "tn327" }, - /* Enhanced, <= 8K. */ - { "avr4", ARCH_AVR4, NULL, 0, 0x0060, "m8" }, - { "atmega8", ARCH_AVR4, "__AVR_ATmega8__", 0, 0x0060, "m8" }, - { "atmega48", ARCH_AVR4, "__AVR_ATmega48__", 0, 0x0100, "m48" }, -+ { "atmega48a", ARCH_AVR4, "__AVR_ATmega48A__", 0, 0x0100, "m48a" }, - { "atmega48p", ARCH_AVR4, "__AVR_ATmega48P__", 0, 0x0100, "m48p" }, - { "atmega88", ARCH_AVR4, "__AVR_ATmega88__", 0, 0x0100, "m88" }, -+ { "atmega88a", ARCH_AVR4, "__AVR_ATmega88A__", 0, 0x0100, "m88a" }, - { "atmega88p", ARCH_AVR4, "__AVR_ATmega88P__", 0, 0x0100, "m88p" }, -+ { "atmega88pa", ARCH_AVR4, "__AVR_ATmega88PA__", 0, 0x0100, "m88pa" }, - { "atmega8515", ARCH_AVR4, "__AVR_ATmega8515__", 0, 0x0060, "m8515" }, - { "atmega8535", ARCH_AVR4, "__AVR_ATmega8535__", 0, 0x0060, "m8535" }, -- { "atmega8c1", ARCH_AVR4, "__AVR_ATmega8C1__", 0, 0x0100, "m8c1" }, -- { "atmega8m1", ARCH_AVR4, "__AVR_ATmega8M1__", 0, 0x0100, "m8m1" }, - { "atmega8hva", ARCH_AVR4, "__AVR_ATmega8HVA__", 0, 0x0100, "m8hva" }, -- { "atmega4hvd", ARCH_AVR4, "__AVR_ATmega4HVD__", 0, 0x0100, "m4hvd" }, -- { "atmega8hvd", ARCH_AVR4, "__AVR_ATmega8HVD__", 0, 0x0100, "m8hvd" }, - { "at90pwm1", ARCH_AVR4, "__AVR_AT90PWM1__", 0, 0x0100, "90pwm1" }, - { "at90pwm2", ARCH_AVR4, "__AVR_AT90PWM2__", 0, 0x0100, "90pwm2" }, - { "at90pwm2b", ARCH_AVR4, "__AVR_AT90PWM2B__", 0, 0x0100, "90pwm2b" }, -@@ -121,45 +127,68 @@ - /* Enhanced, > 8K, <= 64K. */ - { "avr5", ARCH_AVR5, NULL, 0, 0x0060, "m16" }, - { "atmega16", ARCH_AVR5, "__AVR_ATmega16__", 0, 0x0060, "m16" }, -+ { "atmega16a", ARCH_AVR5, "__AVR_ATmega16A__", 0, 0x0060, "m16a" }, - { "atmega161", ARCH_AVR5, "__AVR_ATmega161__", 0, 0x0060, "m161" }, - { "atmega162", ARCH_AVR5, "__AVR_ATmega162__", 0, 0x0100, "m162" }, - { "atmega163", ARCH_AVR5, "__AVR_ATmega163__", 0, 0x0060, "m163" }, -+ { "atmega164a", ARCH_AVR5, "__AVR_ATmega164A__", 0, 0x0060, "m164a" }, - { "atmega164p", ARCH_AVR5, "__AVR_ATmega164P__", 0, 0x0100, "m164p" }, - { "atmega165", ARCH_AVR5, "__AVR_ATmega165__", 0, 0x0100, "m165" }, -+ { "atmega165a", ARCH_AVR5, "__AVR_ATmega165A__", 0, 0x0100, "m165a" }, - { "atmega165p", ARCH_AVR5, "__AVR_ATmega165P__", 0, 0x0100, "m165p" }, - { "atmega168", ARCH_AVR5, "__AVR_ATmega168__", 0, 0x0100, "m168" }, -+ { "atmega168a", ARCH_AVR5, "__AVR_ATmega168A__", 0, 0x0100, "m168a" }, - { "atmega168p", ARCH_AVR5, "__AVR_ATmega168P__", 0, 0x0100, "m168p" }, - { "atmega169", ARCH_AVR5, "__AVR_ATmega169__", 0, 0x0100, "m169" }, -+ { "atmega169a", ARCH_AVR5, "__AVR_ATmega169A__", 0, 0x0100, "m169a" }, - { "atmega169p", ARCH_AVR5, "__AVR_ATmega169P__", 0, 0x0100, "m169p" }, -+ { "atmega169pa", ARCH_AVR5, "__AVR_ATmega169PA__", 0, 0x0100, "m169pa" }, - { "atmega32", ARCH_AVR5, "__AVR_ATmega32__", 0, 0x0060, "m32" }, - { "atmega323", ARCH_AVR5, "__AVR_ATmega323__", 0, 0x0060, "m323" }, -+ { "atmega324a", ARCH_AVR5, "__AVR_ATmega324A__", 0, 0x0100, "m324a" }, - { "atmega324p", ARCH_AVR5, "__AVR_ATmega324P__", 0, 0x0100, "m324p" }, -+ { "atmega324pa", ARCH_AVR5, "__AVR_ATmega324PA__", 0, 0x0100, "m324pa" }, - { "atmega325", ARCH_AVR5, "__AVR_ATmega325__", 0, 0x0100, "m325" }, -+ { "atmega325a", ARCH_AVR5, "__AVR_ATmega325A__", 0, 0x0100, "m325a" }, - { "atmega325p", ARCH_AVR5, "__AVR_ATmega325P__", 0, 0x0100, "m325p" }, - { "atmega3250", ARCH_AVR5, "__AVR_ATmega3250__", 0, 0x0100, "m3250" }, -+ { "atmega3250a", ARCH_AVR5, "__AVR_ATmega3250A__", 0, 0x0100, "m3250a" }, - { "atmega3250p", ARCH_AVR5, "__AVR_ATmega3250P__", 0, 0x0100, "m3250p" }, -+ { "atmega328", ARCH_AVR5, "__AVR_ATmega328__", 0, 0x0100, "m328" }, - { "atmega328p", ARCH_AVR5, "__AVR_ATmega328P__", 0, 0x0100, "m328p" }, - { "atmega329", ARCH_AVR5, "__AVR_ATmega329__", 0, 0x0100, "m329" }, -+ { "atmega329a", ARCH_AVR5, "__AVR_ATmega329A__", 0, 0x0100, "m329a" }, - { "atmega329p", ARCH_AVR5, "__AVR_ATmega329P__", 0, 0x0100, "m329p" }, -+ { "atmega329pa", ARCH_AVR5, "__AVR_ATmega329PA__", 0, 0x0100, "m329pa" }, - { "atmega3290", ARCH_AVR5, "__AVR_ATmega3290__", 0, 0x0100, "m3290" }, -+ { "atmega3290a", ARCH_AVR5, "__AVR_ATmega3290A__", 0, 0x0100, "m3290a" }, - { "atmega3290p", ARCH_AVR5, "__AVR_ATmega3290P__", 0, 0x0100, "m3290p" }, - { "atmega406", ARCH_AVR5, "__AVR_ATmega406__", 0, 0x0100, "m406" }, - { "atmega64", ARCH_AVR5, "__AVR_ATmega64__", 0, 0x0100, "m64" }, - { "atmega640", ARCH_AVR5, "__AVR_ATmega640__", 0, 0x0200, "m640" }, - { "atmega644", ARCH_AVR5, "__AVR_ATmega644__", 0, 0x0100, "m644" }, -+ { "atmega644a", ARCH_AVR5, "__AVR_ATmega644A__", 0, 0x0100, "m644a" }, - { "atmega644p", ARCH_AVR5, "__AVR_ATmega644P__", 0, 0x0100, "m644p" }, -+ { "atmega644pa", ARCH_AVR5, "__AVR_ATmega644PA__", 0, 0x0100, "m644pa" }, - { "atmega645", ARCH_AVR5, "__AVR_ATmega645__", 0, 0x0100, "m645" }, -+ { "atmega645a", ARCH_AVR5, "__AVR_ATmega645A__", 0, 0x0100, "m645a" }, -+ { "atmega645p", ARCH_AVR5, "__AVR_ATmega645P__", 0, 0x0100, "m645p" }, - { "atmega6450", ARCH_AVR5, "__AVR_ATmega6450__", 0, 0x0100, "m6450" }, -+ { "atmega6450a", ARCH_AVR5, "__AVR_ATmega6450A__", 0, 0x0100, "m6450a" }, -+ { "atmega6450p", ARCH_AVR5, "__AVR_ATmega6450P__", 0, 0x0100, "m6450p" }, - { "atmega649", ARCH_AVR5, "__AVR_ATmega649__", 0, 0x0100, "m649" }, -+ { "atmega649a", ARCH_AVR5, "__AVR_ATmega649A__", 0, 0x0100, "m649a" }, -+ { "atmega649p", ARCH_AVR5, "__AVR_ATmega649P__", 0, 0x0100, "m649p" }, - { "atmega6490", ARCH_AVR5, "__AVR_ATmega6490__", 0, 0x0100, "m6490" }, - { "atmega16hva", ARCH_AVR5, "__AVR_ATmega16HVA__", 0, 0x0100, "m16hva" }, -+ { "atmega16hva2", ARCH_AVR5, "__AVR_ATmega16HVA2__", 0, 0x0100, "m16hva2" }, - { "atmega16hvb", ARCH_AVR5, "__AVR_ATmega16HVB__", 0, 0x0100, "m16hvb" }, -- { "atmega32hvb", ARCH_AVR5, "__AVR_ATmega32HVB__", 0, 0x0100, "m23hvb" }, -+ { "atmega32hvb", ARCH_AVR5, "__AVR_ATmega32HVB__", 0, 0x0100, "m32hvb" }, -+ { "atmega64hve", ARCH_AVR5, "__AVR_ATmega64HVE__", 0, 0x0100, "m64hve" }, - { "at90can32", ARCH_AVR5, "__AVR_AT90CAN32__", 0, 0x0100, "can32" }, - { "at90can64", ARCH_AVR5, "__AVR_AT90CAN64__", 0, 0x0100, "can64" }, - { "at90pwm216", ARCH_AVR5, "__AVR_AT90PWM216__", 0, 0x0100, "90pwm216" }, - { "at90pwm316", ARCH_AVR5, "__AVR_AT90PWM316__", 0, 0x0100, "90pwm316" }, -- { "atmega16c1", ARCH_AVR5, "__AVR_ATmega16C1__", 0, 0x0100, "m16c1" }, - { "atmega32c1", ARCH_AVR5, "__AVR_ATmega32C1__", 0, 0x0100, "m32c1" }, - { "atmega64c1", ARCH_AVR5, "__AVR_ATmega64C1__", 0, 0x0100, "m64c1" }, - { "atmega16m1", ARCH_AVR5, "__AVR_ATmega16M1__", 0, 0x0100, "m16m1" }, -@@ -172,6 +201,7 @@ - { "at90usb646", ARCH_AVR5, "__AVR_AT90USB646__", 0, 0x0100, "usb646" }, - { "at90usb647", ARCH_AVR5, "__AVR_AT90USB647__", 0, 0x0100, "usb647" }, - { "at94k", ARCH_AVR5, "__AVR_AT94K__", 0, 0x0060, "at94k" }, -+ { "m3000", ARCH_AVR5, "__AVR_M3000__", 0, 0x1000, "m3000" }, - /* Enhanced, == 128K. */ - { "avr51", ARCH_AVR51, NULL, 0, 0x0100, "m128" }, - { "atmega128", ARCH_AVR51, "__AVR_ATmega128__", 0, 0x0100, "m128" }, -@@ -182,9 +212,6 @@ - { "at90can128", ARCH_AVR51, "__AVR_AT90CAN128__", 0, 0x0100, "can128" }, - { "at90usb1286", ARCH_AVR51, "__AVR_AT90USB1286__", 0, 0x0100, "usb1286" }, - { "at90usb1287", ARCH_AVR51, "__AVR_AT90USB1287__", 0, 0x0100, "usb1286" }, -- { "m3000f", ARCH_AVR51, "__AVR_M3000F__", 0, 0x1000, "m3000f" }, -- { "m3000s", ARCH_AVR51, "__AVR_M3000S__", 0, 0x1000, "m3000f" }, -- { "m3001b", ARCH_AVR51, "__AVR_M3001B__", 0, 0x1000, "m3000f" }, - /* 3-Byte PC. */ - { "avr6", ARCH_AVR6, NULL, 0, 0x0200, "m2561" }, - { "atmega2560", ARCH_AVR6, "__AVR_ATmega2560__", 0, 0x0200, "m2561" }, -Index: gcc/config/avr/t-avr -=================================================================== ---- gcc/config/avr/t-avr (revision 158526) -+++ gcc/config/avr/t-avr (working copy) -@@ -81,15 +81,23 @@ - mmcu?avr25=mmcu?attiny13 \ - mmcu?avr25=mmcu?attiny13a \ - mmcu?avr25=mmcu?attiny2313 \ -+ mmcu?avr25=mmcu?attiny2313a \ -+ mmcu?avr25=mmcu?attiny4313 \ - mmcu?avr25=mmcu?attiny24 \ -+ mmcu?avr25=mmcu?attiny24a \ - mmcu?avr25=mmcu?attiny44 \ -+ mmcu?avr25=mmcu?attiny44a \ - mmcu?avr25=mmcu?attiny84 \ -+ mmcu?avr25=mmcu?attiny84a \ - mmcu?avr25=mmcu?attiny25 \ - mmcu?avr25=mmcu?attiny45 \ - mmcu?avr25=mmcu?attiny85 \ - mmcu?avr25=mmcu?attiny261 \ -+ mmcu?avr25=mmcu?attiny261a \ - mmcu?avr25=mmcu?attiny461 \ -+ mmcu?avr25=mmcu?attiny461a \ - mmcu?avr25=mmcu?attiny861 \ -+ mmcu?avr25=mmcu?attiny861a \ - mmcu?avr25=mmcu?attiny43u \ - mmcu?avr25=mmcu?attiny87 \ - mmcu?avr25=mmcu?attiny48 \ -@@ -105,19 +113,17 @@ - mmcu?avr35=mmcu?atmega16u2 \ - mmcu?avr35=mmcu?atmega32u2 \ - mmcu?avr35=mmcu?attiny167 \ -- mmcu?avr35=mmcu?attiny327 \ - mmcu?avr4=mmcu?atmega48 \ -+ mmcu?avr4=mmcu?atmega48a \ - mmcu?avr4=mmcu?atmega48p \ - mmcu?avr4=mmcu?atmega8 \ - mmcu?avr4=mmcu?atmega8515 \ - mmcu?avr4=mmcu?atmega8535 \ - mmcu?avr4=mmcu?atmega88 \ -+ mmcu?avr4=mmcu?atmega88a \ - mmcu?avr4=mmcu?atmega88p \ -+ mmcu?avr4=mmcu?atmega88pa \ - mmcu?avr4=mmcu?atmega8hva \ -- mmcu?avr4=mmcu?atmega4hvd \ -- mmcu?avr4=mmcu?atmega8hvd \ -- mmcu?avr4=mmcu?atmega8c1 \ -- mmcu?avr4=mmcu?atmega8m1 \ - mmcu?avr4=mmcu?at90pwm1 \ - mmcu?avr4=mmcu?at90pwm2 \ - mmcu?avr4=mmcu?at90pwm2b \ -@@ -125,45 +131,70 @@ - mmcu?avr4=mmcu?at90pwm3b \ - mmcu?avr4=mmcu?at90pwm81 \ - mmcu?avr5=mmcu?atmega16 \ -+ mmcu?avr5=mmcu?atmega16a \ - mmcu?avr5=mmcu?atmega161 \ - mmcu?avr5=mmcu?atmega162 \ - mmcu?avr5=mmcu?atmega163 \ -+ mmcu?avr5=mmcu?atmega164a \ - mmcu?avr5=mmcu?atmega164p \ - mmcu?avr5=mmcu?atmega165 \ -+ mmcu?avr5=mmcu?atmega165a \ - mmcu?avr5=mmcu?atmega165p \ - mmcu?avr5=mmcu?atmega168 \ -+ mmcu?avr5=mmcu?atmega168a \ - mmcu?avr5=mmcu?atmega168p \ - mmcu?avr5=mmcu?atmega169 \ -+ mmcu?avr5=mmcu?atmega169a \ - mmcu?avr5=mmcu?atmega169p \ -+ mmcu?avr5=mmcu?atmega169pa \ - mmcu?avr5=mmcu?atmega32 \ - mmcu?avr5=mmcu?atmega323 \ -+ mmcu?avr5=mmcu?atmega324a \ - mmcu?avr5=mmcu?atmega324p \ -+ mmcu?avr5=mmcu?atmega324pa \ - mmcu?avr5=mmcu?atmega325 \ -+ mmcu?avr5=mmcu?atmega325a \ - mmcu?avr5=mmcu?atmega325p \ - mmcu?avr5=mmcu?atmega3250 \ -+ mmcu?avr5=mmcu?atmega3250a \ - mmcu?avr5=mmcu?atmega3250p \ -+ mmcu?avr5=mmcu?atmega328 \ - mmcu?avr5=mmcu?atmega328p \ - mmcu?avr5=mmcu?atmega329 \ -+ mmcu?avr5=mmcu?atmega329a \ - mmcu?avr5=mmcu?atmega329p \ -+ mmcu?avr5=mmcu?atmega329pa \ - mmcu?avr5=mmcu?atmega3290 \ -+ mmcu?avr5=mmcu?atmega3290a \ - mmcu?avr5=mmcu?atmega3290p \ - mmcu?avr5=mmcu?atmega406 \ - mmcu?avr5=mmcu?atmega64 \ - mmcu?avr5=mmcu?atmega640 \ - mmcu?avr5=mmcu?atmega644 \ -+ mmcu?avr5=mmcu?atmega644a \ - mmcu?avr5=mmcu?atmega644p \ -+ mmcu?avr5=mmcu?atmega644pa \ - mmcu?avr5=mmcu?atmega645 \ -+ mmcu?avr5=mmcu?atmega645a \ -+ mmcu?avr5=mmcu?atmega645p \ - mmcu?avr5=mmcu?atmega6450 \ -+ mmcu?avr5=mmcu?atmega6450a \ -+ mmcu?avr5=mmcu?atmega6450p \ - mmcu?avr5=mmcu?atmega649 \ -+ mmcu?avr5=mmcu?atmega649a \ -+ mmcu?avr5=mmcu?atmega649p \ - mmcu?avr5=mmcu?atmega6490 \ -+ mmcu?avr5=mmcu?atmega6490a \ -+ mmcu?avr5=mmcu?atmega6490p \ - mmcu?avr5=mmcu?atmega16hva \ -+ mmcu?avr5=mmcu?atmega16hva2 \ - mmcu?avr5=mmcu?atmega16hvb \ - mmcu?avr5=mmcu?atmega32hvb \ -+ mmcu?avr5=mmcu?atmega64hve \ - mmcu?avr5=mmcu?at90can32 \ - mmcu?avr5=mmcu?at90can64 \ - mmcu?avr5=mmcu?at90pwm216 \ - mmcu?avr5=mmcu?at90pwm316 \ -- mmcu?avr5=mmcu?atmega16c1 \ - mmcu?avr5=mmcu?atmega32c1 \ - mmcu?avr5=mmcu?atmega64c1 \ - mmcu?avr5=mmcu?atmega16m1 \ -@@ -176,6 +207,7 @@ - mmcu?avr5=mmcu?at90usb646 \ - mmcu?avr5=mmcu?at90usb647 \ - mmcu?avr5=mmcu?at94k \ -+ mmcu?avr5=mmcu?m3000 \ - mmcu?avr51=mmcu?atmega128 \ - mmcu?avr51=mmcu?atmega1280 \ - mmcu?avr51=mmcu?atmega1281 \ -@@ -184,9 +216,6 @@ - mmcu?avr51=mmcu?at90can128 \ - mmcu?avr51=mmcu?at90usb1286 \ - mmcu?avr51=mmcu?at90usb1287 \ -- mmcu?avr51=mmcu?m3000f \ -- mmcu?avr51=mmcu?m3000s \ -- mmcu?avr51=mmcu?m3001b \ - mmcu?avr6=mmcu?atmega2560 \ - mmcu?avr6=mmcu?atmega2561 - diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 77995ef1d..7a291ddb0 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,31 +1,32 @@ -# $Id: PKGBUILD 37852 2011-01-18 18:27:55Z ibiru $ +# $Id: PKGBUILD 45665 2011-04-26 21:32:06Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> #Contributor: Hugo Doria <hugo@archlinux.org> #Contributor: Sergej Chodarev <sergejx@centrum.sk> #Contributor: zhuqin <zhuqin83@gmail.com> pkgname=gedit-plugins -pkgver=2.32.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="Set of plugins for gedit" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://live.gnome.org/GeditPlugins" -depends=('gedit' 'vte' 'gucharmap' 'python2-gconf' 'dbus-python') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.0') +depends=('gedit' 'dbus-python') +makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gedit-plugins.install -source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/2.32/$pkgname-$pkgver.tar.bz2) -sha256sums=('2ef7bf48e9500556d84ae4c2950f4eadcc3f9cb9c58c90f2c83956b0ddad1107') +source=(ftp://ftp.gnome.org/pub/gnome/sources/gedit-plugins/3.0/$pkgname-$pkgver.tar.bz2) +sha256sums=('7152d3f5639258a0b5fb873521d36fc9919dee4c00ce9fb414045a2d8b0c06f6') build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all + ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ + --disable-schemas-compile make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install +} - install -m755 -d $pkgdir/usr/share/gconf/schemas - gconf-merge-schema $pkgdir/usr/share/gconf/schemas/${pkgname}.schemas $pkgdir/etc/gconf/schemas/*.schemas - rm -f $pkgdir/etc/gconf/schemas/*.schemas +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install } diff --git a/community/gedit-plugins/gedit-plugins.install b/community/gedit-plugins/gedit-plugins.install index 5a2fca03e..d5bcc00ae 100644 --- a/community/gedit-plugins/gedit-plugins.install +++ b/community/gedit-plugins/gedit-plugins.install @@ -1,23 +1,22 @@ pkgname=gedit-plugins post_install() { - usr/sbin/gconfpkg --install ${pkgname} + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi } post_upgrade() { post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} post_remove() { - /bin/true + post_install $1 } diff --git a/community/gedit-plugins/libtool.patch b/community/gedit-plugins/libtool.patch deleted file mode 100644 index d00b97b36..000000000 --- a/community/gedit-plugins/libtool.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac 2008-10-25 11:13:17.000000000 +0200 -+++ configure.ac.new 2008-11-13 20:45:39.000000000 +0100 -@@ -20,6 +20,7 @@ - IT_PROG_INTLTOOL([0.35.0]) - - AC_PROG_LIBTOOL -+m4_ifdef([LT_OUTPUT],[LT_OUTPUT]) - - AC_ISC_POSIX - AC_PROG_CC diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD new file mode 100644 index 000000000..88aaacd92 --- /dev/null +++ b/community/gluon/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Ivan Sichmann Freitas <ivansichfreitas@gmail.com> + +pkgname=gluon +pkgver=0.71.0 +_pkgver=0.71 +pkgrel=2 +pkgdesc="A free and open source platform for creating and distributing games" +arch=('i686' 'x86_64') +url="http://gluon.gamingfreedom.org/" +license=('LGPL') +depends=('qt' 'kdebase-runtime' 'libsndfile' 'openal' 'alure' 'attica') +makedepends=('cmake' 'automoc4' 'mesa' 'kdevplatform') +install=gluon.install +source=("http://download.kde.org/download.php?url=unstable/$pkgname/$_pkgver/src/$pkgname-$pkgver.tar.gz") +md5sums=('e4f284c0ae00e5b8a58cc3e6201857fe') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + [[ -d build ]] && rm -rf build + mkdir build && cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + cd build + make DESTDIR="$pkgdir/" install +} diff --git a/community/gluon/gluon.install b/community/gluon/gluon.install new file mode 100644 index 000000000..bf97c58a3 --- /dev/null +++ b/community/gluon/gluon.install @@ -0,0 +1,15 @@ +post_install() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor + update-mime-database usr/share/mime > /dev/null +} diff --git a/community/gnumail/PKGBUILD b/community/gnumail/PKGBUILD index 6f3175ef4..6d4ea1590 100644 --- a/community/gnumail/PKGBUILD +++ b/community/gnumail/PKGBUILD @@ -1,30 +1,23 @@ -# $Id: PKGBUILD 18211 2010-06-01 12:53:53Z spupykin $ +# $Id: PKGBUILD 44415 2011-04-07 13:04:56Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnumail pkgver=1.2.0pre3 -pkgrel=3 +pkgrel=4 pkgdesc="A complete and fast mail application for GNUstep" arch=('i686' 'x86_64' 'mips64el') url="http://www.collaboration-world.com/gnumail" license=('GPL') depends=('pantomime' 'addresses' 'gcc' 'gnustep-gui') options=('!makeflags') -source=(http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103) +source=(GNUMail-$pkgver.tar.gz::http://www.collaboration-world.com/cgi-bin/project/download.cgi/GNUMail-$pkgver.tar.gz?rid=103) md5sums=('0f91fe0c32ef369ea843a2ab3909fb2b') build() { - cd $srcdir - mv GNUMail-$pkgver.tar.gz?rid=103 GNUMail-$pkgver.tar.gz - tar xfz GNUMail-$pkgver.tar.gz cd $srcdir/GNUMail - - if [ -z "$GNUSTEP_USER_CONFIG_FILE" ] ; then - . /etc/profile.d/GNUstep.sh - fi - - make || return 1 + . /etc/profile.d/GNUstep.sh + make make GNUSTEP_INSTALLATION_DIR=$pkgdir/opt/GNUstep/System install } diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD index afc343152..80dbecc6d 100644 --- a/community/gnustep-back/PKGBUILD +++ b/community/gnustep-back/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 16999 2010-05-16 20:53:17Z spupykin $ +# $Id: PKGBUILD 45208 2011-04-18 12:44:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-back -pkgver=0.18.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64' 'mips64el') @@ -15,12 +15,12 @@ makedepends=('gnustep-gui' 'libffi' 'gcc-objc') conflicts=('gnustep-back-svn') groups=('gnustep-core') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('fb428c936dc16b2db7f085514a7bde7c') +md5sums=('a28ba696419eeab17f14c2a75b21c3a7') build() { - cd $startdir/src/$pkgname-$pkgver - - ./configure --prefix=/opt/GNUstep - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install } diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD index 81904d0da..7839af753 100644 --- a/community/gnustep-base/PKGBUILD +++ b/community/gnustep-base/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 22746 2010-07-29 11:42:29Z spupykin $ +# $Id: PKGBUILD 45211 2011-04-18 12:45:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-base -pkgver=1.20.1 +pkgver=1.22.0 pkgrel=1 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=("GPL" "LGPL") -depends=(libxslt avahi gmp gcc-libs openssl ffcall gnustep-make gnutls) +depends=(libxslt avahi gmp gcc-libs openssl libffi gnustep-make gnutls) makedepends=(gcc-objc) conflicts=('gnustep-base-svn') groups=('gnustep-core') options=('!emptydirs' '!makeflags') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('8ade7c698159df7a43c7b5052321e4e0') +md5sums=('7faab4891ae6c1e7a6c806d6da368410') build() { cd $srcdir/$pkgname-$pkgver source /etc/profile.d/GNUstep.sh - # need this stupid hack - mkdir -p $pkgdir/opt/GNUstep/System/Library/Libraries/Resources/gnustep-base/NSTimeZones - ./configure --prefix=/opt/GNUstep --enable-ffcall --disable-libffi + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep --with-ffi-include=/usr/lib/libffi-3.0.9/include/ # fix file ownership sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble - make VERBOSE=1 || return 1 - make DESTDIR=$pkgdir install || return 1 + make VERBOSE=1 + make DESTDIR=$pkgdir install chown -R root.root $pkgdir/ } diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index b5fb29d49..677f7fd80 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 17005 2010-05-16 20:54:38Z spupykin $ +# $Id: PKGBUILD 45216 2011-04-18 12:46:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui -pkgver=0.18.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') @@ -16,12 +16,12 @@ conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('1726eef8bcb7b25d561cf8263242c6e7') +md5sums=('0d3765aa97db1dd20bdbd0690f4aca6b') build() { - cd $startdir/src/$pkgname-$pkgver - - ./configure --prefix=/opt/GNUstep --disable-gsnd - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install } diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD index d657c7a23..b2e2e4e37 100644 --- a/community/gnustep-make/PKGBUILD +++ b/community/gnustep-make/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 17008 2010-05-16 20:55:25Z spupykin $ +# $Id: PKGBUILD 45214 2011-04-18 12:46:00Z spupykin $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-make -pkgver=2.4.0 +pkgver=2.6.0 pkgrel=1 pkgdesc="The GNUstep make package" arch=(i686 x86_64 'mips64el') @@ -13,17 +13,14 @@ depends=('glibc') conflicts=('gnustep-make-svn') groups=('gnustep-core') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('bc2138e6256665e55b00fb0ffac766f1') +md5sums=('71a6c6d9a0b341495e67c915fe6722c1') build() { - cd $startdir/src/$pkgname-$pkgver - - ./configure --prefix=/opt/GNUstep - make || return 1 - - make DESTDIR=$pkgdir install || return 1 - + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make + make DESTDIR=$pkgdir install install -D -m755 \ - $startdir/pkg/opt/GNUstep/System/Library/Makefiles/GNUstep.sh \ - $startdir/pkg/etc/profile.d/GNUstep.sh + $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \ + $pkgdir/etc/profile.d/GNUstep.sh } diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD index 19299adb4..f3f104163 100644 --- a/community/gpsdrive/PKGBUILD +++ b/community/gpsdrive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 41051 2011-03-03 15:12:22Z tdziedzic $ +# $Id: PKGBUILD 45236 2011-04-18 13:25:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: damir <damir@archlinux.org> pkgname=gpsdrive pkgver=2.11 -pkgrel=5 +pkgrel=7 pkgdesc="A car (bike, ship, plane) navigation system" arch=("i686" "x86_64" 'mips64el') url="http://www.gpsdrive.de/" @@ -16,8 +16,10 @@ depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' ' ) # already in core ('sqlite3') makedepends=('cmake>=2.4.4' 'boost' 'cfitsio') install="gpsdrive.install" -source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz") -md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c') +source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz" + "gpsd-2.96.patch") +md5sums=('6eeeca8e5c647115bea836d1f8fb6e0c' + '5769e12c6d8932fb721212434c64f505') build() { cd "$srcdir" @@ -57,6 +59,11 @@ build() { -DWITH_DBUS=OFF \ -DLIBGPS_OLD=OFF \ "$srcdir/gpsdrive-$pkgver" + (cd "$srcdir/gpsdrive-$pkgver" && patch -p1 <$srcdir/gpsd-2.96.patch) make +} + +package() { + cd "$srcdir/build" make DESTDIR="$pkgdir" install } diff --git a/community-testing/gpsdrive/gpsd-2.96.patch b/community/gpsdrive/gpsd-2.96.patch index bc6c7475f..bc6c7475f 100644 --- a/community-testing/gpsdrive/gpsd-2.96.patch +++ b/community/gpsdrive/gpsd-2.96.patch diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index dfdabb0e5..740c7a989 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 37999 2011-01-20 08:04:31Z ttopper $ +# $Id: PKGBUILD 45625 2011-04-26 00:58:22Z dreisner $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> pkgname=i3-wm _pkgsourcename=i3 pkgver=3.e_bf2 _pkgver=3.e-bf2 -pkgrel=1 +pkgrel=2 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64' 'mips64el') url="http://i3.zekjur.net/" @@ -17,12 +17,17 @@ makedepends=('bison' 'flex') optdepends=('rxvt-unicode: The terminal emulator used in the default config.' 'dmenu: As menu.') options=('docs' '!strip') -source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2) -md5sums=('dc2c59623fdc9e69003b8807a0443544') +source=(http://i3.zekjur.net/downloads/${_pkgsourcename}-${_pkgver}.tar.bz2 + yajl-2.x.patch) +md5sums=('dc2c59623fdc9e69003b8807a0443544' + '8c2a58e743ee0f8d76455d2afbeedd6f') build() { cd "$srcdir/$_pkgsourcename-$_pkgver" - + + # fixes for yajl 2.x API + patch -Np1 < "$srcdir/yajl-2.x.patch" + make } diff --git a/community/i3-wm/yajl-2.x.patch b/community/i3-wm/yajl-2.x.patch new file mode 100644 index 000000000..dae2ac4da --- /dev/null +++ b/community/i3-wm/yajl-2.x.patch @@ -0,0 +1,61 @@ +From b095db986c7a22c03e2766180e053817563ef244 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Mon, 25 Apr 2011 17:06:51 -0400 +Subject: [PATCH] ipc: fixup for yajl 2.0 API changes + +--- + src/ipc.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/ipc.c b/src/ipc.c +index 1937d55..ab0a265 100644 +--- a/src/ipc.c ++++ b/src/ipc.c +@@ -182,7 +182,7 @@ IPC_HANDLER(get_workspaces) { + if (last_focused == SLIST_END(&(c_ws->focus_stack))) + last_focused = NULL; + +- yajl_gen gen = yajl_gen_alloc(NULL, NULL); ++ yajl_gen gen = yajl_gen_alloc(NULL); + y(array_open); + + TAILQ_FOREACH(ws, workspaces, workspaces) { +@@ -226,7 +226,7 @@ IPC_HANDLER(get_workspaces) { + y(array_close); + + const unsigned char *payload; +- unsigned int length; ++ size_t length; + y(get_buf, &payload, &length); + + ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_WORKSPACES, length); +@@ -241,7 +241,7 @@ IPC_HANDLER(get_workspaces) { + IPC_HANDLER(get_outputs) { + Output *output; + +- yajl_gen gen = yajl_gen_alloc(NULL, NULL); ++ yajl_gen gen = yajl_gen_alloc(NULL); + y(array_open); + + TAILQ_FOREACH(output, &outputs, outputs) { +@@ -276,7 +276,7 @@ IPC_HANDLER(get_outputs) { + y(array_close); + + const unsigned char *payload; +- unsigned int length; ++ size_t length; + y(get_buf, &payload, &length); + + ipc_send_message(fd, payload, I3_IPC_REPLY_TYPE_OUTPUTS, length); +@@ -338,7 +338,7 @@ IPC_HANDLER(subscribe) { + memset(&callbacks, 0, sizeof(yajl_callbacks)); + callbacks.yajl_string = add_subscription; + +- p = yajl_alloc(&callbacks, NULL, NULL, (void*)client); ++ p = yajl_alloc(&callbacks, NULL, (void*)client); + stat = yajl_parse(p, (const unsigned char*)message, message_size); + if (stat != yajl_status_ok) { + unsigned char *err; +-- +1.7.4.4 + diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 4f9e43c51..bed806c4e 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,7 +6,7 @@ pkgname=john pkgver=1.7.6 -pkgrel=2 +pkgrel=3 pkgdesc="John The Ripper - A fast password cracker. Additional patches (NTLM, MySQL, Kerberos V5, etc.) included." arch=('i686' 'x86_64' 'mips64el') url="http://www.openwall.com/$pkgname/" @@ -14,18 +14,18 @@ license=('GPL2' 'custom') depends=('openssl') backup=('etc/john/john.conf') source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 - http://www.openwall.com/john/contrib/john-$pkgver-jumbo-7.diff.gz - http://www2.psy.uq.edu.au/~ftp/Crypto/DES/libdes-4.04b.tar.gz + http://www.openwall.com/john/g/john-$pkgver-jumbo-12.diff.gz + ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('321ac0793f1aa4f0603b33a393133756' - 'bc87e7dd5c4ac1bb3d84bed87614028b' - 'e83785f17fde1f362b030792f1269bf1' + '405750a1d8f5c62d434e97cd2775843b' + 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') build() { # jumbo patch cd ${srcdir}/$pkgname-$pkgver - patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-7.diff + patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-12.diff cd ${srcdir}/john-$pkgver/src/ # patch default params diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 8494b2150..065716d36 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 45197 2011-04-18 09:53:26Z spupykin $ +# $Id: PKGBUILD 45630 2011-04-26 00:59:03Z dreisner $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt pkgver=0.9.0 -pkgrel=2 +pkgrel=3 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -35,12 +35,14 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.rc.d libvirtd.conf.d openbsd-netcat-default.patch - unixperms.patch) + unixperms.patch + yajl-2.x.patch) md5sums=('53d005e6f3732aba1fd6b2718f9cec99' '018d97dafc0049075fba6f2850f17a12' '3ed0e24f5b5e25bf553f5427d64915e6' '7d5a841d51321be56ad3c4f93d112fb0' - 'db95aecdf2ccf3693fef5821cdcb7eba') + 'db95aecdf2ccf3693fef5821cdcb7eba' + '5745bb8d0b254abb7a3528c66e03b0f9') build() { cd "$srcdir/$pkgname-$pkgver" @@ -59,6 +61,9 @@ build() { [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir"/openbsd-netcat-default.patch + # fixes for yajl 2.0 API changes + [ $NOEXTRACT -eq 1 ] || patch -Np1 -i "$srcdir/yajl-2.x.patch" + export LDFLAGS=-lX11 [ -f Makefile ] || ./configure --prefix=/usr --libexec=/usr/lib/"$pkgname" \ --with-storage-lvm --without-xen --with-udev --without-hal diff --git a/community/libvirt/yajl-2.x.patch b/community/libvirt/yajl-2.x.patch new file mode 100644 index 000000000..80d3edce0 --- /dev/null +++ b/community/libvirt/yajl-2.x.patch @@ -0,0 +1,66 @@ +--- a/src/util/json.c 2011-03-24 03:10:26.000000000 -0400 ++++ b/src/util/json.c 2011-04-25 20:01:29.354939116 -0400 +@@ -709,7 +709,7 @@ + + static int virJSONParserHandleNumber(void * ctx, + const char * s, +- unsigned int l) ++ size_t l) + { + virJSONParserPtr parser = ctx; + char *str = strndup(s, l); +@@ -735,7 +735,7 @@ + + static int virJSONParserHandleString(void * ctx, + const unsigned char * stringVal, +- unsigned int stringLen) ++ size_t stringLen) + { + virJSONParserPtr parser = ctx; + virJSONValuePtr value = virJSONValueNewStringLen((const char *)stringVal, +@@ -756,7 +756,7 @@ + + static int virJSONParserHandleMapKey(void * ctx, + const unsigned char * stringVal, +- unsigned int stringLen) ++ size_t stringLen) + { + virJSONParserPtr parser = ctx; + virJSONParserStatePtr state; +@@ -894,14 +894,14 @@ + /* XXX add an incremental streaming parser - yajl trivially supports it */ + virJSONValuePtr virJSONValueFromString(const char *jsonstring) + { +- yajl_parser_config cfg = { 1, 1 }; + yajl_handle hand; + virJSONParser parser = { NULL, NULL, 0 }; + virJSONValuePtr ret = NULL; + + VIR_DEBUG("string=%s", jsonstring); + +- hand = yajl_alloc(&parserCallbacks, &cfg, NULL, &parser); ++ hand = yajl_alloc(&parserCallbacks, NULL, &parser); ++ yajl_config(hand, yajl_allow_comments, 1); + + if (yajl_parse(hand, + (const unsigned char *)jsonstring, +@@ -1002,15 +1002,16 @@ + + char *virJSONValueToString(virJSONValuePtr object) + { +- yajl_gen_config conf = { 0, " " }; /* Turns off pretty printing since QEMU can't cope */ + yajl_gen g; + const unsigned char *str; + char *ret = NULL; +- unsigned int len; ++ size_t len; + + VIR_DEBUG("object=%p", object); + +- g = yajl_gen_alloc(&conf, NULL); ++ g = yajl_gen_alloc(NULL); ++ yajl_gen_config(g, yajl_gen_beautify, 0); ++ yajl_gen_config(g, yajl_gen_indent_string, " "); + + if (virJSONValueToStringOne(object, g) < 0) { + virReportOOMError(); diff --git a/community/llvm/PKGBUILD b/community/llvm/PKGBUILD index 0bdd941a0..ad8dc556b 100644 --- a/community/llvm/PKGBUILD +++ b/community/llvm/PKGBUILD @@ -1,5 +1,6 @@ -# $Id: PKGBUILD 44403 2011-04-07 11:36:47Z foutrelis $ +# $Id: PKGBUILD 44752 2011-04-11 14:36:48Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> # Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> # Contributor: Tobias Kieslich <tobias@justdreams.de> @@ -10,20 +11,28 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=2.9 -_gcc_ver=4.5.2 -pkgrel=1 +_gcc_ver=4.6.0 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tgz http://llvm.org/releases/$pkgver/clang-$pkgver.tgz + ftp://ftp.archlinux.org/other/community/clang/gcc-headers-4.5.2.tar.xz clang-plugin-loader-registry.patch - cindexer-clang-path.patch) + cindexer-clang-path.patch + clang-toolchains-gcc-versions.patch + clang-pure64.patch + enable-lto.patch) md5sums=('793138412d2af2c7c7f54615f8943771' '634de18d04b7a4ded19ec4c17d23cfca' + '70e23a3dc2b38ecb2bb4d2c48f47295d' '02c23b4aaca3445b8bf39fddb2f9906e' - '87a7162dbe99e9ffce6c40bd09f5f4f0') + '87a7162dbe99e9ffce6c40bd09f5f4f0' + '8da236120a9a287a977b575b8b905c93' + '225ee6b531f8327f34f344a18cb4ec81' + '8f7582d7440e4a8342c3aea9ec714fb4') build() { cd "$srcdir/$pkgname-$pkgver" @@ -52,21 +61,55 @@ build() { # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799) patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch" + # Add GCC 4.6.0 to GccVersions (FS#23631) + patch -d tools/clang -Np1 -i "$srcdir/clang-toolchains-gcc-versions.patch" + + if [[ $CARCH == x86_64 ]]; then + # Adjust lib paths + patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch" + fi + + # Make -flto work + # Use gold instead of default linker, and always use the plugin + patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" + # Apply strip option to configure - _optimize_flag="--enable-optimize" - [ "$(check_option strip)" = "n" ] && _optimize_flag="--disable-optimize" + _optimized_switch="enable" + [[ $(check_option strip) == n ]] && _optimized_switch="disable" # Include location of libffi headers in CPPFLAGS export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - ./configure --prefix=/usr --libdir=/usr/lib/llvm --sysconfdir=/etc \ - --enable-shared --enable-libffi \ - --enable-bindings=ocaml --enable-targets=all \ - --disable-expensive-checks --disable-debug-runtime \ - --disable-assertions --with-binutils-include=/usr/include \ - $_optimize_flag \ - --with-cxx-include-root=/usr/include/c++/$_gcc_ver \ - --with-cxx-include-arch=$CHOST + # TODO: Uncomment when clang works with GCC 4.6+ + #_cxx_headers="/usr/include/c++/$_gcc_ver" + #if [[ ! -d $_cxx_headers ]]; then + # error "Couldn't find the C++ headers, PKGBUILD needs fixing!" + # return 1 + #fi + _cxx_headers="/usr/include/c++/clang-$pkgver" + + _32bit_headers="" + if [[ $CARCH == x86_64 ]]; then + # Important for multilib + _32bit_headers="32" + fi + + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib/llvm \ + --sysconfdir=/etc \ + --enable-shared \ + --enable-libffi \ + --enable-targets=all \ + --disable-expensive-checks \ + --disable-debug-runtime \ + --disable-assertions \ + --with-binutils-include=/usr/include \ + --with-cxx-include-root=$_cxx_headers \ + --with-cxx-include-arch=$CHOST \ + --with-cxx-include-32bit-dir=$_32bit_headers \ + --$_optimized_switch-optimized + make REQUIRES_RTTI=1 } @@ -100,7 +143,7 @@ package_llvm() { rm "$pkgdir"/usr/lib/llvm/*LLVMHello.* # Symlink the gold plugin where clang expects it - ln -s "llvm/libLLVMgold.so" "$pkgdir/usr/lib/LLVMgold.so" + ln -s llvm/LLVMgold.so "$pkgdir/usr/lib/LLVMgold.so" # Add ld.so.conf.d entry install -d "$pkgdir/etc/ld.so.conf.d" @@ -146,6 +189,11 @@ package_clang() { sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \ "$srcdir/llvm-$pkgver/Makefile.config" + # Install old libstdc++ headers. Contains combined headers from + # gcc 4.5.2-6-i686 and gcc-multilib-4.5.2-6-x86_64 + install -d "$pkgdir/usr/include/c++" + cp -rd "$srcdir/gcc-headers-4.5.2" "$pkgdir/usr/include/c++/clang-$pkgver" + install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE" } @@ -157,9 +205,9 @@ package_clang-analyzer() { cd "$srcdir/llvm-$pkgver/tools/clang" install -d "$pkgdir"/usr/{bin,lib/clang-analyzer} - for tool in scan-{build,view}; do - cp -r tools/$tool "$pkgdir/usr/lib/clang-analyzer" - ln -s /usr/lib/clang-analyzer/$tool/$tool "$pkgdir/usr/bin" + for _tool in scan-{build,view}; do + cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/" + ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/" done # Use Python 2 diff --git a/community-testing/llvm/clang-pure64.patch b/community/llvm/clang-pure64.patch index da6178519..da6178519 100644 --- a/community-testing/llvm/clang-pure64.patch +++ b/community/llvm/clang-pure64.patch diff --git a/community-testing/llvm/clang-toolchains-gcc-versions.patch b/community/llvm/clang-toolchains-gcc-versions.patch index 2e527300d..2e527300d 100644 --- a/community-testing/llvm/clang-toolchains-gcc-versions.patch +++ b/community/llvm/clang-toolchains-gcc-versions.patch diff --git a/community-testing/llvm/enable-lto.patch b/community/llvm/enable-lto.patch index 40d93104a..40d93104a 100644 --- a/community-testing/llvm/enable-lto.patch +++ b/community/llvm/enable-lto.patch diff --git a/community/lua-yajl-git/LICENSE b/community/lua-yajl-git/LICENSE deleted file mode 100644 index 89de35479..000000000 --- a/community/lua-yajl-git/LICENSE +++ /dev/null @@ -1,17 +0,0 @@ -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/community/lua-yajl-git/PKGBUILD b/community/lua-yajl-git/PKGBUILD deleted file mode 100644 index ca2289b9e..000000000 --- a/community/lua-yajl-git/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=lua-yajl-git -pkgver=20101121 -pkgrel=1 -pkgdesc="Lua interface to yajl." -arch=('i686' 'x86_64' 'mips64el') -url="http://github.com/brimworks/lua-yajl" -license=('MIT') -depends=('yajl' 'lua') -makedepends=('git' 'cmake') -options=(!libtool) -source=(LICENSE) -md5sums=('838c366f69b72c5df05c96dff79b35f2') - -_gitroot="git://github.com/brimworks/lua-yajl.git" -_gitname="lua-yajl" - -build() { - cd ${srcdir} - msg 'Connecting to GIT server....' - - if [ -d ${_gitname} ] ; then - cd ${_gitname} && git pull origin - msg 'The local files are updated.' - else - git clone ${_gitroot} ${_gitname} - fi - - msg 'GIT checkout done or server timeout' - msg 'Starting make...' - - rm -rf ${srcdir}/${_gitname}-build - git clone ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build - cd ${srcdir}/${_gitname}-build - - cmake . || return 1 - make || return 1 -} - -package(){ - cd ${srcdir}/${_gitname}-build - make DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/usr/lib/lua/5.1 - mv ${pkgdir}/usr/local/share/lua/cmod/* ${pkgdir}/usr/lib/lua/5.1/ - rm -R ${pkgdir}/usr/local - install -Dm644 ${srcdir}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/medit/capsule.diff b/community/medit/capsule.diff deleted file mode 100644 index 7ce4edab8..000000000 --- a/community/medit/capsule.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- medit-1.0.0.orig/moo/moopython/moopython-pygtkmod.h 2010-12-22 05:11:46.000000000 +0100 -+++ medit-1.0.0/moo/moopython/moopython-pygtkmod.h 2011-02-08 16:14:10.000000000 +0100 -@@ -20,7 +20,7 @@ - G_GNUC_UNUSED static void - init_pygtk_mod (void) - { -- PyObject *gobject, *pygtk; -+ PyObject *gobject; - PyObject *mdict; - PyObject *cobject; - -@@ -29,7 +29,7 @@ - - mdict = PyModule_GetDict (gobject); - cobject = PyDict_GetItemString (mdict, "_PyGObject_API"); -- -+ - if (!cobject || !PyCObject_Check (cobject)) - { - PyErr_SetString (PyExc_RuntimeError, -@@ -38,21 +38,13 @@ - } - - _PyGObject_API = (struct _PyGObject_Functions *) PyCObject_AsVoidPtr (cobject); -- -- if (!(pygtk = PyImport_ImportModule("gtk._gtk"))) -- return; -- -- mdict = PyModule_GetDict (pygtk); -- cobject = PyDict_GetItemString (mdict, "_PyGtk_API"); -- -- if (!cobject || !PyCObject_Check (cobject)) -- { -- PyErr_SetString (PyExc_RuntimeError, -- "could not find _PyGtk_API object"); -+ -+ void *capsule = PyCapsule_Import("gtk._gtk._PyGtk_API", 0); -+ if (!capsule) { - return; - } -- -- _PyGtk_API = (struct _PyGtk_FunctionStruct*) PyCObject_AsVoidPtr (cobject); -+ -+ _PyGtk_API = (struct _PyGtk_FunctionStruct*) capsule; - } - - diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index f0210c3ae..204d82fac 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,32 +1,24 @@ -# $Id: PKGBUILD 45343 2011-04-20 13:49:48Z svenstaro $ +# $Id: PKGBUILD 45457 2011-04-22 00:47:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest pkgver=3.5.0 -pkgrel=1 +pkgrel=3 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64' 'mips64el') url="http://sourceforge.net/projects/megaglest/" -license=('GPL2') +license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'mesa' 'lua' 'icu') makedepends=('ftjam' 'p7zip' 'wxgtk' 'cmake') source=("http://downloads.sourceforge.net/project/${pkgname}/current_release/${pkgname}-source-${pkgver}.tar.bz2" - "http://downloads.sourceforge.net/project/${pkgname}/current_release/megaglest-data-${pkgver}.7z" - "megaglest.png" - "megaglest.desktop" "megaglest.sh") -md5sums=('5c84966ee6657274eeb5a28ce8b702c0' - '4405134d91d8303e9485de42ffc53e09' - '5622ce716033d9afb62a3291b47844ed' - '97dc7ea865efbea5daaf300207dad518' +md5sums=('03cb7e67be3e72ac0147b23c6b91eb2a' 'e3d6abbe79263d2fa5edb0bcbcf8755a') build() { cd ${srcdir}/${pkgname}-source-${pkgver}/ - 7z x -y ${srcdir}/megaglest-data-${pkgver}.7z - [[ -d build ]] && rm -r build mkdir build && cd build cmake .. \ @@ -48,8 +40,12 @@ package() { install -m 0755 mk/linux/megaglest_editor "${pkgdir}"/usr/bin/megaglest_editor install -m 0644 glest.ini glestkeys.ini servers.ini "${pkgdir}"/usr/share/$pkgname - install -D -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop - install -D -m 0644 "${srcdir}"/${pkgname}.png "${pkgdir}"/usr/share/pixmaps/${pkgname}.png + sed -i s/Exec=.*/Exec=${pkgname}/g ${pkgname}.desktop + sed -i s/Icon=.*/Icon=${pkgname}/g ${pkgname}.desktop + install -D -m 0644 "${pkgname}.desktop" "${pkgdir}"/usr/share/applications/${pkgname}.desktop + install -D -m 0644 "${pkgname}.png" "${pkgdir}"/usr/share/pixmaps/${pkgname}.png + + install -Dm755 code_license.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } # vim: sw=2:ts=2 et: diff --git a/community/megaglest/megaglest.desktop b/community/megaglest/megaglest.desktop deleted file mode 100644 index 267dbf358..000000000 --- a/community/megaglest/megaglest.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Categories=Application;Game; -Name=Megaglest -Icon=megaglest -Exec=megaglest -Terminal=false -Type=Application diff --git a/community/megaglest/megaglest.png b/community/megaglest/megaglest.png Binary files differdeleted file mode 100644 index 65e5d9862..000000000 --- a/community/megaglest/megaglest.png +++ /dev/null diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index d1554a1bb..b42d83c86 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 39743 2011-02-15 21:13:52Z spupykin $ +# $Id: PKGBUILD 45471 2011-04-22 05:36:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> pkgname=mingw32-gcc pkgver=4.5.2 -pkgrel=2 -arch=(i686 x86_64 'mips64el') +pkgrel=3 +arch=(i686 x86_64 mips64el) pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" -depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils cloog-ppl gmp) +depends=(mingw32-runtime mingw32-binutils mingw32-w32api libmpc elfutils gmp) replaces=(mingw32-gcc-base) provides=(mingw32-gcc-base) -options=(!strip force) +options=(!strip) url="http://sourceforge.net/projects/mingw/files/MinGW/BaseSystem/GCC/Version4/" license=(GPL LGPL) source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma) @@ -29,7 +29,8 @@ build() chmod ugo+x $srcdir/gcc-$pkgver/configure chmod ugo+x $srcdir/gcc-$pkgver/move-if-change - [ $NOEXTRACT -eq 1 ] || $srcdir/gcc-$pkgver/configure \ + msg "gcc" + [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ --target=i486-mingw32 \ --host=$CHOST \ --build=$CHOST \ @@ -39,16 +40,37 @@ build() --enable-sjlj-exceptions \ --enable-hash-synchronization \ --disable-nls \ - --disable-libssp \ + --disable-libssp make make install DESTDIR=$pkgdir + msg "libgcc" make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install + + msg "libstdc++" make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install +# msg "libgomp" +# mkdir -p i486-mingw32/libgomp +# cd i486-mingw32/libgomp +# [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ +# --target=i486-mingw32 \ +# --host=$CHOST \ +# --build=$CHOST \ +# --prefix=/usr \ +# --enable-languages=c,c++ \ +# --enable-shared \ +# --enable-sjlj-exceptions \ +# --enable-hash-synchronization \ +# --disable-nls \ +# --disable-libssp +# make -j1 DESTDIR=$pkgdir all install + + msg "fixes" mkdir -p $pkgdir/usr/i486-mingw32/bin/ - mv $pkgdir/usr/bin/*.dll $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/ + mv $pkgdir/usr/bin/*.dll $pkgdir/usr/i486-mingw32/bin/ + mv $pkgdir/*.dll $pkgdir/usr/i486-mingw32/bin/ cd $pkgdir rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD index 648261581..40ffbb985 100644 --- a/community/ncmpcpp/PKGBUILD +++ b/community/ncmpcpp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 36886 2011-01-09 21:17:22Z mherych $ +# $Id: PKGBUILD 45584 2011-04-24 17:56:50Z mherych $ # Maintainer: Mateusz Herych <heniekk@gmail.com> # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com> pkgname=ncmpcpp -pkgver=0.5.6 +pkgver=0.5.7 pkgrel=1 pkgdesc="An almost exact clone of ncmpc with some new features." arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('curl' 'libmpdclient' 'taglib' 'ncurses') install=ncmpcpp.install source=(http://unkart.ovh.org/ncmpcpp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('cdaf82694c0a1f5e9de65bb0a191e403') +md5sums=('6632c76f2f0836c5aa5a1a2fbb1c921c') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch b/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch deleted file mode 100644 index c58a943b5..000000000 --- a/community/python-scipy/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8ed781828b1d8e1692105c0c0c130858d47a28ce Mon Sep 17 00:00:00 2001 -From: Fabian Pedregosa <fabian.pedregosa@inria.fr> -Date: Sun, 25 Jul 2010 14:35:35 +0200 -Subject: [PATCH] FIX: define macro to access C99 extensions from C++. - -This prevented scipy.sparse.sparsetools to compile correctly under -python2.7, because the wrappers are C++ files but ndarraytypes.h -references some C99 macros in inttypes.h. ---- - scipy/sparse/sparsetools/SConscript | 1 + - scipy/sparse/sparsetools/setup.py | 4 +++- - 2 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/scipy/sparse/sparsetools/SConscript b/scipy/sparse/sparsetools/SConscript -index 1aa5557..85d9e05 100644 ---- a/scipy/sparse/sparsetools/SConscript -+++ b/scipy/sparse/sparsetools/SConscript -@@ -3,6 +3,7 @@ - from numscons import GetNumpyEnvironment - - env = GetNumpyEnvironment(ARGUMENTS) -+env.PrependUnique(CPPDEFINES = '__STDC_FORMAT_MACROS') - - for fmt in ['csr','csc','coo','bsr','dia']: - sources = [ fmt + '_wrap.cxx' ] -diff --git a/scipy/sparse/sparsetools/setup.py b/scipy/sparse/sparsetools/setup.py -index f4027a7..c4c4636 100755 ---- a/scipy/sparse/sparsetools/setup.py -+++ b/scipy/sparse/sparsetools/setup.py -@@ -9,7 +9,9 @@ def configuration(parent_package='',top_path=None): - for fmt in ['csr','csc','coo','bsr','dia']: - sources = [ fmt + '_wrap.cxx' ] - depends = [ fmt + '.h' ] -- config.add_extension('_' + fmt, sources=sources, depends=depends) -+ config.add_extension('_' + fmt, sources=sources, -+ define_macros=[('__STDC_FORMAT_MACROS', 1)], -+ depends=depends) - - return config - --- -1.7.1.1 - diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD index 771194b20..f726054ca 100755 --- a/community/python-scipy/PKGBUILD +++ b/community/python-scipy/PKGBUILD @@ -1,40 +1,85 @@ -#$Id: PKGBUILD 27301 2010-09-19 16:29:18Z schuay $ +# $Id: PKGBUILD 45545 2011-04-24 06:08:32Z schiv $ # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> +# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> +# Contributor: Andrzej Giniewicz <gginiu@gmail.com> -pkgname=python-scipy -pkgver=0.8.0 -pkgrel=4 -pkgdesc="SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering." +pkgbase=python-scipy +_app=scipy +pkgname=('python-scipy' 'python2-scipy') +pkgver=0.9.0 +_theapp=$_app-$pkgver +pkgrel=1 +pkgdesc="SciPy is open-source software for mathematics, science, and engineering." arch=('i686' 'x86_64' 'mips64el') -url="http://www.scipy.org" +url="http://www.scipy.org/" license=('BSD') -depends=('lapack' 'blas' 'python2' 'python-numpy') -makedepends=('gcc' 'gcc-fortran') -conflicts=('scipy' 'scipy_core') -source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" - '0001-FIX-define-macro-to-access-C99-extensions-from-C.patch') -md5sums=('f0bfc6141b90e6a31555b31486602251' - '609759549d0571fc04d52c89b16258ed') +depends=('python3-numpy') +makedepends=('gcc-fortran' 'python2-numpy') +changelog=$pkgbase.changelog +source=("http://downloads.sourceforge.net/$_app/$_theapp.tar.gz") +md5sums=('ebfef6e8e82d15c875a4ee6a46d4e1cd') build() { - unset LDFLAGS - unset FFLAGS + cd "$srcdir" - cd ${srcdir}/scipy-${pkgver} - #Changing the arithmetic parameter (Thanks to Fabrizio Castellano) - sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" $srcdir/scipy-$pkgver/scipy/special/cephes/mconf.h + unset LDFLAGS + unset FFLAGS - # fix build with python 2.7 (see http://projects.scipy.org/scipy/ticket/1180) - patch -p1 < ${srcdir}/0001-FIX-define-macro-to-access-C99-extensions-from-C.patch + # Compatibility symlinks for current stable numpy + # - no need to patch numpy just for this + # see http://projects.scipy.org/numpy/ticket/1749 + ln -sf /usr/lib/liblapack.so liblapack.cpython-32mu.so + ln -sf /usr/lib/libblas.so libblas.cpython-32mu.so + export LAPACK="$srcdir" + export BLAS="$srcdir" - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done + # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) + sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ + $_theapp/$_app/special/cephes/mconf.h - python2 setup.py config_fc --fcompiler=gnu95 build - python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root=${pkgdir} - install -D -m644 LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt + # 2 builds + cp -r $_theapp $_theapp-py2 + + # build for python3 + cd $_theapp + python setup.py config_fc --fcompiler=gnu95 build + + # build for python2 + cd ../$_theapp-py2 + + for file in $(find . -name '*.py' -print); do + sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file + sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file + done + + python2 setup.py config_fc --fcompiler=gnu95 build } + +package_python-scipy() { + provides=('python3-scipy' 'scipy') + + cd "$srcdir/$_theapp" + + python setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-scipy() { + depends=('python2-numpy') + conflicts=('python-scipy<0.9.0') + + cd "$srcdir/$_theapp-py2" + + python2 setup.py config_fc --fcompiler=gnu95 install \ + --prefix=/usr --root="$pkgdir" --optimize=1 + + install -Dm644 LICENSE.txt \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/python-scipy/ChangeLog b/community/python-scipy/python-scipy.changelog index 00071d2a7..77c6d43a5 100644 --- a/community/python-scipy/ChangeLog +++ b/community/python-scipy/python-scipy.changelog @@ -1,3 +1,18 @@ +2011-04-24 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Couldn't release previous update due to lapack/blas issues + See http://mailman.archlinux.org/pipermail/arch-general/2011-April/019677.html + Hopefully symlink trick from AUR/python3-scipy fixes that + +2011-04-05 Ray Rashif <schiv@archlinux.org> + + * 0.9.0-1: + Upstream release + SciPy now supports Python 3 + Package split for python(3), python2 + PKGBUILD cleanup + 2010-07-29 Angel 'angvp' Velasquez <angvp@archlinux.org> * Updated to: 0.8.0 2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> @@ -23,7 +38,7 @@ 2007-10-29 Douglas Soares de Andrade <dsa@aur.archlinux.org> - * Changed email + * Changed email * Fixed some problems in the PKGBUILD * Updated to new release - 0.6.0 diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 21ebfb84c..3fa7ecf2b 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 42859 2011-03-21 21:26:54Z jlichtblau $ +# $Id: PKGBUILD 45140 2011-04-17 12:03:02Z andrea $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') url="http://www.qlandkarte.org/" @@ -15,14 +15,18 @@ makedepends=('cmake' 'garmindev') optdepends=('garmindev: to connect garmin devices') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz \ - $pkgname-mimetypes.xml) +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz + $pkgname-mimetypes.xml + gpsd-2.96.patch) sha256sums=('0288c94edcb0af4e39bc045c8607ed9404b4692c44e5409eff64329a21b33af9' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0' + 'b641c94c6db4087c9ae1a79e31e2ea126830abf7ff1b05c27953edc6afebf8c7') build() { cd ${srcdir}/$pkgname-$pkgver + patch -Np0 -i ${srcdir}/gpsd-2.96.patch + install -d ${srcdir}/$pkgname-$pkgver/build cd ${srcdir}/$pkgname-$pkgver/build diff --git a/community-testing/qlandkartegt/gpsd-2.96.patch b/community/qlandkartegt/gpsd-2.96.patch index 634e9ad7e..634e9ad7e 100644 --- a/community-testing/qlandkartegt/gpsd-2.96.patch +++ b/community/qlandkartegt/gpsd-2.96.patch diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index 1b76a44f2..e9ce6ed22 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -2,13 +2,12 @@ # Contributor: Sebastian Voecking <voeck@web.de> pkgname=root -pkgver=5.28.00b +pkgver=5.28.00c pkgrel=1 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64' 'mips64el') url='http://root.cern.ch' license=('LGPL2.1') -# TODO: add gcc-fortran to optdepends after figuring out what to describe it for depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient' 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran') makedepends=('fftw') @@ -18,7 +17,7 @@ source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz" 'rootd' 'root.desktop' 'root.xml') -md5sums=('ee7e6339de8fe99b0f9c9fe1a5692fe8' +md5sums=('0e997f14cb1c671987e1780d2b6375f8' '0e883ad44f99da9bc7c23bc102800b62' 'efd06bfa230cc2194b38e0c8939e72af' 'ac61b17395d75a2705fefa2ef841a6bf' diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index 7ae611d33..78f067a76 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=2.24 +pkgver=2.25 pkgrel=1 pkgdesc='A generally useful editor with facilities for building and running programs.' arch=('i686' 'x86_64' 'mips64el') @@ -16,11 +16,10 @@ install=scite.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver/\./}.tgz" 'SciTE.desktop' 'makefile.patch') -md5sums=('f180cc1045e245dc0e55d3a764bd5968' +md5sums=('58767cfbdcb4ad99cc9460f36f958995' '48526532ef677982a4b156ae90f25b6f' '87005d4c7262a1a698cde0628dc7e2a2') - build() { sed "s/CXXTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS)/CXXTFLAGS=-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)/" -i scite/gtk/makefile diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index ef0dec24f..4294925be 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=2.32.0.1 +pkgver=2.32.0.2 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('sane' 'gconf') makedepends=('gnome-doc-utils' 'intltool') install="${pkgname}.install" source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9c0682f1aa6b338222b973fec6162e87') +md5sums=('8435b0a31aba1255caf685eb57b18e06') build() { cd ${pkgname}-${pkgver} diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD index a78fe6f4c..0c3dd6d60 100644 --- a/community/springlobby/PKGBUILD +++ b/community/springlobby/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44777 2011-04-11 19:41:39Z svenstaro $ +# $Id: PKGBUILD 45554 2011-04-24 08:25:45Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: DuGi <dugi@irc.pl> pkgname=springlobby -pkgver=0.128 +pkgver=0.129 pkgrel=1 pkgdesc="A free cross-platform lobby client for the Spring RTS project." arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('boost' 'asio' 'cmake') source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2 springlobby.desktop springlobby.png) -md5sums=('14a67b499366f500645d6174f7753674' +md5sums=('ff6573d21f6720f693312dca7fd31d5a' '45f8b59d033931d02e734fe3bd7777dd' '1f388187539aeb0358b51995e26ed890') diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index 5b53eb243..782762d64 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44716 2011-04-11 12:23:36Z spupykin $ +# $Id: PKGBUILD 45591 2011-04-25 08:40:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=0.10.8 +pkgver=0.10.10 pkgrel=1 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ conflicts=('libtracker') provides=("libtracker") install=tracker.install source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2) -md5sums=('58407c7ee04df4043cadd9095d64da5d') +md5sums=('57f475814cfbf9b2e6bf9e5202ec85fc') build() { cd "$srcdir/$pkgname-$pkgver" @@ -40,7 +40,6 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname \ --enable-video-extractor=gstreamer --disable-unac --disable-hal \ --disable-devkit-power --disable-miner-evolution - make } diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index 55b74a8d5..6b5afa13e 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 40427 2011-02-23 20:48:09Z jlichtblau $ +# $Id: PKGBUILD 45239 2011-04-18 13:40:23Z spupykin $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64' 'mips64el') url="http://viking.sourceforge.net/" @@ -16,12 +16,17 @@ optdepends=('gpsbabel: for GPS management') options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/viking/$pkgname-$pkgver.tar.gz) -sha256sums=('5c34a76c09b6fda092e8170f7546606814382cf9d13174e87c4ee43fffa36743') +source=(http://downloads.sourceforge.net/viking/$pkgname-$pkgver.tar.gz + gpsd-2.96.patch) +sha256sums=('5c34a76c09b6fda092e8170f7546606814382cf9d13174e87c4ee43fffa36743' + '7277a6f0bbe7b16440ca92a5975c6f0b38261f13bbbb6f04e4fc684b8965c902') build() { cd ${srcdir}/$pkgname-$pkgver + patch -p1 <$srcdir/gpsd-2.96.patch + autoreconf + ./configure --prefix=/usr make } diff --git a/community-testing/viking/gpsd-2.96.patch b/community/viking/gpsd-2.96.patch index 01b117312..01b117312 100644 --- a/community-testing/viking/gpsd-2.96.patch +++ b/community/viking/gpsd-2.96.patch diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk index 1a17127a0..d0e939ad4 100644 --- a/community/virtualbox/LocalConfig.kmk +++ b/community/virtualbox/LocalConfig.kmk @@ -15,3 +15,5 @@ VBOX_WITH_UPDATE_REQUEST = VBOX_WITH_VNC := 1 VBOX_BLD_PYTHON = python2 VBOX_JAVA_HOME = /opt/java +VBOX_GCC_WERR = +VBOX_GCC_WARN = diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 4dc9a2aae..1d7a68e1d 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44881 2011-04-12 11:57:31Z ibiru $ +# $Id: PKGBUILD 45439 2011-04-21 19:40:11Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.4 -pkgrel=4 +pkgver=4.0.6 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://virtualbox.org' license=('GPL' 'custom') @@ -15,8 +15,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh - 18-system-xorg.patch) -_kernver=2.6.38-ARCH + 18-system-xorg.patch gcc46.patch) +_kernver=2.6.38-LIBRE build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -25,6 +25,7 @@ build() { patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" patch -Np1 -i "$srcdir/vboxdrv-reference.patch" patch -Np1 -i "$srcdir/18-system-xorg.patch" + patch -Np1 -i "$srcdir/gcc46.patch" cp "$srcdir/LocalConfig.kmk" . @@ -202,13 +203,14 @@ package_virtualbox-guest-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" } -md5sums=('b4770ca14d1a8cbad9b3eb0e0028ff4b' - 'bf8007eea0042f745b3c252bbe7586c2' +md5sums=('cf274f0585c35c5c137e2bd9b48b462a' + '7d3ee86e998fa24b07a157add9fb7766' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' - '94514e006e73cc2fa90259a4e0eec04b' - '0f3f273cdbc54db221f737ad4f761c11' + '9bde5b7dfba5abcd49768052c5409800' + 'c1a07f044c476a190af8486fe78bee0f' '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b') + '8a22b33c9dfaf8fb79bb2d26304e650b' + 'a28b48ff01149acbca4bbe6a676a06da') diff --git a/community/virtualbox/gcc46.patch b/community/virtualbox/gcc46.patch new file mode 100644 index 000000000..9786a7287 --- /dev/null +++ b/community/virtualbox/gcc46.patch @@ -0,0 +1,15 @@ +diff -Nur VirtualBox-4.0.6_OSE.orig//configure VirtualBox-4.0.6_OSE/configure +--- VirtualBox-4.0.6_OSE.orig//configure 2011-04-21 03:29:30.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/configure 2011-04-21 11:42:57.517216676 -0700 +@@ -412,9 +412,9 @@ + elif [ $cc_maj -lt 3 \ + -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \ + -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \ +- -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \ ++ -o \( $cc_maj -eq 4 -a $cc_min -gt 6 \) \ + -o $cc_maj -gt 4 ]; then +- log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5" ++ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<=6" + fail really + else + log_success "found version $cc_ver" diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch index ed5e7f377..e7a9179a9 100644 --- a/community/virtualbox/vboxdrv-reference.patch +++ b/community/virtualbox/vboxdrv-reference.patch @@ -1,5 +1,6 @@ ---- VirtualBox-4.0.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp -+++ VirtualBox-4.0.2_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp +--- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 03:31:05.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 11:10:00.503832646 -0700 @@ -75,9 +75,8 @@ "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " @@ -21,8 +22,9 @@ "may correct this. Make sure that you do not mix the " "OSE version and the PUEL version of VirtualBox." ); ---- VirtualBox-4.0.2_OSE/src/VBox/Installer/linux/VBox.sh -+++ VirtualBox-4.0.2_OSE/src/VBox/Installer/linux/VBox.sh +diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh +--- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh 2011-04-21 03:31:18.000000000 -0700 ++++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-04-21 11:10:00.503832646 -0700 @@ -34,7 +34,7 @@ available for the current kernel (`uname -r`) or it failed to load. Please recompile the kernel module and install it by @@ -40,4 +42,4 @@ + /etc/rc.d/vboxdrv restart and if that is not successful, try to re-install the package. -
\ No newline at end of file + diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD index b497c66aa..d4268ee38 100644 --- a/community/warmux/PKGBUILD +++ b/community/warmux/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 41384 2011-03-05 15:36:57Z lcarlier $ +# $Id: PKGBUILD 45573 2011-04-24 16:51:07Z lcarlier $ # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: pukyxd # Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=warmux -pkgver=11.01 -pkgrel=1 +pkgver=11.04 +pkgrel=2 pkgdesc="A clone of the worms game" arch=('i686' 'x86_64' 'mips64el') url="http://www.wormux.org/" license=('GPL') -depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') -makedepends=('pkgconfig') +makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') replaces=('wormux') source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('ecf98ff1a91899d35d0ba8266ace9787') +md5sums=('668cd4c22afde352c566454e65fc4144') build() { cd "${srcdir}/${pkgname}-${pkgver}" + #gcc 4.6.0 fix + sed -i '27i#include <stddef.h>' lib/warmux/include/WARMUX_action.h + ./configure --prefix=/usr make } package() { + depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver}") + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rm -r ${pkgdir}/usr/share/warmux } diff --git a/community/yajl/PKGBUILD b/community/yajl/PKGBUILD index 1f1941d13..0204af458 100644 --- a/community/yajl/PKGBUILD +++ b/community/yajl/PKGBUILD @@ -1,33 +1,37 @@ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Maintainer: Dave Reisner <d@falconindy.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=yajl -pkgver=1.0.11 -pkgrel=3 +pkgver=2.0.0 +pkgrel=2 pkgdesc='Yet Another JSON Library.' arch=('i686' 'x86_64' 'mips64el') url='http://lloyd.github.com/yajl/' -license=('BSD') +license=('ISC') makedepends=('cmake') -source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/lloyd/${pkgname}/tarball/${pkgver}") -md5sums=('5b60f4d59b3b1fb42d7808d08460fb12') +source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/tarball/$pkgver" + "handle-null-case.patch") +md5sums=('ff3bb8531d1f3c48441a57220919c8e7' + 'dd6ad7386f6d19f1d68357d8a2d48f3e') build() { - cd lloyd-${pkgname}-f4baae0 + dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); + cd "$dirname" - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - . + patch -Np1 < "$srcdir/handle-null-case.patch" + + cmake -DCMAKE_INSTALL_PREFIX=/usr . make } package() { - cd lloyd-${pkgname}-f4baae0 + dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); + cd "$dirname" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install - install -D -m644 COPYING \ - ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + install -Dm644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/yajl/handle-null-case.patch b/community/yajl/handle-null-case.patch new file mode 100644 index 000000000..923e23961 --- /dev/null +++ b/community/yajl/handle-null-case.patch @@ -0,0 +1,78 @@ +From 615924b7bf68791c166149a9f76bec740dacefd6 Mon Sep 17 00:00:00 2001 +From: Lloyd Hilaiel <lloyd@hilaiel.com> +Date: Tue, 26 Apr 2011 09:47:13 -0600 +Subject: [PATCH] crash fix, handle the case where yajl_alloc() is followed by + yajl_complete_parse() without a call to yajl_parse() in the + middle. closes #27. + +--- + src/yajl.c | 18 +++++++++++++++--- + src/yajl_parser.c | 2 +- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/yajl.c b/src/yajl.c +index 793eea3..293e545 100644 +--- a/src/yajl.c ++++ b/src/yajl.c +@@ -49,7 +49,7 @@ yajl_alloc(const yajl_callbacks * callbacks, + { + yajl_handle hand = NULL; + yajl_alloc_funcs afsBuffer; +- ++ + /* first order of business is to set up memory allocation routines */ + if (afs != NULL) { + if (afs->malloc == NULL || afs->realloc == NULL || afs->free == NULL) +@@ -73,7 +73,7 @@ yajl_alloc(const yajl_callbacks * callbacks, + hand->decodeBuf = yajl_buf_alloc(&(hand->alloc)); + hand->flags = 0; + yajl_bs_init(hand->stateStack, &(hand->alloc)); +- yajl_bs_push(hand->stateStack, yajl_state_start); ++ yajl_bs_push(hand->stateStack, yajl_state_start); + + return hand; + } +@@ -120,7 +120,7 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText, + { + yajl_status status; + +- // lazy allocate the lexer ++ /* lazy allocation of the lexer */ + if (hand->lexer == NULL) { + hand->lexer = yajl_lex_alloc(&(hand->alloc), + hand->flags & yajl_allow_comments, +@@ -135,6 +135,18 @@ yajl_parse(yajl_handle hand, const unsigned char * jsonText, + yajl_status + yajl_complete_parse(yajl_handle hand) + { ++ /* The lexer is lazy allocated in the first call to parse. if parse is ++ * never called, then no data was provided to parse at all. This is a ++ * "premature EOF" error unless yajl_allow_partial_values is specified. ++ * allocating the lexer now is the simplest possible way to handle this ++ * case while preserving all the other semantics of the parser ++ * (multiple values, partial values, etc). */ ++ if (hand->lexer == NULL) { ++ hand->lexer = yajl_lex_alloc(&(hand->alloc), ++ hand->flags & yajl_allow_comments, ++ !(hand->flags & yajl_dont_validate_strings)); ++ } ++ + return yajl_do_finish(hand); + } + +diff --git a/src/yajl_parser.c b/src/yajl_parser.c +index 20d73bf..3903b38 100644 +--- a/src/yajl_parser.c ++++ b/src/yajl_parser.c +@@ -155,7 +155,7 @@ yajl_status + yajl_do_finish(yajl_handle hand) + { + yajl_status stat; +- stat = yajl_do_parse(hand,(const unsigned char *)" ",1); ++ stat = yajl_do_parse(hand,(const unsigned char *) " ",1); + + if (stat != yajl_status_ok) return stat; + +-- +1.7.4.4 + diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index 0a6eeaea3..30ac1896f 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' 'mips64el') 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/binutils/binutils.git-39637246.patch b/core/binutils/binutils.git-39637246.patch deleted file mode 100644 index 460450e43..000000000 --- a/core/binutils/binutils.git-39637246.patch +++ /dev/null @@ -1,700 +0,0 @@ -diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c -index 777d7cf..c4c34a1 100644 ---- a/gas/config/tc-i386.c -+++ b/gas/config/tc-i386.c -@@ -1060,7 +1060,6 @@ i386_align_code (fragS *fragP, int count) - else - patt = f32_patt; - break; -- case PROCESSOR_PENTIUMPRO: - case PROCESSOR_PENTIUM4: - case PROCESSOR_NOCONA: - case PROCESSOR_CORE: -@@ -1080,6 +1079,7 @@ i386_align_code (fragS *fragP, int count) - case PROCESSOR_I386: - case PROCESSOR_I486: - case PROCESSOR_PENTIUM: -+ case PROCESSOR_PENTIUMPRO: - case PROCESSOR_GENERIC32: - patt = f32_patt; - break; -diff --git a/gas/testsuite/gas/i386/nops-1-i686.d b/gas/testsuite/gas/i386/nops-1-i686.d -index 7752ee2..137d5c2 100644 ---- a/gas/testsuite/gas/i386/nops-1-i686.d -+++ b/gas/testsuite/gas/i386/nops-1-i686.d -@@ -10,25 +10,41 @@ Disassembly of section .text: - - 0+ <nop15>: - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 0d jmp 10 <nop14> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+10 <nop14>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+20 <nop13>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+30 <nop12>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi -+[ ]*[a-f0-9]+: 8d bf 00 00 00 00 lea 0x0\(%edi\),%edi - - 0+40 <nop11>: - [ ]*[a-f0-9]+: 90 nop -@@ -36,7 +52,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d 74 26 00 lea 0x0\(%esi,%eiz,1\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+50 <nop10>: - [ ]*[a-f0-9]+: 90 nop -@@ -45,7 +62,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d 76 00 lea 0x0\(%esi\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+60 <nop9>: - [ ]*[a-f0-9]+: 90 nop -@@ -55,7 +73,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 89 f6 mov %esi,%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+70 <nop8>: - [ ]*[a-f0-9]+: 90 nop -@@ -66,7 +85,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+80 <nop7>: - [ ]*[a-f0-9]+: 90 nop -@@ -78,7 +98,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%eax\) -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+90 <nop6>: - [ ]*[a-f0-9]+: 90 nop -@@ -91,7 +111,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi - - 0+a0 <nop5>: - [ ]*[a-f0-9]+: 90 nop -@@ -105,7 +125,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 8d 74 26 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+b0 <nop4>: - [ ]*[a-f0-9]+: 90 nop -@@ -120,7 +141,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) -+[ ]*[a-f0-9]+: 8d 74 26 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+c0 <nop3>: - [ ]*[a-f0-9]+: 90 nop -@@ -136,7 +157,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%eax\) -+[ ]*[a-f0-9]+: 8d 76 00 lea 0x0\(%esi\),%esi - - 0+d0 <nop2>: - [ ]*[a-f0-9]+: 90 nop -diff --git a/gas/testsuite/gas/i386/nops-3-i686.d b/gas/testsuite/gas/i386/nops-3-i686.d -index 30d2627..5c114f4 100644 ---- a/gas/testsuite/gas/i386/nops-3-i686.d -+++ b/gas/testsuite/gas/i386/nops-3-i686.d -@@ -9,9 +9,37 @@ Disassembly of section .text: - - 0+ <nop>: - [ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: eb 1d jmp 20 <nop\+0x20> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) - [ ]*[a-f0-9]+: 89 c3 mov %eax,%ebx --[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - #pass -diff --git a/gas/testsuite/gas/i386/nops-4-i686.d b/gas/testsuite/gas/i386/nops-4-i686.d -index 3d8420b..c61f08d 100644 ---- a/gas/testsuite/gas/i386/nops-4-i686.d -+++ b/gas/testsuite/gas/i386/nops-4-i686.d -@@ -9,30 +9,135 @@ Disassembly of section .text: - - 0+ <nop31>: - [ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: eb 1d jmp 20 <nop30> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) - - 0+20 <nop30>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 1c jmp 40 <nop29> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+40 <nop29>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 1b jmp 60 <nop28> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+60 <nop28>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 1a jmp 80 <nop27> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+80 <nop27>: - [ ]*[a-f0-9]+: 90 nop -@@ -40,8 +145,32 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 19 jmp a0 <nop26> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+a0 <nop26>: - [ ]*[a-f0-9]+: 90 nop -@@ -50,8 +179,31 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 18 jmp c0 <nop25> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+c0 <nop25>: - [ ]*[a-f0-9]+: 90 nop -@@ -61,8 +213,30 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 17 jmp e0 <nop24> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+e0 <nop24>: - [ ]*[a-f0-9]+: 90 nop -@@ -73,8 +247,29 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 16 jmp 100 <nop23> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+100 <nop23>: - [ ]*[a-f0-9]+: 90 nop -@@ -86,8 +281,28 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 15 jmp 120 <nop22> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+120 <nop22>: - [ ]*[a-f0-9]+: 90 nop -@@ -100,8 +315,27 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%eax\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 14 jmp 140 <nop21> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+140 <nop21>: - [ ]*[a-f0-9]+: 90 nop -@@ -115,8 +349,26 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 13 jmp 160 <nop20> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+160 <nop20>: - [ ]*[a-f0-9]+: 90 nop -@@ -131,8 +383,25 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 12 jmp 180 <nop19> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+180 <nop19>: - [ ]*[a-f0-9]+: 90 nop -@@ -148,8 +417,24 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 11 jmp 1a0 <nop18> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+1a0 <nop18>: - [ ]*[a-f0-9]+: 90 nop -@@ -166,8 +451,23 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%eax\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 10 jmp 1c0 <nop17> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+1c0 <nop17>: - [ ]*[a-f0-9]+: 90 nop -@@ -185,8 +485,22 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 90 xchg %ax,%ax --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 0f jmp 1e0 <nop16> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+1e0 <nop16>: - [ ]*[a-f0-9]+: 90 nop -@@ -205,6 +519,19 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: eb 0e jmp 200 <align> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) - #pass diff --git a/core/cloog-ppl/PKGBUILD b/core/cloog-ppl/PKGBUILD deleted file mode 100644 index dfeb05950..000000000 --- a/core/cloog-ppl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 104416 2011-01-02 12:23:31Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: ezzetabi <ezzetabi at gawab dot com> - -pkgname=cloog-ppl -pkgver=0.15.10 -pkgrel=2 -pkgdesc="Library that generates loops for scanning polyhedra" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.cloog.org/" -license=('GPL') -depends=('ppl>=0.11') -options=('!libtool') -source=(ftp://gcc.gnu.org/pub/gcc/infrastructure/${pkgname}-${pkgver}.tar.gz) -md5sums=('04aa756179b6d850d9ffa50f61b91895') - -build() { - cd $srcdir/$pkgname-$pkgver - - ./autogen.sh - ./configure --prefix=/usr --includedir=/usr/include/cloog-ppl \ - --with-bits=gmp --with-ppl=/usr - make - make check -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir/ install - mv $pkgdir/usr/bin/cloog{,-ppl} -} diff --git a/testing/cloog/PKGBUILD b/core/cloog/PKGBUILD index f53c19480..f53c19480 100644 --- a/testing/cloog/PKGBUILD +++ b/core/cloog/PKGBUILD diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index e6e785bb3..7d99e4155 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' 'mips64el') @@ -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 663da6359..1a6960643 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' 'mips64el') 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/file/file-5.05-python-3.2.patch b/core/file/file-5.05-python-3.2.patch deleted file mode 100644 index 355eb08a6..000000000 --- a/core/file/file-5.05-python-3.2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur file-5.05.ori/magic/Magdir/python file-5.05/magic/Magdir/python ---- file-5.05.ori/magic/Magdir/python 2010-12-31 10:15:28.000000000 -0800 -+++ file-5.05/magic/Magdir/python 2011-02-24 07:07:36.030004467 -0800 -@@ -20,6 +20,7 @@ - 0 belong 0x03f30d0a python 2.7 byte-compiled - 0 belong 0x3b0c0d0a python 3.0 byte-compiled - 0 belong 0x4f0c0d0a python 3.1 byte-compiled -+0 belong 0x6c0c0d0a python 3.2 byte-compiled - - 0 search/1/w #!\ /usr/bin/python Python script text executable - !:mime text/x-python diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 878d01b5c..7a2f7daa3 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,35 +1,36 @@ -# $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' 'mips64el') license=('GPL' 'LGPL' 'custom') +arch=('i686' 'x86_64' 'mips64el') +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 +41,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 \ - --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 +101,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 +119,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 +177,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 +191,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 +217,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 +239,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/multilib-testing/gcc-multilib/gcc-go.install b/core/gcc/gcc-go.install index 7dc50dee5..7dc50dee5 100644 --- a/multilib-testing/gcc-multilib/gcc-go.install +++ b/core/gcc/gcc-go.install 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 4cb70e27b..1a3dace84 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' 'mips64el') @@ -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/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/core/glibc/glibc-2.13-futex.patch index 9b9c3ac45..9b9c3ac45 100644 --- a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch +++ b/core/glibc/glibc-2.13-futex.patch diff --git a/testing/isl/PKGBUILD b/core/isl/PKGBUILD index 9fc3e3ca6..9fc3e3ca6 100644 --- a/testing/isl/PKGBUILD +++ b/core/isl/PKGBUILD diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index d72becad4..785e64aa1 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' 'mips64el') @@ -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 4af7cae2d..7ad51c2b5 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' 'mips64el') 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 15c3933d5..44ee659ca 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' 'mips64el') @@ -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 c2c6d8283..cc4d53a15 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 'mips64el') 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/testing/mdadm/segfault-3.2.1.patch b/core/mdadm/segfault-3.2.1.patch index 6042d86c2..6042d86c2 100644 --- a/testing/mdadm/segfault-3.2.1.patch +++ b/core/mdadm/segfault-3.2.1.patch diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index c1022f265..f4a32bca5 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,34 +1,34 @@ -# $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' 'mips64el') license=('LGPL') +arch=('i686' 'x86_64' 'mips64el') 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/core/mpfr/mpfr-3.0.0-p8.patch b/core/mpfr/mpfr-3.0.0-p8.patch deleted file mode 100644 index e21571b52..000000000 --- a/core/mpfr/mpfr-3.0.0-p8.patch +++ /dev/null @@ -1,1945 +0,0 @@ -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-06-23 11:02:49.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-06-23 11:03:36.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_out_str -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-06-23 11:03:20.000000000 +0000 -@@ -1 +1 @@ --3.0.0 -+3.0.0-p1 -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-06-23 11:03:20.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0" -+#define MPFR_VERSION_STRING "3.0.0-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.0-a/mpfr.texi mpfr-3.0.0-b/mpfr.texi ---- mpfr-3.0.0-a/mpfr.texi 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.texi 2010-06-23 11:03:12.000000000 +0000 -@@ -2050,7 +2050,7 @@ - are printed. If @var{base} is greater than 10, @samp{@@} will be used - instead of @samp{e} as exponent delimiter. - --Return the number of bytes written, or if an error occurred, return 0. -+Return the number of characters written, or if an error occurred, return 0. - @end deftypefun - - @deftypefun size_t mpfr_inp_str (mpfr_t @var{rop}, FILE *@var{stream}, int @var{base}, mpfr_rnd_t @var{rnd}) -diff -Naurd mpfr-3.0.0-a/out_str.c mpfr-3.0.0-b/out_str.c ---- mpfr-3.0.0-a/out_str.c 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/out_str.c 2010-06-23 11:03:12.000000000 +0000 -@@ -22,6 +22,16 @@ - - #include "mpfr-impl.h" - -+/* Warning! S should not contain "%". */ -+#define OUT_STR_RET(S) \ -+ do \ -+ { \ -+ int r; \ -+ r = fprintf (stream, (S)); \ -+ return r < 0 ? 0 : r; \ -+ } \ -+ while (0) -+ - size_t - mpfr_out_str (FILE *stream, int base, size_t n_digits, mpfr_srcptr op, - mpfr_rnd_t rnd_mode) -@@ -29,6 +39,7 @@ - char *s, *s0; - size_t l; - mpfr_exp_t e; -+ int err; - - MPFR_ASSERTN (base >= 2 && base <= 62); - -@@ -36,37 +47,16 @@ - if (stream == NULL) - stream = stdout; - -- if (MPFR_IS_NAN(op)) -- { -- fprintf (stream, "@NaN@"); -- return 3; -- } -- -- if (MPFR_IS_INF(op)) -- { -- if (MPFR_SIGN(op) > 0) -- { -- fprintf (stream, "@Inf@"); -- return 3; -- } -- else -- { -- fprintf (stream, "-@Inf@"); -- return 4; -- } -- } -- -- if (MPFR_IS_ZERO(op)) -+ if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (op))) - { -- if (MPFR_SIGN(op) > 0) -- { -- fprintf(stream, "0"); -- return 1; -- } -+ if (MPFR_IS_NAN (op)) -+ OUT_STR_RET ("@NaN@"); -+ else if (MPFR_IS_INF (op)) -+ OUT_STR_RET (MPFR_IS_POS (op) ? "@Inf@" : "-@Inf@"); - else - { -- fprintf(stream, "-0"); -- return 2; -+ MPFR_ASSERTD (MPFR_IS_ZERO (op)); -+ OUT_STR_RET (MPFR_IS_POS (op) ? "0" : "-0"); - } - } - -@@ -77,21 +67,31 @@ - - l = strlen (s) + 1; /* size of allocated block returned by mpfr_get_str - - may be incorrect, as only an upper bound? */ -- if (*s == '-') -- fputc (*s++, stream); - -- /* outputs mantissa */ -- fputc (*s++, stream); e--; /* leading digit */ -- fputc ((unsigned char) MPFR_DECIMAL_POINT, stream); -- fputs (s, stream); /* rest of mantissa */ -+ /* outputs possible sign and significand */ -+ err = (*s == '-' && fputc (*s++, stream) == EOF) -+ || fputc (*s++, stream) == EOF /* leading digit */ -+ || fputc ((unsigned char) MPFR_DECIMAL_POINT, stream) == EOF -+ || fputs (s, stream) == EOF; /* trailing significand */ - (*__gmp_free_func) (s0, l); -+ if (MPFR_UNLIKELY (err)) -+ return 0; -+ -+ e--; /* due to the leading digit */ - - /* outputs exponent */ - if (e) - { -+ int r; -+ - MPFR_ASSERTN(e >= LONG_MIN); - MPFR_ASSERTN(e <= LONG_MAX); -- l += fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e); -+ -+ r = fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e); -+ if (MPFR_UNLIKELY (r < 0)) -+ return 0; -+ -+ l += r; - } - - return l; -diff -Naurd mpfr-3.0.0-a/tests/tout_str.c mpfr-3.0.0-b/tests/tout_str.c ---- mpfr-3.0.0-a/tests/tout_str.c 2010-06-10 11:00:13.000000000 +0000 -+++ mpfr-3.0.0-b/tests/tout_str.c 2010-06-23 11:03:12.000000000 +0000 -@@ -46,22 +46,54 @@ - special (void) - { - mpfr_t x; -+ unsigned int n; - - mpfr_init (x); - - mpfr_set_nan (x); -- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ if (n != 5) -+ { -+ printf ("Error: mpfr_out_str (file, 10, 0, NaN, MPFR_RNDN) wrote %u " -+ "characters instead of 5.\n", n); -+ exit (1); -+ } - - mpfr_set_inf (x, 1); -- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ if (n != 5) -+ { -+ printf ("Error: mpfr_out_str (file, 10, 0, +Inf, MPFR_RNDN) wrote %u " -+ "characters instead of 5.\n", n); -+ exit (1); -+ } - - mpfr_set_inf (x, -1); -- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ if (n != 6) -+ { -+ printf ("Error: mpfr_out_str (file, 10, 0, -Inf, MPFR_RNDN) wrote %u " -+ "characters instead of 6.\n", n); -+ exit (1); -+ } - - mpfr_set_ui (x, 0, MPFR_RNDN); -- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ if (n != 1) -+ { -+ printf ("Error: mpfr_out_str (file, 10, 0, +0, MPFR_RNDN) wrote %u " -+ "characters instead of 1.\n", n); -+ exit (1); -+ } -+ - mpfr_neg (x, x, MPFR_RNDN); -- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN); -+ if (n != 2) -+ { -+ printf ("Error: mpfr_out_str (file, 10, 0, -0, MPFR_RNDN) wrote %u " -+ "characters instead of 2.\n", n); -+ exit (1); -+ } - - mpfr_clear (x); - } -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-06-23 11:03:20.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0"; -+ return "3.0.0-p1"; - } -diff -Naurd mpfr-3.0.0-a/Makefile.in mpfr-3.0.0-b/Makefile.in ---- mpfr-3.0.0-a/Makefile.in 2010-06-10 11:00:52.000000000 +0000 -+++ mpfr-3.0.0-b/Makefile.in 2010-06-10 11:00:52.000000000 +0000 -@@ -239,6 +239,7 @@ - distuninstallcheck_listfiles = find . -type f -print - distcleancheck_listfiles = find . -type f -print - ACLOCAL = @ACLOCAL@ -+ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-06-23 11:03:36.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-06-25 13:23:13.000000000 +0000 -@@ -0,0 +1 @@ -+alloca -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-06-23 11:03:20.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-06-25 13:23:13.000000000 +0000 -@@ -1 +1 @@ --3.0.0-p1 -+3.0.0-p2 -diff -Naurd mpfr-3.0.0-a/acinclude.m4 mpfr-3.0.0-b/acinclude.m4 ---- mpfr-3.0.0-a/acinclude.m4 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/acinclude.m4 2010-06-10 11:00:14.000000000 +0000 -@@ -59,6 +59,9 @@ - dnl sys/fpu.h - MIPS specific - AC_CHECK_HEADERS([sys/time.h sys/fpu.h]) - -+dnl Check how to get `alloca' -+AC_FUNC_ALLOCA -+ - dnl SIZE_MAX macro - gl_SIZE_MAX - -diff -Naurd mpfr-3.0.0-a/configure mpfr-3.0.0-b/configure ---- mpfr-3.0.0-a/configure 2010-06-10 11:00:51.000000000 +0000 -+++ mpfr-3.0.0-b/configure 2010-06-25 13:23:05.000000000 +0000 -@@ -783,6 +783,7 @@ - OBJDUMP - DLLTOOL - AS -+ALLOCA - MPFR_LIBM - ANSI2KNR - U -@@ -5622,6 +5623,197 @@ - done - - -+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -+# for constant arguments. Useless! -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 -+$as_echo_n "checking for working alloca.h... " >&6; } -+if test "${ac_cv_working_alloca_h+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <alloca.h> -+int -+main () -+{ -+char *p = (char *) alloca (2 * sizeof (int)); -+ if (p) return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_working_alloca_h=yes -+else -+ ac_cv_working_alloca_h=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5 -+$as_echo "$ac_cv_working_alloca_h" >&6; } -+if test $ac_cv_working_alloca_h = yes; then -+ -+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h -+ -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5 -+$as_echo_n "checking for alloca... " >&6; } -+if test "${ac_cv_func_alloca_works+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+#else -+# ifdef _MSC_VER -+# include <malloc.h> -+# define alloca _alloca -+# else -+# ifdef HAVE_ALLOCA_H -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca /* predefined by HP cc +Olibcalls */ -+char *alloca (); -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+int -+main () -+{ -+char *p = (char *) alloca (1); -+ if (p) return 0; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ ac_cv_func_alloca_works=yes -+else -+ ac_cv_func_alloca_works=no -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5 -+$as_echo "$ac_cv_func_alloca_works" >&6; } -+ -+if test $ac_cv_func_alloca_works = yes; then -+ -+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h -+ -+else -+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions -+# that cause trouble. Some versions do not even contain alloca or -+# contain a buggy version. If you still want to use their alloca, -+# use ar to extract alloca.o from them instead of compiling alloca.c. -+ -+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext -+ -+$as_echo "#define C_ALLOCA 1" >>confdefs.h -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5 -+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; } -+if test "${ac_cv_os_cray+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#if defined CRAY && ! defined CRAY2 -+webecray -+#else -+wenotbecray -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "webecray" >/dev/null 2>&1; then : -+ ac_cv_os_cray=yes -+else -+ ac_cv_os_cray=no -+fi -+rm -f conftest* -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5 -+$as_echo "$ac_cv_os_cray" >&6; } -+if test $ac_cv_os_cray = yes; then -+ for ac_func in _getb67 GETB67 getb67; do -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ -+cat >>confdefs.h <<_ACEOF -+#define CRAY_STACKSEG_END $ac_func -+_ACEOF -+ -+ break -+fi -+ -+ done -+fi -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5 -+$as_echo_n "checking stack direction for C alloca... " >&6; } -+if test "${ac_cv_c_stack_direction+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "$cross_compiling" = yes; then : -+ ac_cv_c_stack_direction=0 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$ac_includes_default -+int -+find_stack_direction () -+{ -+ static char *addr = 0; -+ auto char dummy; -+ if (addr == 0) -+ { -+ addr = &dummy; -+ return find_stack_direction (); -+ } -+ else -+ return (&dummy > addr) ? 1 : -1; -+} -+ -+int -+main () -+{ -+ return find_stack_direction () < 0; -+} -+_ACEOF -+if ac_fn_c_try_run "$LINENO"; then : -+ ac_cv_c_stack_direction=1 -+else -+ ac_cv_c_stack_direction=-1 -+fi -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5 -+$as_echo "$ac_cv_c_stack_direction" >&6; } -+cat >>confdefs.h <<_ACEOF -+#define STACK_DIRECTION $ac_cv_c_stack_direction -+_ACEOF -+ -+ -+fi -+ -+ - - for ac_header in stdint.h - do : -@@ -7564,13 +7756,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:7567: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:7759: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:7570: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:7762: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:7573: output\"" >&5) -+ (eval echo "\"\$as_me:7765: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -8772,7 +8964,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 8775 "configure"' > conftest.$ac_ext -+ echo '#line 8967 "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -10032,11 +10224,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10035: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10227: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:10039: \$? = $ac_status" >&5 -+ echo "$as_me:10231: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -10371,11 +10563,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10374: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10566: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:10378: \$? = $ac_status" >&5 -+ echo "$as_me:10570: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -10476,11 +10668,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10479: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10671: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10483: \$? = $ac_status" >&5 -+ echo "$as_me:10675: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -10531,11 +10723,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10534: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10726: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10538: \$? = $ac_status" >&5 -+ echo "$as_me:10730: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -12915,7 +13107,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 12918 "configure" -+#line 13110 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -13011,7 +13203,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 13014 "configure" -+#line 13206 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-06-23 11:03:20.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-06-25 13:23:13.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0-p1" -+#define MPFR_VERSION_STRING "3.0.0-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.0-a/tests/Makefile.in mpfr-3.0.0-b/tests/Makefile.in ---- mpfr-3.0.0-a/tests/Makefile.in 2010-06-10 11:00:52.000000000 +0000 -+++ mpfr-3.0.0-b/tests/Makefile.in 2010-06-10 11:00:52.000000000 +0000 -@@ -960,6 +960,7 @@ - red=; grn=; lgn=; blu=; std= - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - ACLOCAL = @ACLOCAL@ -+ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ - AR = @AR@ - AS = @AS@ -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-06-23 11:03:20.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-06-25 13:23:13.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0-p1"; -+ return "3.0.0-p2"; - } -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-07-10 00:11:19.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-07-10 00:12:50.000000000 +0000 -@@ -0,0 +1 @@ -+gamma_underflow -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-06-25 13:23:13.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-07-10 00:11:53.000000000 +0000 -@@ -1 +1 @@ --3.0.0-p2 -+3.0.0-p3 -diff -Naurd mpfr-3.0.0-a/gamma.c mpfr-3.0.0-b/gamma.c ---- mpfr-3.0.0-a/gamma.c 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/gamma.c 2010-07-10 00:11:46.000000000 +0000 -@@ -274,7 +274,7 @@ - /* we want an upper bound for x * [log(2-x)-1]. - since x < 0, we need a lower bound on log(2-x) */ - mpfr_ui_sub (xp, 2, x, MPFR_RNDD); -- mpfr_log (xp, xp, MPFR_RNDD); -+ mpfr_log2 (xp, xp, MPFR_RNDD); - mpfr_sub_ui (xp, xp, 1, MPFR_RNDD); - mpfr_mul (xp, xp, x, MPFR_RNDU); - -@@ -303,8 +303,8 @@ - { - mpfr_sub (tmp, tmp, tmp2, MPFR_RNDZ); /* low bnd on |sin(Pi*(2-x))| */ - mpfr_ui_div (tmp, 12, tmp, MPFR_RNDU); /* upper bound */ -- mpfr_log (tmp, tmp, MPFR_RNDU); -- mpfr_add (tmp, tmp, xp, MPFR_RNDU); -+ mpfr_log2 (tmp, tmp, MPFR_RNDU); -+ mpfr_add (xp, tmp, xp, MPFR_RNDU); - underflow = mpfr_cmp_si (xp, expo.saved_emin - 2) <= 0; - } - -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-06-25 13:23:13.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-07-10 00:11:53.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0-p2" -+#define MPFR_VERSION_STRING "3.0.0-p3" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.0-a/tests/tgamma.c mpfr-3.0.0-b/tests/tgamma.c ---- mpfr-3.0.0-a/tests/tgamma.c 2010-06-10 11:00:13.000000000 +0000 -+++ mpfr-3.0.0-b/tests/tgamma.c 2010-07-10 00:11:46.000000000 +0000 -@@ -461,6 +461,20 @@ - mpfr_clear (x); - } - -+/* bug found by Stathis, only occurs on 32-bit machines */ -+static void -+test20100709 (void) -+{ -+ mpfr_t x; -+ int inex; -+ -+ mpfr_init2 (x, 100); -+ mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN); -+ inex = mpfr_gamma (x, x, MPFR_RNDN); -+ MPFR_ASSERTN(MPFR_IS_ZERO(x) && MPFR_IS_NEG(x) && inex > 0); -+ mpfr_clear (x); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -471,6 +485,7 @@ - test_generic (2, 100, 2); - gamma_integer (); - test20071231 (); -+ test20100709 (); - - data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); - -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-06-25 13:23:13.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-07-10 00:11:53.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0-p2"; -+ return "3.0.0-p3"; - } -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-09-07 08:44:01.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-09-07 08:48:46.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_cmp/set_ui/si -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-07-10 00:11:53.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-09-07 08:46:06.000000000 +0000 -@@ -1 +1 @@ --3.0.0-p3 -+3.0.0-p4 -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-07-10 00:11:53.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-09-07 08:46:06.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0-p3" -+#define MPFR_VERSION_STRING "3.0.0-p4" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -@@ -798,35 +798,45 @@ - anyway. Checking with other ICC versions is needed. Possibly detect - whether warnings are produced or not with a configure test. - + Remove C++ too, since it complains too much. */ -+/* Added casts to improve robustness in case of undefined behavior and -+ compiler extensions based on UB (in particular -fwrapv). MPFR doesn't -+ use such extensions, but these macros will be used by 3rd-party code, -+ where such extensions may be required. -+ Moreover casts to unsigned long have been added to avoid warnings in -+ programs that use MPFR and are compiled with -Wconversion; such casts -+ are OK since if X is a constant expression, then (unsigned long) X is -+ also a constant expression, so that the optimizations still work. */ - #if defined (__GNUC__) && !defined(__ICC) && !defined(__cplusplus) - #if (__GNUC__ >= 2) - #undef mpfr_cmp_ui --/* We use the fact that mpfr_sgn on NaN sets the erange flag and returns 0. */ --#define mpfr_cmp_ui(_f,_u) \ -- (__builtin_constant_p (_u) && (_u) == 0 ? \ -- mpfr_sgn (_f) : \ -- mpfr_cmp_ui_2exp ((_f),(_u),0)) -+/* We use the fact that mpfr_sgn on NaN sets the erange flag and returns 0. -+ But warning! mpfr_sgn is specified as a macro in the API, thus the macro -+ mustn't be used if side effects are possible, like here. */ -+#define mpfr_cmp_ui(_f,_u) \ -+ (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ? \ -+ (mpfr_sgn) (_f) : \ -+ mpfr_cmp_ui_2exp ((_f), (unsigned long) (_u), 0)) - #undef mpfr_cmp_si --#define mpfr_cmp_si(_f,_s) \ -- (__builtin_constant_p (_s) && (_s) >= 0 ? \ -- mpfr_cmp_ui ((_f), (_s)) : \ -- mpfr_cmp_si_2exp ((_f), (_s), 0)) -+#define mpfr_cmp_si(_f,_s) \ -+ (__builtin_constant_p (_s) && (long) (_s) >= 0 ? \ -+ mpfr_cmp_ui ((_f), (unsigned long) (long) (_s)) : \ -+ mpfr_cmp_si_2exp ((_f), (long) (_s), 0)) - #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95 - #undef mpfr_set_ui --#define mpfr_set_ui(_f,_u,_r) \ -- (__builtin_constant_p (_u) && (_u) == 0 ? \ -- __extension__ ({ \ -- mpfr_ptr _p = (_f); \ -- _p->_mpfr_sign = 1; \ -- _p->_mpfr_exp = __MPFR_EXP_ZERO; \ -- (void) (_r); 0; }) : \ -- mpfr_set_ui_2exp ((_f), (_u), 0, (_r))) -+#define mpfr_set_ui(_f,_u,_r) \ -+ (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ? \ -+ __extension__ ({ \ -+ mpfr_ptr _p = (_f); \ -+ _p->_mpfr_sign = 1; \ -+ _p->_mpfr_exp = __MPFR_EXP_ZERO; \ -+ (void) (_r); 0; }) : \ -+ mpfr_set_ui_2exp ((_f), (unsigned long) (_u), 0, (_r))) - #endif - #undef mpfr_set_si --#define mpfr_set_si(_f,_s,_r) \ -- (__builtin_constant_p (_s) && (_s) >= 0 ? \ -- mpfr_set_ui ((_f), (_s), (_r)) : \ -- mpfr_set_si_2exp ((_f), (_s), 0, (_r))) -+#define mpfr_set_si(_f,_s,_r) \ -+ (__builtin_constant_p (_s) && (long) (_s) >= 0 ? \ -+ mpfr_set_ui ((_f), (unsigned long) (long) (_s), (_r)) : \ -+ mpfr_set_si_2exp ((_f), (long) (_s), 0, (_r))) - #endif - #endif - -diff -Naurd mpfr-3.0.0-a/tests/tcmp_ui.c mpfr-3.0.0-b/tests/tcmp_ui.c ---- mpfr-3.0.0-a/tests/tcmp_ui.c 2010-06-10 11:00:13.000000000 +0000 -+++ mpfr-3.0.0-b/tests/tcmp_ui.c 2010-09-07 08:45:12.000000000 +0000 -@@ -88,6 +88,126 @@ - mpfr_clear (x); - } - -+/* Since mpfr_cmp_ui and mpfr_cmp_si are also implemented by a macro -+ with __builtin_constant_p for GCC, check that side effects are -+ handled correctly. */ -+static void -+check_macros (void) -+{ -+ mpfr_t x; -+ int c; -+ -+ mpfr_init2 (x, 32); -+ -+ c = 0; -+ mpfr_set_ui (x, 17, MPFR_RNDN); -+ if (mpfr_cmp_ui (x, 17) != 0) -+ { -+ printf ("Error 1 on mpfr_cmp_ui(x,17) in check_macros\n"); -+ exit (1); -+ } -+ if (mpfr_cmp_ui (x, (c++, 17)) != 0) -+ { -+ printf ("Error 2 on mpfr_cmp_ui(x,17) in check_macros\n"); -+ exit (1); -+ } -+ if (c != 1) -+ { -+ printf ("Error 3 on mpfr_cmp_ui(x,17) in check_macros\n" -+ "(c = %d instead of 1)\n", c); -+ exit (1); -+ } -+ if (mpfr_cmp_si (x, 17) != 0) -+ { -+ printf ("Error 1 on mpfr_cmp_si(x,17) in check_macros\n"); -+ exit (1); -+ } -+ if (mpfr_cmp_si (x, (c++, 17)) != 0) -+ { -+ printf ("Error 2 on mpfr_cmp_si(x,17) in check_macros\n"); -+ exit (1); -+ } -+ if (c != 2) -+ { -+ printf ("Error 3 on mpfr_cmp_si(x,17) in check_macros\n" -+ "(c = %d instead of 2)\n", c); -+ exit (1); -+ } -+ -+ c = 0; -+ mpfr_set_ui (x, 0, MPFR_RNDN); -+ if (mpfr_cmp_ui (x, 0) != 0) -+ { -+ printf ("Error 1 on mpfr_cmp_ui(x,0) in check_macros\n"); -+ exit (1); -+ } -+ if (mpfr_cmp_ui (x, (c++, 0)) != 0) -+ { -+ printf ("Error 2 on mpfr_cmp_ui(x,0) in check_macros\n"); -+ exit (1); -+ } -+ if (c != 1) -+ { -+ printf ("Error 3 on mpfr_cmp_ui(x,0) in check_macros\n" -+ "(c = %d instead of 1)\n", c); -+ exit (1); -+ } -+ if (mpfr_cmp_si (x, 0) != 0) -+ { -+ printf ("Error 1 on mpfr_cmp_si(x,0) in check_macros\n"); -+ exit (1); -+ } -+ if (mpfr_cmp_si (x, (c++, 0)) != 0) -+ { -+ printf ("Error 2 on mpfr_cmp_si(x,0) in check_macros\n"); -+ exit (1); -+ } -+ if (c != 2) -+ { -+ printf ("Error 3 on mpfr_cmp_si(x,0) in check_macros\n" -+ "(c = %d instead of 2)\n", c); -+ exit (1); -+ } -+ -+ mpfr_clear (x); -+} -+ -+/* Bug in r7114 */ -+static void -+test_macros (void) -+{ -+ mpfr_t x[3]; -+ mpfr_ptr p; -+ -+ mpfr_inits (x[0], x[1], x[2], (mpfr_ptr) 0); -+ mpfr_set_ui (x[0], 0, MPFR_RNDN); -+ p = x[0]; -+ if (mpfr_cmp_ui (p++, 0) != 0) -+ { -+ printf ("Error in mpfr_cmp_ui macro: result should be 0.\n"); -+ exit (1); -+ } -+ if (p != x[1]) -+ { -+ printf ("Error in mpfr_cmp_ui macro: p - x[0] = %d (expecting 1)\n", -+ (int) (p - x[0])); -+ exit (1); -+ } -+ p = x[0]; -+ if (mpfr_cmp_si (p++, 0) != 0) -+ { -+ printf ("Error in mpfr_cmp_si macro: result should be 0.\n"); -+ exit (1); -+ } -+ if (p != x[1]) -+ { -+ printf ("Error in mpfr_cmp_si macro: p - x[0] = %d (expecting 1)\n", -+ (int) (p - x[0])); -+ exit (1); -+ } -+ mpfr_clears (x[0], x[1], x[2], (mpfr_ptr) 0); -+} -+ - int - main (void) - { -@@ -216,6 +336,8 @@ - mpfr_clear (x); - - check_nan (); -+ check_macros (); -+ test_macros (); - - tests_end_mpfr (); - return 0; -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-07-10 00:11:53.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-09-07 08:46:06.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0-p3"; -+ return "3.0.0-p4"; - } -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-10-21 20:28:38.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-10-21 20:28:38.000000000 +0000 -@@ -0,0 +1 @@ -+tcan_round -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-09-07 08:46:06.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-10-21 20:28:38.000000000 +0000 -@@ -1 +1 @@ --3.0.0-p4 -+3.0.0-p5 -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-09-07 08:46:06.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-10-21 20:28:38.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0-p4" -+#define MPFR_VERSION_STRING "3.0.0-p5" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.0-a/tests/tcan_round.c mpfr-3.0.0-b/tests/tcan_round.c ---- mpfr-3.0.0-a/tests/tcan_round.c 2010-06-10 11:00:13.000000000 +0000 -+++ mpfr-3.0.0-b/tests/tcan_round.c 2010-10-21 20:28:38.000000000 +0000 -@@ -41,7 +41,7 @@ - /* avoid mpn_random which leaks memory */ - for (i = 0; i < n; i++) - buf[i] = randlimb (); -- p = (mpfr_prec_t) randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN; -+ p = randlimb() % ((n-1) * GMP_NUMB_BITS) + MPFR_PREC_MIN; - err = p + randlimb () % GMP_NUMB_BITS; - r1 = mpfr_round_p (buf, n, err, p); - r2 = mpfr_can_round_raw (buf, n, MPFR_SIGN_POS, err, -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-09-07 08:46:06.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-10-21 20:28:38.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0-p4"; -+ return "3.0.0-p5"; - } -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-10-21 20:59:32.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-10-21 20:59:32.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_sub1 -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-10-21 20:28:38.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-10-21 20:59:32.000000000 +0000 -@@ -1 +1 @@ --3.0.0-p5 -+3.0.0-p6 -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-10-21 20:28:38.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-10-21 20:59:32.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0-p5" -+#define MPFR_VERSION_STRING "3.0.0-p6" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.0-a/sub1.c mpfr-3.0.0-b/sub1.c ---- mpfr-3.0.0-a/sub1.c 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/sub1.c 2010-10-21 20:59:32.000000000 +0000 -@@ -37,7 +37,9 @@ - mp_size_t cancel2, an, bn, cn, cn0; - mp_limb_t *ap, *bp, *cp; - mp_limb_t carry, bb, cc, borrow = 0; -- int inexact, shift_b, shift_c, is_exact = 1, down = 0, add_exp = 0; -+ int inexact, shift_b, shift_c, add_exp = 0; -+ int cmp_low = 0; /* used for rounding to nearest: 0 if low(b) = low(c), -+ negative if low(b) < low(c), positive if low(b)>low(c) */ - int sh, k; - MPFR_TMP_DECL(marker); - -@@ -196,7 +198,8 @@ - } - - #ifdef DEBUG -- printf ("shift_b=%d shift_c=%d diffexp=%lu\n", shift_b, shift_c, -+ printf ("rnd=%s shift_b=%d shift_c=%d diffexp=%lu\n", -+ mpfr_print_rnd_mode (rnd_mode), shift_b, shift_c, - (unsigned long) diff_exp); - #endif - -@@ -307,17 +310,18 @@ - { - if (MPFR_LIKELY(sh)) - { -- is_exact = (carry == 0); - /* can decide except when carry = 2^(sh-1) [middle] - or carry = 0 [truncate, but cannot decide inexact flag] */ -- down = (carry < (MPFR_LIMB_ONE << (sh - 1))); - if (carry > (MPFR_LIMB_ONE << (sh - 1))) - goto add_one_ulp; -- else if ((0 < carry) && down) -+ else if ((0 < carry) && (carry < (MPFR_LIMB_ONE << (sh - 1)))) - { - inexact = -1; /* result if smaller than exact value */ - goto truncate; - } -+ /* now carry = 2^(sh-1), in which case cmp_low=2, -+ or carry = 0, in which case cmp_low=0 */ -+ cmp_low = (carry == 0) ? 0 : 2; - } - } - else /* directed rounding: set rnd_mode to RNDZ iff toward zero */ -@@ -344,12 +348,32 @@ - cn -= (long int) an + cancel2; - - #ifdef DEBUG -- printf ("last %d bits from a are %lu, bn=%ld, cn=%ld\n", -+ printf ("last sh=%d bits from a are %lu, bn=%ld, cn=%ld\n", - sh, (unsigned long) carry, (long) bn, (long) cn); - #endif - -+ /* for rounding to nearest, we couldn't conclude up to here in the following -+ cases: -+ 1. sh = 0, then cmp_low=0: we can either truncate, subtract one ulp -+ or add one ulp: -1 ulp < low(b)-low(c) < 1 ulp -+ 2. sh > 0 but the low sh bits from high(b)-high(c) equal 2^(sh-1): -+ -0.5 ulp <= -1/2^sh < low(b)-low(c)-0.5 < 1/2^sh <= 0.5 ulp -+ we can't decide the rounding, in that case cmp_low=2: -+ either we truncate and flag=-1, or we add one ulp and flag=1 -+ 3. the low sh>0 bits from high(b)-high(c) equal 0: we know we have to -+ truncate but we can't decide the ternary value, here cmp_low=0: -+ -0.5 ulp <= -1/2^sh < low(b)-low(c) < 1/2^sh <= 0.5 ulp -+ we always truncate and inexact can be any of -1,0,1 -+ */ -+ -+ /* note: here cn might exceed cn0, in which case we consider a zero limb */ - for (k = 0; (bn > 0) || (cn > 0); k = 1) - { -+ /* if cmp_low < 0, we know low(b) - low(c) < 0 -+ if cmp_low > 0, we know low(b) - low(c) > 0 -+ (more precisely if cmp_low = 2, low(b) - low(c) = 0.5 ulp so far) -+ if cmp_low = 0, so far low(b) - low(c) = 0 */ -+ - /* get next limbs */ - bb = (bn > 0) ? bp[--bn] : 0; - if ((cn > 0) && (cn-- <= cn0)) -@@ -357,76 +381,115 @@ - else - cc = 0; - -- /* down is set when low(b) < low(c) */ -- if (down == 0) -- down = (bb < cc); -+ /* cmp_low compares low(b) and low(c) */ -+ if (cmp_low == 0) /* case 1 or 3 */ -+ cmp_low = (bb < cc) ? -2+k : (bb > cc) ? 1 : 0; -+ -+ /* Case 1 for k=0 splits into 7 subcases: -+ 1a: bb > cc + half -+ 1b: bb = cc + half -+ 1c: 0 < bb - cc < half -+ 1d: bb = cc -+ 1e: -half < bb - cc < 0 -+ 1f: bb - cc = -half -+ 1g: bb - cc < -half -+ -+ Case 2 splits into 3 subcases: -+ 2a: bb > cc -+ 2b: bb = cc -+ 2c: bb < cc -+ -+ Case 3 splits into 3 subcases: -+ 3a: bb > cc -+ 3b: bb = cc -+ 3c: bb < cc -+ */ - - /* the case rounding to nearest with sh=0 is special since one couldn't - subtract above 1/2 ulp in the trailing limb of the result */ -- if ((rnd_mode == MPFR_RNDN) && sh == 0 && k == 0) -+ if (rnd_mode == MPFR_RNDN && sh == 0 && k == 0) /* case 1 for k=0 */ - { - mp_limb_t half = MPFR_LIMB_HIGHBIT; - -- is_exact = (bb == cc); -- - /* add one ulp if bb > cc + half - truncate if cc - half < bb < cc + half - sub one ulp if bb < cc - half - */ - -- if (down) -+ if (cmp_low < 0) /* bb < cc: -1 ulp < low(b) - low(c) < 0, -+ cases 1e, 1f and 1g */ - { - if (cc >= half) - cc -= half; -- else -+ else /* since bb < cc < half, bb+half < 2*half */ - bb += half; -+ /* now we have bb < cc + half: -+ we have to subtract one ulp if bb < cc, -+ and truncate if bb > cc */ - } -- else /* bb >= cc */ -+ else if (cmp_low >= 0) /* bb >= cc, cases 1a to 1d */ - { - if (cc < half) - cc += half; -- else -+ else /* since bb >= cc >= half, bb - half >= 0 */ - bb -= half; -+ /* now we have bb > cc - half: we have to add one ulp if bb > cc, -+ and truncate if bb < cc */ -+ if (cmp_low > 0) -+ cmp_low = 2; - } - } - - #ifdef DEBUG -- printf (" bb=%lu cc=%lu down=%d is_exact=%d\n", -- (unsigned long) bb, (unsigned long) cc, down, is_exact); -+ printf ("k=%u bb=%lu cc=%lu cmp_low=%d\n", k, -+ (unsigned long) bb, (unsigned long) cc, cmp_low); - #endif -- if (bb < cc) -+ if (cmp_low < 0) /* low(b) - low(c) < 0: either truncate or subtract -+ one ulp */ - { - if (rnd_mode == MPFR_RNDZ) -- goto sub_one_ulp; -+ goto sub_one_ulp; /* set inexact=-1 */ - else if (rnd_mode != MPFR_RNDN) /* round away */ - { - inexact = 1; - goto truncate; - } -- else /* round to nearest: special case here since for sh=k=0 -- bb = bb0 - MPFR_LIMB_HIGHBIT */ -+ else /* round to nearest */ - { -- if (is_exact && sh == 0) -- { -- /* For k=0 we can't decide exactness since it may depend -- from low order bits. -- For k=1, the first low limbs matched: low(b)-low(c)<0. */ -- if (k) -- { -- inexact = 1; -- goto truncate; -- } -- } -- else if (down && sh == 0) -- goto sub_one_ulp; -- else -- { -- inexact = (is_exact) ? 1 : -1; -+ /* If cmp_low < 0 and bb > cc, then -0.5 ulp < low(b)-low(c) < 0, -+ whatever the value of sh. -+ If sh>0, then cmp_low < 0 implies that the initial neglected -+ sh bits were 0 (otherwise cmp_low=2 initially), thus the -+ weight of the new bits is less than 0.5 ulp too. -+ If k > 0 (and sh=0) this means that either the first neglected -+ limbs bb and cc were equal (thus cmp_low was 0 for k=0), -+ or we had bb - cc = -0.5 ulp or 0.5 ulp. -+ The last case is not possible here since we would have -+ cmp_low > 0 which is sticky. -+ In the first case (where we have cmp_low = -1), we truncate, -+ whereas in the 2nd case we have cmp_low = -2 and we subtract -+ one ulp. -+ */ -+ if (bb > cc || sh > 0 || cmp_low == -1) -+ { /* -0.5 ulp < low(b)-low(c) < 0, -+ bb > cc corresponds to cases 1e and 1f1 -+ sh > 0 corresponds to cases 3c and 3b3 -+ cmp_low = -1 corresponds to case 1d3 (also 3b3) */ -+ inexact = 1; - goto truncate; - } -+ else if (bb < cc) /* here sh = 0 and low(b)-low(c) < -0.5 ulp, -+ this corresponds to cases 1g and 1f3 */ -+ goto sub_one_ulp; -+ /* the only case where we can't conclude is sh=0 and bb=cc, -+ i.e., we have low(b) - low(c) = -0.5 ulp (up to now), thus -+ we don't know if we must truncate or subtract one ulp. -+ Note: for sh=0 we can't have low(b) - low(c) = -0.5 ulp up to -+ now, since low(b) - low(c) > 1/2^sh */ - } - } -- else if (bb > cc) -+ else if (cmp_low > 0) /* 0 < low(b) - low(c): either truncate or -+ add one ulp */ - { - if (rnd_mode == MPFR_RNDZ) - { -@@ -437,34 +500,70 @@ - goto add_one_ulp; - else /* round to nearest */ - { -- if (is_exact) -+ if (bb > cc) - { -- inexact = -1; -- goto truncate; -+ /* if sh=0, then bb>cc means that low(b)-low(c) > 0.5 ulp, -+ and similarly when cmp_low=2 */ -+ if (cmp_low == 2) /* cases 1a, 1b1, 2a and 2b1 */ -+ goto add_one_ulp; -+ /* sh > 0 and cmp_low > 0: this implies that the sh initial -+ neglected bits were 0, and the remaining low(b)-low(c)>0, -+ but its weight is less than 0.5 ulp */ -+ else /* 0 < low(b) - low(c) < 0.5 ulp, this corresponds to -+ cases 3a, 1d1 and 3b1 */ -+ { -+ inexact = -1; -+ goto truncate; -+ } - } -- else if (down) -+ else if (bb < cc) /* 0 < low(b) - low(c) < 0.5 ulp, cases 1c, -+ 1b3, 2b3 and 2c */ - { -- inexact = 1; -+ inexact = -1; - goto truncate; - } -- else -- goto add_one_ulp; -+ /* the only case where we can't conclude is bb=cc, i.e., -+ low(b) - low(c) = 0.5 ulp (up to now), thus we don't know -+ if we must truncate or add one ulp. */ - } - } -+ /* after k=0, we cannot conclude in the following cases, we split them -+ according to the values of bb and cc for k=1: -+ 1b. sh=0 and cmp_low = 1 and bb-cc = half [around 0.5 ulp] -+ 1b1. bb > cc: add one ulp, inex = 1 -+ 1b2: bb = cc: cannot conclude -+ 1b3: bb < cc: truncate, inex = -1 -+ 1d. sh=0 and cmp_low = 0 and bb-cc = 0 [around 0] -+ 1d1: bb > cc: truncate, inex = -1 -+ 1d2: bb = cc: cannot conclude -+ 1d3: bb < cc: truncate, inex = +1 -+ 1f. sh=0 and cmp_low = -1 and bb-cc = -half [around -0.5 ulp] -+ 1f1: bb > cc: truncate, inex = +1 -+ 1f2: bb = cc: cannot conclude -+ 1f3: bb < cc: sub one ulp, inex = -1 -+ 2b. sh > 0 and cmp_low = 2 and bb=cc [around 0.5 ulp] -+ 2b1. bb > cc: add one ulp, inex = 1 -+ 2b2: bb = cc: cannot conclude -+ 2b3: bb < cc: truncate, inex = -1 -+ 3b. sh > 0 and cmp_low = 0 [around 0] -+ 3b1. bb > cc: truncate, inex = -1 -+ 3b2: bb = cc: cannot conclude -+ 3b3: bb < cc: truncate, inex = +1 -+ */ - } - -- if ((rnd_mode == MPFR_RNDN) && !is_exact) -+ if ((rnd_mode == MPFR_RNDN) && cmp_low != 0) - { - /* even rounding rule */ - if ((ap[0] >> sh) & 1) - { -- if (down) -+ if (cmp_low < 0) - goto sub_one_ulp; - else - goto add_one_ulp; - } - else -- inexact = (down) ? 1 : -1; -+ inexact = (cmp_low > 0) ? -1 : 1; - } - else - inexact = 0; -diff -Naurd mpfr-3.0.0-a/tests/tfma.c mpfr-3.0.0-b/tests/tfma.c ---- mpfr-3.0.0-a/tests/tfma.c 2010-06-10 11:00:13.000000000 +0000 -+++ mpfr-3.0.0-b/tests/tfma.c 2010-10-21 20:59:32.000000000 +0000 -@@ -337,6 +337,94 @@ - mpfr_clears (x, y, z, r, (mpfr_ptr) 0); - } - -+static void -+bug20101018 (void) -+{ -+ mpfr_t x, y, z, t, u; -+ int i; -+ -+ mpfr_init2 (x, 64); -+ mpfr_init2 (y, 64); -+ mpfr_init2 (z, 64); -+ mpfr_init2 (t, 64); -+ mpfr_init2 (u, 64); -+ -+ mpfr_set_str (x, "0xf.fffffffffffffffp-14766", 16, MPFR_RNDN); -+ mpfr_set_str (y, "-0xf.fffffffffffffffp+317", 16, MPFR_RNDN); -+ mpfr_set_str (z, "0x8.3ffffffffffe3ffp-14443", 16, MPFR_RNDN); -+ mpfr_set_str (t, "0x8.7ffffffffffc7ffp-14444", 16, MPFR_RNDN); -+ i = mpfr_fma (u, x, y, z, MPFR_RNDN); -+ if (mpfr_cmp (u, t) != 0) -+ { -+ printf ("Wrong result in bug20101018 (a)\n"); -+ printf ("Expected "); -+ mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN); -+ printf ("\nGot "); -+ mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN); -+ printf ("\n"); -+ exit (1); -+ } -+ if (i <= 0) -+ { -+ printf ("Wrong ternary value in bug20101018 (a)\n"); -+ printf ("Expected > 0\n"); -+ printf ("Got %d\n", i); -+ exit (1); -+ } -+ -+ mpfr_set_str (x, "-0xf.fffffffffffffffp-11420", 16, MPFR_RNDN); -+ mpfr_set_str (y, "0xf.fffffffffffffffp+9863", 16, MPFR_RNDN); -+ mpfr_set_str (z, "0x8.fffff80ffffffffp-1551", 16, MPFR_RNDN); -+ mpfr_set_str (t, "0x9.fffff01ffffffffp-1552", 16, MPFR_RNDN); -+ i = mpfr_fma (u, x, y, z, MPFR_RNDN); -+ if (mpfr_cmp (u, t) != 0) -+ { -+ printf ("Wrong result in bug20101018 (b)\n"); -+ printf ("Expected "); -+ mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN); -+ printf ("\nGot "); -+ mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN); -+ printf ("\n"); -+ exit (1); -+ } -+ if (i <= 0) -+ { -+ printf ("Wrong ternary value in bug20101018 (b)\n"); -+ printf ("Expected > 0\n"); -+ printf ("Got %d\n", i); -+ exit (1); -+ } -+ -+ mpfr_set_str (x, "0xf.fffffffffffffffp-2125", 16, MPFR_RNDN); -+ mpfr_set_str (y, "-0xf.fffffffffffffffp-6000", 16, MPFR_RNDN); -+ mpfr_set_str (z, "0x8p-8119", 16, MPFR_RNDN); -+ mpfr_set_str (t, "0x8.000000000000001p-8120", 16, MPFR_RNDN); -+ i = mpfr_fma (u, x, y, z, MPFR_RNDN); -+ if (mpfr_cmp (u, t) != 0) -+ { -+ printf ("Wrong result in bug20101018 (c)\n"); -+ printf ("Expected "); -+ mpfr_out_str (stdout, 16, 0, t, MPFR_RNDN); -+ printf ("\nGot "); -+ mpfr_out_str (stdout, 16, 0, u, MPFR_RNDN); -+ printf ("\n"); -+ exit (1); -+ } -+ if (i <= 0) -+ { -+ printf ("Wrong ternary value in bug20101018 (c)\n"); -+ printf ("Expected > 0\n"); -+ printf ("Got %d\n", i); -+ exit (1); -+ } -+ -+ mpfr_clear (x); -+ mpfr_clear (y); -+ mpfr_clear (z); -+ mpfr_clear (t); -+ mpfr_clear (u); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -345,6 +433,8 @@ - - tests_start_mpfr (); - -+ bug20101018 (); -+ - mpfr_init (x); - mpfr_init (s); - mpfr_init (y); -diff -Naurd mpfr-3.0.0-a/tests/tsub.c mpfr-3.0.0-b/tests/tsub.c ---- mpfr-3.0.0-a/tests/tsub.c 2010-06-10 11:00:13.000000000 +0000 -+++ mpfr-3.0.0-b/tests/tsub.c 2010-10-21 20:59:32.000000000 +0000 -@@ -201,6 +201,8 @@ - if (mpfr_cmp (z, x)) - { - printf ("Error in mpfr_sub (2)\n"); -+ printf ("Expected "); mpfr_print_binary (x); puts (""); -+ printf ("Got "); mpfr_print_binary (z); puts (""); - exit (1); - } - mpfr_set_str_binary (x, "1.1110111011110001110111011111111111101000011001011100101100101101"); -@@ -478,6 +480,156 @@ - mpfr_clear (u); - } - -+/* Bug found by Jakub Jelinek -+ * http://bugzilla.redhat.com/643657 -+ * https://gforge.inria.fr/tracker/index.php?func=detail&aid=11301 -+ * The consequence can be either an assertion failure (i = 2 in the -+ * testcase below, in debug mode) or an incorrectly rounded value. -+ */ -+static void -+bug20101017 (void) -+{ -+ mpfr_t a, b, c; -+ int inex; -+ int i; -+ -+ mpfr_init2 (a, GMP_NUMB_BITS * 2); -+ mpfr_init2 (b, GMP_NUMB_BITS); -+ mpfr_init2 (c, GMP_NUMB_BITS); -+ -+ /* a = 2^(2N) + k.2^(2N-1) + 2^N and b = 1 -+ with N = GMP_NUMB_BITS and k = 0 or 1. -+ c = a - b should round to the same value as a. */ -+ -+ for (i = 2; i <= 3; i++) -+ { -+ mpfr_set_ui_2exp (a, i, GMP_NUMB_BITS - 1, MPFR_RNDN); -+ mpfr_add_ui (a, a, 1, MPFR_RNDN); -+ mpfr_mul_2ui (a, a, GMP_NUMB_BITS, MPFR_RNDN); -+ mpfr_set_ui (b, 1, MPFR_RNDN); -+ inex = mpfr_sub (c, a, b, MPFR_RNDN); -+ mpfr_set (b, a, MPFR_RNDN); -+ if (! mpfr_equal_p (c, b)) -+ { -+ printf ("Error in bug20101017 for i = %d.\n", i); -+ printf ("Expected "); -+ mpfr_out_str (stdout, 16, 0, b, MPFR_RNDN); -+ putchar ('\n'); -+ printf ("Got "); -+ mpfr_out_str (stdout, 16, 0, c, MPFR_RNDN); -+ putchar ('\n'); -+ exit (1); -+ } -+ if (inex >= 0) -+ { -+ printf ("Error in bug20101017 for i = %d: bad inex value.\n", i); -+ printf ("Expected negative, got %d.\n", inex); -+ exit (1); -+ } -+ } -+ -+ mpfr_set_prec (a, 64); -+ mpfr_set_prec (b, 129); -+ mpfr_set_prec (c, 2); -+ mpfr_set_str_binary (b, "0.100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001E65"); -+ mpfr_set_str_binary (c, "0.10E1"); -+ inex = mpfr_sub (a, b, c, MPFR_RNDN); -+ if (mpfr_cmp_ui_2exp (a, 1, 64) != 0 || inex >= 0) -+ { -+ printf ("Error in mpfr_sub for b-c for b=2^64+1+2^(-64), c=1\n"); -+ printf ("Expected result 2^64 with inex < 0\n"); -+ printf ("Got "); mpfr_print_binary (a); -+ printf (" with inex=%d\n", inex); -+ exit (1); -+ } -+ -+ mpfr_clears (a, b, c, (mpfr_ptr) 0); -+} -+ -+/* hard test of rounding */ -+static void -+check_rounding (void) -+{ -+ mpfr_t a, b, c, res; -+ mpfr_prec_t p; -+ long k, l; -+ int i; -+ -+#define MAXKL (2 * GMP_NUMB_BITS) -+ for (p = MPFR_PREC_MIN; p <= GMP_NUMB_BITS; p++) -+ { -+ mpfr_init2 (a, p); -+ mpfr_init2 (res, p); -+ mpfr_init2 (b, p + 1 + MAXKL); -+ mpfr_init2 (c, MPFR_PREC_MIN); -+ -+ /* b = 2^p + 1 + 2^(-k), c = 2^(-l) */ -+ for (k = 0; k <= MAXKL; k++) -+ for (l = 0; l <= MAXKL; l++) -+ { -+ mpfr_set_ui_2exp (b, 1, p, MPFR_RNDN); -+ mpfr_add_ui (b, b, 1, MPFR_RNDN); -+ mpfr_mul_2ui (b, b, k, MPFR_RNDN); -+ mpfr_add_ui (b, b, 1, MPFR_RNDN); -+ mpfr_div_2ui (b, b, k, MPFR_RNDN); -+ mpfr_set_ui_2exp (c, 1, -l, MPFR_RNDN); -+ i = mpfr_sub (a, b, c, MPFR_RNDN); -+ /* b - c = 2^p + 1 + 2^(-k) - 2^(-l), should be rounded to -+ 2^p for l <= k, and 2^p+2 for l < k */ -+ if (l <= k) -+ { -+ if (mpfr_cmp_ui_2exp (a, 1, p) != 0) -+ { -+ printf ("Wrong result in check_rounding\n"); -+ printf ("p=%lu k=%ld l=%ld\n", p, k, l); -+ printf ("b="); mpfr_print_binary (b); puts (""); -+ printf ("c="); mpfr_print_binary (c); puts (""); -+ printf ("Expected 2^%lu\n", p); -+ printf ("Got "); mpfr_print_binary (a); puts (""); -+ exit (1); -+ } -+ if (i >= 0) -+ { -+ printf ("Wrong ternary value in check_rounding\n"); -+ printf ("p=%lu k=%ld l=%ld\n", p, k, l); -+ printf ("b="); mpfr_print_binary (b); puts (""); -+ printf ("c="); mpfr_print_binary (c); puts (""); -+ printf ("a="); mpfr_print_binary (a); puts (""); -+ printf ("Expected < 0, got %d\n", i); -+ exit (1); -+ } -+ } -+ else /* l < k */ -+ { -+ mpfr_set_ui_2exp (res, 1, p, MPFR_RNDN); -+ mpfr_add_ui (res, res, 2, MPFR_RNDN); -+ if (mpfr_cmp (a, res) != 0) -+ { -+ printf ("Wrong result in check_rounding\n"); -+ printf ("b="); mpfr_print_binary (b); puts (""); -+ printf ("c="); mpfr_print_binary (c); puts (""); -+ printf ("Expected "); mpfr_print_binary (res); puts (""); -+ printf ("Got "); mpfr_print_binary (a); puts (""); -+ exit (1); -+ } -+ if (i <= 0) -+ { -+ printf ("Wrong ternary value in check_rounding\n"); -+ printf ("b="); mpfr_print_binary (b); puts (""); -+ printf ("c="); mpfr_print_binary (c); puts (""); -+ printf ("Expected > 0, got %d\n", i); -+ exit (1); -+ } -+ } -+ } -+ -+ mpfr_clear (a); -+ mpfr_clear (res); -+ mpfr_clear (b); -+ mpfr_clear (c); -+ } -+} -+ - #define TEST_FUNCTION test_sub - #define TWO_ARGS - #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS) -@@ -491,6 +643,8 @@ - - tests_start_mpfr (); - -+ bug20101017 (); -+ check_rounding (); - check_diverse (); - check_inexact (); - bug_ddefour (); -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-10-21 20:28:38.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-10-21 20:59:32.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0-p5"; -+ return "3.0.0-p6"; - } -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-10-21 21:18:26.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-10-21 21:18:26.000000000 +0000 -@@ -0,0 +1 @@ -+mpfr_set_ld -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-10-21 20:59:32.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-10-21 21:18:26.000000000 +0000 -@@ -1 +1 @@ --3.0.0-p6 -+3.0.0-p7 -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-10-21 20:59:32.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-10-21 21:18:26.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0-p6" -+#define MPFR_VERSION_STRING "3.0.0-p7" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.0.0-a/set_ld.c mpfr-3.0.0-b/set_ld.c ---- mpfr-3.0.0-a/set_ld.c 2010-06-10 11:00:14.000000000 +0000 -+++ mpfr-3.0.0-b/set_ld.c 2010-10-21 21:18:26.000000000 +0000 -@@ -102,21 +102,25 @@ - { - x /= div13; /* exact */ - shift_exp += 8192; -+ mpfr_div_2si (t, t, 8192, MPFR_RNDZ); - } - if (ABS (x) >= div12) - { - x /= div12; /* exact */ - shift_exp += 4096; -+ mpfr_div_2si (t, t, 4096, MPFR_RNDZ); - } - if (ABS (x) >= div11) - { - x /= div11; /* exact */ - shift_exp += 2048; -+ mpfr_div_2si (t, t, 2048, MPFR_RNDZ); - } - if (ABS (x) >= div10) - { - x /= div10; /* exact */ - shift_exp += 1024; -+ mpfr_div_2si (t, t, 1024, MPFR_RNDZ); - } - /* warning: we may have DBL_MAX=2^1024*(1-2^(-53)) < x < 2^1024, - therefore we have one extra exponent reduction step */ -@@ -124,9 +128,10 @@ - { - x /= div9; /* exact */ - shift_exp += 512; -+ mpfr_div_2si (t, t, 512, MPFR_RNDZ); - } - } /* Check overflow of double */ -- else -+ else /* no overflow on double */ - { - long double div9, div10, div11; - -@@ -149,29 +154,34 @@ - { - x /= div13; /* exact */ - shift_exp -= 8192; -+ mpfr_mul_2si (t, t, 8192, MPFR_RNDZ); - } - if (ABS (x) <= div12) - { - x /= div12; /* exact */ - shift_exp -= 4096; -+ mpfr_mul_2si (t, t, 4096, MPFR_RNDZ); - } - if (ABS (x) <= div11) - { - x /= div11; /* exact */ - shift_exp -= 2048; -+ mpfr_mul_2si (t, t, 2048, MPFR_RNDZ); - } - if (ABS (x) <= div10) - { - x /= div10; /* exact */ - shift_exp -= 1024; -+ mpfr_mul_2si (t, t, 1024, MPFR_RNDZ); - } - if (ABS(x) <= div9) - { - x /= div9; /* exact */ - shift_exp -= 512; -+ mpfr_mul_2si (t, t, 512, MPFR_RNDZ); - } - } -- else -+ else /* no underflow */ - { - inexact = mpfr_set_d (u, (double) x, MPFR_RNDZ); - MPFR_ASSERTD (inexact == 0); -diff -Naurd mpfr-3.0.0-a/tests/tset_ld.c mpfr-3.0.0-b/tests/tset_ld.c ---- mpfr-3.0.0-a/tests/tset_ld.c 2010-06-10 11:00:13.000000000 +0000 -+++ mpfr-3.0.0-b/tests/tset_ld.c 2010-10-21 21:18:26.000000000 +0000 -@@ -147,12 +147,39 @@ - test_fixed_bugs (void) - { - mpfr_t x; -- long double d; -+ long double l, m; - - /* bug found by Steve Kargl (2009-03-14) */ - mpfr_init2 (x, 64); - mpfr_set_ui_2exp (x, 1, -16447, MPFR_RNDN); -- d = mpfr_get_ld (x, MPFR_RNDN); /* an assertion failed in init2.c:50 */ -+ mpfr_get_ld (x, MPFR_RNDN); /* an assertion failed in init2.c:50 */ -+ -+ /* bug reported by Jakub Jelinek (2010-10-17) -+ https://gforge.inria.fr/tracker/?func=detail&aid=11300 */ -+ mpfr_set_prec (x, MPFR_LDBL_MANT_DIG); -+ /* l = 0x1.23456789abcdef0123456789abcdp-914L; */ -+ l = 8.215640181713713164092636634579e-276; -+ mpfr_set_ld (x, l, MPFR_RNDN); -+ m = mpfr_get_ld (x, MPFR_RNDN); -+ if (m != l) -+ { -+ printf ("Error in get_ld o set_ld for l=%Le\n", l); -+ printf ("Got m=%Le instead of l\n", m); -+ exit (1); -+ } -+ -+ /* another similar test which failed with extended double precision and the -+ generic code for mpfr_set_ld */ -+ /* l = 0x1.23456789abcdef0123456789abcdp-968L; */ -+ l = 4.560596445887084662336528403703e-292; -+ mpfr_set_ld (x, l, MPFR_RNDN); -+ m = mpfr_get_ld (x, MPFR_RNDN); -+ if (m != l) -+ { -+ printf ("Error in get_ld o set_ld for l=%Le\n", l); -+ printf ("Got m=%Le instead of l\n", m); -+ exit (1); -+ } - - mpfr_clear (x); - } -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-10-21 20:59:32.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-10-21 21:18:26.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0-p6"; -+ return "3.0.0-p7"; - } -diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES ---- mpfr-3.0.0-a/PATCHES 2010-11-09 15:15:07.000000000 +0000 -+++ mpfr-3.0.0-b/PATCHES 2010-11-09 15:15:07.000000000 +0000 -@@ -0,0 +1 @@ -+macros -diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION ---- mpfr-3.0.0-a/VERSION 2010-10-21 21:18:26.000000000 +0000 -+++ mpfr-3.0.0-b/VERSION 2010-11-09 15:15:07.000000000 +0000 -@@ -1 +1 @@ --3.0.0-p7 -+3.0.0-p8 -diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h ---- mpfr-3.0.0-a/mpfr.h 2010-10-21 21:18:26.000000000 +0000 -+++ mpfr-3.0.0-b/mpfr.h 2010-11-09 15:15:07.000000000 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "3.0.0-p7" -+#define MPFR_VERSION_STRING "3.0.0-p8" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -@@ -67,6 +67,16 @@ - # define _MPFR_H_HAVE_INTMAX_T 1 - #endif - -+/* Avoid some problems with macro expansion if the user defines macros -+ with the same name as keywords. By convention, identifiers and macro -+ names starting with mpfr_ are reserved by MPFR. */ -+typedef void mpfr_void; -+typedef int mpfr_int; -+typedef unsigned int mpfr_uint; -+typedef long mpfr_long; -+typedef unsigned long mpfr_ulong; -+typedef size_t mpfr_size_t; -+ - /* Definition of rounding modes (DON'T USE MPFR_RNDNA!). - Warning! Changing the contents of this enum should be seen as an - interface change since the old and the new types are not compatible -@@ -136,7 +146,7 @@ - typedef mp_exp_t mpfr_exp_t; - - /* Definition of the standard exponent limits */ --#define MPFR_EMAX_DEFAULT ((mpfr_exp_t) (((unsigned long) 1 << 30) - 1)) -+#define MPFR_EMAX_DEFAULT ((mpfr_exp_t) (((mpfr_ulong) 1 << 30) - 1)) - #define MPFR_EMIN_DEFAULT (-(MPFR_EMAX_DEFAULT)) - - /* Definition of the main structure */ -@@ -725,13 +735,13 @@ - unexpected results with future compilers and aggressive optimisations. - Why not working only with signed types, using INT_MIN and LONG_MIN? */ - #if __GMP_MP_SIZE_T_INT --#define __MPFR_EXP_NAN ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+2)) --#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+1)) --#define __MPFR_EXP_INF ((mpfr_exp_t)((~((~(unsigned int)0)>>1))+3)) -+#define __MPFR_EXP_NAN ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+2)) -+#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+1)) -+#define __MPFR_EXP_INF ((mpfr_exp_t)((~((~(mpfr_uint)0)>>1))+3)) - #else --#define __MPFR_EXP_NAN ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+2)) --#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+1)) --#define __MPFR_EXP_INF ((mpfr_exp_t)((~((~(unsigned long)0)>>1))+3)) -+#define __MPFR_EXP_NAN ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+2)) -+#define __MPFR_EXP_ZERO ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+1)) -+#define __MPFR_EXP_INF ((mpfr_exp_t)((~((~(mpfr_ulong)0)>>1))+3)) - #endif - - /* Define MPFR_USE_EXTENSION to avoid "gcc -pedantic" warnings. */ -@@ -760,9 +770,9 @@ - #define mpfr_inf_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_INF) - #define mpfr_zero_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_ZERO) - #define mpfr_regular_p(_x) ((_x)->_mpfr_exp > __MPFR_EXP_INF) --#define mpfr_sgn(_x) \ -- ((_x)->_mpfr_exp < __MPFR_EXP_INF ? \ -- (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (void) 0), 0 : \ -+#define mpfr_sgn(_x) \ -+ ((_x)->_mpfr_exp < __MPFR_EXP_INF ? \ -+ (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (mpfr_void) 0), 0 : \ - MPFR_SIGN (_x)) - - /* Prevent them from using as lvalues */ -@@ -805,7 +815,19 @@ - Moreover casts to unsigned long have been added to avoid warnings in - programs that use MPFR and are compiled with -Wconversion; such casts - are OK since if X is a constant expression, then (unsigned long) X is -- also a constant expression, so that the optimizations still work. */ -+ also a constant expression, so that the optimizations still work. The -+ warnings are probably related to the following two bugs: -+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=4210 -+ http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38470 (possibly a variant) -+ and the casts could be removed once these bugs are fixed. -+ Casts shouldn't be used on the generic calls (to the ..._2exp functions), -+ where implicit conversions are performed. Indeed, having at least one -+ implicit conversion in the macro allows the compiler to emit diagnostics -+ when normally expected, for instance in the following call: -+ mpfr_set_ui (x, "foo", MPFR_RNDN); -+ If this is not possible (for future macros), one of the tricks described -+ on http://groups.google.com/group/comp.std.c/msg/e92abd24bf9eaf7b could -+ be used. */ - #if defined (__GNUC__) && !defined(__ICC) && !defined(__cplusplus) - #if (__GNUC__ >= 2) - #undef mpfr_cmp_ui -@@ -813,45 +835,45 @@ - But warning! mpfr_sgn is specified as a macro in the API, thus the macro - mustn't be used if side effects are possible, like here. */ - #define mpfr_cmp_ui(_f,_u) \ -- (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ? \ -+ (__builtin_constant_p (_u) && (mpfr_ulong) (_u) == 0 ? \ - (mpfr_sgn) (_f) : \ -- mpfr_cmp_ui_2exp ((_f), (unsigned long) (_u), 0)) -+ mpfr_cmp_ui_2exp ((_f), (_u), 0)) - #undef mpfr_cmp_si --#define mpfr_cmp_si(_f,_s) \ -- (__builtin_constant_p (_s) && (long) (_s) >= 0 ? \ -- mpfr_cmp_ui ((_f), (unsigned long) (long) (_s)) : \ -- mpfr_cmp_si_2exp ((_f), (long) (_s), 0)) -+#define mpfr_cmp_si(_f,_s) \ -+ (__builtin_constant_p (_s) && (mpfr_long) (_s) >= 0 ? \ -+ mpfr_cmp_ui ((_f), (mpfr_ulong) (mpfr_long) (_s)) : \ -+ mpfr_cmp_si_2exp ((_f), (_s), 0)) - #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95 - #undef mpfr_set_ui - #define mpfr_set_ui(_f,_u,_r) \ -- (__builtin_constant_p (_u) && (unsigned long) (_u) == 0 ? \ -+ (__builtin_constant_p (_u) && (mpfr_ulong) (_u) == 0 ? \ - __extension__ ({ \ - mpfr_ptr _p = (_f); \ - _p->_mpfr_sign = 1; \ - _p->_mpfr_exp = __MPFR_EXP_ZERO; \ -- (void) (_r); 0; }) : \ -- mpfr_set_ui_2exp ((_f), (unsigned long) (_u), 0, (_r))) -+ (mpfr_void) (_r); 0; }) : \ -+ mpfr_set_ui_2exp ((_f), (_u), 0, (_r))) - #endif - #undef mpfr_set_si - #define mpfr_set_si(_f,_s,_r) \ -- (__builtin_constant_p (_s) && (long) (_s) >= 0 ? \ -- mpfr_set_ui ((_f), (unsigned long) (long) (_s), (_r)) : \ -- mpfr_set_si_2exp ((_f), (long) (_s), 0, (_r))) -+ (__builtin_constant_p (_s) && (mpfr_long) (_s) >= 0 ? \ -+ mpfr_set_ui ((_f), (mpfr_ulong) (mpfr_long) (_s), (_r)) : \ -+ mpfr_set_si_2exp ((_f), (_s), 0, (_r))) - #endif - #endif - - /* Macro version of mpfr_stack interface for fast access */ --#define mpfr_custom_get_size(p) ((size_t) \ -+#define mpfr_custom_get_size(p) ((mpfr_size_t) \ - (((p)+GMP_NUMB_BITS-1)/GMP_NUMB_BITS*sizeof (mp_limb_t))) - #define mpfr_custom_init(m,p) do {} while (0) --#define mpfr_custom_get_significand(x) ((void*)((x)->_mpfr_d)) -+#define mpfr_custom_get_significand(x) ((mpfr_void*)((x)->_mpfr_d)) - #define mpfr_custom_get_exp(x) ((x)->_mpfr_exp) - #define mpfr_custom_move(x,m) do { ((x)->_mpfr_d = (mp_limb_t*)(m)); } while (0) - #define mpfr_custom_init_set(x,k,e,p,m) do { \ - mpfr_ptr _x = (x); \ - mpfr_exp_t _e; \ - mpfr_kind_t _t; \ -- int _s, _k; \ -+ mpfr_int _s, _k; \ - _k = (k); \ - if (_k >= 0) { \ - _t = (mpfr_kind_t) _k; \ -@@ -868,11 +890,13 @@ - _x->_mpfr_exp = _e; \ - _x->_mpfr_d = (mp_limb_t*) (m); \ - } while (0) --#define mpfr_custom_get_kind(x) \ -- ( (x)->_mpfr_exp > __MPFR_EXP_INF ? (int)MPFR_REGULAR_KIND*MPFR_SIGN (x) \ -- : (x)->_mpfr_exp == __MPFR_EXP_INF ? (int)MPFR_INF_KIND*MPFR_SIGN (x) \ -- : (x)->_mpfr_exp == __MPFR_EXP_NAN ? (int)MPFR_NAN_KIND \ -- : (int) MPFR_ZERO_KIND * MPFR_SIGN (x) ) -+#define mpfr_custom_get_kind(x) \ -+ ( (x)->_mpfr_exp > __MPFR_EXP_INF ? \ -+ (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (x) \ -+ : (x)->_mpfr_exp == __MPFR_EXP_INF ? \ -+ (mpfr_int) MPFR_INF_KIND * MPFR_SIGN (x) \ -+ : (x)->_mpfr_exp == __MPFR_EXP_NAN ? (mpfr_int) MPFR_NAN_KIND \ -+ : (mpfr_int) MPFR_ZERO_KIND * MPFR_SIGN (x) ) - - - #endif /* MPFR_USE_NO_MACRO */ -diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c ---- mpfr-3.0.0-a/version.c 2010-10-21 21:18:26.000000000 +0000 -+++ mpfr-3.0.0-b/version.c 2010-11-09 15:15:07.000000000 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.0.0-p7"; -+ return "3.0.0-p8"; - } diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD index 818044c6a..0e97d0b5c 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' 'mips64el') 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/avogadro/fix-pycapsule.patch b/extra/avogadro/fix-pycapsule.patch deleted file mode 100644 index de4e2ca75..000000000 --- a/extra/avogadro/fix-pycapsule.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- avogadro-1.0.1/libavogadro/src/python/sip.cpp 2010-05-02 17:31:22.000000000 +0100 -+++ avogadro-1.0.1-pycapsule/libavogadro/src/python/sip.cpp 2010-11-23 19:00:09.000000000 +0000 -@@ -62,12 +62,20 @@ bool init_sip_api() - return false; - } - -+#ifdef SIP_USE_PYCAPSULE -+ if (!PyCapsule_IsValid(sip_capi_obj.ptr(), "sip._C_API")) { -+#else - if (!PyCObject_Check(sip_capi_obj.ptr())) { -+#endif - std::cout << "The _C_API object in the sip python module is invalid." << std::endl; - return false; - } - -+#ifdef SIP_USE_PYCAPSULE -+ sip_API = reinterpret_cast<const sipAPIDef*>(PyCapsule_GetPointer(sip_capi_obj.ptr(), "sip._C_API")); -+#else - sip_API = reinterpret_cast<const sipAPIDef*>(PyCObject_AsVoidPtr(sip_capi_obj.ptr())); -+#endif - - return true; - } diff --git a/extra/avogadro/sip-4.11.patch b/extra/avogadro/sip-4.11.patch deleted file mode 100644 index 0cd1e5b94..000000000 --- a/extra/avogadro/sip-4.11.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur avogadro-1.0.1/cmake/modules/PythonDeps.cmake avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake ---- avogadro-1.0.1/cmake/modules/PythonDeps.cmake 2010-05-02 18:31:22.000000000 +0200 -+++ avogadro-1.0.1-sip411/cmake/modules/PythonDeps.cmake 2010-09-14 19:11:50.000000000 +0200 -@@ -59,10 +59,13 @@ - if (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h) - message(STATUS "Found sip.h header...") - execute_process(COMMAND sip -V OUTPUT_VARIABLE SIP_VERSION) -- if (${SIP_VERSION} VERSION_GREATER "4.8") -+ if (NOT ${SIP_VERSION} VERSION_LESS "4.11") -+ message(STATUS "using sip version 4.11 or above...") -+ add_definitions( -DSIP_4_11 -DSIP_4_8 ) -+ elseif (NOT ${SIP_VERSION} VERSION_LESS "4.8") - message(STATUS "using sip version 4.8 or above...") - add_definitions( -DSIP_4_8 ) -- endif (${SIP_VERSION} VERSION_GREATER "4.8") -+ endif (NOT ${SIP_VERSION} VERSION_LESS "4.11") - else (EXISTS ${PYTHON_INCLUDE_PATH}/sip.h) - message(STATUS "sip.h header NOT found - Python support disabled") - # message(STATUS "debian/ubuntu: install the python-sip4-dev package.") -diff -ur avogadro-1.0.1/libavogadro/src/python/sip.cpp avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp ---- avogadro-1.0.1/libavogadro/src/python/sip.cpp 2010-05-02 18:31:22.000000000 +0200 -+++ avogadro-1.0.1-sip411/libavogadro/src/python/sip.cpp 2010-09-14 19:13:31.000000000 +0200 -@@ -204,7 +204,11 @@ - sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr); - #endif - // return the C++ pointer -+#ifdef SIP_4_11 -+ return sip_API->api_get_address(wrapper); -+#else - return wrapper->u.cppPtr; -+#endif - } - - QClass_converters() diff --git a/extra/cmus/PKGBUILD b/extra/cmus/PKGBUILD index a473a74cd..355449166 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' 'mips64el') @@ -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 7ba8acc09..be395e27d 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 5eebb9012..3b3dd7a8e 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 'mips64el') 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/ChangeLog b/extra/faad2/ChangeLog deleted file mode 100644 index ed5548b7d..000000000 --- a/extra/faad2/ChangeLog +++ /dev/null @@ -1,26 +0,0 @@ -2009-02-16 Eric Belanger <eric@archlinux.org> - - * faad2 2.7-1 - * Upstream update - * Updated LICENSE file - * Compiled with -fPIC option - -2009-01-05 Eric Belanger <eric@archlinux.org> - - * faad2 2.6.1-2 - * Applied security patch - -2008-07-19 Eric Belanger <eric@archlinux.org> - - * faad2 2.6.1-1 - * Upstream update - * Patched to fix libtool build problem : - faad2-2.6.1-libtool22.patch - * Patched to make faad2 exit if output pipe breaks : - faad2-2.6.1-broken-pipe.patch - * Patched to fix include file implicit declaration : - faad2-2.6.1-implicitdeclar.patch - * Patched to bump soname (symbols have been changed) : - faad2-2.6.1-abi_has_changed.patch - * Updated license - * Added ChangeLog diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD index 78633181d..90b7405dc 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' 'mips64el') 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 043e0dbd4..8d3b8000f 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' 'mips64el') @@ -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 463afc8a0..357733d16 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' 'mips64el') @@ -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 eed421c50..26a2a8b0d 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' 'mips64el') 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 5fd482b5c..6730537bc 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" -arch=(i686 x86_64 'mips64el') +pkgdesc="Base libraries from ILM for OpenEXR" +arch=(i686 x86_64 mips64el) 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 e2a5b0684..72568ca06 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' 'mips64el') 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/testing/kdeedu/gpsd-2.96.patch b/extra/kdeedu/gpsd-2.96.patch index ec515e99d..ec515e99d 100644 --- a/testing/kdeedu/gpsd-2.96.patch +++ b/extra/kdeedu/gpsd-2.96.patch diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index b2c6ee287..421e86016 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' 'mips64el') @@ -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 65416c0df..a68675772 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' 'mips64el') 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/kdepim/asynchronous-start.patch b/extra/kdepim/asynchronous-start.patch deleted file mode 100644 index bc014116c..000000000 --- a/extra/kdepim/asynchronous-start.patch +++ /dev/null @@ -1,87 +0,0 @@ -commit cfa404b7188e4c26bddbc9579728f6d25f8cd214 -Author: Stephen Kelly <steveire@gmail.com> -Date: Tue Apr 5 11:09:43 2011 +0200 - - Start kdepim 4.4 asynchronously if built against 4.6. - - The synchronous mechanism doesn't have enough time to start - before it reports failure. - -diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp -index 4c8ca42..200f8ec 100644 ---- a/kaddressbook/main.cpp -+++ b/kaddressbook/main.cpp -@@ -49,11 +49,13 @@ int main( int argc, char **argv ) - MainWindow *window = new MainWindow; - window->show(); - -+#if !KDE_IS_VERSION(4,6,0) - if ( !Akonadi::Control::start( window ) ) { - //TODO: add message box after string freeze - kWarning() << "Unable to start Akonadi server, exit application"; - return 1; - } -+#endif - - return app.exec(); - } -diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp -index a31973a..10b14e4 100644 ---- a/kmail/kmmainwidget.cpp -+++ b/kmail/kmmainwidget.cpp -@@ -165,6 +165,9 @@ using KMail::TemplateParser; - - #include <errno.h> // ugh - -+#include <akonadi/control.h> -+#include <akonadi/servermanager.h> -+ - #include "kmmainwidget.moc" - - K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList ) -@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient, - mVacationIndicatorActive( false ), - mGoToFirstUnreadMessageInSelectedFolder( false ) - { -+#if KDE_IS_VERSION(4,6,0) -+ Akonadi::Control::widgetNeedsAkonadi(this); -+ Akonadi::ServerManager::start(); -+#endif - // must be the first line of the constructor: - mStartupDone = false; - mWasEverShown = false; -diff --git a/kmail/main.cpp b/kmail/main.cpp -index f39ca5f..c2dd1c3 100644 ---- a/kmail/main.cpp -+++ b/kmail/main.cpp -@@ -145,12 +145,14 @@ int main(int argc, char *argv[]) - app.setEventLoopReached(); - app.delayedInstanceCreation(); - -+#if !KDE_IS_VERSION(4,6,0) - // Start Akonadi - if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) { - //TODO: add message box after string freeze - kWarning() << "Unable to start Akonadi server, exit application"; - return 1; - } -+#endif - - // Go! - int ret = qApp->exec(); -diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp -index 356aa57..cb4a235 100644 ---- a/kontact/src/main.cpp -+++ b/kontact/src/main.cpp -@@ -199,9 +199,11 @@ int main( int argc, char **argv ) - - KontactApp app; - -+#if !KDE_IS_VERSION(4,6,0) - // KDE 4.4: do akonadi startup before creating any window, since creating - // the window loads kmail. In 4.5 we'll do this startup async instead. - Akonadi::Control::start( 0 ); -+#endif - - // Qt doesn't treat the system tray as a window, and therefore Qt would quit - // the event loop when an error message is clicked away while Kontact is in the diff --git a/extra/latex2html/PKGBUILD b/extra/latex2html/PKGBUILD deleted file mode 100644 index eae7fde90..000000000 --- a/extra/latex2html/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 20302 2008-12-02 10:44:29Z ronald $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> -# Contributor: Jason Chu <jason.archlinux.org> - -pkgname=latex2html -pkgver=2008 -pkgrel=1 -pkgdesc="latex2html is a convertor written in Perl that converts LaTeX documents to HTML." -arch=('i686' 'x86_64' 'mips64el') -url="http://saftsack.fs.uni-bayreuth.de/~latex2ht/" -depends=('perl' 'ghostscript' 'texlive-core' 'libpng' 'giflib' 'netpbm') -install=$pkgname.install -license=('GPL2') -source=(http://saftsack.fs.uni-bayreuth.de/~latex2ht/current/$pkgname-$pkgver.tar.gz) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=$startdir/pkg/usr \ - --shlibdir=$startdir/pkg/usr/lib/$pkgname \ - --with-texpath=$startdir/pkg/usr/share/texmf/tex/latex/html \ - --enable-wrapper \ - --enable-gif \ - --enable-png || return 1 - - make || return 1 - make install || return 1 - - find $startdir/pkg/usr -type f -print | while read filename; do - if [ ! -z '`grep "$startdir" "$filename"`' ]; then - mv $filename $filename.mkpkg - sed -e "s#$pkgdir##g" -e "s#$srcdir##g" < $filename.mkpkg > $filename - rm $filename.mkpkg - fi - done - - # move files to FHS location - mv $startdir/pkg/usr/cfgcache.pm $startdir/pkg/usr/l2hconf.pm $startdir/pkg/usr/lib/$pkgname/ - - # set correct permission on executables - chmod 755 $pkgdir/usr/bin/pstoimg \ - $pkgdir/usr/bin/$pkgname \ - $pkgdir/usr/bin/texexpand - -} diff --git a/extra/latex2html/latex2html.install b/extra/latex2html/latex2html.install deleted file mode 100644 index afbeeb50c..000000000 --- a/extra/latex2html/latex2html.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - echo ">>> texlive: updating the filename database..." - texconfig-sys rehash -} - -post_upgrade() { - echo ">>> texlive: updating the filename database..." - texconfig-sys rehash -} - -post_remove() { - echo ">>> texlive: updating the filename database..." - texconfig-sys rehash -} - diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 65afb91c4..32ae2a118 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' 'mips64el') 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/multilib-testing/gcc-multilib/gcc-ada.install b/extra/libisoburn/libisoburn.install index df0553a4f..7f8b83e67 100644 --- a/multilib-testing/gcc-multilib/gcc-ada.install +++ b/extra/libisoburn/libisoburn.install @@ -1,5 +1,5 @@ infodir=usr/share/info -filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) +filelist=(xorriso.info.gz xorrisofs.info.gz) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD index 15406fd72..31ec18b16 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 'mips64el') +arch=('i686' 'x86_64' 'mips64el') +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 1d92c02cb..a32351445 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' 'mips64el') 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 334b0f8e1..19b9c8249 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' 'mips64el') @@ -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 1c3595a45..7c31710ba 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' 'mips64el') 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/nitrogen/ChangeLog b/extra/nitrogen/ChangeLog deleted file mode 100644 index c37e10baf..000000000 --- a/extra/nitrogen/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2008-08-04 Alexander Fehr <pizzapunk gmail com> - - * nitrogen-1.4-1: - New upstream release. - New maintainer. - Changed url. - Added dependency on hicolor-icon-theme. - Added install file (gtk-update-icon-cache). - Added ChangeLog. diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD index 522e068d4..1b4168f99 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 de8433958..1d0bfbead 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' 'mips64el') 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 ce0dd60c7..d5db674dc 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' 'mips64el') 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 912597e49..e5823fc36 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 846ff527d..12810e517 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' 'mips64el') 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/slang/slang-2.2.3-faster-baud-rates.patch b/extra/slang/slang-2.2.3-faster-baud-rates.patch deleted file mode 100644 index b37b253f4..000000000 --- a/extra/slang/slang-2.2.3-faster-baud-rates.patch +++ /dev/null @@ -1,62 +0,0 @@ -The baud rate constant list used for setting the SLang_TT_Baud_Rate -variable contains baud rates only up to 230400; any faster baud rate is -not properly detected, and SLang_TT_Baud_Rate is left as 0. This caused -problems at least with the Midnight Commander: - - https://www.midnight-commander.org/ticket/2452 - -(recent versions of rxvt-unicode set speed 4000000 for the pty (and -there is no configurable option for this), and mc then considers such -terminal as "slow" due to SLang_TT_Baud_Rate == 0 and turns off some -useful UI options). - -This patch adds missing values to the Baud_Rates array in src/slutty.c, -which fixes the baud rate detection problem. It also brings this array -in sync with Baudrate_Map in modules/termios-module.c, where those -higher baud rates were already present for some time. - - ---- slang-2.2.3/src/slutty.c.alt-baud-rates 2010-12-15 13:56:48.000000000 +0300 -+++ slang-2.2.3/src/slutty.c 2011-01-09 22:34:59.911000008 +0300 -@@ -170,6 +170,42 @@ static Baud_Rate_Type Baud_Rates [] = - #ifdef B230400 - {B230400, 230400}, - #endif -+#ifdef B460800 -+ {B460800, 460800}, -+#endif -+#ifdef B500000 -+ {B500000, 500000}, -+#endif -+#ifdef B576000 -+ {B576000, 576000}, -+#endif -+#ifdef B921600 -+ {B921600, 921600}, -+#endif -+#ifdef B1000000 -+ {B1000000, 1000000}, -+#endif -+#ifdef B1152000 -+ {B1152000, 1152000}, -+#endif -+#ifdef B1500000 -+ {B1500000, 1500000}, -+#endif -+#ifdef B2000000 -+ {B2000000, 2000000}, -+#endif -+#ifdef B2500000 -+ {B2500000, 2500000}, -+#endif -+#ifdef B3000000 -+ {B3000000, 3000000}, -+#endif -+#ifdef B3500000 -+ {B3500000, 3500000}, -+#endif -+#ifdef B4000000 -+ {B4000000, 4000000}, -+#endif - {0, 0} - }; diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 03809ff7b..015cf6547 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' 'mips64el') 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/wxpython/editra-aui.diff b/extra/wxpython/editra-aui.diff deleted file mode 100644 index afdcf9f8f..000000000 --- a/extra/wxpython/editra-aui.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur wxPython-src-2.8.11.0-orig/wxPython/setup.py wxPython-src-2.8.11.0/wxPython/setup.py ---- wxPython-src-2.8.11.0-orig/wxPython/setup.py 2010-06-04 04:15:47.000000000 -0400 -+++ wxPython-src-2.8.11.0/wxPython/setup.py 2010-06-04 04:18:36.000000000 -0400 -@@ -893,6 +893,7 @@ - 'wx.tools.Editra.src.eclib', - 'wx.tools.Editra.src.ebmlib', - 'wx.tools.Editra.src.extern', -+ 'wx.tools.Editra.src.extern.aui', - 'wx.tools.Editra.src.syntax', - ] - diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index c4f032aef..c4e4af6f8 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 'mips64el') @@ -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 16c90f0ca..07a5ad402 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' 'mips64el') 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 7f36ef452..fb29c76fe 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' 'mips64el') 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 8a253622d..64375751f 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/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD deleted file mode 100644 index 0c1886616..000000000 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 43542 2011-03-27 14:09:06Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils-multilib -pkgver=2.21 -pkgrel=6 -_date=20110326 -pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" -arch=('x86_64' 'mips64el') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('multilib-devel') -provides=("binutils=$pkgver-$pkgrel") -conflicts=('binutils') -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) -md5sums=('884dcbc87d4722b152aea72312356da1') - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared \ - --enable-64-bit-bfd --enable-multilib - - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - 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 -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/multilib-testing/binutils-multilib/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - 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 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD deleted file mode 100644 index 6a9ff2421..000000000 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,305 +0,0 @@ -# $Id: PKGBUILD 45100 2011-04-16 13:45:55Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: 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 - -pkgbase='gcc-multilib' -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' 'mips64el') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -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,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=('aed037654091d1f478dfcb6e13444325' - '8d4b78c03c1d477c6cb562d42f461958' - 'c346e76014569b25e2869ff986d2ac2d' - '8376485de1c7aa90bb32f52f2372d451' - '0c2d89f9e2e614ad84c6e2aa239c5c1c' - '50bab6a0c9e5403ea77f57361dec5436' - '6e0032461f87ce60db6302ca652ae9d8' - '1e9fd2eaf0ee47ea64e82c48998f1999' - '22cec272f9cc2801d3cd348feaca888b' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - patch -Np1 -i ${srcdir}/gcc_pure64.patch - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --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 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs-multilib() -{ - pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.11.1-2' "lib32-gcc-libs=$pkgver-$pkgrel") - provides=("gcc-libs=$pkgver-$pkgrel") - conflicts=('gcc-libs') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - 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 - - # 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 - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_lib32-gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.12.1' "gcc-libs>=$pkgver") - - cd gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - 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 - - # 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 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -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' - "gcc-libs-multilib=$pkgver-$pkgrel") - groups=('multilib-devel') - provides=("gcc=$pkgver-$pkgrel") - conflicts=('gcc') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - 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/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran-multilib() -{ - pkgdesc="Fortran front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-fortran=$pkgver-$pkgrel") - conflicts=('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 ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc-multilib() -{ - pkgdesc="Objective-C front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-objc=$pkgver-$pkgrel") - conflicts=('gcc-objc') - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada-multilib() -{ - pkgdesc="Ada front-end for GCC (GNAT) for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-ada=$pkgver-$pkgrel") - conflicts=('gcc-ada') - install=gcc-ada.install - - 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-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib-testing/gcc-multilib/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- 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 - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- 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 - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- 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: \ - %{!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: \ - %{!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: \ - %{!static: \ - %{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 "-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: \ diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib-testing/gcc-multilib/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - 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 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib-testing/gcc-multilib/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch deleted file mode 100644 index 8c6b08171..000000000 --- a/multilib-testing/gcc-multilib/gcc_pure64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,7 +49,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib 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-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD deleted file mode 100644 index bd371a1b0..000000000 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ /dev/null @@ -1,129 +0,0 @@ -# $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> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuild with each new glibc version - -_pkgbasename=glibc -pkgname=lib32-$_pkgbasename -pkgver=2.13 -pkgrel=5 -_glibcdate=20110117 -pkgdesc="GNU C Library for multilib" -arch=('x86_64' 'mips64el') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") -makedepends=('gcc-multilib>=4.4') -options=('!strip' '!emptydirs') -source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - 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' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '24dfab6fd244f3773523412588ecc52c' - '7d0154b7e17ea218c9fa953599d24cc4' - '6e052f1cb693d5d3203f50f9d4e8c33b') - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - - # 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 - - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - - echo "slibdir=/usr/lib32" >> configparms - - export CC="gcc -m32" - - ${srcdir}/glibc/configure --prefix=/usr \ - --libdir=/usr/lib32 --libexecdir=/usr/lib32 \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch i686-unknown-linux-gnu - - make - - # some errors are expected - manually check log files - make -k check || true -} - -package() { - cd ${srcdir}/glibc-build - make install_root=${pkgdir} install - - rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}} - - # We need one 32 bit specific header file - find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES usr/lib32/getconf/* - - strip $STRIP_STATIC usr/lib32/*.a \ - usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib32/{pt_chown,gconv/*.so} - - # Dynamic linker - install -d -m755 ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ - - # Add /usr/lib32 to the default library search path - install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" - - # Symlink /usr/lib32/locale to /usr/lib/locale - ln -s ../lib/locale "$pkgdir/usr/lib32/locale" -} diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/multilib-testing/lib32-glibc/glibc-2.13-prelink.patch b/multilib-testing/lib32-glibc/glibc-2.13-prelink.patch deleted file mode 100644 index bef7998a8..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.13-prelink.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/elf/rtld.c b/elf/rtld.c -index 9a560b3..201c9cf 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - we need it in the memory handling later. */ - GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; - -+ /* Remember the last search directory added at startup, now that -+ malloc will no longer be the one from dl-minimal.c. */ -+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -+ - if (prelinked) - { - if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) -@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lossage); - } - -- /* Remember the last search directory added at startup, now that -- malloc will no longer be the one from dl-minimal.c. */ -- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -- - if (! prelinked && rtld_multiple_ref) - { - /* There was an explicit ref to the dynamic linker as a shared lib. diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/multilib-testing/lib32-glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf deleted file mode 100644 index 9b08c3f43..000000000 --- a/multilib-testing/lib32-glibc/lib32-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib32 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 dde002e59..0c1886616 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' 'mips64el') 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/binutils-multilib/binutils.git-39637246.patch b/multilib/binutils-multilib/binutils.git-39637246.patch deleted file mode 100644 index 460450e43..000000000 --- a/multilib/binutils-multilib/binutils.git-39637246.patch +++ /dev/null @@ -1,700 +0,0 @@ -diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c -index 777d7cf..c4c34a1 100644 ---- a/gas/config/tc-i386.c -+++ b/gas/config/tc-i386.c -@@ -1060,7 +1060,6 @@ i386_align_code (fragS *fragP, int count) - else - patt = f32_patt; - break; -- case PROCESSOR_PENTIUMPRO: - case PROCESSOR_PENTIUM4: - case PROCESSOR_NOCONA: - case PROCESSOR_CORE: -@@ -1080,6 +1079,7 @@ i386_align_code (fragS *fragP, int count) - case PROCESSOR_I386: - case PROCESSOR_I486: - case PROCESSOR_PENTIUM: -+ case PROCESSOR_PENTIUMPRO: - case PROCESSOR_GENERIC32: - patt = f32_patt; - break; -diff --git a/gas/testsuite/gas/i386/nops-1-i686.d b/gas/testsuite/gas/i386/nops-1-i686.d -index 7752ee2..137d5c2 100644 ---- a/gas/testsuite/gas/i386/nops-1-i686.d -+++ b/gas/testsuite/gas/i386/nops-1-i686.d -@@ -10,25 +10,41 @@ Disassembly of section .text: - - 0+ <nop15>: - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 0d jmp 10 <nop14> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+10 <nop14>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+20 <nop13>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+30 <nop12>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi -+[ ]*[a-f0-9]+: 8d bf 00 00 00 00 lea 0x0\(%edi\),%edi - - 0+40 <nop11>: - [ ]*[a-f0-9]+: 90 nop -@@ -36,7 +52,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d 74 26 00 lea 0x0\(%esi,%eiz,1\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+50 <nop10>: - [ ]*[a-f0-9]+: 90 nop -@@ -45,7 +62,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d 76 00 lea 0x0\(%esi\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+60 <nop9>: - [ ]*[a-f0-9]+: 90 nop -@@ -55,7 +73,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 89 f6 mov %esi,%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - - 0+70 <nop8>: - [ ]*[a-f0-9]+: 90 nop -@@ -66,7 +85,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+80 <nop7>: - [ ]*[a-f0-9]+: 90 nop -@@ -78,7 +98,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%eax\) -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+90 <nop6>: - [ ]*[a-f0-9]+: 90 nop -@@ -91,7 +111,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b6 00 00 00 00 lea 0x0\(%esi\),%esi - - 0+a0 <nop5>: - [ ]*[a-f0-9]+: 90 nop -@@ -105,7 +125,8 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 8d 74 26 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+b0 <nop4>: - [ ]*[a-f0-9]+: 90 nop -@@ -120,7 +141,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) -+[ ]*[a-f0-9]+: 8d 74 26 00 lea 0x0\(%esi,%eiz,1\),%esi - - 0+c0 <nop3>: - [ ]*[a-f0-9]+: 90 nop -@@ -136,7 +157,7 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%eax\) -+[ ]*[a-f0-9]+: 8d 76 00 lea 0x0\(%esi\),%esi - - 0+d0 <nop2>: - [ ]*[a-f0-9]+: 90 nop -diff --git a/gas/testsuite/gas/i386/nops-3-i686.d b/gas/testsuite/gas/i386/nops-3-i686.d -index 30d2627..5c114f4 100644 ---- a/gas/testsuite/gas/i386/nops-3-i686.d -+++ b/gas/testsuite/gas/i386/nops-3-i686.d -@@ -9,9 +9,37 @@ Disassembly of section .text: - - 0+ <nop>: - [ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: eb 1d jmp 20 <nop\+0x20> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) - [ ]*[a-f0-9]+: 89 c3 mov %eax,%ebx --[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: 8d b4 26 00 00 00 00 lea 0x0\(%esi,%eiz,1\),%esi -+[ ]*[a-f0-9]+: 8d bc 27 00 00 00 00 lea 0x0\(%edi,%eiz,1\),%edi - #pass -diff --git a/gas/testsuite/gas/i386/nops-4-i686.d b/gas/testsuite/gas/i386/nops-4-i686.d -index 3d8420b..c61f08d 100644 ---- a/gas/testsuite/gas/i386/nops-4-i686.d -+++ b/gas/testsuite/gas/i386/nops-4-i686.d -@@ -9,30 +9,135 @@ Disassembly of section .text: - - 0+ <nop31>: - [ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: eb 1d jmp 20 <nop30> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) - - 0+20 <nop30>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 1c jmp 40 <nop29> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+40 <nop29>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 1b jmp 60 <nop28> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+60 <nop28>: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 1a jmp 80 <nop27> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+80 <nop27>: - [ ]*[a-f0-9]+: 90 nop -@@ -40,8 +145,32 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 19 jmp a0 <nop26> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+a0 <nop26>: - [ ]*[a-f0-9]+: 90 nop -@@ -50,8 +179,31 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 2e 0f 1f 84 00 00 00 00 00 data32 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 18 jmp c0 <nop25> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+c0 <nop25>: - [ ]*[a-f0-9]+: 90 nop -@@ -61,8 +213,30 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 2e 0f 1f 84 00 00 00 00 00 nopw %cs:0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 17 jmp e0 <nop24> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+e0 <nop24>: - [ ]*[a-f0-9]+: 90 nop -@@ -73,8 +247,29 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 84 00 00 00 00 00 nopw 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 16 jmp 100 <nop23> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+100 <nop23>: - [ ]*[a-f0-9]+: 90 nop -@@ -86,8 +281,28 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 84 00 00 00 00 00 nopl 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 15 jmp 120 <nop22> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+120 <nop22>: - [ ]*[a-f0-9]+: 90 nop -@@ -100,8 +315,27 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 80 00 00 00 00 nopl 0x0\(%eax\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 14 jmp 140 <nop21> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+140 <nop21>: - [ ]*[a-f0-9]+: 90 nop -@@ -115,8 +349,26 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 0f 1f 44 00 00 nopw 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 13 jmp 160 <nop20> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+160 <nop20>: - [ ]*[a-f0-9]+: 90 nop -@@ -131,8 +383,25 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%eax,%eax,1\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 12 jmp 180 <nop19> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+180 <nop19>: - [ ]*[a-f0-9]+: 90 nop -@@ -148,8 +417,24 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%eax\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 11 jmp 1a0 <nop18> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+1a0 <nop18>: - [ ]*[a-f0-9]+: 90 nop -@@ -166,8 +451,23 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 0f 1f 00 nopl \(%eax\) --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 10 jmp 1c0 <nop17> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+1c0 <nop17>: - [ ]*[a-f0-9]+: 90 nop -@@ -185,8 +485,22 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 90 xchg %ax,%ax --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) -+[ ]*[a-f0-9]+: eb 0f jmp 1e0 <nop16> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - - 0+1e0 <nop16>: - [ ]*[a-f0-9]+: 90 nop -@@ -205,6 +519,19 @@ Disassembly of section .text: - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: eb 0e jmp 200 <align> -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop -+[ ]*[a-f0-9]+: 90 nop - [ ]*[a-f0-9]+: 90 nop --[ ]*[a-f0-9]+: 66 66 66 66 66 66 2e 0f 1f 84 00 00 00 00 00 data32 data32 data32 data32 data32 nopw %cs:0x0\(%eax,%eax,1\) - #pass diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index e97f9425f..6a9ff2421 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' 'mips64el') -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-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 e15b93556..bd371a1b0 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' 'mips64el') @@ -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/testing/glibc/glibc-2.13-futex.patch b/multilib/lib32-glibc/glibc-2.13-futex.patch index 9b9c3ac45..9b9c3ac45 100644 --- a/testing/glibc/glibc-2.13-futex.patch +++ b/multilib/lib32-glibc/glibc-2.13-futex.patch diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD index 87cbafd46..67c21cdbc 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' 'mips64el') 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 b7fb0657b..e03418258 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' 'mips64el') 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 e320a313b..3e09aad25 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' 'mips64el') @@ -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/staging/ardour/PKGBUILD b/testing/ardour/PKGBUILD index 770a8d0a2..770a8d0a2 100644 --- a/staging/ardour/PKGBUILD +++ b/testing/ardour/PKGBUILD diff --git a/staging/ardour/ardour.changelog b/testing/ardour/ardour.changelog index ee9cf00bf..ee9cf00bf 100644 --- a/staging/ardour/ardour.changelog +++ b/testing/ardour/ardour.changelog diff --git a/staging/ardour/ardour.desktop b/testing/ardour/ardour.desktop index b50f6c952..b50f6c952 100644 --- a/staging/ardour/ardour.desktop +++ b/testing/ardour/ardour.desktop diff --git a/testing/at-spi/PKGBUILD b/testing/at-spi/PKGBUILD index 6ca106517..82cc1b4ec 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' 'mips64el') 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 12736a7e2..e0034efe3 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' 'mips64el') @@ -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 248f06f2c..f826d6763 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' 'mips64el') @@ -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/bin86/PKGBUILD b/testing/bin86/PKGBUILD deleted file mode 100644 index c897a883c..000000000 --- a/testing/bin86/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $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.18 -pkgrel=1 -pkgdesc="A complete 8086 assembler and loader" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://www.debath.co.uk/" -depends=('glibc') -source=(http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz - bin86-0.16.17-x86_64-1.patch) -md5sums=('914068fb649b93642d1cf21857b75699' - '92bdce7b0655cd2e9f83c83fc56d128e') - -build() { - cd $srcdir/$pkgname-$pkgver - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch - fi - make PREFIX=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1 - make PREFIX=$pkgdir/usr MANDIR=$pkgdir/usr/share/man/man1 install -} diff --git a/testing/bin86/bin86-0.16.17-x86_64-1.patch b/testing/bin86/bin86-0.16.17-x86_64-1.patch deleted file mode 100644 index 152413ee7..000000000 --- a/testing/bin86/bin86-0.16.17-x86_64-1.patch +++ /dev/null @@ -1,44 +0,0 @@ -Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net> -Date: 2005-06-28 -Initial Package Version: 0.16.14 -Upstream Status: Submitted Upstream -Origin: from ROCK Linux -Description: Allows bin86 to compile on x86_64, which permits lilo to - be used in a 64-bit system. I'm dubious about ROCK's attempts to - automatically add dual-licensing to all their patches, but bin86 is - already GPL'd. I've heard from the maintainer that this will be - included in the next upload. - - -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch -# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or 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. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h ---- bin86-0.16.14-orig/ld/x86_aout.h 2004-11-07 20:07:31.506442000 +0100 -+++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100 -@@ -12,6 +12,9 @@ - #if defined(i386) || defined(__BCC__) || defined(MSDOS) - typedef long Long; - #define __OUT_OK 1 -+#elif defined(__x86_64__) -+typedef int Long; -+#define __OUT_OK 1 - #else - typedef char Long[4]; - #endif diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD deleted file mode 100644 index 30ac1896f..000000000 --- a/testing/binutils/PKGBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# $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=6 -_date=20110326 -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=('base') -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) -md5sums=('884dcbc87d4722b152aea72312356da1') - -mksource() { - mkdir ${pkgname}-${_date} - cd ${pkgname}-${_date} - export _TAG=binutils-2_21-branch - export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' - cvs -z9 co -r $_TAG binutils || return 1 - mv src binutils - tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* -} - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared $CONFIGFLAG - - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - 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 -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/testing/binutils/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - 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 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD index 66f8f3713..28365ff5e 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 'mips64el') @@ -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/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD deleted file mode 100644 index 7d99e4155..000000000 --- a/testing/coreutils/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $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.11 -pkgrel=1 -pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL3') -url="http://www.gnu.org/software/coreutils" -groups=('base') -depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap') -replaces=('mktemp') -backup=('etc/pam.d/su') -install=${pkgname}.install -options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz - coreutils-uname.patch - coreutils-pam.patch - su.pam) -md5sums=('b623ee9b1b768a14e40dfd35ff446f4c' - 'c4fcca138b6abf6d443d48a6f0cd8833' - 'aad79a2aa6d566c375d7bdd1b0767278' - 'fa85e5cce5d723275b14365ba71a8aad') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # added su wheel group pam patch (from fedora git) - patch -Np1 -i ${srcdir}/coreutils-pam.patch - - # linux specific uname improvement (from gentoo portage) - patch -Np1 -i ${srcdir}/coreutils-uname.patch - - autoreconf -v - ./configure --prefix=/usr \ - --enable-install-program=su \ - --enable-no-install-program=groups,hostname,kill,uptime \ - --enable-pam - make -} - -check() { - cd ${srcdir}/${pkgname}-${pkgver} - make RUN_EXPENSIVE_TESTS=yes check -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - - cd ${pkgdir}/usr/bin - install -dm755 ${pkgdir}/{bin,usr/sbin} - - # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ - mkdir mknod mv pwd rm rmdir stty su sync true uname" - mv ${_fhs} ${pkgdir}/bin - - # binaries required by various Arch scripts - _bin="cut dir dircolors du install mkfifo readlink shred \ - sleep touch tr vdir" - mv ${_bin} ${pkgdir}/bin - ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep - - mv chroot ${pkgdir}/usr/sbin - install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su -} diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch deleted file mode 100644 index e61908f3f..000000000 --- a/testing/coreutils/coreutils-pam.patch +++ /dev/null @@ -1,428 +0,0 @@ -diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac ---- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 -+++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 -@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then - AC_SUBST([GNULIB_WARN_CFLAGS]) - fi - -+dnl Give the chance to enable PAM -+AC_ARG_ENABLE(pam, dnl -+[ --enable-pam Enable use of the PAM libraries], -+[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) -+LIB_PAM="-ldl -lpam -lpam_misc" -+AC_SUBST(LIB_PAM)]) -+ - AC_FUNC_FORK - - optional_bin_progs= -diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi ---- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 -@@ -15081,8 +15081,11 @@ to certain shells, etc.). - @findex syslog - @command{su} can optionally be compiled to use @code{syslog} to report - failed, and optionally successful, @command{su} attempts. (If the system --supports @code{syslog}.) However, GNU @command{su} does not check if the --user is a member of the @code{wheel} group; see below. -+supports @code{syslog}.) -+ -+This version of @command{su} has support for using PAM for -+authentication. You can edit @file{/etc/pam.d/su} to customize its -+behaviour. - - The program accepts the following options. Also see @ref{Common options}. - -@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, - @env{PATH} to a compiled-in default value. Change to @var{user}'s home - directory. Prepend @samp{-} to the shell's name, intended to make it - read its login startup file(s). -+Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables -+are preserved as well for PAM functionality. - - @item -m - @itemx -p -@@ -15163,33 +15168,6 @@ Exit status: - the exit status of the subshell otherwise - @end display - --@cindex wheel group, not supported --@cindex group wheel, not supported --@cindex fascism --@subsection Why GNU @command{su} does not support the @samp{wheel} group -- --(This section is by Richard Stallman.) -- --@cindex Twenex --@cindex MIT AI lab --Sometimes a few of the users try to hold total power over all the --rest. For example, in 1984, a few users at the MIT AI lab decided to --seize power by changing the operator password on the Twenex system and --keeping it secret from everyone else. (I was able to thwart this coup --and give power back to the users by patching the kernel, but I --wouldn't know how to do that in Unix.) -- --However, occasionally the rulers do tell someone. Under the usual --@command{su} mechanism, once someone learns the root password who --sympathizes with the ordinary users, he or she can tell the rest. The --``wheel group'' feature would make this impossible, and thus cement the --power of the rulers. -- --I'm on the side of the masses, not that of the rulers. If you are --used to supporting the bosses and sysadmins in whatever they do, you --might find this idea strange at first. -- -- - @node timeout invocation - @section @command{timeout}: Run a command with a time limit - -diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am ---- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 -+++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 -@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) - uptime_LDADD += $(GETLOADAVG_LIBS) - - # for crypt --su_LDADD += $(LIB_CRYPT) -+su_LDADD += $(LIB_CRYPT) @LIB_PAM@ - - # for various ACL functions - copy_LDADD += $(LIB_ACL) -diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c ---- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 -+++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 -@@ -37,6 +37,16 @@ - restricts who can su to UID 0 accounts. RMS considers that to - be fascist. - -+#ifdef USE_PAM -+ -+ Actually, with PAM, su has nothing to do with whether or not a -+ wheel group is enforced by su. RMS tries to restrict your access -+ to a su which implements the wheel group, but PAM considers that -+ to be fascist, and gives the user/sysadmin the opportunity to -+ enforce a wheel group by proper editing of /etc/pam.conf -+ -+#endif -+ - Compile-time options: - -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. - -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. -@@ -53,6 +63,15 @@ - #include <pwd.h> - #include <grp.h> - -+#ifdef USE_PAM -+# include <signal.h> -+# include <sys/wait.h> -+# include <sys/fsuid.h> -+# include <unistd.h> -+# include <security/pam_appl.h> -+# include <security/pam_misc.h> -+#endif /* USE_PAM */ -+ - #include "system.h" - #include "getpass.h" - -@@ -120,10 +139,17 @@ - /* The user to become if none is specified. */ - #define DEFAULT_USER "root" - -+#ifndef USE_PAM - char *crypt (char const *key, char const *salt); -+#endif - --static void run_shell (char const *, char const *, char **, size_t) -+static void run_shell (char const *, char const *, char **, size_t, -+ const struct passwd *) -+#ifdef USE_PAM -+ ; -+#else - ATTRIBUTE_NORETURN; -+#endif - - /* If true, pass the `-f' option to the subshell. */ - static bool fast_startup; -@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su - } - #endif - -+#ifdef USE_PAM -+static pam_handle_t *pamh = NULL; -+static int retval; -+static struct pam_conv conv = { -+ misc_conv, -+ NULL -+}; -+ -+#define PAM_BAIL_P if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+ return 0; \ -+} -+#define PAM_BAIL_P_VOID if (retval) { \ -+ pam_end(pamh, PAM_SUCCESS); \ -+return; \ -+} -+#endif -+ - /* Ask the user for a password. -+ If PAM is in use, let PAM ask for the password if necessary. - Return true if the user gives the correct password for entry PW, - false if not. Return true without asking for a password if run by UID 0 - or if PW has an empty password. */ -@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su - static bool - correct_password (const struct passwd *pw) - { -+#ifdef USE_PAM -+ struct passwd *caller; -+ char *tty_name, *ttyn; -+ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); -+ PAM_BAIL_P; -+ -+ if (getuid() != 0 && !isatty(0)) { -+ fprintf(stderr, "standard in must be a tty\n"); -+ exit(1); -+ } -+ -+ caller = getpwuid(getuid()); -+ if(caller != NULL && caller->pw_name != NULL) { -+ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); -+ PAM_BAIL_P; -+ } -+ -+ ttyn = ttyname(0); -+ if (ttyn) { -+ if (strncmp(ttyn, "/dev/", 5) == 0) -+ tty_name = ttyn+5; -+ else -+ tty_name = ttyn; -+ retval = pam_set_item(pamh, PAM_TTY, tty_name); -+ PAM_BAIL_P; -+ } -+ retval = pam_authenticate(pamh, 0); -+ PAM_BAIL_P; -+ retval = pam_acct_mgmt(pamh, 0); -+ if (retval == PAM_NEW_AUTHTOK_REQD) { -+ /* password has expired. Offer option to change it. */ -+ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); -+ PAM_BAIL_P; -+ } -+ PAM_BAIL_P; -+ /* must be authenticated if this point was reached */ -+ return 1; -+#else /* !USE_PAM */ - char *unencrypted, *encrypted, *correct; - #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP - /* Shadow passwd stuff for SVR3 and maybe other systems. */ -@@ -241,6 +324,7 @@ correct_password (const struct passwd *p - encrypted = crypt (unencrypted, correct); - memset (unencrypted, 0, strlen (unencrypted)); - return STREQ (encrypted, correct); -+#endif /* !USE_PAM */ - } - - /* Update `environ' for the new shell based on PW, with SHELL being -@@ -254,12 +338,18 @@ modify_environment (const struct passwd - /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. - Unset all other environment variables. */ - char const *term = getenv ("TERM"); -+ char const *display = getenv ("DISPLAY"); -+ char const *xauthority = getenv ("XAUTHORITY"); - if (term) - term = xstrdup (term); - environ = xmalloc ((6 + !!term) * sizeof (char *)); - environ[0] = NULL; - if (term) - xsetenv ("TERM", term); -+ if (display) -+ xsetenv ("DISPLAY", display); -+ if (xauthority) -+ xsetenv ("XAUTHORITY", xauthority); - xsetenv ("HOME", pw->pw_dir); - xsetenv ("SHELL", shell); - xsetenv ("USER", pw->pw_name); -@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw - { - #ifdef HAVE_INITGROUPS - errno = 0; -- if (initgroups (pw->pw_name, pw->pw_gid) == -1) -+ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { -+#ifdef USE_PAM -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+#endif - error (EXIT_CANCELED, errno, _("cannot set groups")); -+ } - endgrent (); - #endif - if (setgid (pw->pw_gid)) -@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw - error (EXIT_CANCELED, errno, _("cannot set user id")); - } - -+#ifdef USE_PAM -+static int caught=0; -+/* Signal handler for parent process later */ -+static void su_catch_sig(int sig) -+{ -+ ++caught; -+} -+ -+int -+pam_copyenv (pam_handle_t *pamh) -+{ -+ char **env; -+ -+ env = pam_getenvlist(pamh); -+ if(env) { -+ while(*env) { -+ if (putenv (*env)) -+ xalloc_die (); -+ env++; -+ } -+ } -+ return(0); -+} -+#endif -+ - /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. - If COMMAND is nonzero, pass it to the shell with the -c option. - Pass ADDITIONAL_ARGS to the shell as more arguments; there -@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw - - static void - run_shell (char const *shell, char const *command, char **additional_args, -- size_t n_additional_args) -+ size_t n_additional_args, const struct passwd *pw) - { - size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; - char const **args = xnmalloc (n_args, sizeof *args); - size_t argno = 1; -+#ifdef USE_PAM -+ int child; -+ sigset_t ourset; -+ int status; -+ -+ retval = pam_open_session(pamh,0); -+ if (retval != PAM_SUCCESS) { -+ fprintf (stderr, "could not open session\n"); -+ exit (1); -+ } -+ -+/* do this at the last possible moment, because environment variables may -+ be passed even in the session phase -+*/ -+ if(pam_copyenv(pamh) != PAM_SUCCESS) -+ fprintf (stderr, "error copying PAM environment\n"); -+ -+ /* Credentials should be set in the parent */ -+ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { -+ pam_close_session(pamh, 0); -+ fprintf(stderr, "could not set PAM credentials\n"); -+ exit(1); -+ } -+ -+ child = fork(); -+ if (child == 0) { /* child shell */ -+ change_identity (pw); -+ pam_end(pamh, 0); -+#endif - - if (simulate_login) - { - char *arg0; - char *shell_basename; - -+ if(chdir(pw->pw_dir)) -+ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+ - shell_basename = last_component (shell); - arg0 = xmalloc (strlen (shell_basename) + 2); - arg0[0] = '-'; -@@ -344,6 +496,67 @@ run_shell (char const *shell, char const - error (0, errno, "%s", shell); - exit (exit_status); - } -+#ifdef USE_PAM -+ } else if (child == -1) { -+ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ pam_close_session(pamh, 0); -+ pam_end(pamh, PAM_ABORT); -+ exit(1); -+ } -+ /* parent only */ -+ sigfillset(&ourset); -+ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ if (!caught) { -+ struct sigaction action; -+ action.sa_handler = su_catch_sig; -+ sigemptyset(&action.sa_mask); -+ action.sa_flags = 0; -+ sigemptyset(&ourset); -+ if (sigaddset(&ourset, SIGTERM) -+ || sigaddset(&ourset, SIGALRM) -+ || sigaction(SIGTERM, &action, NULL) -+ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { -+ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); -+ caught = 1; -+ } -+ } -+ if (!caught) { -+ do { -+ int pid; -+ -+ pid = waitpid(-1, &status, WUNTRACED); -+ -+ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { -+ kill(getpid(), WSTOPSIG(status)); -+ /* once we get here, we must have resumed */ -+ kill(pid, SIGCONT); -+ } -+ } while (0 != WIFSTOPPED(status)); -+ } -+ -+ if (caught) { -+ fprintf(stderr, "\nSession terminated, killing shell..."); -+ kill (child, SIGTERM); -+ } -+ /* Not checking retval on this because we need to call close session */ -+ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); -+ retval = pam_close_session(pamh, 0); -+ PAM_BAIL_P_VOID; -+ retval = pam_end(pamh, PAM_SUCCESS); -+ PAM_BAIL_P_VOID; -+ if (caught) { -+ sleep(2); -+ kill(child, SIGKILL); -+ fprintf(stderr, " ...killed.\n"); -+ exit(-1); -+ } -+ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) -+ : WTERMSIG (status) + 128); -+#endif /* USE_PAM */ - } - - /* Return true if SHELL is a restricted shell (one not returned by -@@ -511,9 +724,9 @@ main (int argc, char **argv) - shell = xstrdup (shell ? shell : pw->pw_shell); - modify_environment (pw, shell); - -+#ifndef USE_PAM - change_identity (pw); -- if (simulate_login && chdir (pw->pw_dir) != 0) -- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); -+#endif - - /* error() flushes stderr, but does not check for write failure. - Normally, we would catch this via our atexit() hook of -@@ -523,5 +736,5 @@ main (int argc, char **argv) - if (ferror (stderr)) - exit (EXIT_CANCELED); - -- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); -+ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); - } diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch deleted file mode 100644 index b458abeba..000000000 --- a/testing/coreutils/coreutils-uname.patch +++ /dev/null @@ -1,173 +0,0 @@ -On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. - -Prob not suitable for upstream seeing as how it's 100% linux-specific -http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html - -Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but -heavily reworked to suck less. - -To add support for additional platforms, check out the show_cpuinfo() -func in the linux/arch/<ARCH>/ source tree of the kernel. - ---- coreutils/src/uname.c -+++ coreutils/src/uname.c -@@ -50,6 +50,11 @@ - # include <mach-o/arch.h> - #endif - -+#if defined(__linux__) -+# define USE_PROCINFO -+# define UNAME_HARDWARE_PLATFORM -+#endif -+ - #include "system.h" - #include "error.h" - #include "quote.h" -@@ -138,6 +143,117 @@ - exit (status); - } - -+#if defined(USE_PROCINFO) -+ -+# if defined(__s390__) || defined(__s390x__) -+# define CPUINFO_FILE "/proc/sysinfo" -+# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" -+# else -+# define CPUINFO_FILE "/proc/cpuinfo" -+# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" -+# endif -+ -+# define PROCINFO_PROCESSOR 0 -+# define PROCINFO_HARDWARE_PLATFORM 1 -+ -+static void __eat_cpuinfo_space(char *buf) -+{ -+ /* first eat trailing space */ -+ char *tmp = buf + strlen(buf) - 1; -+ while (tmp > buf && isspace(*tmp)) -+ *tmp-- = '\0'; -+ /* then eat leading space */ -+ tmp = buf; -+ while (*tmp && isspace(*tmp)) -+ tmp++; -+ if (tmp != buf) -+ memmove(buf, tmp, strlen(tmp)+1); -+ /* finally collapse whitespace */ -+ tmp = buf; -+ while (tmp[0] && tmp[1]) { -+ if (isspace(tmp[0]) && isspace(tmp[1])) { -+ memmove(tmp, tmp+1, strlen(tmp)); -+ continue; -+ } -+ ++tmp; -+ } -+} -+ -+static int __linux_procinfo(int x, char *fstr, size_t s) -+{ -+ FILE *fp; -+ -+ char *procinfo_keys[] = { -+ /* --processor --hardware-platform */ -+ #if defined(__alpha__) -+ "cpu model", "system type" -+ #elif defined(__arm__) -+ "Processor", "Hardware" -+ #elif defined(__avr32__) -+ "processor", "cpu family" -+ #elif defined(__bfin__) -+ "CPU", "BOARD Name" -+ #elif defined(__cris__) -+ "cpu", "cpu model" -+ #elif defined(__frv__) -+ "CPU-Core", "System" -+ #elif defined(__i386__) || defined(__x86_64__) -+ "model name", "vendor_id" -+ #elif defined(__ia64__) -+ "family", "vendor" -+ #elif defined(__hppa__) -+ "cpu", "model" -+ #elif defined(__m68k__) -+ "CPU", "MMU" -+ #elif defined(__mips__) -+ "cpu model", "system type" -+ #elif defined(__powerpc__) || defined(__powerpc64__) -+ "cpu", "machine" -+ #elif defined(__s390__) || defined(__s390x__) -+ "Type", "Manufacturer" -+ #elif defined(__sh__) -+ "cpu type", "machine" -+ #elif defined(sparc) || defined(__sparc__) -+ "type", "cpu" -+ #elif defined(__vax__) -+ "cpu type", "cpu" -+ #else -+ "unknown", "unknown" -+ #endif -+ }; -+ -+ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { -+ char key[65], value[257], eol, *ret = NULL; -+ -+ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { -+ __eat_cpuinfo_space(key); -+ if (!strcmp(key, procinfo_keys[x])) { -+ __eat_cpuinfo_space(value); -+ ret = value; -+ break; -+ } -+ if (eol != '\n') { -+ /* we need two fscanf's here in case the previous -+ * length limit caused us to read right up to the -+ * newline ... doing "%*[^\n]\n" wont eat the newline -+ */ -+ fscanf(fp, "%*[^\n]"); -+ fscanf(fp, "\n"); -+ } -+ } -+ fclose(fp); -+ -+ if (ret) { -+ strncpy(fstr, ret, s); -+ return 0; -+ } -+ } -+ -+ return -1; -+} -+ -+#endif -+ - /* Print ELEMENT, preceded by a space if something has already been - printed. */ - -@@ -250,10 +344,14 @@ main (int argc, char **argv) - if (toprint & PRINT_PROCESSOR) - { - char const *element = unknown; --#if HAVE_SYSINFO && defined SI_ARCHITECTURE -+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) - { - static char processor[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) -+#else - if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) -+#endif - element = processor; - } - #endif -@@ -306,9 +404,13 @@ main (int argc, char **argv) - if (element == unknown) - { - static char hardware_platform[257]; -+#if defined(USE_PROCINFO) -+ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) -+#else - size_t s = sizeof hardware_platform; - static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; - if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) -+#endif - element = hardware_platform; - } - #endif diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install deleted file mode 100644 index 8caae6686..000000000 --- a/testing/coreutils/coreutils.install +++ /dev/null @@ -1,21 +0,0 @@ -infodir=usr/share/info -filelist=(coreutils.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/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 - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam deleted file mode 100644 index cf15f40f1..000000000 --- a/testing/coreutils/su.pam +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -# Uncomment the following line to implicitly trust users in the "wheel" group. -#auth sufficient pam_wheel.so trust use_uid -# Uncomment the following line to require a user to be in the "wheel" group. -#auth required pam_wheel.so use_uid -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so 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/community-testing/cronie/crond.pam.d b/testing/cronie/pam.d index 4863ba834..094051b5e 100644 --- a/community-testing/cronie/crond.pam.d +++ b/testing/cronie/pam.d @@ -1,5 +1,3 @@ -### /etc/pam.d/crond: PAM configuration for `crond` - account required pam_access.so account required pam_time.so account required pam_unix.so @@ -7,5 +5,3 @@ account required pam_unix.so session required pam_limits.so session required pam_env.so session required pam_unix.so - -### /etc/pam.d/crond: PAM configuration for `crond` 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/curl/curl-config-fix-version.patch b/testing/curl/curl-config-fix-version.patch deleted file mode 100644 index 6e34998a4..000000000 --- a/testing/curl/curl-config-fix-version.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 82ecc85d9ed0fc05931fb6d6893eda567a3c443f Mon Sep 17 00:00:00 2001 -From: Daniel Stenberg <daniel@haxx.se> -Date: Mon, 18 Apr 2011 09:03:12 +0200 -Subject: [PATCH] curl-config: fix --version - -curl-config --version didn't output the correct version string (bug -introduced in commit 0355e33b5f7b234cf3), and unfortunately the test -case 1022 that was supposed to check for this was broken. - -This change fixes the test to detect this problem and it fixes the -output. - -Bug: http://curl.haxx.se/bug/view.cgi?id=3288727 ---- - curl-config.in | 4 ++-- - tests/libtest/test1022.pl | 17 +++++++++++++---- - 2 files changed, 15 insertions(+), 6 deletions(-) - -diff --git a/curl-config.in b/curl-config.in -index 27b9f7f..0232803 100644 ---- a/curl-config.in -+++ b/curl-config.in -@@ -6,7 +6,7 @@ - # | (__| |_| | _ <| |___ - # \___|\___/|_| \_\_____| - # --# Copyright (C) 2001 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. -+# Copyright (C) 2001 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. - # - # This software is licensed as described in the file COPYING, which - # you should have received as part of this distribution. The terms -@@ -94,7 +94,7 @@ while test $# -gt 0; do - ;; - - --version) -- echo libcurl @VERSION@ -+ echo libcurl @CURLVERSION@ - exit 0 - ;; - -diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl -index 60eee38..7fac00e 100755 ---- a/tests/libtest/test1022.pl -+++ b/tests/libtest/test1022.pl -@@ -22,14 +22,23 @@ my $curlconfigversion; - open(CURLCONFIG, "sh $ARGV[0] --$what|") || die "Can't get curl-config --$what list\n"; - $_ = <CURLCONFIG>; - chomp; -+my $filever=$_; - if ( $what eq "version" ) { -- /^libcurl ([\.\d]+(-DEV)?)$/ ; -- $curlconfigversion = $1; -+ if($filever =~ /^libcurl ([\.\d]+(-DEV)?)$/) { -+ $curlconfigversion = $1; -+ } -+ else { -+ $curlconfigversion = "illegal value"; -+ } - } - else { - # Convert hex version to decimal for comparison's sake -- /^(..)(..)(..)$/ ; -- $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3); -+ if($filever =~ /^(..)(..)(..)$/) { -+ $curlconfigversion = hex($1) . "." . hex($2) . "." . hex($3); -+ } -+ else { -+ $curlconfigversion = "illegal value"; -+ } - - # Strip off the -DEV from the curl version if it's there - $version =~ s/-DEV$//; --- -1.7.4.4 - diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD index d50479b1f..a42ae2bd2 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' 'mips64el') @@ -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 814115ac1..15430e72d 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' 'mips64el') @@ -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 d8196203d..44b11b962 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' 'mips64el') @@ -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 de9e96949..756a4e379 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' 'mips64el') @@ -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 bf9f713af..7d90c1ee1 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' 'mips64el') @@ -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 f88416aca..42e98b3ca 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' 'mips64el') @@ -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 6d71a2d3e..d340971a2 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' 'mips64el') @@ -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/file/PKGBUILD b/testing/file/PKGBUILD deleted file mode 100644 index c7dd791be..000000000 --- a/testing/file/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $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.06 -pkgrel=1 -pkgdesc="File type identification utility" -arch=('i686' 'x86_64') -license=('custom') -groups=('base') -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) -md5sums=('deb12b0fb9d09e7681be72bad6eba4e0' - '385f020467debd98bd2d8df6143f93d0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's#\$(datadir)/misc#\$(datadir)#' configure - - # identify zip64 files - patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - - ./configure --prefix=/usr --datadir=/usr/share/file - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR=${pkgdir} install - install -dm755 ${pkgdir}/usr/share/misc - ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc - - install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING -} diff --git a/testing/file/file-5.05-zip64.patch b/testing/file/file-5.05-zip64.patch deleted file mode 100644 index 2c9aede5f..000000000 --- a/testing/file/file-5.05-zip64.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur file-5.05-old//magic/Magdir/archive file-5.05/magic/Magdir/archive ---- file-5.05-old//magic/Magdir/archive 2011-01-08 06:24:25.000000000 +1000 -+++ file-5.05/magic/Magdir/archive 2011-01-19 14:37:47.766673895 +1000 -@@ -688,6 +688,7 @@ - >>4 byte 0x0b \b, at least v1.1 to extract - >>0x161 string WINZIP \b, WinZIP self-extracting - >>4 byte 0x14 \b, at least v2.0 to extract -+>>4 byte 0x2d \b, at least v3.0 to extract - - # Zoo archiver - 20 lelong 0xfdc4a7dc Zoo archive data diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD index f80cfc3f4..81036be00 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 'mips64el') @@ -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 ef802a5e1..c397966ce 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' 'mips64el') @@ -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 e24e16252..6aa7c7c4f 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 'mips64el') @@ -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 659f1dc8d..6b369dbeb 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 'mips64el') @@ -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 a1bbef735..42b189676 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' 'mips64el') 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 1c341c772..ec2c907fa 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' 'mips64el') 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/glibc/PKGBUILD b/testing/glibc/PKGBUILD deleted file mode 100644 index 1a3dace84..000000000 --- a/testing/glibc/PKGBUILD +++ /dev/null @@ -1,168 +0,0 @@ -# $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 -# NOTE: valgrind requires rebuilt with each new glibc version - -pkgname=glibc -pkgver=2.13 -pkgrel=5 -_glibcdate=20110117 -pkgdesc="GNU C Library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -groups=('base') -depends=('linux-api-headers>=2.6.37' 'tzdata') -makedepends=('gcc>=4.4') -backup=(etc/locale.gen - etc/nscd.conf) -options=('!strip') -install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - 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) -md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '24dfab6fd244f3773523412588ecc52c' - '7d0154b7e17ea218c9fa953599d24cc4' - 'b587ee3a70c9b3713099295609afde49' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') - -mksource() { - git clone git://sourceware.org/git/glibc.git - pushd glibc - git checkout -b glibc-2.13-arch origin/release/2.13/master - popd - tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* -} - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - - # 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 - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - if [[ ${CARCH} = "i686" ]]; then - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - fi - - echo "slibdir=/lib" >> configparms - - ${srcdir}/glibc/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch - - make -} - -check() { - cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true -} - -package() { - cd ${srcdir}/glibc-build - make install_root=${pkgdir} install - - rm ${pkgdir}/etc/ld.so.{cache,conf} - - install -dm755 ${pkgdir}/etc/rc.d - install -dm755 ${pkgdir}/usr/sbin - install -dm755 ${pkgdir}/usr/lib/locale - install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin - install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf - - sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf - - # create /etc/locale.gen - install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED - sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED - sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED - cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen - - if [[ ${CARCH} = "x86_64" ]]; then - # fix for the linker - sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - # Comply with multilib binaries, they look for the linker in /lib64 - mkdir ${pkgdir}/lib64 - cd ${pkgdir}/lib64 - ln -v -s ../lib/ld* . - fi - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES sbin/{ldconfig,sln} \ - usr/bin/{gencat,getconf,getent,iconv,locale} \ - usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \ - usr/lib/getconf/* \ - usr/sbin/{iconvconfig,nscd,rpcinfo} - [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - - strip $STRIP_STATIC usr/lib/*.a \ - lib/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,gconv/*.so} -} diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/testing/glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/testing/glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/testing/glibc/glibc-2.13-prelink.patch b/testing/glibc/glibc-2.13-prelink.patch deleted file mode 100644 index bef7998a8..000000000 --- a/testing/glibc/glibc-2.13-prelink.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/elf/rtld.c b/elf/rtld.c -index 9a560b3..201c9cf 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - we need it in the memory handling later. */ - GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; - -+ /* Remember the last search directory added at startup, now that -+ malloc will no longer be the one from dl-minimal.c. */ -+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -+ - if (prelinked) - { - if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) -@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lossage); - } - -- /* Remember the last search directory added at startup, now that -- malloc will no longer be the one from dl-minimal.c. */ -- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -- - if (! prelinked && rtld_multiple_ref) - { - /* There was an explicit ref to the dynamic linker as a shared lib. diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/testing/glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install deleted file mode 100644 index 7f85ade96..000000000 --- a/testing/glibc/glibc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) - -post_upgrade() { - sbin/ldconfig -r . - [ -x sbin/init ] && sbin/init u - usr/sbin/locale-gen - - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen deleted file mode 100755 index 5aff344c4..000000000 --- a/testing/glibc/locale-gen +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -LOCALEGEN=/etc/locale.gen -LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi - - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; - -# Remove all old locale dir and locale-archive before generating new -# locale data. -rm -rf /usr/lib/locale/* || true - -umask 022 - -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi -} - -echo "Generating locales..." -while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ -done < $LOCALEGEN -echo "Generation complete." diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt deleted file mode 100644 index ccdd81734..000000000 --- a/testing/glibc/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# <locale> <charset> -# -# where <locale> is one of the locales given in /usr/share/i18n/locales -# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# diff --git a/testing/glibc/nscd b/testing/glibc/nscd deleted file mode 100755 index 8b14f2a3f..000000000 --- a/testing/glibc/nscd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/nscd` -case "$1" in - start) - stat_busy "Starting nscd" - # create necessary directories if they don't already exist - mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null - # remove stale files - rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null - [ -z "$PID" ] && /usr/sbin/nscd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon nscd - stat_done - fi - ;; - stop) - stat_busy "Stopping nscd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon nscd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD index 51fb8c499..f8482fb93 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' 'mips64el') -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 c52e8f4b9..de382038d 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' 'mips64el') @@ -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 43ad29881..ff10f5bea 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' 'mips64el') 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 9cff05ded..6488fc2dd 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 'mips64el') @@ -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 63014f397..682651e66 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' 'mips64el') 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 fddb0c986..14916a6dd 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 'mips64el') 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 181663c77..9658f40a3 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' 'mips64el') 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 866d44288..605c38fc8 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' 'mips64el') 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 d54c7d166..06bb43fac 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' 'mips64el') @@ -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 97da0e192..366bdadfc 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' 'mips64el') @@ -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 b65307375..bf6b99380 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 'mips64el') @@ -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 49594629f..a3471ac2c 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/gpsd/LICENSE b/testing/gpsd/LICENSE deleted file mode 100644 index 076538678..000000000 --- a/testing/gpsd/LICENSE +++ /dev/null @@ -1,38 +0,0 @@ - COPYRIGHTS - -Compilation copyright is held by the GPSD project. All rights reserved. - -GPSD project copyrights are assigned to the project lead, currently -Eric S. Raymond. Other portions of the GPSD code are Copyright (c) -1997, 1998, 1999, 2000, 2001, 2002 by Remco Treffkorn, and others -Copyright (c) 2005 by Eric S. Raymond. For other copyrights, see -individual files. - - BSD LICENSE - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met:<P> - -Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer.<P> - -Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution.<P> - -Neither name of the GPSD project nor the names of its contributors -may be used to endorse or promote products derived from this software -without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD deleted file mode 100644 index d26892a8a..000000000 --- a/testing/gpsd/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# $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.96 -pkgrel=1 -pkgdesc="GPS daemon and library to support USB/serial GPS devices" -arch=('i686' 'x86_64') -url="http://gpsd.berlios.de" -license=('BSD') -depends=('lesstif' 'libxaw' 'python2' 'pth' 'libusb' 'desktop-file-utils') -optdepends=('php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page') -makedepends=('docbook-xsl') -backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') -options=('!libtool') -install="${pkgname}.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'gpsd' 'LICENSE') -md5sums=('26a7a04d4298bc3a3a5d89fef4582b64' - 'f929322fc4670543fcb36dafc7bb9e03' - 'd217a23f408e91c94359447735bc1800') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # install python to the same DESTDIR given make - sed -i 's|--prefix=${prefix} # --root=$(DESTDIR)|--prefix=${prefix} --root=$(DESTDIR)|' Makefile.am Makefile.in - - # fix python 2.7 path - sed -i 's|/usr/bin/python|/usr/bin/python2|' gpsd.hotplug{,.wrapper} - sed -i 's|/usr/bin/python2.6|/usr/bin/python2|' valgrind-audit - sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gpscat \ - gpsfake gpsprof xgps xgpsspeed gps/gps.py - - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --disable-libQgpsmm \ - --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Fix man pages path (FS#21715) - sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 - - make DESTDIR="${pkgdir}" install - - # Our own udev-install since the Makefile uses absolute paths - # Original file names are [mostly] unmodified: useful to match process name in case of error - # Following the switch from hotplug to udev helper scripts now live in /lib/udev/ instead of /etc/hotplug/ - sed -i 's|GPSD_OPTIONS=""|GPSD_OPTIONS="-P /var/run/gpsd.pid"|' packaging/deb/etc_default_gpsd - sed -i 's|"/var/run/gpsd.sock"|"/var/run/gpsd/gpsd.sock"|' packaging/deb/etc_default_gpsd - install -D -m644 "packaging/deb/etc_default_gpsd" "${pkgdir}/etc/conf.d/gpsd" - - sed -i 's|Id: gpsd.rules|Id: 99-gpsd-usb.rules|' gpsd.rules - install -D -m644 "gpsd.rules" "${pkgdir}/lib/udev/rules.d/99-gpsd-usb.rules" - - sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug.wrapper - install -D -m755 gpsd.hotplug.wrapper "${pkgdir}/lib/udev/gpsd.hotplug.wrapper" - - # Patch a path bug. Check to see if fixed in ensuing releases - sed -i 's|gpsdcmd = "gpsd %s|gpsdcmd = "/usr/sbin/gpsd %s|' gpsd.hotplug - install -D -m755 gpsd.hotplug "${pkgdir}/lib/udev/gpsd.hotplug" - - install -D -m644 packaging/X11/xgps.desktop ${pkgdir}/usr/share/applications/xgps.desktop - install -D -m644 packaging/X11/xgpsspeed.desktop ${pkgdir}/usr/share/applications/xgpsspeed.desktop - install -D -m644 packaging/X11/gpsd-logo.png ${pkgdir}/usr/share/gpsd/gpsd-logo.png - - install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" - - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/testing/gpsd/gpsd b/testing/gpsd/gpsd deleted file mode 100755 index b0f22c735..000000000 --- a/testing/gpsd/gpsd +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh - -. /etc/rc.conf -. /etc/rc.d/functions -[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd - -NAME=gpsd -DAEMON=/usr/sbin/$NAME -PID=$(pidof -o %PPID /usr/sbin/gpsd) - -case "$1" in - start) - stat_busy "Starting gpsd" - [ ! -d /var/run/gpsd ] && install -d /var/run/gpsd - [ -z "$PID" ] && "$DAEMON" ${GPSD_OPTIONS} -F ${GPSD_SOCKET} ${DEVICES} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon gpsd - stat_done - fi - ;; - stop) - stat_busy "Stopping gpsd" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm -f /var/run/$PID.pid &>/dev/null - rm_daemon gpsd - stat_done - fi - ;; - - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/testing/gpsd/gpsd.install b/testing/gpsd/gpsd.install deleted file mode 100644 index ee661fcb1..000000000 --- a/testing/gpsd/gpsd.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - echo ">>> Note: the supplied gpsd udev rules are device-specific, so" - echo ">>> if your device isn't detected correctly, please use lsusb or" - echo ">>> another suitable tool to determine the proper device IDs and" - echo ">>> use the commented rules to fill in the blanks for your device." - - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD index d008a7124..f66541e44 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 'mips64el') @@ -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 4c62f91dd..58b9e0500 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' 'mips64el') @@ -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 a2c11fbfd..36882078c 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' 'mips64el') @@ -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 beba9f501..40322ce77 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' 'mips64el') 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/kdeedu/PKGBUILD b/testing/kdeedu/PKGBUILD deleted file mode 100644 index d3c26577a..000000000 --- a/testing/kdeedu/PKGBUILD +++ /dev/null @@ -1,281 +0,0 @@ -# $Id: PKGBUILD 119955 2011-04-17 11:47:18Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=kdeedu -pkgname=('kdeedu-blinken' - 'kdeedu-cantor' - 'kdeedu-data' - 'kdeedu-kalgebra' - 'kdeedu-kalzium' - 'kdeedu-kanagram' - 'kdeedu-kbruch' - 'kdeedu-kgeography' - 'kdeedu-khangman' - 'kdeedu-kig' - 'kdeedu-kiten' - 'kdeedu-klettres' - 'kdeedu-kmplot' - 'kdeedu-kstars' - 'kdeedu-ktouch' - 'kdeedu-kturtle' - 'kdeedu-kwordquiz' - 'kdeedu-libkdeedu' - 'kdeedu-marble' - 'kdeedu-parley' - 'kdeedu-rocs' - 'kdeedu-step') -pkgver=4.6.2 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://www.kde.org' -license=('GPL' 'LGPL' 'FDL') -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" - 'gpsd-2.96.patch') -sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05' - 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e') - -build() { - 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 - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package_kdeedu-blinken() { - pkgdesc='A memory enhancement game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/blinken - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/blinken - make DESTDIR=$pkgdir install -} - -package_kdeedu-cantor() { - pkgdesc='KDE Frontend to Mathematical Software' - depends=('kdeedu-libkdeedu' 'libspectre') - optdepends=('kdeedu-kalgebra: backend' - 'maxima: backend' - 'r: backend') - install='kdeedu.install' - cd $srcdir/build/cantor - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/cantor - make DESTDIR=$pkgdir install -} - -package_kdeedu-data() { - pkgdesc='Data for KDE Educational Software' - groups=() - cd $srcdir/build/data - make DESTDIR=$pkgdir install -} - -package_kdeedu-kalgebra() { - pkgdesc='Math Expression Solver and Plotter' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kalgebra - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalgebra - make DESTDIR=$pkgdir install -} - -package_kdeedu-kalzium() { - pkgdesc='KDE Periodic Table of Elements' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro') - install='kdeedu.install' - cd $srcdir/build/kalzium - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kalzium - make DESTDIR=$pkgdir install -} - -package_kdeedu-kanagram() { - pkgdesc='KDE Letter Order Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') - install='kdeedu.install' - cd $srcdir/build/kanagram - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kanagram - make DESTDIR=$pkgdir install -} - -package_kdeedu-kbruch() { - pkgdesc='Practice exercises with fractions' - depends=('kdelibs' 'kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kbruch - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kbruch - make DESTDIR=$pkgdir install -} - -package_kdeedu-kgeography() { - pkgdesc='A Geography Learning Program' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kgeography - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kgeography - make DESTDIR=$pkgdir install -} - -package_kdeedu-khangman() { - pkgdesc='KDE Hangman Game' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') - install='kdeedu.install' - cd $srcdir/build/khangman - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/khangman - make DESTDIR=$pkgdir install -} - -package_kdeedu-kig() { - pkgdesc='Explore Geometric Constructions' - depends=('kdebase-runtime' 'boost-libs' 'python2') - install='kdeedu.install' - cd $srcdir/build/kig - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kig - make DESTDIR=$pkgdir install - - # Use the python2 executable - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py -} - -package_kdeedu-kiten() { - pkgdesc='Japanese Reference and Study Tool' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kiten - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kiten - make DESTDIR=$pkgdir install -} - -package_kdeedu-klettres() { - pkgdesc='a KDE program to learn the alphabet' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/klettres - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/klettres - make DESTDIR=$pkgdir install -} - -package_kdeedu-kmplot() { - pkgdesc='Function Plotter' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kmplot - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmplot - make DESTDIR=$pkgdir install -} - -package_kdeedu-kstars() { - pkgdesc='Desktop Planetarium' - depends=('kdebase-runtime' 'libindi') - install='kdeedu.install' - cd $srcdir/build/kstars - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kstars - make DESTDIR=$pkgdir install -} - -package_kdeedu-ktouch() { - pkgdesc='Touch Typing Tutor' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/ktouch - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ktouch - make DESTDIR=$pkgdir install -} - -package_kdeedu-kturtle() { - pkgdesc='Educational Programming Environment' - depends=('kdebase-runtime') - install='kdeedu.install' - cd $srcdir/build/kturtle - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kturtle - make DESTDIR=$pkgdir install -} - -package_kdeedu-kwordquiz() { - pkgdesc='A flashcard and vocabulary learning program' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') - install='kdeedu.install' - cd $srcdir/build/kwordquiz - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kwordquiz - make DESTDIR=$pkgdir install -} - -package_kdeedu-libkdeedu() { - pkgdesc='Support library for KDE Educational Software' - groups=() - depends=('kdelibs') - install='kdeedu.install' - cd $srcdir/build/libkdeedu - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake -} - -package_kdeedu-marble() { - pkgdesc='Desktop Globe' - depends=('kdebase-runtime' 'gpsd') - install='kdeedu.install' - cd $srcdir/build/marble - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/marble - make DESTDIR=$pkgdir install - install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \ - $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake -} - -package_kdeedu-parley() { - pkgdesc='Vocabulary Trainer' - depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python') - install='kdeedu.install' - cd $srcdir/build/parley - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/parley - make DESTDIR=$pkgdir install -} - -package_kdeedu-rocs() { - pkgdesc='Graph Theory Tool for Professors and Students.' - depends=('kdebase-runtime' 'kdeedu-libkdeedu') - install='kdeedu.install' - cd $srcdir/build/rocs - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/rocs - make DESTDIR=$pkgdir install -} - -package_kdeedu-step() { - pkgdesc='Simulate physics experiments' - depends=('kdebase-runtime' 'gsl' 'libqalculate') - install='kdeedu.install' - cd $srcdir/build/step - make DESTDIR=$pkgdir install - cd $srcdir/build/doc/step - make DESTDIR=$pkgdir install -} diff --git a/testing/kdeedu/kdeedu.install b/testing/kdeedu/kdeedu.install deleted file mode 100644 index e70c054ec..000000000 --- a/testing/kdeedu/kdeedu.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD deleted file mode 100644 index 785e64aa1..000000000 --- a/testing/less/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 119700 2011-04-13 21:50:08Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=less -pkgver=443 -pkgrel=1 -pkgdesc="A terminal based program for viewing text files" -license=('GPL3') -arch=('i686' 'x86_64' 'mips64el') -url="http://www.greenwoodsoftware.com/less" -groups=('base') -depends=('ncurses' 'pcre') -source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('47db098fb3cdaf847b3c4be05ee954fc') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --with-regex=pcre - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make prefix=${pkgdir}/usr install - install -dm755 ${pkgdir}/bin - mv ${pkgdir}/usr/bin/${pkgname} ${pkgdir}/bin -} diff --git a/testing/less/zless b/testing/less/zless deleted file mode 100644 index 93d560bc5..000000000 --- a/testing/less/zless +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -: ${PAGER=less} -export PAGER - -PATH="/usr/bin:$PATH" -export PATH - -exec zmore ${1+"$@"} diff --git a/testing/libgda/PKGBUILD b/testing/libgda/PKGBUILD index 2ea353353..c24e4d6fb 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 'mips64el') @@ -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 05f51d5bd..158699992 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 'mips64el') @@ -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/staging/liblrdf/PKGBUILD b/testing/liblrdf/PKGBUILD index 0bd976da0..0bd976da0 100644 --- a/staging/liblrdf/PKGBUILD +++ b/testing/liblrdf/PKGBUILD diff --git a/staging/liblrdf/md5.patch b/testing/liblrdf/md5.patch index 1c43b12e9..1c43b12e9 100644 --- a/staging/liblrdf/md5.patch +++ b/testing/liblrdf/md5.patch diff --git a/testing/libsocialweb/PKGBUILD b/testing/libsocialweb/PKGBUILD index b7af8d199..fb2c9cbde 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' 'mips64el') @@ -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 b10d438f8..901438de5 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' 'mips64el') 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/linux-api-headers/PKGBUILD b/testing/linux-api-headers/PKGBUILD deleted file mode 100644 index 44ee659ca..000000000 --- a/testing/linux-api-headers/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $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.38.1 -_basever=2.6.38 -pkgrel=1 -pkgdesc="Kernel headers sanitized for use in userspace" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/libc" -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=('7d471477bfa67546f902da62227fa976' - 'bd2be4d0465345e4e9355d6773f5f6fe') - -build() { - cd ${srcdir}/linux-${_basever} - [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver} - - make mrproper - make headers_check -} - -package() { - cd ${srcdir}/linux-${_basever} - make INSTALL_HDR_PATH=${pkgdir}/usr headers_install - - # use headers from libdrm - rm -rf ${pkgdir}/usr/include/drm - - # clean-up unnecessary files generated during install - find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f -} diff --git a/testing/mdadm/PKGBUILD b/testing/mdadm/PKGBUILD deleted file mode 100644 index 3fd43387e..000000000 --- a/testing/mdadm/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 119650 2011-04-13 07:07:09Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> -pkgname=mdadm -pkgver=3.2.1 -pkgrel=2 -pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://www.cse.unsw.edu.au/~neilb/source/mdadm/" -groups=('base') -conflicts=('mkinitcpio<0.5.99') -depends=('glibc') -backup=('etc/mdadm.conf') -source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 - mdadm - mdadm.conf - mdadm_install - mdadm_hook - segfault-3.2.1.patch) -install=mdadm.install -replaces=('raidtools') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../segfault-3.2.1.patch - make CXFLAGS="$CFLAGS" -} - -package() { - cd $srcdir/$pkgname-$pkgver - make INSTALL=/bin/install DESTDIR=$pkgdir install - install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf - install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm - install -D -m644 ../mdadm_install $pkgdir/lib/initcpio/install/mdadm - install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm - # symlink for backward compatibility - ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid - # build static mdassemble for Arch's initramfs - make MDASSEMBLE_AUTO=1 mdassemble - install -D -m755 mdassemble $pkgdir/sbin/mdassemble -} -md5sums=('5af65c32193fe0aea1aac4c4d44ac383' - '7bff0e506fb6017510c8ec4a01896952' - '00cbed931db4f15b6ce49e3e7d433966' - '865c3d39e5f5dae58388160b563981f1' - '1a3eb63832cecd6550f5b0a21d58cfdb') -md5sums=('d1e2549202bd79d9e99f1498d1109530' - '7bff0e506fb6017510c8ec4a01896952' - '00cbed931db4f15b6ce49e3e7d433966' - '865c3d39e5f5dae58388160b563981f1' - '1a3eb63832cecd6550f5b0a21d58cfdb' - '2fd25605bd1836a33c689ac442cb73ed') diff --git a/testing/mdadm/mdadm b/testing/mdadm/mdadm deleted file mode 100755 index 918a62537..000000000 --- a/testing/mdadm/mdadm +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /sbin/mdadm` -case "$1" in - start) - stat_busy "Starting mdadm RAID Monitor" - if [ -z "$PID" ]; then - /sbin/mdadm --monitor --scan -i /var/run/mdadm.pid -f - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - mdadm --monitor --oneshot --scan - add_daemon mdadm - stat_done - fi - ;; - stop) - stat_busy "Stopping mdadm RAID Monitor" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mdadm - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/testing/mdadm/mdadm.conf b/testing/mdadm/mdadm.conf deleted file mode 100644 index 57bd4c683..000000000 --- a/testing/mdadm/mdadm.conf +++ /dev/null @@ -1,67 +0,0 @@ -# mdadm configuration file -# -# mdadm will function properly without the use of a configuration file, -# but this file is useful for keeping track of arrays and member disks. -# In general, a mdadm.conf file is created, and updated, after arrays -# are created. This is the opposite behavior of /etc/raidtab which is -# created prior to array construction. -# -# -# the config file takes two types of lines: -# -# DEVICE lines specify a list of devices of where to look for -# potential member disks -# -# ARRAY lines specify information about how to identify arrays so -# so that they can be activated -# - - -# You can have more than one device line and use wild cards. The first -# example includes SCSI the first partition of SCSI disks /dev/sdb, -# /dev/sdc, /dev/sdd, /dev/sdj, /dev/sdk, and /dev/sdl. The second -# line looks for array slices on IDE disks. -# -#DEVICE /dev/sd[bcdjkl]1 -#DEVICE /dev/hda1 /dev/hdb1 -# -# The designation "partitions" will scan all partitions found in -# /proc/partitions -DEVICE partitions - - -# ARRAY lines specify an array to assemble and a method of identification. -# Arrays can currently be identified by using a UUID, superblock minor number, -# or a listing of devices. -# -# super-minor is usually the minor number of the metadevice -# UUID is the Universally Unique Identifier for the array -# Each can be obtained using -# -# mdadm -D <md> -# -# To capture the UUIDs for all your RAID arrays to this file, run these: -# to get a list of running arrays: -# # mdadm -D --scan >>/etc/mdadm.conf -# to get a list from superblocks: -# # mdadm -E --scan >>/etc/mdadm.conf -# -#ARRAY /dev/md0 UUID=3aaa0122:29827cfa:5331ad66:ca767371 -#ARRAY /dev/md1 super-minor=1 -#ARRAY /dev/md2 devices=/dev/hda1,/dev/hdb1 -# -# ARRAY lines can also specify a "spare-group" for each array. mdadm --monitor -# will then move a spare between arrays in a spare-group if one array has a -# failed drive but no spare -#ARRAY /dev/md4 uuid=b23f3c6d:aec43a9f:fd65db85:369432df spare-group=group1 -#ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977 spare-group=group1 -# - - -# When used in --follow (aka --monitor) mode, mdadm needs a -# mail address and/or a program. To start mdadm's monitor mode, add -# "mdadm" to your DAEMONS array in /etc/rc.conf -# -# If the lines are not found, mdadm will exit quietly -#MAILADDR root@mydomain.tld -#PROGRAM /usr/sbin/handle-mdadm-events diff --git a/testing/mdadm/mdadm.install b/testing/mdadm/mdadm.install deleted file mode 100644 index e8404c260..000000000 --- a/testing/mdadm/mdadm.install +++ /dev/null @@ -1,10 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 2.6.8-2)" -lt 0 -a "$(grep raid_partitions /etc/mkinitcpio.conf)" ]; then - echo "Attention mdadm update:" - echo "raid_partitions hook has been replaced by the more powerfull mdadm hook." - echo "Please update your /etc/mkinitcpio.conf accordingly." - fi -} diff --git a/testing/mdadm/mdadm_hook b/testing/mdadm/mdadm_hook deleted file mode 100755 index 57799d3b8..000000000 --- a/testing/mdadm/mdadm_hook +++ /dev/null @@ -1,44 +0,0 @@ -# vim: set ft=sh: -run_hook () -{ - input="$(cat /proc/cmdline)" - mdconfig="/etc/mdadm.conf" - # for partitionable raid, we need to load md_mod first! - modprobe md_mod 2>/dev/null - # If md is specified on commandline, create config file from those parameters. - if [ "$(echo $input | grep "md=")" ]; then - #Create initial mdadm.conf - # scan all devices in /proc/partitions - echo DEVICE partitions > $mdconfig - for i in $input; do - case $i in - # raid - md=[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig - ;; - # partitionable raid - md=d[0-9]*,/*) - device="$(echo "$i" | sed -e 's|,/.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device devices=$array" >> $mdconfig - ;; - # raid UUID - md=[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=||g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig - ;; - # partitionable raid UUID - md=d[0-9]*,[0-9,a-z]*) - device="$(echo "$i" | sed -e 's|,.*||g' -e 's|=|_|g')" - array="$(echo $i | cut -d, -f2-)" - echo "ARRAY /dev/$device UUID=$array" >> $mdconfig - ;; - esac - done - fi - # assemble everything - [ -e $mdconfig ] && /sbin/mdassemble -}
\ No newline at end of file diff --git a/testing/mdadm/mdadm_install b/testing/mdadm/mdadm_install deleted file mode 100644 index b7a57ea4e..000000000 --- a/testing/mdadm/mdadm_install +++ /dev/null @@ -1,46 +0,0 @@ -# vim: set ft=sh: - -install () -{ - MODULES=" $(checked_modules "drivers/md/*" | grep -v "dm-") " - BINARIES="" - FILES="" - SCRIPT="mdadm" - # check if a custom mdadm.conf exists - if grep -q ^ARRAY /etc/mdadm.conf; then - echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays." - add_file "/etc/mdadm.conf" - fi - add_binary "/sbin/mdassemble" - add_file "/lib/udev/rules.d/64-md-raid.rules" -} - -help () -{ -cat<<HELPEOF - This hook loads the necessary modules for any raid root device, - and assembles the raid device when run. - - If arrays are defined in /etc/mdadm.conf, the file will be used instead - of command line assembling. - - Command Line Setup: - - for raid arrays with persistent superblocks: - md=<md device no.>,dev0,dev1,...,devn - md=<md device no.>,uuid - - for partitionable raid arrays with persistent superblocks: - md=d<md device no.>,dev0,dev1,...,devn - md=d<md device no.>,uuid - - Parameters: - - <md device no.> = the number of the md device: - 0 means md0, 1 means md1, ... - - <dev0-devn>: e.g. /dev/hda1,/dev/hdc1,/dev/sda1,/dev/sdb1 - or 0900878d:f95f6057:c39a36e9:55efa60a - Examples: - - md=d0,/dev/sda3,/dev/sda4 md=d1,/dev/hda1,/dev/hdb1 - This will setup 2 md partitionable arrays. - - md=0,/dev/sda3,/dev/sda4 md=1,/dev/hda1,/dev/hdb1 - This will setup 2 md arrays with persistent superblocks. -HELPEOF -} diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD deleted file mode 100644 index 9ab7f963c..000000000 --- a/testing/mpfr/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $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 -pkgver=3.0.1 -pkgrel=1 -pkgdesc="Multiple-precision floating-point library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.mpfr.org/" -license=('LGPL') -depends=('gmp>=5.0') -options=('!libtool') -install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${pkgver}.tar.xz) -md5sums=('645882d9d179113a70af84d27086ed9f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-thread-safe --enable-shared - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install deleted file mode 100644 index d6dd0475b..000000000 --- a/testing/mpfr/mpfr.install +++ /dev/null @@ -1,20 +0,0 @@ -info_dir=usr/share/info -info_files=(mpfr.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for f in ${info_files[@]}; do - install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null - done -} diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD index d080d904b..623253bc1 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 'mips64el') @@ -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 7f30b8d36..3cef534ea 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' 'mips64el') @@ -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/opencv/libpng-1.4.patch b/testing/opencv/libpng-1.4.patch deleted file mode 100644 index c34c5a58a..000000000 --- a/testing/opencv/libpng-1.4.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp OpenCV-2.0.0/src/highgui/grfmt_png.cpp ---- OpenCV-2.0.0-orig/src/highgui/grfmt_png.cpp 2010-01-21 01:08:46.000000000 -0500 -+++ OpenCV-2.0.0/src/highgui/grfmt_png.cpp 2010-01-21 01:13:11.000000000 -0500 -@@ -223,7 +223,7 @@ - png_set_palette_to_rgb( png_ptr ); - - if( m_color_type == PNG_COLOR_TYPE_GRAY && m_bit_depth < 8 ) -- png_set_gray_1_2_4_to_8( png_ptr ); -+ png_set_expand_gray_1_2_4_to_8( png_ptr ); - - if( CV_MAT_CN(m_type) > 1 && color ) - png_set_bgr( png_ptr ); // convert RGB to BGR diff --git a/testing/opencv/nov4l1.patch b/testing/opencv/nov4l1.patch deleted file mode 100644 index cacdd77b7..000000000 --- a/testing/opencv/nov4l1.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp ---- OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp.nov4l1 2011-02-02 16:55:22.844244001 +0100 -+++ OpenCV-2.2.0/modules/highgui/src/cap_v4l.cpp 2011-02-02 16:53:22.224244002 +0100 -@@ -214,7 +214,9 @@ make & enjoy! - #include <sys/types.h> - #include <sys/mman.h> - -+#ifdef HAVE_CAMV4L - #include <linux/videodev.h> -+#endif - - #include <string.h> - #include <stdlib.h> -diff -up OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 OpenCV-2.2.0/modules/highgui/src/cap.cpp ---- OpenCV-2.2.0/modules/highgui/src/cap.cpp.nov4l1 2011-02-04 15:10:51.461243999 +0100 -+++ OpenCV-2.2.0/modules/highgui/src/cap.cpp 2011-02-04 15:11:22.040244001 +0100 -@@ -171,7 +171,7 @@ CV_IMPL CvCapture * cvCreateCameraCaptur - if (capture) - return capture; - #endif -- #if defined (HAVE_CAMV4L) || defined (HAVE_CAMV4L2) -+ #if defined (HAVE_CAMV4L) - capture = cvCreateCameraCapture_V4L (index); - if (capture) - return capture; diff --git a/testing/pacman/PKGBUILD b/testing/pacman/PKGBUILD deleted file mode 100644 index 6edea83d1..000000000 --- a/testing/pacman/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ -# Maintainer: Dan McGee <dan@archlinux.org> - -pkgname=pacman -pkgver=3.5.2 -pkgrel=1 -pkgdesc="A library-based package manager with dependency support" -arch=('i686' 'x86_64') -url="http://www.archlinux.org/pacman/" -license=('GPL') -groups=('base') -depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist') -optdepends=('fakeroot: for makepkg usage as normal user' - 'curl: for rankmirrors usage') -backup=(etc/pacman.conf etc/makepkg.conf) -install=pacman.install -options=(!libtool) -source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz - pacman.conf - pacman.conf.x86_64 - makepkg.conf) -md5sums=('b4f1fdbc17100923071ebe8fe9377be5' - 'e99eb721b6b704f68c5f47468507c102' - 'f8b939d9b2beb79a0436961a2d707d7c' - 'a8684989d3dfad5a6e1bcf95af3e571b') - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --enable-doc - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - # install Arch specific stuff - mkdir -p $pkgdir/etc - case "$CARCH" in - i686) - install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf - mycarch="i686" - mychost="i686-pc-linux-gnu" - myflags="-march=i686 " - ;; - x86_64) - install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf - mycarch="x86_64" - mychost="x86_64-unknown-linux-gnu" - myflags="-march=x86-64 " - ;; - esac - install -m644 $srcdir/makepkg.conf $pkgdir/etc/ - # set things correctly in the default conf file - sed -i $pkgdir/etc/makepkg.conf \ - -e "s|@CARCH[@]|$mycarch|g" \ - -e "s|@CHOST[@]|$mychost|g" \ - -e "s|@CARCHFLAGS[@]|$myflags|g" - - # install completion files - mkdir -p $pkgdir/etc/bash_completion.d/ - install -m644 contrib/bash_completion $pkgdir/etc/bash_completion.d/pacman - mkdir -p $pkgdir/usr/share/zsh/site-functions/ - install -m644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman -} - -# vim: set ts=2 sw=2 et: diff --git a/testing/pacman/makepkg.conf b/testing/pacman/makepkg.conf deleted file mode 100644 index a655e935f..000000000 --- a/testing/pacman/makepkg.conf +++ /dev/null @@ -1,114 +0,0 @@ -# -# /etc/makepkg.conf -# - -######################################################################### -# SOURCE ACQUISITION -######################################################################### -# -#-- The download utilities that makepkg should use to acquire sources -# Format: 'protocol::agent' -DLAGENTS=('ftp::/usr/bin/wget -c --passive-ftp -t 3 --waitretry=3 -O %o %u' - 'http::/usr/bin/wget -c -t 3 --waitretry=3 -O %o %u' - 'https::/usr/bin/wget -c -t 3 --waitretry=3 --no-check-certificate -O %o %u' - 'rsync::/usr/bin/rsync -z %u %o' - 'scp::/usr/bin/scp -C %u %o') - -# Other common tools: -# /usr/bin/snarf -# /usr/bin/lftpget -c -# /usr/bin/curl - -######################################################################### -# ARCHITECTURE, COMPILE FLAGS -######################################################################### -# -CARCH="@CARCH@" -CHOST="@CHOST@" - -#-- Exclusive: will only run on @CARCH@ -# -march (or -mcpu) builds exclusively for an architecture -# -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" -#-- Make Flags: change this for DistCC/SMP systems -#MAKEFLAGS="-j2" - -######################################################################### -# BUILD ENVIRONMENT -######################################################################### -# -# Defaults: BUILDENV=(fakeroot !distcc color !ccache check) -# A negated environment option will do the opposite of the comments below. -# -#-- fakeroot: Allow building packages as a non-root user -#-- distcc: Use the Distributed C/C++/ObjC compiler -#-- color: Colorize output messages -#-- ccache: Use ccache to cache compilation -#-- check: Run the check() function if present in the PKGBUILD -# -BUILDENV=(fakeroot !distcc color !ccache check) -# -#-- If using DistCC, your MAKEFLAGS will also need modification. In addition, -#-- specify a space-delimited list of hosts running in the DistCC cluster. -#DISTCC_HOSTS="" - -######################################################################### -# GLOBAL PACKAGE OPTIONS -# These are default values for the options=() settings -######################################################################### -# -# Default: OPTIONS=(strip docs libtool emptydirs zipman purge) -# A negated option will do the opposite of the comments below. -# -#-- strip: Strip symbols from binaries/libraries -#-- docs: Save doc directories specified by DOC_DIRS -#-- libtool: Leave libtool (.la) files in packages -#-- emptydirs: Leave empty directories in packages -#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip -#-- purge: Remove files specified by PURGE_TARGETS -# -OPTIONS=(strip docs libtool emptydirs zipman purge) - -#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512 -INTEGRITY_CHECK=(md5) -#-- Options to be used when stripping binaries. See `man strip' for details. -STRIP_BINARIES="--strip-all" -#-- Options to be used when stripping shared libraries. See `man strip' for details. -STRIP_SHARED="--strip-unneeded" -#-- Options to be used when stripping static libraries. See `man strip' for details. -STRIP_STATIC="--strip-debug" -#-- Manual (man and info) directories to compress (if zipman is specified) -MAN_DIRS=({usr{,/local}{,/share},opt/*}/{man,info}) -#-- Doc directories to remove (if !docs is specified) -DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc}) -#-- Files to be removed from all packages (if purge is specified) -PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) - -######################################################################### -# PACKAGE OUTPUT -######################################################################### -# -# Default: put built package and cached source in build directory -# -#-- Destination: specify a fixed directory where all packages will be placed -#PKGDEST=/home/packages -#-- Source cache: specify a fixed directory where source files will be cached -#SRCDEST=/home/sources -#-- Source packages: specify a fixed directory where all src packages will be placed -#SRCPKGDEST=/home/srcpackages -#-- Packager: name/email of the person or organization building packages -#PACKAGER="John Doe <john@doe.com>" - -######################################################################### -# EXTENSION DEFAULTS -######################################################################### -# -# WARNING: Do NOT modify these variables unless you know what you are -# doing. -# -PKGEXT='.pkg.tar.xz' -SRCEXT='.src.tar.gz' - -# vim: set ft=sh ts=2 sw=2 et: diff --git a/testing/pacman/pacman.conf b/testing/pacman/pacman.conf deleted file mode 100644 index 206ab23b4..000000000 --- a/testing/pacman/pacman.conf +++ /dev/null @@ -1,80 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - -f %u > %o -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options (all disabled by default) -#UseSyslog -#ShowSize -#UseDelta -#TotalDownload -#CheckSpace - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#Server = file:///home/custompkgs - diff --git a/testing/pacman/pacman.conf.x86_64 b/testing/pacman/pacman.conf.x86_64 deleted file mode 100644 index 6f0423647..000000000 --- a/testing/pacman/pacman.conf.x86_64 +++ /dev/null @@ -1,89 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#XferCommand = /usr/bin/curl -C - -f %u > %o -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options (all disabled by default) -#UseSyslog -#ShowSize -#UseDelta -#TotalDownload -#CheckSpace - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#Server = file:///home/custompkgs - diff --git a/testing/pacman/pacman.install b/testing/pacman/pacman.install deleted file mode 100644 index 0e598bb4b..000000000 --- a/testing/pacman/pacman.install +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - # one time stuff for md5sum issue with older pacman versions - if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then - _resetbackups - fi - if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then - _warnupgrade - fi -} - -_warnupgrade() { - echo ">>> The pacman database format has changed as of pacman 3.5.0." - echo ">>> You will need to run \`pacman-db-upgrade\` as root." - echo ">>>" -} - -_resetbackups() { - echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" - echo ">>> you are able to remove all NoUpgrade lines of already protected" - echo ">>> files from pacman.conf." - echo ">>>" - - # path variables - pacconf="/etc/pacman.conf" - dbpath="/var/lib/pacman/local" - - # get a list of NoUpgrade files from the user's pacman.conf - echo ">>> Retrieving pacman.conf NoUpgrade list..." - config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2) - # add the standard list of files, even if they are already above - config="$config \ - etc/passwd etc/group etc/shadow etc/sudoers \ - etc/fstab etc/raidtab etc/ld.so.conf \ - etc/rc.conf etc/rc.local \ - etc/modprobe.conf etc/modules.conf \ - etc/lilo.conf boot/grub/menu.lst" - - # blank md5sum for use in sed expression - zeroes='00000000000000000000000000000000' - - for file in $config; do - echo ">>> -> finding owner of /$file..." - line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null) - # if file is owned by a package, go find its incorrectly stored sum - if [ ! -z "$line" ]; then - # get the name and version of the package owning file - name=$(echo $line | awk '{print $5}') - version=$(echo $line | awk '{print $6}') - # set the path to the backup array holding the md5sum - path="$dbpath/$name-$version/files" - # run a sed on the path to reset the line containing $file - # NOTE: literal tab characters in sed expression after $file - echo ">>> -> resetting sum of /$file..." - sed -i "s#$file [0-9a-fA-F]*#$file $zeroes#" $path - else - echo ">>> -> $file is unowned." - fi - done -} diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD deleted file mode 100644 index d8daf9053..000000000 --- a/testing/php/PKGBUILD +++ /dev/null @@ -1,379 +0,0 @@ -# $Id: PKGBUILD 120015 2011-04-18 10:42:15Z pierre $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -pkgbase=php -pkgname=('php' - 'php-cgi' - 'php-apache' - 'php-fpm' - 'php-embed' - 'php-pear' - 'php-curl' - 'php-enchant' - 'php-gd' - 'php-gmp' - 'php-intl' - 'php-ldap' - 'php-mcrypt' - 'php-mssql' - 'php-odbc' - 'php-pgsql' - 'php-pspell' - 'php-snmp' - 'php-sqlite' - 'php-tidy' - 'php-xsl') -pkgver=5.3.6 -pkgrel=3 -_suhosinver=${pkgver}-0.9.10 -arch=('i686' 'x86_64') -license=('PHP') -url='http://www.php.net' -makedepends=('apache' 'imap' 'postgresql-libs' 'mysql' 'libldap' 'postfix' - 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' - 'libmcrypt' 'tidyhtml' 'aspell' 'libtool' 'libpng' 'libjpeg' 'icu' - 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') -source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" - "suhosin-patch-${_suhosinver}.patch.gz" - 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' - 'logrotate.d.php-fpm') -md5sums=('2286f5a82a6e8397955a0025c1c2ad98' - 'fff1a38877142f3ae6036dbe5a85d0a6' - '39eaa70d276fc3d45d6bcf6cd5ae1106' - 'dec2cbaad64e3abf4f0ec70e1de4e8e9' - 'b01be5f816988fcee7e78225836e5e27' - 'd50ff349da08110a7cc8c691ce2d0423' - '07c4e412909ac65a44ec90e7a2c4bade') - -build() { - # ldap-sasl does not compile with --as-needed - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - export LDFLAGS="${LDFLAGS//,--as-needed}" - - phpconfig="--srcdir=../${pkgbase}-${pkgver} \ - --prefix=/usr \ - --sysconfdir=/etc/php \ - --localstatedir=/var \ - --with-layout=GNU \ - --with-config-file-path=/etc/php \ - --with-config-file-scan-dir=/etc/php/conf.d \ - --enable-inline-optimization \ - --disable-debug \ - --disable-rpath \ - --disable-static \ - --enable-shared \ - --mandir=/usr/share/man \ - --without-pear \ - " - - phpextensions="--enable-bcmath=shared \ - --enable-calendar=shared \ - --enable-dba=shared \ - --enable-exif=shared \ - --enable-ftp=shared \ - --enable-gd-native-ttf \ - --enable-intl=shared \ - --enable-json=shared \ - --enable-mbregex \ - --enable-mbstring \ - --enable-pdo \ - --enable-phar=shared \ - --enable-posix=shared \ - --enable-session \ - --enable-shmop=shared \ - --enable-soap=shared \ - --enable-sockets=shared \ - --enable-sqlite-utf8 \ - --enable-sysvmsg=shared \ - --enable-sysvsem=shared \ - --enable-sysvshm=shared \ - --enable-xml \ - --enable-zip=shared \ - --with-bz2=shared \ - --with-curl=shared \ - --with-db4=/usr \ - --with-enchant=shared,/usr \ - --with-freetype-dir=shared,/usr \ - --with-gd=shared \ - --with-gdbm=shared \ - --with-gettext=shared \ - --with-gmp=shared \ - --with-iconv=shared \ - --with-icu-dir=/usr \ - --with-imap-ssl=shared \ - --with-imap=shared \ - --with-jpeg-dir=shared,/usr \ - --with-ldap=shared \ - --with-ldap-sasl \ - --with-mcrypt=shared \ - --with-mhash \ - --with-mssql=shared \ - --with-mysql-sock=/var/run/mysqld/mysqld.sock \ - --with-mysql=shared,mysqlnd \ - --with-mysqli=shared,mysqlnd \ - --with-openssl=shared \ - --with-pcre-regex=/usr \ - --with-pdo-mysql=shared,mysqlnd \ - --with-pdo-odbc=shared,unixODBC,/usr \ - --with-pdo-pgsql=shared \ - --with-pdo-sqlite=shared,/usr \ - --with-pgsql=shared \ - --with-png-dir=shared,/usr \ - --with-pspell=shared \ - --with-regex=php \ - --with-snmp=shared \ - --with-sqlite3=shared,/usr \ - --with-sqlite=shared \ - --with-tidy=shared \ - --with-unixODBC=shared,/usr \ - --with-xmlrpc=shared \ - --with-xsl=shared \ - --with-zlib \ - --without-db2 \ - --without-db3 \ - " - - EXTENSION_DIR=/usr/lib/php/modules - export EXTENSION_DIR - PEAR_INSTALLDIR=/usr/share/pear - export PEAR_INSTALLDIR - - cd ${srcdir}/${pkgbase}-${pkgver} - - # apply suhosin patch - patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch - - # adjust paths - patch -p0 -i ${srcdir}/php.ini.patch - patch -p0 -i ${srcdir}/php-fpm.conf.in.patch - - # php - mkdir ${srcdir}/build-php - cd ${srcdir}/build-php - ln -s ../${pkgbase}-${pkgver}/configure - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - ${phpextensions} - make - - # cgi and fcgi - # reuse the previous run; this will save us a lot of time - cp -a ${srcdir}/build-php ${srcdir}/build-cgi - cd ${srcdir}/build-cgi - ./configure ${phpconfig} \ - --disable-cli \ - --enable-cgi \ - ${phpextensions} - make - - # apache - cp -a ${srcdir}/build-php ${srcdir}/build-apache - cd ${srcdir}/build-apache - ./configure ${phpconfig} \ - --disable-cli \ - --with-apxs2 \ - ${phpextensions} - make - - # fpm - cp -a ${srcdir}/build-php ${srcdir}/build-fpm - cd ${srcdir}/build-fpm - ./configure ${phpconfig} \ - --disable-cli \ - --enable-fpm \ - --with-fpm-user=http \ - --with-fpm-group=http \ - ${phpextensions} - make - - # embed - cp -a ${srcdir}/build-php ${srcdir}/build-embed - cd ${srcdir}/build-embed - ./configure ${phpconfig} \ - --disable-cli \ - --enable-embed=shared \ - ${phpextensions} - make - - # pear - cp -a ${srcdir}/build-php ${srcdir}/build-pear - cd ${srcdir}/build-pear - ./configure ${phpconfig} \ - --disable-cgi \ - --with-readline \ - --enable-pcntl \ - --with-pear \ - ${phpextensions} - make -} - -# check() { -# cd ${srcdir}/build-php -# make test -# } - -package_php() { - pkgdesc='An HTML-embedded scripting language' - depends=('pcre' 'libxml2' 'bzip2' 'openssl') - replaces=('php-fileinfo') - provides=('php-fileinfo') - conflicts=('php-fileinfo') - backup=('etc/php/php.ini') - - cd ${srcdir}/build-php - make -j1 INSTALL_ROOT=${pkgdir} install - install -d -m755 ${pkgdir}/usr/share/pear - # install php.ini - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini - install -d -m755 ${pkgdir}/etc/php/conf.d/ - - # remove static modules - rm -f ${pkgdir}/usr/lib/php/modules/*.a - # remove modules provided by sub packages - rm -f ${pkgdir}/usr/lib/php/modules/{curl,enchant,gd,gmp,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so -} - -package_php-cgi() { - pkgdesc='CGI and FCGI SAPI for PHP' - depends=('php' 'pcre' 'libxml2') - - install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi -} - -package_php-apache() { - pkgdesc='Apache SAPI for PHP' - depends=('php' 'apache' 'pcre' 'libxml2') - backup=('etc/httpd/conf/extra/php5_module.conf') - - install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so - install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf -} - -package_php-fpm() { - pkgdesc='FastCGI Process Manager for PHP' - depends=('php') - backup=('etc/php/php-fpm.conf') - - install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 - install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf - install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm - install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm - install -d -m755 ${pkgdir}/etc/php/fpm.d -} - -package_php-embed() { - pkgdesc='Embed SAPI for PHP' - depends=('php' 'pcre' 'libxml2') - - install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h -} - -package_php-pear() { - pkgdesc='PHP Extension and Application Repository' - depends=('php' 'bash') - backup=('etc/php/pear.conf') - - cd ${srcdir}/build-pear - make -j1 install-pear INSTALL_ROOT=${pkgdir} - local i - while read i; do - [ ! -e "$i" ] || rm -rf "$i" - done < <(find ${pkgdir} -name '.*') -} - -package_php-curl() { - depends=('php' 'curl') - pkgdesc='curl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/curl.so ${pkgdir}/usr/lib/php/modules/curl.so -} - -package_php-enchant() { - depends=('php' 'enchant') - pkgdesc='enchant module for PHP' - install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so -} - -package_php-gd() { - depends=('php' 'libpng' 'libjpeg' 'freetype2') - pkgdesc='gd module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so -} - -package_php-gmp() { - depends=('php' 'gmp') - pkgdesc='gmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/gmp.so ${pkgdir}/usr/lib/php/modules/gmp.so -} - -package_php-intl() { - depends=('php' 'icu') - pkgdesc='intl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so -} - -package_php-ldap() { - depends=('php' 'libldap') - pkgdesc='ldap module for PHP' - install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so -} - -package_php-mcrypt() { - depends=('php' 'libmcrypt' 'libtool') - pkgdesc='mcrypt module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so -} - -package_php-mssql() { - depends=('php' 'freetds') - pkgdesc='mssql module for PHP' - install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so -} - -package_php-odbc() { - depends=('php' 'unixodbc') - pkgdesc='ODBC modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so - install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so -} - -package_php-pgsql() { - depends=('php' 'postgresql-libs') - pkgdesc='PostgreSQL modules for PHP' - install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so - install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so -} - -package_php-pspell() { - depends=('php' 'aspell') - pkgdesc='pspell module for PHP' - install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so -} - -package_php-snmp() { - depends=('php' 'net-snmp') - pkgdesc='snmp module for PHP' - install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so -} - -package_php-sqlite() { - depends=('php' 'sqlite3') - pkgdesc='sqlite3 module for PHP' - install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so - install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so -} - -package_php-tidy() { - depends=('php' 'tidyhtml') - pkgdesc='tidy module for PHP' - install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so -} - -package_php-xsl() { - depends=('php' 'libxslt') - pkgdesc='xsl module for PHP' - install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so -} diff --git a/testing/php/apache.conf b/testing/php/apache.conf deleted file mode 100644 index c3ca0aad5..000000000 --- a/testing/php/apache.conf +++ /dev/null @@ -1,13 +0,0 @@ -# Required modules: dir_module, php5_module - -<IfModule dir_module> - <IfModule php5_module> - DirectoryIndex index.php index.html - <FilesMatch "\.php$"> - SetHandler application/x-httpd-php - </FilesMatch> - <FilesMatch "\.phps$"> - SetHandler application/x-httpd-php-source - </FilesMatch> - </IfModule> -</IfModule> diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm deleted file mode 100644 index 7a1ba2597..000000000 --- a/testing/php/logrotate.d.php-fpm +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/php-fpm.log { - missingok - postrotate - /etc/rc.d/php-fpm logrotate >/dev/null || true - endscript -} diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch deleted file mode 100644 index 93c62430a..000000000 --- a/testing/php/php-fpm.conf.in.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:47.695294987 +0100 -+++ sapi/fpm/php-fpm.conf.in 2010-12-11 08:31:55.907812237 +0100 -@@ -12,7 +12,7 @@ - ; Relative path can also be used. They will be prefixed by: - ; - the global prefix if it's been set (-p arguement) - ; - @prefix@ otherwise --;include=etc/fpm.d/*.conf -+;include=/etc/php/fpm.d/*.conf - - ;;;;;;;;;;;;;;;;;; - ; Global Options ; -@@ -22,7 +22,7 @@ - ; Pid file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ - ; Default Value: none --;pid = run/php-fpm.pid -+pid = run/php-fpm/php-fpm.pid - - ; Error log file - ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ -@@ -93,7 +93,8 @@ - ; specific port; - ; '/path/to/unix/socket' - to listen on a unix socket. - ; Note: This value is mandatory. --listen = 127.0.0.1:9000 -+;listen = 127.0.0.1:9000 -+listen = /var/run/php-fpm/php-fpm.sock - - ; Set listen(2) backlog. A value of '-1' means unlimited. - ; Default Value: 128 (-1 on FreeBSD and OpenBSD) -@@ -112,9 +113,9 @@ - ; BSD-derived systems allow connections regardless of permissions. - ; Default Values: user and group are set as the running user - ; mode is set to 0666 --;listen.owner = @php_fpm_user@ --;listen.group = @php_fpm_group@ --;listen.mode = 0666 -+listen.owner = @php_fpm_user@ -+listen.group = @php_fpm_group@ -+listen.mode = 0660 - - ; Unix user/group of processes - ; Note: The user is mandatory. If the group is not set, the default user's group -@@ -154,23 +155,23 @@ - ; The number of child processes created on startup. - ; Note: Used only when pm is set to 'dynamic' - ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2 --;pm.start_servers = 20 -+pm.start_servers = 20 - - ; The desired minimum number of idle server processes. - ; Note: Used only when pm is set to 'dynamic' - ; Note: Mandatory when pm is set to 'dynamic' --;pm.min_spare_servers = 5 -+pm.min_spare_servers = 5 - - ; The desired maximum number of idle server processes. - ; Note: Used only when pm is set to 'dynamic' - ; Note: Mandatory when pm is set to 'dynamic' --;pm.max_spare_servers = 35 -+pm.max_spare_servers = 35 - - ; The number of requests each child process should execute before respawning. - ; This can be useful to work around memory leaks in 3rd party libraries. For - ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS. - ; Default Value: 0 --;pm.max_requests = 500 -+pm.max_requests = 500 - - ; The URI to view the FPM status page. If this value is not set, no URI will be - ; recognized as a status page. By default, the status page shows the following -@@ -264,7 +265,7 @@ - ; Chdir to this directory at the start. - ; Note: relative path can be used. - ; Default Value: current directory or / when chroot --;chdir = /var/www -+;chdir = /srv/http - - ; Redirect worker stdout and stderr into main error log. If not set, stdout and - ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch deleted file mode 100644 index 356e190b4..000000000 --- a/testing/php/php.ini.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- php.ini-production 2011-02-09 01:25:44.000000000 +0100 -+++ php.ini-production 2011-03-19 11:11:44.496987763 +0100 -@@ -376,7 +376,7 @@ - ; or per-virtualhost web server configuration file. This directive is - ; *NOT* affected by whether Safe Mode is turned On or Off. - ; http://php.net/open-basedir --;open_basedir = -+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ - - ; This directive allows you to disable certain functions for security reasons. - ; It receives a comma-delimited list of function names. This directive is -@@ -781,7 +781,7 @@ - ;;;;;;;;;;;;;;;;;;;;;;;;; - - ; UNIX: "/path1:/path2" --;include_path = ".:/php/includes" -+include_path = ".:/usr/share/pear" - ; - ; Windows: "\path1;\path2" - ;include_path = ".;c:\php\includes" -@@ -804,7 +804,7 @@ - - ; Directory in which the loadable extensions (modules) reside. - ; http://php.net/extension-dir --; extension_dir = "./" -+extension_dir = "/usr/lib/php/modules/" - ; On windows: - ; extension_dir = "ext" - -@@ -938,53 +938,49 @@ - ; If you only provide the name of the extension, PHP will look for it in its - ; default extension directory. - ; --; Windows Extensions --; Note that ODBC support is built in, so no dll is needed for it. --; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) --; extension folders as well as the separate PECL DLL download (PHP 5). --; Be sure to appropriately set the extension_dir directive. --; --;extension=php_bz2.dll --;extension=php_curl.dll --;extension=php_fileinfo.dll --;extension=php_gd2.dll --;extension=php_gettext.dll --;extension=php_gmp.dll --;extension=php_intl.dll --;extension=php_imap.dll --;extension=php_interbase.dll --;extension=php_ldap.dll --;extension=php_mbstring.dll --;extension=php_exif.dll ; Must be after mbstring as it depends on it --;extension=php_mysql.dll --;extension=php_mysqli.dll --;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client --;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client --;extension=php_openssl.dll --;extension=php_pdo_firebird.dll --;extension=php_pdo_mssql.dll --;extension=php_pdo_mysql.dll --;extension=php_pdo_oci.dll --;extension=php_pdo_odbc.dll --;extension=php_pdo_pgsql.dll --;extension=php_pdo_sqlite.dll --;extension=php_pgsql.dll --;extension=php_pspell.dll --;extension=php_shmop.dll -- --; The MIBS data available in the PHP distribution must be installed. --; See http://www.php.net/manual/en/snmp.installation.php --;extension=php_snmp.dll -- --;extension=php_soap.dll --;extension=php_sockets.dll --;extension=php_sqlite.dll --;extension=php_sqlite3.dll --;extension=php_sybase_ct.dll --;extension=php_tidy.dll --;extension=php_xmlrpc.dll --;extension=php_xsl.dll --;extension=php_zip.dll -+;extension=bcmath.so -+;extension=bz2.so -+;extension=calendar.so -+;extension=curl.so -+;extension=dba.so -+;extension=enchant.so -+;extension=exif.so -+;extension=ftp.so -+;extension=gd.so -+extension=gettext.so -+;extension=gmp.so -+;extension=iconv.so -+;extension=imap.so -+;extension=intl.so -+;extension=json.so -+;extension=ldap.so -+;extension=mcrypt.so -+;extension=mssql.so -+;extension=mysqli.so -+;extension=mysql.so -+;extension=odbc.so -+;extension=openssl.so -+;extension=pdo_mysql.so -+;extension=pdo_odbc.so -+;extension=pdo_pgsql.so -+;extension=pdo_sqlite.so -+;extension=pgsql.so -+;extension=phar.so -+;extension=posix.so -+;extension=pspell.so -+;extension=shmop.so -+;extension=snmp.so -+;extension=soap.so -+;extension=sockets.so -+;extension=sqlite3.so -+;extension=sqlite.so -+;extension=sysvmsg.so -+;extension=sysvsem.so -+;extension=sysvshm.so -+;extension=tidy.so -+;extension=xmlrpc.so -+;extension=xsl.so -+;extension=zip.so - - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ; diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm deleted file mode 100644 index 54bcf4d5b..000000000 --- a/testing/php/rc.d.php-fpm +++ /dev/null @@ -1,158 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -wait_for_pid () { - try=0 - while test $try -lt 35 ; do - case "$1" in - 'created') - if [ -f "$2" ] ; then - try='' - break - fi - ;; - 'removed') - if [ ! -f "$2" ] ; then - try='' - break - fi - ;; - esac - - stat_append '.' - try=`expr $try + 1` - sleep 1 - done -} - -test_config() { - stat_busy 'Checking configuration' - if [ $(id -u) -ne 0 ]; then - stat_append '(This script must be run as root)' - stat_die - fi - - if [ ! -r /etc/php/php-fpm.conf ]; then - stat_append '(/etc/php/php-fpm.conf not found)' - stat_die - fi - - local test=$(/usr/sbin/php-fpm -t 2>&1) - if [ $? -gt 0 ]; then - stat_append '(error in /etc/php/php-fpm.conf)' - stat_die - elif echo $test | grep -qi 'error'; then - stat_append '(error in /etc/php/php.ini)' - stat_die - fi - - [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm - - stat_done -} - -case "$1" in - start) - test_config - stat_busy 'Starting php-fpm' - - /usr/sbin/php-fpm - - if [ "$?" != 0 ] ; then - stat_fail - exit 1 - fi - - wait_for_pid created /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - add_daemon php-fpm - stat_done - fi - ;; - - stop) - test_config - stat_busy 'Gracefully shutting down php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - force-quit) - stat_busy 'Terminating php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -TERM `cat /var/run/php-fpm/php-fpm.pid` - - wait_for_pid removed /var/run/php-fpm/php-fpm.pid - - if [ -n "$try" ] ; then - stat_fail - exit 1 - else - rm_daemon php-fpm - stat_done - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - test_config - stat_busy 'Reload service php-fpm' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - logrotate) - stat_busy 'Reopen php-fpm log' - - if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then - stat_fail - exit 1 - fi - - kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` - stat_done - ;; - - *) - echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" - exit 1 - ;; - -esac diff --git a/testing/php/suhosin-patch-5.3.6-0.9.10.patch.gz b/testing/php/suhosin-patch-5.3.6-0.9.10.patch.gz Binary files differdeleted file mode 100644 index 7167ce2d0..000000000 --- a/testing/php/suhosin-patch-5.3.6-0.9.10.patch.gz +++ /dev/null diff --git a/staging/raptor/PKGBUILD b/testing/raptor/PKGBUILD index c41f00a3f..c41f00a3f 100644 --- a/staging/raptor/PKGBUILD +++ b/testing/raptor/PKGBUILD diff --git a/staging/raptor1/PKGBUILD b/testing/raptor1/PKGBUILD index c8cf6aa7b..c8cf6aa7b 100644 --- a/staging/raptor1/PKGBUILD +++ b/testing/raptor1/PKGBUILD 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/staging/rasqal/PKGBUILD b/testing/rasqal/PKGBUILD index d4b8915a8..d4b8915a8 100644 --- a/staging/rasqal/PKGBUILD +++ b/testing/rasqal/PKGBUILD 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/staging/redland/rpath.diff b/testing/redland-compat/rpath.diff index 831bc80ed..831bc80ed 100644 --- a/staging/redland/rpath.diff +++ b/testing/redland-compat/rpath.diff diff --git a/staging/redland/PKGBUILD b/testing/redland/PKGBUILD index 97add6534..97add6534 100644 --- a/staging/redland/PKGBUILD +++ b/testing/redland/PKGBUILD 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 6304427f4..721a90b53 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' 'mips64el') @@ -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 7c81be95a..0fa87b4af 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' 'mips64el') 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 656868a1e..c235a694d 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 'mips64el') @@ -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/staging/slv2/PKGBUILD b/testing/slv2/PKGBUILD index 571d39503..571d39503 100644 --- a/staging/slv2/PKGBUILD +++ b/testing/slv2/PKGBUILD diff --git a/staging/slv2/slv2.changelog b/testing/slv2/slv2.changelog index f394a5067..f394a5067 100644 --- a/staging/slv2/slv2.changelog +++ b/testing/slv2/slv2.changelog diff --git a/staging/slv2/slv2.install b/testing/slv2/slv2.install index c980ddfab..c980ddfab 100644 --- a/staging/slv2/slv2.install +++ b/testing/slv2/slv2.install diff --git a/staging/soprano/PKGBUILD b/testing/soprano/PKGBUILD index fa8929ab2..a3fd9aa39 100644 --- a/staging/soprano/PKGBUILD +++ b/testing/soprano/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 111023 2011-02-23 17:17:20Z andrea $ +# $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=2 +pkgrel=3 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt' 'clucene' 'virtuoso' 'libiodbc' 'raptor1') -makedepends=('cmake' 'openjdk6' 'doxygen') +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') @@ -23,8 +23,7 @@ build() { cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DSOPRANO_DISABLE_REDLAND_BACKEND=ON + -DCMAKE_INSTALL_PREFIX=/usr make } 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 bf479fcc9..47e5961f1 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' 'mips64el') 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 976af2a5c..cbb00a4c0 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' 'mips64el') @@ -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 464637633..2f910c3ed 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' 'mips64el') @@ -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 777dce2d8..ae5b3290f 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' 'mips64el') @@ -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 096c49a5e..ff9fb8a51 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' 'mips64el') 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/udev/80-drivers.rules b/testing/udev/80-drivers.rules deleted file mode 100644 index 56ac06cb4..000000000 --- a/testing/udev/80-drivers.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="remove", GOTO="drivers_end" - -DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" -SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" -SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" -SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" -SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" - -LABEL="drivers_end" diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules deleted file mode 100644 index 21127a729..000000000 --- a/testing/udev/81-arch.rules +++ /dev/null @@ -1,138 +0,0 @@ -# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> -# do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# - -##################################### -###### Hotplug rules - begin -# Only additional modules, -# which are not detectable, -# are loaded here! -##################################### -# check if the device has already been claimed by a driver -ACTION!="add", GOTO="drivers_end" - -# SOUND addon modules -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss" -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss" - -#PNP addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog" - -# PARPORT addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev" - -# fix ide cdrom detection on old proliant servers -SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" - -LABEL="drivers_end" -##################################### -##### Hotplug rules - end -##################################### - -##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" -##################################### -###### CD/DVD symlinks - end -##################################### - -##################################### -# Additional Archlinux -# Permissions and Symlinks - begin -##################################### - -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# video devices -### xorg resets those permissions, adjust your xorg.conf! -KERNEL=="3dfx*", GROUP="video" -KERNEL=="fb[0-9]*", GROUP="video" - -# misc -KERNEL=="sgi_fetchop", MODE="0666" -KERNEL=="sonypi", MODE="0666" - -# USB devices -KERNEL=="legousbtower*", MODE="0666" - -# kbd devices -KERNEL=="kbd", MODE="0664" - -# miscellaneous -KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" -####################################### -# Permissions and Symlinks - end -####################################### diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD deleted file mode 100644 index 08f8783b3..000000000 --- a/testing/udev/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 118985 2011-04-09 21:29:33Z tpowa $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgbase="udev" -pkgname=('udev' 'udev-compat') -pkgver=167 -pkgrel=1 -arch=(i686 x86_64 'mips64el') -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -groups=('base') -# older initscripts versions required start_udev -options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 - 80-drivers.rules - 81-arch.rules - load-modules.sh - cdsymlinks.sh) - -build() { - cd $srcdir/$pkgbase-$pkgver - ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ - --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system - make -} - -package_udev() { - pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' - 'module-init-tools>=3.11' 'pciutils') - install=udev.install - backup=(etc/udev/udev.conf - etc/modprobe.d/framebuffer_blacklist.conf) - conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') - replaces=('devfsd') - - cd $srcdir/$pkgbase-$pkgver - make DESTDIR=${pkgdir} install - # Replace original 80-drivers.rules with custom one. - install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules - # Install our rule for permissions and symlinks - install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules - # install our module loading subsystem - install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh - # install cdsymlinks.sh - install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh - # disable error logging to prevent startup failures printed to vc on boot - sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf - # disable persistent cdromsymlinks and network by default - # and move it to /etc/udev/rules.d - mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \ - $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional - mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \ - $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional - - # create framebuffer blacklist - mkdir -p $pkgdir/etc/modprobe.d/ - for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do - echo "blacklist $mod" - done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf - - # create static devices in /lib/udev/devices/ - mkdir ${pkgdir}/lib/udev/devices/pts - mkdir ${pkgdir}/lib/udev/devices/shm - - mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 - mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 - mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 - mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 - - ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd - ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin - ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout - ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr - ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core - - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/loop0 - mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 - chgrp disk ${pkgdir}/lib/udev/devices/loop0 - # /dev/net/tun - mkdir ${pkgdir}/lib/udev/devices/net - mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 - # /dev/fuse - mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 - # /dev/ppp - mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do - sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' $i - done -} - -package_udev-compat() { - pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" - depends=('udev') - groups=('') - cd $srcdir/$pkgbase-$pkgver - install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules -} -md5sums=('4b37e1222f06c14c24147de346aa0bad' - '4427855146513a4703ab5c7eb8a0156e' - 'f17c99779173ddc79f866cf3a5de5e68' - 'f91fddc67609b45b244a624977c4247b' - '2e808ee78d237c478b57af2a68d43769') diff --git a/testing/udev/cdsymlinks.sh b/testing/udev/cdsymlinks.sh deleted file mode 100755 index 498abda4a..000000000 --- a/testing/udev/cdsymlinks.sh +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -# Creates cdsymlinks in /dev -# for Archlinux by Tobias Powalowski <tpowa@archlinux.org> - -# check on cd/dvd drives and if persistant rules file is used -if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then - # remove existing device files - rm /dev/cdrom* - rm /dev/cdrw* - rm /dev/dvd* - rm /dev/dvdrw* - # start creating symlinks - for i in /dev/cd/cdrom-*; do - if [ -h $i ]; then - [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom - [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1" - ! [ "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER - fi - done - - for i in /dev/cd/cdrw-*; do - if [ -h $i ]; then - [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw - [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1" - ! [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER - fi - done - - for i in /dev/cd/dvd-*; do - if [ -h $i ]; then - [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd - [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1" - ! [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER - fi - done - - for i in /dev/cd/dvdrw-*; do - if [ -h $i ]; then - [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw - [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1" - ! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER - fi - done -fi diff --git a/testing/udev/load-modules.sh b/testing/udev/load-modules.sh deleted file mode 100755 index 1e2af913e..000000000 --- a/testing/udev/load-modules.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# Implement blacklisting for udev-loaded modules - -[ $# -ne 1 ] && exit 1 - -. /etc/rc.conf - -# grab modules from rc.conf -BLACKLIST="${MOD_BLACKLIST[@]}" -MODPROBE="/sbin/modprobe" -LOGGER="/usr/bin/logger" -RESOLVEALIAS="${MODPROBE} --resolve-alias" -USEBLACKLIST="--use-blacklist" - -if [ -f /proc/cmdline ]; then - for cmd in $(cat /proc/cmdline); do - case $cmd in - disablemodules=*) eval $cmd ;; - load_modules=off) exit ;; - esac - done - #parse cmdline entries of the form "disablemodules=x,y,z" - if [ -n "$disablemodules" ]; then - BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')" - fi -fi - -#MODULES entries in rc.conf that begin with ! are blacklisted -for mod in ${MODULES[@]}; do - if [ "${mod}" != "${mod#!}" ]; then - BLACKLIST="$BLACKLIST ${mod#!}" - fi -done - -if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then - if [ -n "${BLACKLIST}" ]; then - # If an alias name is on the blacklist, load no modules for this device - if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then - $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted" - exit - fi - #sanitize the blacklist - BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" - # Try to find all modules for the alias - mods=$($RESOLVEALIAS $1) - # If no modules could be found, try if the alias name is a module name - # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour - [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" - [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" - for mod in ${mods}; do - # Find the module and all its dependencies - deps="$($MODPROBE -i --show-depends ${mod})" - [ $? -ne 0 ] && continue - - #sanitize the module names - deps="$(echo "$deps" | sed \ - -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \ - -e 's|-|_|g')" - - # If the module or any of its dependencies is blacklisted, don't load it - for dep in $deps; do - if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then - if [ "${dep}" = "${mod}" ]; then - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" - else - $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" - fi - continue 2 - fi - done - # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases - # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists - # module names if we resolved alias names manually above - $MODPROBE $USEBLACKLIST ${mod} - done - else - $MODPROBE $USEBLACKLIST $1 - fi -fi -# vim: set et ts=4: diff --git a/testing/udev/udev.install b/testing/udev/udev.install deleted file mode 100644 index e953ec743..000000000 --- a/testing/udev/udev.install +++ /dev/null @@ -1,38 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_upgrade() { - if [ "$(vercmp $2 100)" -lt 0 ]; then - echo "ATTENTION UDEV:" - echo "----------" - echo "udev >=098 rules syntax has changed, please update your own rules." - echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." - echo "Please read the instructions carefully before reboot." - echo "They are located in /etc/udev/readme-udev-arch.txt" - echo "----------" - fi -} - -post_install() { - # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist - # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible - ROOTDIR="" - [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) - [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} - if [ ! -c ${ROOTDIR}/dev/console ]; then - rm -f ${ROOTDIR}/dev/console - mknod -m600 ${ROOTDIR}/dev/console c 5 1 - fi - if [ ! -c ${ROOTDIR}/dev/null ]; then - rm -f ${ROOTDIR}/dev/null - mknod -m644 ${ROOTDIR}/dev/null c 1 3 - fi - if [ ! -c ${ROOTDIR}/dev/zero ]; then - rm -f ${ROOTDIR}/dev/zero - mknod -m644 ${ROOTDIR}/dev/zero c 1 5 - fi - if [ -n "${ROOTDIR}" ]; then - umount ${ROOTDIR} - rmdir ${ROOTDIR} - fi -} diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD index 46efcabed..1801cb940 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' 'mips64el') 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 f5ebf40c5..cfbed0f8e 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' 'mips64el') @@ -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 33a604427..c68a296b4 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' 'mips64el') 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}" |
