diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-26 00:01:46 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-26 00:01:46 +0000 |
| commit | f96a2208b6a0ba89c3d824514a3929f08d79f7bf (patch) | |
| tree | 88c1033b9ec826ca6da1f1847685957bce496c62 | |
| parent | 891f44722456b693d99b397f7e332a9ed68a47a2 (diff) | |
Mon Mar 26 00:01:45 UTC 2012
96 files changed, 2707 insertions, 357 deletions
diff --git a/community-staging/ejabberd/PKGBUILD b/community-staging/ejabberd/PKGBUILD new file mode 100644 index 000000000..4b55b0074 --- /dev/null +++ b/community-staging/ejabberd/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 68447 2012-03-24 17:08:32Z arodseth $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> + +pkgname=ejabberd +pkgver=2.1.10 +pkgrel=4 +pkgdesc="Jabber server written in Erlang" +arch=('x86_64' 'i686') +url="http://www.ejabberd.im/" +license=("GPL") +depends=('expat' 'openssl' 'zlib' 'erlang' 'pam' 'iproute2') +backup=(etc/ejabberd/ejabberd.cfg etc/logrotate.d/ejabberd) +install=$pkgname.install +source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz" + "$pkgname.logrotate" + "$pkgname") +sha256sums=('9dc2e5889e919a7d51f2b95b83da835116631db81550a115c02e71909ad932be' + '31780cac78736d285e46f445f8c8463a70f2aeb2683280c259129db11832ddd2' + '93f8f9a8751b9e982b332f74e71f766c3c9c4818876991cadef08fe140b83ca6') + +build() { + cd "$srcdir/$pkgname-$pkgver/src" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-pam --enable-odbc + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/src" + + make DESTDIR="$pkgdir" install + install -D -m 0755 "$srcdir/$pkgname" "$pkgdir/etc/rc.d/$pkgname" + install -d "$pkgdir/var/spool/$pkgname" + install -d "$pkgdir/var/lib/$pkgname" + install -D -m0644 "$srcdir/$pkgname.logrotate" \ + "$pkgdir/etc/logrotate.d/$pkgname" + chmod ug+r "$pkgdir/etc/$pkgname/"* + rm -rf "$pkgdir/var/lock" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/ejabberd/ejabberd b/community-staging/ejabberd/ejabberd new file mode 100644 index 000000000..259d4db66 --- /dev/null +++ b/community-staging/ejabberd/ejabberd @@ -0,0 +1,63 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +cd /var/log/ejabberd/ + +get_pid() { + pidof epmd >/dev/null || { echo '' ; return 0; } + # get port from 'epmd -names', then get pid from 'ss -tlnp' + PORT=`epmd -names | grep ejabberd | cut -f5 -d\ ` + [ -z "$PORT" ] && { echo '' ; return 0; } + PID=`ss -tlnp | grep $PORT | grep -oE '[[:digit:]]+,' | cut -d, -f1` + [ -z "$PID" ] && { echo '' ; return 0; } + echo ${PID%/} +} + +case "$1" in + start) + stat_busy "Starting ejabber daemon" + + [ -d /var/lock/ejabberdctl ] || mkdir -p /var/lock/ejabberdctl + [ -f /var/run/ejabber.pid ] && rm -f /var/run/ejabber.pid + PID=`get_pid` + if [ -z "$PID" ]; then + su ejabberd -s /bin/bash - -c 'erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/spool/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"' + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `get_pid` > /var/run/ejabberd.pid + add_daemon ejabberd + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping ejabber daemon" + PID=`get_pid` + [ ! -z "$PID" ] && su ejabberd -s /bin/bash - -c "kill $PID" &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/ejabberd.pid &> /dev/null + rm_daemon ejabberd + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-staging/ejabberd/ejabberd.install b/community-staging/ejabberd/ejabberd.install new file mode 100644 index 000000000..9d17a911e --- /dev/null +++ b/community-staging/ejabberd/ejabberd.install @@ -0,0 +1,26 @@ +post_install() { + groupadd -r jabber + useradd -r -G jabber -d /var/lib/ejabberd ejabberd + chown -R ejabberd.jabber /var/log/ejabberd + chown -R ejabberd.jabber /var/spool/ejabberd + chown -R ejabberd.jabber /var/lib/ejabberd + chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam + chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd + chmod 4750 /usr/lib/ejabberd/priv/bin/epam +} + +post_upgrade() { + chown -R ejabberd.jabber /var/log/ejabberd + chown -R ejabberd.jabber /var/spool/ejabberd + chown -R ejabberd.jabber /var/lib/ejabberd + chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd + chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam + chmod 4750 /usr/lib/ejabberd/priv/bin/epam +} + +post_remove() { + userdel ejabberd + groupdel jabber +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/ejabberd/ejabberd.logrotate b/community-staging/ejabberd/ejabberd.logrotate new file mode 100644 index 000000000..03069078a --- /dev/null +++ b/community-staging/ejabberd/ejabberd.logrotate @@ -0,0 +1,12 @@ +/var/log/ejabberd/ejabberd.log { + weekly + missingok + rotate 10 + compress + delaycompress + ifempty + nomail + sharedscripts + postrotate ejabberdctl --node ejabberd reopen-log > /dev/null + endscript +} diff --git a/community-staging/erlang/PKGBUILD b/community-staging/erlang/PKGBUILD new file mode 100644 index 000000000..651be0c36 --- /dev/null +++ b/community-staging/erlang/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 68414 2012-03-24 10:06:33Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> + +pkgname=erlang +pkgver=R15B +pkgrel=1 +pkgdesc='A small concurrent functional programming language developed by Ericsson.' +arch=(i686 x86_64) +url='http://www.erlang.org/index.html' +license=('custom') +depends=('ncurses' 'glibc') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') +optdepends=('wxgtk: for wx support' + 'mesa: for wx support' + 'unixodbc: database' + 'java-environment: for Java support') +options=('!makeflags') +source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz" + "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz") +md5sums=('dd6c2a4807551b4a8a536067bde31d73' + '9738da523737712a9db87db0dee05338') + +build() { + cd "$srcdir/otp_src_${pkgver/./-}" + + export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) + export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < \ + lib/erl_interface/vsn.mk) + + sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure + + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \ + --enable-threads -enable-native-libs + make +} + +package() { + cd "$srcdir/otp_src_${pkgver/./-}" + + make INSTALL_PREFIX="$pkgdir" install + + # fix prefix + cd "$pkgdir/usr/lib/erlang" + sed -i "s#$pkgdir##" bin/erl bin/start "erts-${ERTSVERSION}/bin/erl" \ + "erts-${ERTSVERSION}/bin/start" releases/RELEASES + + # fix symlinks + cd bin/ + ln -sf "../erts-${ERTSVERSION}/bin/epmd" + + cd "$pkgdir/usr/bin" + for file in *; do + ln -sfv "../lib/erlang/bin/$file" + done + + ln -s "../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call" \ + "$pkgdir/usr/bin/erl_call" + + # install documentation + install -d "$pkgdir/usr/share/doc/erlang" + install -Dm0644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" + + # install man pages + cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + + # install license + install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" \ + "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" +} diff --git a/community-staging/sword/PKGBUILD b/community-staging/sword/PKGBUILD new file mode 100644 index 000000000..d61209089 --- /dev/null +++ b/community-staging/sword/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 68455 2012-03-25 01:12:48Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Andrea Scarpino +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: TripleE <eric1548@yahoo.com> + +pkgname=sword +pkgver=1.6.2 +pkgrel=7 +pkgdesc="Library for Bible study programs" +arch=('x86_64' 'i686') +url="http://www.crosswire.org/sword/" +license=('GPL') +depends=('curl' 'clucene' 'swig') +makedepends=('cmake') +backup=('etc/sword.conf') +source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz" + "curl.patch") +sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9' + '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i ../curl.patch + + mkdir ../build + cd ../build + + CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "$srcdir/build" + + make DESTDIR="$pkgdir" install + + install -d "$pkgdir/usr/lib/sword" + mv "$pkgdir"/usr/lib/${pkgver}_icu_* \ + "$pkgdir/usr/lib/sword/" + + cd "$srcdir/$pkgname-$pkgver/locales.d/" + for file in *.conf; do + install -Dm644 "$file" \ + "$pkgdir/usr/share/sword/locales.d/$file" + done + + cd ../include + install -d "$pkgdir/usr/include/sword" + install -Dm644 canon_{catholic{,2},synodalp}.h \ + "$pkgdir/usr/include/sword" + + cd ../samples + install -Dm644 mods.d/globals.conf \ + "$pkgdir/usr/share/sword/mods.d/globals.conf" + install -Dm644 recommended/sword.conf \ + "$pkgdir/etc/sword.conf" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/sword/curl.patch b/community-staging/sword/curl.patch new file mode 100644 index 000000000..63fd4433c --- /dev/null +++ b/community-staging/sword/curl.patch @@ -0,0 +1,22 @@ +diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp +--- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200 +@@ -26,7 +26,6 @@ + #include <fcntl.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> +diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp +--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200 +@@ -25,7 +25,6 @@ + #include <cctype> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> diff --git a/community-staging/yaws/PKGBUILD b/community-staging/yaws/PKGBUILD new file mode 100644 index 000000000..2272d1047 --- /dev/null +++ b/community-staging/yaws/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 68449 2012-03-24 17:18:17Z arodseth $ +# Maintainer: Vesa Kaihlavirta +# Contributor: Alexander Rødseth <rodseth@gmail.com> + +pkgname=yaws +pkgver=1.92 +pkgrel=2 +pkgdesc='Yet Another Web Server -- The pure Erlang HTTP server/framework' +arch=('x86_64' 'i686') +url='http://yaws.hyber.org/' +license=('BSD') +depends=('pam' 'erlang') +backup=('etc/yaws/yaws.conf') +options=('!emptydirs') +install=$pkgname.install +source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz") +sha256sums=('cde83ca55d8e1b10a89094e1cfdc3e78d91ba9b1036cb5ea4e1994f5922c2357') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + for file in www/cgi.yaws www/cgi-bin/foo.py; do + # python2 fix + sed -i '0,/on/s//on2/' "$file" + done + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -d "$pkgdir/usr/lib/erlang/lib" + ln -s /usr/lib/yaws "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/yaws/yaws.install b/community-staging/yaws/yaws.install new file mode 100644 index 000000000..2b28403e1 --- /dev/null +++ b/community-staging/yaws/yaws.install @@ -0,0 +1,13 @@ +post_upgrade() { + mkdir -p /usr/var/log/yaws +} + +post_install() { + post_upgrade +} + +post_remove() { + rmdir --ignore-fail-on-non-empty /usr/var/log/yaws +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/yaws/yaws.profile b/community-staging/yaws/yaws.profile new file mode 100644 index 000000000..57303c1f8 --- /dev/null +++ b/community-staging/yaws/yaws.profile @@ -0,0 +1 @@ +export PATH=$PATH:/opt/yaws/bin diff --git a/community-testing/avr-binutils/PKGBUILD b/community-testing/avr-binutils/PKGBUILD new file mode 100644 index 000000000..70b93f499 --- /dev/null +++ b/community-testing/avr-binutils/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 68437 2012-03-24 15:12:33Z schuay $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: danst0 <danst0@west.de> + +pkgname=avr-binutils +pkgver=2.22 +pkgrel=3 +_pkgname=binutils +_date=20120323 +pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +depends=('glibc>=2.15' 'zlib') +provides=("binutils-avr=$pkgver") +replaces=('binutils-avr') +options=('!libtool' '!distcc' '!ccache') +source=(ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}_${_date}.tar.bz2) + +_builddir=binutils-build + +build() { + cd ${srcdir} + + config_guess=$(${_pkgname}/config.guess) + rm -rf ${_builddir} + mkdir ${_builddir} && cd ${_builddir} + + [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" + + ${srcdir}/${_pkgname}/configure \ + --prefix=/usr \ + --build=${config_guess} \ + --disable-nls \ + --enable-install-libbfd \ + --includedir=/usr/${config_guess}/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --mandir=/usr/share/man \ + --target=avr \ + $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 +} + +package() { + cd ${srcdir}/${_builddir} + + make DESTDIR=${pkgdir} tooldir=/usr install + + rm -f ${pkgdir}/usr/lib/libiberty.a + + for bin in ar as nm objcopy objdump ranlib strip ; do + rm -f ${pkgdir}/usr/bin/${bin} + done + + for info in as bfd binutils configure gprof ld standards; do + mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info + done +} + +md5sums=('de2ac4298732827f8af706fc24020330') diff --git a/community-testing/avr-gcc/PKGBUILD b/community-testing/avr-gcc/PKGBUILD new file mode 100644 index 000000000..bd42392ee --- /dev/null +++ b/community-testing/avr-gcc/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 68439 2012-03-24 15:13:21Z schuay $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> +# Contributor: danst0 <danst0@west.de> + +pkgname=avr-gcc +_pkgname=gcc +pkgver=4.7.0 +pkgrel=1 +pkgdesc="The GNU avr Compiler Collection" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'custom') +url="http://gcc.gnu.org/" +depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc') +provides=("gcc-avr=$pkgver") +replaces=('gcc-avr') +options=('!libtool' '!emptydirs' '!libtool' '!strip') +source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2) + +_basedir=${srcdir}/${_pkgname}-${pkgver} + +build() { + # default CFLAGS lead to issues later on when configure + # calls avr-gcc with -march set. + export CFLAGS="-O2 -pipe" + export CXXFLAGS="-O2 -pipe" + + cd ${_basedir} + + # Do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + 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 \ + --enable-languages=c,c++ \ + --disable-libssp \ + --disable-nls \ + --target=avr \ + --with-as=/usr/bin/avr-as \ + --with-ld=/usr/bin/avr-ld \ + --with-gnu-as \ + --with-gnu-ld + + make +} + +package() { + cd ${srcdir}/gcc-build + + make -j1 DESTDIR=${pkgdir} install + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION + + rm -rf ${pkgdir}/usr/share/man/man7 + rm -rf ${pkgdir}/usr/share/info +} + +md5sums=('2a0f1d99fda235c29d40b561f81d9a77') diff --git a/community-testing/gnustep-back/ChangeLog b/community-testing/gnustep-back/ChangeLog new file mode 100644 index 000000000..15622ab88 --- /dev/null +++ b/community-testing/gnustep-back/ChangeLog @@ -0,0 +1,2 @@ +2007-06-27 tardo <tardo@nagi-fanboi.net> +* version upgrade diff --git a/community-testing/gnustep-back/PKGBUILD b/community-testing/gnustep-back/PKGBUILD new file mode 100644 index 000000000..c4c64322b --- /dev/null +++ b/community-testing/gnustep-back/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 68412 2012-03-24 09:58:13Z allan $ +# 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.22.0 +pkgrel=2 +pkgdesc="The GNUstep GUI Backend" +arch=('i686' 'x86_64') +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=('6ea64404d78766f93d192ff467162f53') + +build() { + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + make DESTDIR=$pkgdir install + mkdir -p $pkgdir/etc/ld.so.conf.d + cat >$pkgdir/etc/ld.so.conf.d/gnustep.conf <<EOF +/opt/GNUstep/System/Library/Libraries +/usr/lib/GNUstep/Libraries +EOF +} diff --git a/community-testing/gnustep-base/ChangeLog b/community-testing/gnustep-base/ChangeLog new file mode 100644 index 000000000..590f23f5e --- /dev/null +++ b/community-testing/gnustep-base/ChangeLog @@ -0,0 +1,6 @@ +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 new file mode 100644 index 000000000..8d0e44c5f --- /dev/null +++ b/community-testing/gnustep-base/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 68408 2012-03-24 09:54:48Z allan $ +# 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.24.0 +pkgrel=2 +pkgdesc="The GNUstep base package" +arch=('i686' 'x86_64') +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=('53cd117e9f64729870e906b66d2314ba') + +build() { + cd "$srcdir/$pkgname-$pkgver" + source /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep \ + --with-ffi-include=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ + # fix file ownership + sed -i 's/tar -xf $(TIMEZONE_ARCHIVE);/tar -xf $(TIMEZONE_ARCHIVE);chown -R root:root * ;/' NSTimeZones/Makefile.postamble + sed -i 's|.*gnutls_transport_set_lowat.*||' Source/GSSocketStream.m + make VERBOSE=1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + chown -R root.root "$pkgdir/" +} diff --git a/community-testing/gnustep-gui/ChangeLog b/community-testing/gnustep-gui/ChangeLog new file mode 100644 index 000000000..15622ab88 --- /dev/null +++ b/community-testing/gnustep-gui/ChangeLog @@ -0,0 +1,2 @@ +2007-06-27 tardo <tardo@nagi-fanboi.net> +* version upgrade diff --git a/community-testing/gnustep-gui/PKGBUILD b/community-testing/gnustep-gui/PKGBUILD new file mode 100644 index 000000000..ae3d82c4a --- /dev/null +++ b/community-testing/gnustep-gui/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 68410 2012-03-24 09:56:22Z allan $ +# 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.22.0 +pkgrel=2 +pkgdesc="The GNUstep GUI class library" +arch=('i686' 'x86_64') +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=('3aa3346071736206ca144ce1ce8f063f') + +build() { + cd $srcdir/$pkgname-$pkgver + . /etc/profile.d/GNUstep.sh + ./configure --prefix=/usr --sysconfdir=/etc/GNUstep + sed -i 's|#include "GNUstepBase/preface.h"|//#include "GNUstepBase/preface.h" |' Source/GSGuiPrivate.h + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install +} diff --git a/community-testing/sword/PKGBUILD b/community-testing/sword/PKGBUILD new file mode 100644 index 000000000..0efbbe9c1 --- /dev/null +++ b/community-testing/sword/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 68457 2012-03-25 01:46:00Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Andrea Scarpino +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: TripleE <eric1548@yahoo.com> + +pkgname=sword +pkgver=1.6.2 +pkgrel=7 +pkgdesc="Library for Bible study programs" +arch=('x86_64' 'i686') +url="http://www.crosswire.org/sword/" +license=('GPL') +depends=('curl' 'clucene' 'swig') +makedepends=('cmake') +backup=('etc/sword.conf') +source=("http://www.crosswire.org/ftpmirror/pub/$pkgname/source/v1.6/$pkgname-$pkgver.tar.gz" + "curl.patch") +sha256sums=('af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9' + '3c2676b6dc1d56b08b2532f46af32c54e91ea71ed92a5d7a30ee29ed7ff09124') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i ../curl.patch + + mkdir ../build + cd ../build + + CXXFLAGS=-fpermissive cmake "../$pkgname-$pkgver" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "$srcdir/build" + + make DESTDIR="$pkgdir" install + + install -d "$pkgdir/usr/lib/sword" + mv "$pkgdir"/usr/lib/${pkgver}_icu_* \ + "$pkgdir/usr/lib/sword/" + + cd "$srcdir/$pkgname-$pkgver/locales.d/" + for file in *.conf; do + install -Dm644 "$file" \ + "$pkgdir/usr/share/sword/locales.d/$file" + done + + cd ../include + install -d "$pkgdir/usr/include/sword" + install -Dm644 canon_{catholic{,2},synodalp}.h \ + "$pkgdir/usr/include/sword" + + cd ../samples + install -Dm644 mods.d/globals.conf \ + "$pkgdir/usr/share/sword/mods.d/globals.conf" + install -Dm644 recommended/sword.conf \ + "$pkgdir/etc/sword.conf" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/sword/curl.patch b/community-testing/sword/curl.patch new file mode 100644 index 000000000..63fd4433c --- /dev/null +++ b/community-testing/sword/curl.patch @@ -0,0 +1,22 @@ +diff -Naur sword-1.6.2.orig/src/mgr/curlftpt.cpp sword-1.6.2.new/src/mgr/curlftpt.cpp +--- sword-1.6.2.orig/src/mgr/curlftpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlftpt.cpp 2011-07-27 00:42:05.000000000 +0200 +@@ -26,7 +26,6 @@ + #include <fcntl.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> +diff -Naur sword-1.6.2.orig/src/mgr/curlhttpt.cpp sword-1.6.2.new/src/mgr/curlhttpt.cpp +--- sword-1.6.2.orig/src/mgr/curlhttpt.cpp 2011-07-27 00:41:40.000000000 +0200 ++++ sword-1.6.2.new/src/mgr/curlhttpt.cpp 2011-07-27 00:42:45.000000000 +0200 +@@ -25,7 +25,6 @@ + #include <cctype> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <swlog.h> diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD new file mode 100644 index 000000000..e7605e4bb --- /dev/null +++ b/community/apper/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 68404 2012-03-24 09:35:57Z idevolder $ +# Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor: Valeriy Lyasotskiy <onestep@ukr.net> +# Contributor: Zom <zom@eevul.org> + +pkgname=apper +_pkgmainver=0.7 +pkgver=0.7.1 +pkgrel=6 +pkgdesc="KDE tools for PackageKit" +arch=('i686' 'x86_64') +url="http://kde-apps.org/content/show.php/Apper?content=84745" +license=('GPL') +depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17') +makedepends=('cmake' 'automoc4' 'chrpath') +install="$pkgname.install" +provides=('kpackagekit') +conflicts=('kpackagekit') +replaces=('kpackagekit') +source=("https://launchpad.net/$pkgname/$_pkgmainver/$pkgver/+download/$pkgname-$pkgver.tar.bz2") +sha256sums=('d604e766c788ed26d5e352b7e97477ba58d6fe9e41db0c2649a2a39460bcab98') + +build() { + cd "$pkgname-$pkgver" + [ -d "build" ] && rm -rf build + mkdir build + cd build + + cmake ../ \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + cd build + make DESTDIR="$pkgdir" install + # Hack around cmake rpath bug (debian) + chrpath --list "$pkgdir/usr/bin/apper" + chrpath --replace "/usr/lib/apper" "$pkgdir/usr/bin/apper" +} diff --git a/community/apper/apper.install b/community/apper/apper.install new file mode 100644 index 000000000..9837f1937 --- /dev/null +++ b/community/apper/apper.install @@ -0,0 +1,29 @@ +available() { + which "$1" >/dev/null 2>&1 +} + +updatemime() { + # Setup Menus + if available update-desktop-database + then + update-desktop-database -q /usr/share/applications + fi + + # Setup MIME types + if available update-mime-database + then + update-mime-database /usr/share/mime >/dev/null + fi +} + +post_install() { + updatemime +} + +post_upgrade() { + updatemime +} + +post_remove() { + updatemime +} diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD index 594fa3f30..fb4fc8595 100644 --- a/community/deadbeef/PKGBUILD +++ b/community/deadbeef/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66292 2012-02-23 13:43:57Z allan $ +# $Id: PKGBUILD 68423 2012-03-24 13:07:55Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexey Yakovenko <waker@users.sourceforge.net> pkgname=deadbeef -pkgver=0.5.1 -pkgrel=5 +pkgver=0.5.2 +pkgrel=1 pkgdesc='An audio player for GNU/Linux based on GTK2.' arch=('i686' 'x86_64') url='http://deadbeef.sourceforge.net' @@ -32,19 +32,12 @@ optdepends=('libsamplerate: for Resampler plugin' 'libzip: for vfs_zip plugin') options=('!libtool') install='deadbeef.install' -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch' - 'deadbeef-0.5.1-ffmpeg-version-check-fix.patch') -md5sums=('be8359d1bd9cf7679cf2ca748996e726' - 'd1c913c0ccefef33012732cf0ae49f7f' - '6d22855f61f4d2fea4b343dca76d5e85') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('0810c1b609b6c1ca43578ebf321fdec4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch - patch -Np1 -i ../deadbeef-0.5.1-ffmpeg-version-check-fix.patch - ./configure --prefix=/usr make } diff --git a/community/gdesklets/PKGBUILD b/community/gdesklets/PKGBUILD new file mode 100644 index 000000000..197781d7c --- /dev/null +++ b/community/gdesklets/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 68406 2012-03-24 09:48:30Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: nifan <carlos@nifan.tk> +# Contributor: Roman Kyrylych <roman@archlinux.org> + +pkgname=gdesklets +pkgver=0.36.3 +pkgrel=4 +pkgdesc="System for bringing mini programs (desklets) onto your desktop" +arch=('i686' 'x86_64') +url="http://gdesklets.de/" +license=('GPL') +depends=('libgtop' 'librsvg' 'pygtk' 'desktop-file-utils' 'gnome-icon-theme' 'xdg-utils') +makedepends=('gnome-python' 'intltool') +options=(!libtool) +install=$pkgname.install +source=(http://gdesklets.de/files/$pkgname-$pkgver.tar.bz2 + gdesklets-core-0.36.3-.in-files.patch + fix-vfs.patch + make-gconf-optional.patch) +md5sums=('60c0c4e7301b3e653702b6fe5bf7e698' + '27839bbefc2f6664ff31cff2d48dfeed' + '55ac07d16a571f29033495307c4d0f0c' + '45e81dd0fb20157bb840d006c3a4e2ea') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np0 -i "$srcdir/gdesklets-core-0.36.3-.in-files.patch" + patch -Np1 -i "$srcdir/fix-vfs.patch" + # https://code.launchpad.net/~ballogy/gdesklets/optional-use-gconf-appindicator/+merge/95809 + patch -Np1 -i "$srcdir/make-gconf-optional.patch" + + find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + sed -i 's/python -c/$PYTHON -c/' configure.ac + sed -i 's/python/python2/' shell/plugins/PackageInstaller/__init__.py + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/gdesklets/fix-vfs.patch b/community/gdesklets/fix-vfs.patch new file mode 100644 index 000000000..34f51f5f6 --- /dev/null +++ b/community/gdesklets/fix-vfs.patch @@ -0,0 +1,11 @@ +diff -Naur gdesklets-0.36.3.orig/utils/vfs.py gdesklets-0.36.3/utils/vfs.py +--- gdesklets-0.36.3.orig/utils/vfs.py 2008-03-20 00:00:59.000000000 +0100 ++++ gdesklets-0.36.3/utils/vfs.py 2012-01-10 03:40:42.026593299 +0100 +@@ -21,7 +21,6 @@ + OPEN_WRITE = gnomevfs.OPEN_WRITE + + except ImportError: +- log("Using urllib, because gnomevfs isn't available") + OPEN_READ = "r" + OPEN_WRITE = "w" + diff --git a/community/gdesklets/gdesklets-core-0.36.3-.in-files.patch b/community/gdesklets/gdesklets-core-0.36.3-.in-files.patch new file mode 100644 index 000000000..fc8753e46 --- /dev/null +++ b/community/gdesklets/gdesklets-core-0.36.3-.in-files.patch @@ -0,0 +1,149 @@ +=== modified file 'Makefile.am' +--- Makefile.am 2010-12-14 10:24:59 +0000 ++++ Makefile.am 2011-01-31 01:20:58 +0000 +@@ -11,8 +11,12 @@ + autostartdir = $(sysconfdir)/xdg/autostart + sharedmimepackagedir = $(datadir)/mime/packages + mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes ++pixmapdir = $(datadir)/pixmaps + basicdeskletsdir = ${installdir} + ++# initialize this so we can add to it later ++nobase_dist_install_DATA = ++ + include Makefile_gdesklets.am + include Makefile_python.am + + +=== modified file 'Makefile_gdesklets.am' +--- Makefile_gdesklets.am 2011-01-06 11:01:06 +0000 ++++ Makefile_gdesklets.am 2011-01-31 01:20:58 +0000 +@@ -1,12 +1,14 @@ + # Set the LDFLAGS for this section + AM_LDFLAGS = -module -avoid-version -as-needed + ++# Libraries that get installed in these exact subdirectories + nobase_install_LTLIBRARIES = \ + libdesklets/system/gtop.la \ + utils/svg.la \ + utils/tiling.la \ + utils/x11.la + ++# Scripts that get distributed and installed + dist_install_SCRIPTS = \ + ctrlinfo \ + gdesklets \ +@@ -16,38 +18,62 @@ + gdesklets-shell \ + test-control.py + ++# "System" scripts that get distributed but not installed + dist_noinst_SCRIPTS = autogen.sh + ++# Man page + dist_man_MANS = doc/man/gdesklets.1 + +-EXTRA_DIST = \ +- AUTHORS \ +- COPYING \ +- README \ +- TODO \ +- NEWS \ +- contrib/bash/gdesklets +- ++# The .desktop file ++desktop_in_files = data/gdesklets.desktop.in ++# The shared mime XML file ++sharedmimepackage_in_files = data/gdesklets.xml.in ++ ++# Other odds and ends that get distributed, but not installed ++# It's up to distro package maintainers to install these ++EXTRA_DIST = \ ++ AUTHORS \ ++ COPYING \ ++ README \ ++ TODO \ ++ NEWS \ ++ contrib/bash/gdesklets \ ++ $(desktop_in_files) \ ++ $(sharedmimepackage_in_files) ++ ++# Docs and images that get distributed and installed to these specific ++# directories ++nobase_dist_install_DATA += \ ++ doc/basic/gdesklets-doc.xml \ ++ doc/basic/Images/desklet-context-menu.png \ ++ doc/basic/Images/desklet-start-shell.png \ ++ doc/basic/Images/gdesklets.png \ ++ doc/basic/Images/open-command.png \ ++ doc/basic/Images/preferences.png \ ++ doc/basic/Images/profile.png \ ++ doc/basic/Images/remote.png \ ++ doc/basic/Images/shell.png \ ++ data/about.png \ ++ data/gdesklets.png ++ ++# Additional files that get cleaned by distclean + # See http://www.gnu.org/software/hello/manual/automake/Clean.html + CLEANFILES = \ + po/.intltool-merge-cache + + # The .desktop file +-desktop_in_files = data/gdesklets.desktop.in +-dist_desktop_DATA= $(desktop_in_files) + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + autostart_DATA = $(desktop_in_files:.desktop.in=.desktop) + @INTLTOOL_DESKTOP_RULE@ + + # The shared mime XML file +-sharedmimepackage_in_files = data/gdesklets.xml.in +-dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files) + sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml) + @INTLTOOL_XML_RULE@ + + # And the mime icon +-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png ++dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png + ++# Note, this gets installed in both $(pixmapdir) and $(installdir) + pixmap_DATA = data/gdesklets.png + + libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \ + +=== modified file 'Makefile_python.am' +--- Makefile_python.am 2010-12-14 10:24:59 +0000 ++++ Makefile_python.am 2011-01-31 01:20:58 +0000 +@@ -1,4 +1,4 @@ +-nobase_dist_install_DATA = \ ++nobase_dist_install_DATA += \ + Controls/__init__.py \ + Controls/ArrayBuffer/__init__.py \ + Controls/ArrayBuffer/IArrayBuffer.py \ +@@ -48,21 +48,6 @@ + config/DisplayConfigger.py \ + config/StateSaver.py \ + config/settings.py \ +- data/about.png \ +- data/calendar.png \ +- data/gdesklets.desktop \ +- data/gdesklets.png \ +- data/gdesklets.xml \ +- data/gnome-mime-application-x-gdesklets-display.png \ +- doc/basic/gdesklets-doc.xml \ +- doc/basic/Images/desklet-context-menu.png \ +- doc/basic/Images/desklet-start-shell.png \ +- doc/basic/Images/gdesklets.png \ +- doc/basic/Images/open-command.png \ +- doc/basic/Images/preferences.png \ +- doc/basic/Images/profile.png \ +- doc/basic/Images/remote.png \ +- doc/basic/Images/shell.png \ + display/__init__.py \ + display/ContainerTarget.py \ + display/DataTarget.py \ +@@ -212,4 +197,3 @@ + utils/typeconverter.py \ + utils/vfs.py \ + utils/xdr.py +- + diff --git a/community/gdesklets/gdesklets.install b/community/gdesklets/gdesklets.install new file mode 100644 index 000000000..9ba94ee6b --- /dev/null +++ b/community/gdesklets/gdesklets.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme gnome +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/gdesklets/make-gconf-optional.patch b/community/gdesklets/make-gconf-optional.patch new file mode 100644 index 000000000..8a9e9c2b8 --- /dev/null +++ b/community/gdesklets/make-gconf-optional.patch @@ -0,0 +1,36 @@ +diff -Naur gdesklets-0.36.3.orig/shell/plugins/PackageInstaller/Downloader.py gdesklets-0.36.3/shell/plugins/PackageInstaller/Downloader.py +--- gdesklets-0.36.3.orig/shell/plugins/PackageInstaller/Downloader.py 2008-03-20 00:00:58.000000000 +0100 ++++ gdesklets-0.36.3/shell/plugins/PackageInstaller/Downloader.py 2012-01-10 02:58:26.451869752 +0100 +@@ -61,16 +61,22 @@ + + dest_fd = open(dest, "w") + +- import gconf +- client = gconf.client_get_default() +- use_proxy = client.get_bool('/system/http_proxy/use_http_proxy') +- if (use_proxy != 0): +- host = client.get_string('/system/http_proxy/host') +- port = client.get_int('/system/http_proxy/port') +- if (host != ""): +- http_proxy = "http://" + host + ':' + str(port) +- else: +- http_proxy = None ++ try: ++ import gconf ++ except ImportError: ++ gconf = None ++ if gconf: ++ client = gconf.client_get_default() ++ use_proxy = client.get_bool('/system/http_proxy/use_http_proxy') ++ if (use_proxy != 0): ++ host = client.get_string('/system/http_proxy/host') ++ port = client.get_int('/system/http_proxy/port') ++ if (host != ""): ++ http_proxy = "http://" + host + ':' + str(port) ++ else: ++ http_proxy = None ++ else: ++ http_proxy = None + else: + http_proxy = None + diff --git a/community/gnac/PKGBUILD b/community/gnac/PKGBUILD new file mode 100644 index 000000000..9abd3206f --- /dev/null +++ b/community/gnac/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 68399 2012-03-24 07:12:29Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gnac +pkgver=0.2.4 +pkgrel=2 +pkgdesc="Audio converter for GNOME" +arch=('i686' 'x86_64') +url="http://gnac.sourceforge.net/" +license=('GPL') +depends=('libnotify' 'libunique3' 'gstreamer0.10-base-plugins' 'dconf' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('gstreamer0.10-good-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs') +install=$pkgname.install +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('8794871d1abd8c186dd5b01d53f1e62e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community/gnac/gnac.install b/community/gnac/gnac.install new file mode 100644 index 000000000..aa4c3e059 --- /dev/null +++ b/community/gnac/gnac.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/gupnp-dlna/PKGBUILD b/community/gupnp-dlna/PKGBUILD new file mode 100644 index 000000000..cbb30c5ef --- /dev/null +++ b/community/gupnp-dlna/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 68452 2012-03-24 21:52:20Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=gupnp-dlna +pkgver=0.6.6 +pkgrel=1 +pkgdesc="Library to ease DLNA-related bits for applications using gupnp" +arch=('i686' 'x86_64') +url="http://gupnp.org/" +license=('LGPL') +depends=('gstreamer0.10-base-plugins') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD new file mode 100644 index 000000000..a8b670950 --- /dev/null +++ b/community/rygel/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 68453 2012-03-24 21:52:58Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=rygel +pkgver=0.12.7 +pkgrel=2 +pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Rygel" +license=('LGPL') +depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'sqlite3' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('vala' 'intltool') +optdepends=('gstreamer0.10-good-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'tracker: Share indexed media files') +backup=('etc/rygel.conf') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e26f642ad6b44fef89d4dfea7c9862c0c77bc38a1b45bb63bb0038a9e4e0854d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/rygel/rygel.install b/community/rygel/rygel.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community/rygel/rygel.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index a11c8894c..444fb03c0 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67291 2012-03-07 16:02:37Z svenstaro $ +# $Id: PKGBUILD 68416 2012-03-24 10:22:55Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.87.0 -_pkgver=87.0 +pkgver=0.88.0 +_pkgver=88.0 pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') @@ -17,7 +17,8 @@ makedepends=('boost' 'cmake' 'zip' 'lzma-utils' 'p7zip' 'python2' 'java-environm optdepends=('python2: python-based bots' 'java-runtime: java-based bots') source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('8dc5bfbd95a8fbfc41a07808438fa1aa') + +md5sums=('151bf483f1c3b801b4cede6f02d79ea9') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD new file mode 100644 index 000000000..01eb6df30 --- /dev/null +++ b/community/uget/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 68396 2012-03-24 05:49:50Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=uget +pkgver=1.8.0 +pkgrel=3 +pkgdesc="GTK+ download manager featuring download classification and HTML import" +arch=('i686' 'x86_64') +url="http://urlget.sourceforge.net/" +license=('GPL') +depends=('libnotify' 'gtk3' 'gstreamer0.10' 'curl' 'hicolor-icon-theme' 'xdg-utils') +makedepends=('intltool') +optdepends=('aria2: alternative backend') +install=$pkgname.install +source=(http://downloads.sourceforge.net/urlget/$pkgname-$pkgver.tar.gz) +md5sums=('2e0ad66ecdd0104b8fb27b29fdb44df1') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix aria2 arguments + sed -i 's/\"--enable-xml-rpc\"/"--enable-rpc"/' uget-gtk/UgSetting.c + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-appindicator --with-gtk3 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community/uget/uget.install b/community/uget/uget.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community/uget/uget.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD index beb6b52cd..cb9956ecb 100644 --- a/community/xwax/PKGBUILD +++ b/community/xwax/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63352 2012-01-30 22:33:32Z lfleischer $ +# $Id: PKGBUILD 68434 2012-03-24 14:05:02Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: sputnick <gilles DOT quenot AT gmail DOT com> pkgname=xwax -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc='Open-source vinyl emulation software for Linux.' arch=('i686' 'x86_64') @@ -14,15 +14,15 @@ optdepends=('cdparanoia: for CD import' 'mpg123: for MP3 import' 'ffmpeg: for video fallback import') source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz") -md5sums=('17649401ee16a91f56c1cdc8995a752a') +md5sums=('3be17f0021a791b52c7d097c6a686722') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # Patch "rig.c" to use Arch Linux's default rtprio value + # patch "rig.c" to use Arch Linux's default rtprio value sed -i 's/^#define REALTIME_PRIORITY 80/#define REALTIME_PRIORITY 65/' rig.c - # Patch installation path for "xwax-scan" and "xwax-import" + # patch installation path for "xwax-scan" and "xwax-import" sed -i "s#^EXECDIR = \$(PREFIX)/libexec#EXECDIR = \$(PREFIX)/share/${pkgname}#" Makefile ./configure --enable-alsa --prefix /usr diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 6e1e75200..fc7a9c34f 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 148373 2012-01-30 19:14:16Z ibiru $ +# $Id: PKGBUILD 154258 2012-03-25 02:41:53Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.24.0 -pkgrel=2 +pkgver=7.25.0 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" @@ -15,11 +15,9 @@ license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} - 0001-include-headers-for-tcp-keepalives.patch curlbuild.h) -md5sums=('b93420f80a2baaa61a0f45214eddc2ba' - '710242df6bc318d16eea611e7d1b1410' - '84833972c2ff36abb2bfdd4ac065c2e5' +md5sums=('a56cbe2778b09769f8a5ba17d8f4d92a' + '0e0fd2da19bde6f7be687667e2fac02f' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') @@ -34,8 +32,6 @@ esac build() { cd "$pkgname-$pkgver" - patch -Np1 < "$srcdir/0001-include-headers-for-tcp-keepalives.patch" - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \ diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 1605d798f..3f933fae3 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 152815 2012-03-09 17:34:10Z dreisner $ +# $Id: PKGBUILD 154256 2012-03-25 02:41:50Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=6 +pkgver=7 pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('bad08102fad212cd34405136d9a7eb94' - '4b8cbcbc54b9029c99fd730e257d4436') +md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb' + '09d8af2ba37c5902d904275cb27f1b09') build() { cd "$pkgname-$pkgver" diff --git a/core/kmod/depmod-search.conf b/core/kmod/depmod-search.conf index 3feb67b05..240606a88 100644 --- a/core/kmod/depmod-search.conf +++ b/core/kmod/depmod-search.conf @@ -1,5 +1,5 @@ # -# /etc/depmod.d/depmod.conf +# /lib/depmod.d/search.conf # search updates extramodules built-in diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index 12bc4baa8..ffd1f4175 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 147145 2012-01-23 07:56:33Z foutrelis $ +# $Id: PKGBUILD 154180 2012-03-24 05:59:14Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=1 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('b1159027ca459661f04bc3bac8e79381895933ee214c4d6dba49b7d27204e5d3') +sha256sums=('e028d15e134c10350cd02b14188b31a0c593b3b6c8f2af9a298ecf3e47019e18') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD index 20537ce70..76025dea9 100644 --- a/extra/xf86-video-ast/PKGBUILD +++ b/extra/xf86-video-ast/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 153323 2012-03-12 20:53:14Z andyrtr $ +# $Id: PKGBUILD 154223 2012-03-24 10:34:56Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-ast -pkgver=0.93.9 -pkgrel=2 +pkgver=0.93.10 +pkgrel=1 pkgdesc="X.org ASPEED AST Graphics video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.902') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - ast-0.93.9-vga.patch) -md5sums=('e25c6a55e9d07cc6054d6affc1231296' - '9aa9ea4c568b6563389fa634cb0f7cf0') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('c9d466fef391bdf960f79b82f1f776a1c1ab870e93475c3d1b3d028531fac4e0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/ast-0.93.9-vga.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD index 8f03c11d3..036da6db8 100644 --- a/extra/xf86-video-cirrus/PKGBUILD +++ b/extra/xf86-video-cirrus/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 153329 2012-03-12 20:53:21Z andyrtr $ +# $Id: PKGBUILD 154221 2012-03-24 10:34:01Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-cirrus -pkgver=1.3.2 -pkgrel=8 +pkgver=1.4.0 +pkgrel=1 pkgdesc="X.org Cirrus Logic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - cirrus-1.3.2-git.patch) -md5sums=('8195d03ed0be0975c03441e66a9f53b3' - '3e3677f330f1c24ce0f570c81f2b9de2') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('2b07fa5d4a86acb277d72c7ae35566ae21b08836645c6a88e7662422af5e962e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/cirrus-1.3.2-git.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD index c4a961180..cd82d6686 100644 --- a/extra/xf86-video-i128/PKGBUILD +++ b/extra/xf86-video-i128/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 153338 2012-03-12 20:53:31Z andyrtr $ +# $Id: PKGBUILD 154219 2012-03-24 10:32:19Z jgc $ # Maintainer:Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-i128 -pkgver=1.3.4 -pkgrel=5 +pkgver=1.3.5 +pkgrel=1 pkgdesc="X.org Number 9 I128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - i128-1.3.4-git.patch) -sha1sums=('d5f755dc964eaa067b4efcafafd00814a60df775' - 'c282f9de94ef7225f03034c9c07f40f46bd44bdc') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('3eedeb1e575e96b2ebebdf894c515e8543900aa3f9f85d10120b8240264333ea') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/i128-1.3.4-git.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD index 2f8f5631b..a61b4c3b2 100644 --- a/extra/xf86-video-mach64/PKGBUILD +++ b/extra/xf86-video-mach64/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 153344 2012-03-12 20:53:38Z andyrtr $ +# $Id: PKGBUILD 154217 2012-03-24 10:30:42Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mach64 -pkgver=6.9.0 -pkgrel=3 +pkgver=6.9.1 +pkgrel=1 pkgdesc="X.org mach64 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1') +sha256sums=('9f6ad49f07c8785a64caac6f4aaf58fc7746a24b718491d047c45bc1ee9e834e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr #--enable-dri + ./configure --prefix=/usr --disable-dri make } diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD index 10b01e817..24b7be2d8 100644 --- a/extra/xf86-video-mga/PKGBUILD +++ b/extra/xf86-video-mga/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 153814 2012-03-19 19:03:46Z andyrtr $ +# $Id: PKGBUILD 154215 2012-03-24 10:28:18Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mga -pkgver=1.4.13 -pkgrel=6 +pkgver=1.5.0 +pkgrel=1 pkgdesc="X.org mga video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378' - 'f2f07d2ab7c4fccd127fc890e074049962819ccf') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('ca983d780dd90115c0599980a7a83425b5e4eeb16f2e8c7fed15823fcbe7830e') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr --disable-dri make } diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD index 8eb28448c..b04b376ca 100644 --- a/extra/xf86-video-neomagic/PKGBUILD +++ b/extra/xf86-video-neomagic/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 153936 2012-03-20 20:20:11Z andyrtr $ +# $Id: PKGBUILD 154213 2012-03-24 10:25:08Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-neomagic -pkgver=1.2.5 -pkgrel=7 +pkgver=1.2.6 +pkgrel=1 pkgdesc="X.org neomagic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.diff) -sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3' - '09a8b2d1b1bd1a2d8bfe7b03ba19947f4461e4b4') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('b19ed2a33e8d9a3e2bfc1ae3e8ff49031b7d34dec786e4a5e060e68e48649888') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git-fixes.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index 6a83bdf15..a66f54c29 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,29 +1,24 @@ -# $Id: PKGBUILD 153356 2012-03-12 20:53:53Z andyrtr $ +# $Id: PKGBUILD 154210 2012-03-24 10:22:27Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 -pkgver=6.8.1 -pkgrel=8 +pkgver=6.8.2 +pkgrel=1 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86driproto' 'libdrm' 'mesa') # 'glproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -md5sums=('2b90854a62a4d45d652062f582dc8d13' - '3937776d4427861d0797e47119ac327d') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('7b41135c3d177e61644573e5c16e35fd9eff98b4d6685c9c6de9e33401e904b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - - autoreconf -fi - ./configure --prefix=/usr #--enable-dri + ./configure --prefix=/usr --disable-dri make } diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index e01fa5d93..45e1cf83b 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,28 +1,23 @@ -# $Id: PKGBUILD 153364 2012-03-12 20:54:13Z andyrtr $ +# $Id: PKGBUILD 154208 2012-03-24 10:17:46Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-savage -pkgver=2.3.3 -pkgrel=3 -_gitver=c4022796ec69bb3223d435d8442f9168aebe9c3d +pkgver=2.3.4 +pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') # 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.903' 'savage-dri') -options=(!libtool !makeflags) +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') +options=(!libtool) groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - #http://cgit.freedesktop.org/xorg/driver/xf86-video-savage/snapshot/xf86-video-savage-${_gitver}.tar.gz - ftp://ftp..archlinux.org/other/xf86-video-savage/xf86-video-savage-${_gitver}.tar.gz) -md5sums=('3a7921de0d365ab5dd1af15010807e36') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('3a666a66339686ad4dd85b0665cc300e8a7fc6d38b49a9e8e8d48f393627be49') build() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - autoreconf -fi + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --disable-dri make } diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD index 6ca6aca44..b2eb44b02 100644 --- a/extra/xf86-video-siliconmotion/PKGBUILD +++ b/extra/xf86-video-siliconmotion/PKGBUILD @@ -1,27 +1,24 @@ -# $Id: PKGBUILD 153366 2012-03-12 20:54:19Z andyrtr $ +# $Id: PKGBUILD 154206 2012-03-24 10:14:17Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-siliconmotion -pkgver=1.7.5 -pkgrel=4 +pkgver=1.7.6 +pkgrel=1 pkgdesc="X.org siliconmotion video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - smi-1.7.5-vga.patch) -sha1sums=('946acae0822d51da57abe8b7ed049691bd731589' - '50b0e4aa858d7f8eb6f7e826f62fde23f01afe48') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('a59f1bd21499351b3703c4b77ec007d1299ccb888434d19fabbbeee0a7a14d07') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/smi-1.7.5-vga.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD index 42addf67d..811ef82e5 100644 --- a/extra/xf86-video-sis/PKGBUILD +++ b/extra/xf86-video-sis/PKGBUILD @@ -1,31 +1,23 @@ -# $Id: PKGBUILD 153368 2012-03-12 20:54:25Z andyrtr $ +# $Id: PKGBUILD 154202 2012-03-24 10:11:20Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sis -pkgver=0.10.3 -pkgrel=7 +pkgver=0.10.4 +pkgrel=1 pkgdesc="X.org SiS video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto') +conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-f5dafa24.patch) -sha1sums=('158673747e240b0c33499685a32d46bdaead7cd5' - 'b61c6a78723aa59f8c82152fec42475b611cd1e7') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('4e841080ea524f37d887ef4ee50df5b9f7f5b417abddc9eb8ddad19128c0b10d') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-f5dafa24.patch" - libtoolize --force --copy - aclocal - autoconf - automake - ./configure --prefix=/usr --disable-dri make } diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD index ecbb31fcb..0751690e0 100644 --- a/extra/xf86-video-tdfx/PKGBUILD +++ b/extra/xf86-video-tdfx/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 153372 2012-03-12 20:54:36Z andyrtr $ +# $Id: PKGBUILD 154200 2012-03-24 10:07:16Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-tdfx -pkgver=1.4.3 -pkgrel=8 -_gitver=a985b54c8559d7ff8f5481004d54989ed7499237 +pkgver=1.4.4 +pkgrel=1 pkgdesc="X.org tdfx video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'libdrm' 'xf86driproto' 'mesa>=8.0') # 'glproto') -conflicts=('xorg-server<1.11.99.902') +makedepends=('xorg-server-devel>=1.12.0') +conflicts=('xorg-server<1.12.0') options=(!libtool) groups=('xorg-drivers' 'xorg') -source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - http://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx/snapshot/xf86-video-tdfx-${_gitver}.tar.gz) -sha1sums=('01c13cdec926c1aaa9c8c8855995c6cc38149ab2') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('e0b931dea0fb1ebfaa628a3dc07bf6945b377d3f7bbfd3a43ca4c80c46d48f88') build() { - #cd "${srcdir}/${pkgname}-${pkgver}" - cd ${srcdir}/${pkgname}* - autoreconf -fi - ./configure --prefix=/usr #--enable-dri + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-dri make } diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD index c8551a0f9..0092f0b85 100644 --- a/extra/xf86-video-trident/PKGBUILD +++ b/extra/xf86-video-trident/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 153374 2012-03-12 20:54:43Z andyrtr $ +# $Id: PKGBUILD 154198 2012-03-24 10:03:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-trident -pkgver=1.3.4 -pkgrel=6 +pkgver=1.3.5 +pkgrel=1 pkgdesc="X.org Trident video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel>=1.12.0' 'xf86dgaproto') +conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - trident-1.3.4-git.patch) -sha1sums=('7c40f5c02bddf399862782b708941e79302318af' - 'cba17aad6cf2f051d89e65ffe26242ed62ea4454') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/trident-1.3.4-git.patch ./configure --prefix=/usr make } diff --git a/gnome-unstable/upower/PKGBUILD b/gnome-unstable/upower/PKGBUILD new file mode 100644 index 000000000..98fbfd8ca --- /dev/null +++ b/gnome-unstable/upower/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 154254 2012-03-24 22:31:59Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=upower +pkgver=0.9.15 +pkgrel=2 +pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" +arch=('i686' 'x86_64') +url="http://upower.freedesktop.org" +license=('GPL') +depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') +options=('!libtool') +source=($url/releases/$pkgname-$pkgver.tar.xz) +sha256sums=('d5941480f32dcee47401b3f650485c71f70e7eb0d92537bf4b62410248a6238c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/upower --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD index 46f7a75e8..31170b19f 100644 --- a/libre/mesa-demos-libre/PKGBUILD +++ b/libre/mesa-demos-libre/PKGBUILD @@ -1,36 +1,29 @@ -# $Id$ -# Maintainer: Joseph Yaworski <jy@dervormund.info> +# $Id: PKGBUILD 151279 2012-02-25 12:34:03Z pierre $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor (Parabola): <andre.paulista@adinet.com.uy> pkgname='mesa-demos-libre' pkgver=8.0.1 -pkgrel=1 -arch=(i686 x86_64) +pkgrel=2 +arch=('i686' 'x86_64') pkgdesc="Mesa demos and tools, libre" url="http://mesa3d.sourceforge.net" license=('custom') -depends=('glew>=1.5.6') +depends=('glew') provides=("mesa-demos=$pkgver") replaces=('mesa-demos') -conflicts=('mesa<7.9', 'mesa-demos') -source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.bz2 +conflicts=('mesa-demos') +source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2" mesa-demos-libre.patch LICENSE) - -mksource() { - - wget ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2 \ - -O - | tar xvf - - - pushd mesa-demos-$pkgver - patch -Np1 -i ../mesa-demos-libre.patch - popd - - tar cjf ${pkgname}-${pkgver}.tar.bz2 mesa-demos-${pkgver}/ - -} +md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4' + '1858e95d40ac9e5e0b59753ce9e673e3' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd "${srcdir}/mesa-demos-${pkgver}" + patch -Np1 -i "${srcdir}/mesa-demos-libre.patch" ./configure --prefix=/usr make } @@ -41,6 +34,3 @@ package() { install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos" install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/" } -md5sums=('665a4ad12bff27ca2b655dd16554d36c' - '1858e95d40ac9e5e0b59753ce9e673e3' - '5c65a0fe315dd347e09b1f2826a1df5a') diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD new file mode 100644 index 000000000..2697ece62 --- /dev/null +++ b/multilib-testing/binutils-multilib/PKGBUILD @@ -0,0 +1,85 @@ +# $Id: PKGBUILD 68429 2012-03-24 13:23:39Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <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.22 +pkgrel=5 +_date=20120323 +pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib" +arch=('x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +groups=('multilib-devel') +provides=("binutils=$pkgver-$pkgrel") +conflicts=('binutils') +depends=('glibc>=2.15' '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=('de2ac4298732827f8af706fc24020330') + +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 + + # check the host environment and makes sure all the necessary tools are available + make configure-host + + make tooldir=${pkgdir}/usr + + # Rebuild libiberty.a with -fPIC + cp -a libiberty libiberty-pic + make -C libiberty-pic clean + make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic + + # Rebuild libbfd.a with -fPIC + # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API + cp -a bfd bfd-pic + make -C bfd-pic clean + make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic + + # Rebuild libopcodes.a with -fPIC + cp -a opcodes opcodes-pic + make -C opcodes-pic clean + make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic +} + +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 + + # install libraries rebuilt with -fPIC + install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib + install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib + install -m644 opcodes/libopcodes.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 new file mode 100644 index 000000000..8bf9f3a47 --- /dev/null +++ b/multilib-testing/binutils-multilib/binutils.install @@ -0,0 +1,17 @@ +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 index ea9bf7b80..adb5fbe05 100644 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ b/multilib-testing/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66975 2012-03-03 03:50:38Z heftig $ +# $Id: PKGBUILD 68430 2012-03-24 13:40:21Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -7,10 +7,10 @@ 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.3 -pkgrel=1 +pkgver=4.7.0 +pkgrel=2 #_snapshot=4.6-20120120 -_libstdcppmanver=20111215 +_libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -21,15 +21,13 @@ checkdepends=('dejagnu') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch - gcc-hash-style-both.patch - gcc-4.6.2-cloog-0.17.patch) -md5sums=('773092fe5194353b02bb0110052a972e' - '450772ce32daed97d7383199f8797f33' - '7da5b7ab75b3c29993f953b18bc38579' - '4df25b623799b148a0703eaeec8fdf3f' - '6d9939a2e667376031679ac9f9c49263') + gcc-4.7.0-cloog-0.17.patch) +md5sums=('2a0f1d99fda235c29d40b561f81d9a77' + '489d2f5311535800a120efd8d18db719' + 'ec24c32d3d1030c2bc8cb2ad2d1dc629' + '575f7d17b022e609447a590e481b18b5') if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -46,11 +44,10 @@ build() { # Do not run fixincludes sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - patch -Np1 -i ${srcdir}/gcc_pure64-multilib.patch - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch + patch -p1 -i ${srcdir}/gcc_pure64-multilib.patch # compatibility with latest cloog - patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch + patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch echo ${pkgver} > gcc/BASE-VER @@ -70,7 +67,9 @@ build() { --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ + --with-linker-hash-style=gnu \ --enable-multilib --disable-libssp \ + --disable-build-with-cxx --disable-build-poststage1-with-cxx \ --enable-checking=release --with-fpmath=sse make } @@ -90,14 +89,14 @@ check() { package_gcc-libs-multilib() { pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel") + depends=('glibc>=2.15' "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 libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src libitm; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install @@ -108,10 +107,10 @@ package_gcc-libs-multilib() 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} + rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} # remove stuff in lib32-gcc-libs - rm -rf ${pkgdir}/usr/lib32 + rm -r ${pkgdir}/usr/lib32 # remove static libraries find ${pkgdir} -name *.a -delete @@ -124,11 +123,11 @@ package_gcc-libs-multilib() package_lib32-gcc-libs() { pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver") + depends=('lib32-glibc>=2.15' "gcc-libs>=$pkgver") cd gcc-build make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src libitm; do make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done @@ -140,8 +139,8 @@ package_lib32-gcc-libs() rm ${pkgdir}/usr/lib32/libgfortran.spec # remove stuff in gcc-libs-multilib - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/info + rm -r ${pkgdir}/usr/lib + rm -r ${pkgdir}/usr/share/info # remove static libraries find ${pkgdir} -name *.a -delete @@ -162,35 +161,30 @@ package_gcc-multilib() cd gcc-build - # unfortunately it is much, much easier to install the lot and clean-up the mess... make -j1 DESTDIR=${pkgdir} install + + install -d $pkgdir/usr/share/gdb/auto-load + mv $pkgdir/usr/{lib/libstdc++.so.6.0.17-gdb.py,share/gdb/auto-load} + + # unfortunately it is much, much easier to install the lot and clean-up the mess... 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 $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{libcaf_single,libgfortranbegin}.a rm -r $pkgdir/usr/lib{,32}/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.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++ - - # install gengtype for plugin support - install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - - # plugin headers are all over the place at the moment... - for i in common objc pragma pretty-print; do - ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h - done + ln -s /usr/bin/cpp ${pkgdir}/lib/cpp + ln -s gcc ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 cat > $pkgdir/usr/bin/c89 <<"EOF" @@ -223,7 +217,7 @@ EOF # install the libstdc++ man pages install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/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 \ @@ -248,7 +242,9 @@ package_gcc-fortran-multilib() # remove libraries included in gcc-libs rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* rm ${pkgdir}/usr/share/info/libquadmath.info - + + ln -s gfortran ${pkgdir}/usr/bin/f95 + # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION @@ -290,6 +286,8 @@ package_gcc-ada-multilib() make -j1 DESTDIR=${pkgdir} INSTALL="install" \ INSTALL_DATA="install -m644" install-gnatlib + ln -s gcc ${pkgdir}/usr/bin/gnatgcc + # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION diff --git a/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch b/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch new file mode 100644 index 000000000..c7146fa04 --- /dev/null +++ b/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch @@ -0,0 +1,24 @@ +diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure +--- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 ++++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 +@@ -6049,8 +6049,8 @@ + LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" + + if test "${cloog_org}" = yes ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 +-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 ++$as_echo_n "checking for version 0.17 of CLooG... " >&6; } + if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +@@ -6061,8 +6061,7 @@ + main () + { + #if CLOOG_VERSION_MAJOR != 0 \ +- || CLOOG_VERSION_MINOR != 16 \ +- || CLOOG_VERSION_REVISION < 1 ++ || CLOOG_VERSION_MINOR != 17 + choke me + #endif + ; diff --git a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch b/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch index 73df6b873..b5576ae0e 100644 --- a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch +++ b/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch @@ -1,24 +1,22 @@ -diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h ---- gcc-4.6-20111223/gcc/config/i386/linux64.h 2011-09-08 11:12:35.000000000 +0200 -+++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h 2012-01-14 19:52:33.688573352 +0100 -@@ -63,7 +63,7 @@ - done. */ +diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h +--- gcc-4.7.0/gcc/config/i386/linux64.h 2011-07-07 17:38:34.000000000 +0200 ++++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h 2012-03-24 11:52:58.926204014 +0100 +@@ -29,5 +29,5 @@ + #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" #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" - - #if TARGET_64BIT_DEFAULT - #define SPEC_32 "m32" -diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 ---- gcc-4.6-20111223/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200 -+++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 2012-01-14 19:50:27.346242617 +0100 -@@ -25,7 +25,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 + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" +diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64 +--- gcc-4.7.0/gcc/config/i386/t-linux64 2011-11-02 16:23:48.000000000 +0100 ++++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64 2012-03-24 11:52:44.119651885 +0100 +@@ -34,6 +34,6 @@ + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) + MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-MULTILIB_OSDIRNAMES = m64=../lib64 +-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = m64=../lib ++MULTILIB_OSDIRNAMES+= m32=../lib32 + MULTILIB_OSDIRNAMES+= mx32=../libx32 diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 72a563645..e6298fdc0 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66927 2012-03-01 17:16:36Z heftig $ +# $Id: PKGBUILD 68428 2012-03-24 13:21:15Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <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.15 -pkgrel=7 +pkgrel=8 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -19,7 +19,8 @@ depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=4.6') options=('!strip' '!emptydirs') source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch + glibc-2.15-do-not-install-timezone-files.patch + glibc-2.15-do-not-install-timezone-files-2.patch glibc-__i686.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.14-libdl-crash.patch @@ -48,7 +49,8 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.15-nearbyintf-rounding.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '4dadb9203b69a3210d53514bb46f41c3' + '7ef69c530a15106de93e4de2df2d393e' + 'b6c619e5cf91829a15ce34dccef676d5' '40cd342e21f71f5e49e32622b25acc52' 'e60e33591c9ec1447e4cddadcbb9cf3a' '6970bcfeb3bf88913436d5112d16f588' @@ -69,7 +71,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7a2998a04ebfcf8bf820540f490ce714' '0d77d20fa7fe2f87ad945cb9edb4d91d' 'bfdefac3d705f41fbf84b1de1dc945af' - 'dded423e264cdd178500f3e8ad62fe66' + '3443e89c1e98089cd6c3e3c23f0c3d85' '340deaa582a95ddde86edb624c3bfea0' '6bbac50e6ff82187654e6a0a7bd849e7' 'c483504cf404ed0b44480af627813a97' @@ -81,9 +83,12 @@ build() { cd ${srcdir}/glibc # timezone data is in separate package (tzdata) - patch -p1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + # http://sourceware.org/git/?p=glibc.git;a=commit;h=482ff4da + patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files.patch + # http://sourceware.org/git/?p=glibc.git;a=commit;h=a458e7fe + patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch - # undefine __i686 for gcc <= 4.6 + # undefine __i686 # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting... patch -p1 -i ${srcdir}/glibc-__i686.patch @@ -98,9 +103,9 @@ build() { # re-export RPC interface until libtirpc is ready as a replacement # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + patch -p1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + patch -p1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch # fix res_query assertion # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 @@ -108,25 +113,25 @@ build() { # fix up regcomp/regexec # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 - patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + patch -p1 -i ${srcdir}/glibc-2.15-regex.patch # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch + patch -p1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch # revert commit c5a0802a - causes various hangs # https://bugzilla.redhat.com/show_bug.cgi?id=769421 # Note: fedora may have actual fix (not submitted upstream yet...) # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch - patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch # fix realloc usage in vfscanf # http://sourceware.org/git/?p=glibc.git;a=commit;h=20b38e03 - patch -Np1 -i ${srcdir}/glibc-2.15-scanf.patch + patch -p1 -i ${srcdir}/glibc-2.15-scanf.patch # fix ifunc relocations # http://sourceware.org/git/?p=glibc.git;a=commit;h=6ee65ed6 - patch -Np1 -i ${srcdir}/glibc-2.15-ifunc.patch + patch -p1 -i ${srcdir}/glibc-2.15-ifunc.patch # fix AVX detection # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09 @@ -167,8 +172,7 @@ build() { patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch # vfprintf nargs overflow - CVE-2012-0864 - # http://sourceware.org/bugzilla/show_bug.cgi?id=13656 - # http://sourceware.org/ml/libc-alpha/2012-02/msg00328.html + # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c1f4834 patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch # avoid out ouf bounds read in __libc_res_nquerydomain diff --git a/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch new file mode 100644 index 000000000..d28237f85 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch @@ -0,0 +1,20 @@ +diff --git a/timezone/Makefile b/timezone/Makefile +index 00bfba6..9e55a6a 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -45,7 +45,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. + CPPFLAGS-zic = -DNOT_IN_libc + + ifeq ($(have-ksh),yes) +-install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab + install-bin-script = tzselect + generated += tzselect + endif +@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make + -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new + chmod 555 $@.new + mv -f $@.new $@ +- +-$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \ +- $(inst_zonedir)/%: % $(+force) +- $(do-install) diff --git a/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch b/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch new file mode 100644 index 000000000..e4f29bc1a --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch @@ -0,0 +1,124 @@ +diff --git a/timezone/Makefile b/timezone/Makefile +index e8fb716..d5ea538 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -1,4 +1,4 @@ +-# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc. ++# Copyright (C) 1998-2000,2002,2005,2007,2012 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + + # The GNU C Library is free software; you can redistribute it and/or +@@ -49,33 +49,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. + + CPPFLAGS-zic = -DNOT_IN_libc + +-# z.* use this variable. +-define nl +- +- +-endef +-ifndef avoid-generated +-ifndef inhibit_timezone_rules +--include $(addprefix $(objpfx)z.,$(tzfiles)) +-endif +-endif +- +-# Make these absolute file names. +-installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \ +- $(addprefix $(inst_zonedir)/, \ +- $(localtime-file))) +-installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \ +- $(addprefix $(inst_zonedir)/, \ +- $(posixrules-file))) +- +-ifeq ($(cross-compiling),no) +-# Don't try to install the zoneinfo files since we can't run zic. +-install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ +- $(zonenames:%=posix/%) \ +- $(zonenames:%=right/%)) \ +- $(installed-localtime-file) $(installed-posixrules-file) +-endif +- + ifeq ($(have-ksh),yes) + install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab + install-bin-script = tzselect +@@ -85,79 +58,6 @@ endif + include ../Rules + + +-$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile +-# Kludge alert: we use an implicit rule (in what we are generating here) +-# because that is the only way to tell Make that the one command builds all +-# the files. +-# The extra kludge for the $(tzlinks) files is necessary since running zic +-# this file requires all other files to exist. Blech! +- $(make-target-directory) +- (echo 'define $*-zones' ;\ +- $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\ +- echo 'endef' ;\ +- echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))' ;\ +- echo 'ifdef $*-zones' ;\ +- if test x$(findstring $*, $(tzlinks)) != x; then \ +- echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\ +- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\ +- echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\ +- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\ +- echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \' ;\ +- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\ +- fi ;\ +- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\ +- echo '$< $$(objpfx)zic leapseconds yearistype' ;\ +- echo ' $$(tzcompile)' ;\ +- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\ +- echo '$< $$(objpfx)zic /dev/null yearistype' ;\ +- echo ' $$(tzcompile)' ;\ +- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\ +- echo '$< $$(objpfx)zic $$(leapseconds) yearistype' ;\ +- echo ' $$(tzcompile)' ;\ +- echo 'endif' ;\ +- echo 'zonenames := $$(zonenames) $$($*-zones)' ;\ +- ) > $@.new +- mv $@.new $@ +- +-.PHONY: echo-zonenames +-echo-zonenames: +- @echo 'Known zones: $(zonenames)' +- +- +-# We have to use `-d $(inst_zonedir)' to explictly tell zic where to +-# place the output files although $(zonedir) is compiled in. But the +-# user might have set $(install_root) on the command line of `make install'. +-zic-cmd = $(built-program-cmd) -d $(inst_zonedir) +-tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \ +- -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $< +- +-# The source files specify the zone names relative to the -d directory, +-# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix +-# and the like. This magic extracts /posix or /right if it's the first +-# component after $(inst_zonedir) in the target name $@. +-target-zone-flavor = $(filter /posix /right, \ +- /$(firstword $(subst /, , \ +- $(patsubst $(inst_zonedir)/%,%,$@)))) +- +-ifdef localtime +-$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \ +- $(+force) +- $(make-target-directory) +- if test -r $@; then \ +- echo Site timezone NOT reset to Factory.; \ +- else \ +- rm -f $@T; \ +- $(SHELL) $(..)scripts/rellns-sh $< $@T; \ +- mv -f $@T $@; \ +- fi +-endif +-ifdef posixrules +-$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \ +- $(+force) +- $(zic-cmd) -p $(posixrules) +-endif +- +- + $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o + + tz-cflags = -DTZDIR='"$(zonedir)"' \ diff --git a/multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch b/multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch index 6a37bde68..f8dde53f5 100644 --- a/multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch +++ b/multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch @@ -97,7 +97,7 @@ index 0000000..13c66c0 +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c -index 863cd5d..022e72b 100644 +index 863cd5d..c802e46 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) @@ -123,22 +123,26 @@ index 863cd5d..022e72b 100644 /* Positional parameters refer to arguments directly. This could also determine the maximum number of arguments. Track the -@@ -1698,13 +1702,33 @@ do_positional: +@@ -1698,13 +1702,38 @@ do_positional: /* Determine the number of arguments the format string consumes. */ nargs = MAX (nargs, max_ref_arg); ++ /* Calculate total size needed to represent a single argument across ++ all three argument-related arrays. */ + bytes_per_arg = sizeof (*args_value) + sizeof (*args_size) + + sizeof (*args_type); + + /* Check for potential integer overflow. */ -+ if (nargs > SIZE_MAX / bytes_per_arg) ++ if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0)) + { ++ __set_errno (ERANGE); + done = -1; + goto all_done; + } - /* Allocate memory for the argument descriptions. */ +- /* Allocate memory for the argument descriptions. */ - args_type = alloca (nargs * sizeof (int)); ++ /* Allocate memory for all three argument arrays. */ + if (__libc_use_alloca (nargs * bytes_per_arg)) + args_value = alloca (nargs * bytes_per_arg); + else @@ -151,6 +155,8 @@ index 863cd5d..022e72b 100644 + } + } + ++ /* Set up the remaining two arrays to each point past the end of the ++ prior array, since space for all three has been allocated now. */ + args_size = &args_value[nargs].pa_int; + args_type = &args_size[nargs]; memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0', @@ -161,7 +167,7 @@ index 863cd5d..022e72b 100644 /* XXX Could do sanity check here: If any element in ARGS_TYPE is still zero after this loop, format is invalid. For now we -@@ -1973,8 +1997,8 @@ do_positional: +@@ -1973,8 +2002,8 @@ do_positional: } all_done: diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD index f81121e6b..ffe588144 100644 --- a/multilib-testing/libtool-multilib/PKGBUILD +++ b/multilib-testing/libtool-multilib/PKGBUILD @@ -1,5 +1,5 @@ -# $Id: PKGBUILD 66976 2012-03-03 03:51:25Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 68431 2012-03-24 13:41:08Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -8,12 +8,12 @@ pkgbase=libtool-multilib pkgname=(libtool-multilib lib32-libltdl) pkgver=2.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="A generic library support script for multilib" arch=('x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -_gccver=4.6.3 +_gccver=4.7.0 makedepends=("gcc-multilib=$_gccver") options=('!libtool') source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig}) diff --git a/staging/icu/PKGBUILD b/staging/icu/PKGBUILD new file mode 100644 index 000000000..9e716368f --- /dev/null +++ b/staging/icu/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 154242 2012-03-24 17:08:37Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Art Gramlich <art@gramlich-net.com> + +pkgname=icu +pkgver=49.1 +pkgrel=1 +pkgdesc="International Components for Unicode library" +arch=(i686 x86_64) +url="http://www.icu-project.org/" +license=('custom:"icu"') +depends=('gcc-libs' 'sh') +source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz + http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz + icu.8198.revert.icu5431.patch) +md5sums=('f9e3e48a7cb6cc5f432e3f61fcc82099' + 'ebd5470fc969c75e52baf4af94a9ee82') + +build() { + cd ${srcdir}/icu/source + # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200 + patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man + make +} + +package() { + cd ${srcdir}/icu/source + make -j1 DESTDIR=${pkgdir} install + + # Install license + install -Dm644 ${srcdir}/icu/license.html ${pkgdir}/usr/share/licenses/icu/license.html +} diff --git a/staging/icu/icu.8198.revert.icu5431.patch b/staging/icu/icu.8198.revert.icu5431.patch new file mode 100644 index 000000000..4c3e78b8e --- /dev/null +++ b/staging/icu/icu.8198.revert.icu5431.patch @@ -0,0 +1,129 @@ +Index: icu/trunk/source/layout/IndicReordering.cpp
+===================================================================
+--- icu/trunk/source/layout/IndicReordering.cpp (revision 25772)
++++ icu/trunk/source/layout/IndicReordering.cpp (revision 26090)
+@@ -126,4 +126,8 @@
+ FeatureMask fSMFeatures;
+
++ LEUnicode fPreBaseConsonant;
++ LEUnicode fPreBaseVirama;
++ le_int32 fPBCIndex;
++ FeatureMask fPBCFeatures;
+
+ void saveMatra(LEUnicode matra, le_int32 matraIndex, IndicClassTable::CharClass matraClass)
+@@ -172,5 +176,6 @@
+ fMatraFeatures(0), fMPreOutIndex(-1), fMPreFixups(mpreFixups),
+ fVMabove(0), fVMpost(0), fVMIndex(0), fVMFeatures(0),
+- fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0)
++ fSMabove(0), fSMbelow(0), fSMIndex(0), fSMFeatures(0),
++ fPreBaseConsonant(0), fPreBaseVirama(0), fPBCIndex(0), fPBCFeatures(0)
+ {
+ // nothing else to do...
+@@ -191,4 +196,6 @@
+ fVMabove = fVMpost = 0;
+ fSMabove = fSMbelow = 0;
++
++ fPreBaseConsonant = fPreBaseVirama = 0;
+ }
+
+@@ -386,4 +393,12 @@
+ }
+
++ void notePreBaseConsonant(le_uint32 index,LEUnicode PBConsonant, LEUnicode PBVirama, FeatureMask features)
++ {
++ fPBCIndex = index;
++ fPreBaseConsonant = PBConsonant;
++ fPreBaseVirama = PBVirama;
++ fPBCFeatures = features;
++ }
++
+ void noteBaseConsonant()
+ {
+@@ -465,4 +480,20 @@
+ }
+
++ void writePreBaseConsonant()
++ {
++ // The TDIL spec says that consonant + virama + RRA should produce a rakar in Malayalam. However,
++ // it seems that almost none of the fonts for Malayalam are set up to handle this.
++ // So, we're going to force the issue here by using the rakar as defined with RA in most fonts.
++
++ if (fPreBaseConsonant == 0x0d31) { // RRA
++ fPreBaseConsonant = 0x0d30; // RA
++ }
++
++ if (fPreBaseConsonant != 0) {
++ writeChar(fPreBaseConsonant, fPBCIndex, fPBCFeatures);
++ writeChar(fPreBaseVirama,fPBCIndex-1,fPBCFeatures);
++ }
++ }
++
+ le_int32 getOutputIndex()
+ {
+@@ -723,4 +754,5 @@
+ }
+
++
+ IndicClassTable::CharClass charClass = CC_RESERVED;
+ IndicClassTable::CharClass nextClass = CC_RESERVED;
+@@ -730,7 +762,9 @@
+ le_bool seenVattu = FALSE;
+ le_bool seenBelowBaseForm = FALSE;
++ le_bool seenPreBaseForm = FALSE;
+ le_bool hasNukta = FALSE;
+ le_bool hasBelowBaseForm = FALSE;
+ le_bool hasPostBaseForm = FALSE;
++ le_bool hasPreBaseForm = FALSE;
+
+ if (postBase < markStart && classTable->isNukta(chars[postBase])) {
+@@ -746,12 +780,20 @@
+ hasBelowBaseForm = IndicClassTable::hasBelowBaseForm(charClass) && !hasNukta;
+ hasPostBaseForm = IndicClassTable::hasPostBaseForm(charClass) && !hasNukta;
++ hasPreBaseForm = IndicClassTable::hasPreBaseForm(charClass) && !hasNukta;
+
+ if (IndicClassTable::isConsonant(charClass)) {
+ if (postBaseLimit == 0 || seenVattu ||
+ (baseConsonant > baseLimit && !classTable->isVirama(chars[baseConsonant - 1])) ||
+- !(hasBelowBaseForm || hasPostBaseForm)) {
++ !(hasBelowBaseForm || hasPostBaseForm || hasPreBaseForm)) {
+ break;
+ }
+
++ // Note any pre-base consonants
++ if ( baseConsonant == lastConsonant && lastConsonant > 0 &&
++ hasPreBaseForm && classTable->isVirama(chars[baseConsonant - 1])) {
++ output.notePreBaseConsonant(lastConsonant,chars[lastConsonant],chars[lastConsonant-1],tagArray2);
++ seenPreBaseForm = TRUE;
++
++ }
+ // consonants with nuktas are never vattus
+ seenVattu = IndicClassTable::isVattu(charClass) && !hasNukta;
+@@ -786,10 +828,12 @@
+
+ // write any pre-base consonants
++ output.writePreBaseConsonant();
++
+ le_bool supressVattu = TRUE;
+
+ for (i = baseLimit; i < baseConsonant; i += 1) {
+ LEUnicode ch = chars[i];
+- // Don't put 'blwf' on first consonant.
+- FeatureMask features = (i == baseLimit? tagArray2 : tagArray1);
++ // Don't put 'pstf' or 'blwf' on anything before the base consonant.
++ FeatureMask features = tagArray1 & ~( pstfFeatureMask | blwfFeatureMask );
+
+ charClass = classTable->getCharClass(ch);
+@@ -842,5 +886,5 @@
+
+ // write below-base consonants
+- if (baseConsonant != lastConsonant) {
++ if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+ for (i = bcSpan + 1; i < postBase; i += 1) {
+ output.writeChar(chars[i], i, tagArray1);
+@@ -872,5 +916,5 @@
+ // write post-base consonants
+ // FIXME: does this put the right tags on post-base consonants?
+- if (baseConsonant != lastConsonant) {
++ if (baseConsonant != lastConsonant && !seenPreBaseForm) {
+ if (postBase <= lastConsonant) {
+ for (i = postBase; i <= lastConsonant; i += 1) {
diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD new file mode 100644 index 000000000..9f922516f --- /dev/null +++ b/testing/binutils/PKGBUILD @@ -0,0 +1,93 @@ +# $Id: PKGBUILD 154190 2012-03-24 08:47:35Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc + +pkgname=binutils +pkgver=2.22 +pkgrel=5 +_date=20120323 +pkgdesc="A set of programs to assemble and manipulate binary and object files" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +groups=('base-devel') +depends=('glibc>=2.15' 'zlib') +checkdepends=('dejagnu') +options=('!libtool' '!distcc' '!ccache') +install=binutils.install +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) +md5sums=('de2ac4298732827f8af706fc24020330') + +mksource() { + mkdir ${pkgname}-${_date} + cd ${pkgname}-${_date} + export _TAG=binutils-2_22-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 + + # check the host environment and makes sure all the necessary tools are available + make configure-host + + make tooldir=${pkgdir}/usr + + # Rebuild libiberty.a with -fPIC + cp -a libiberty libiberty-pic + make -C libiberty-pic clean + make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic + + # Rebuild libbfd.a with -fPIC + # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API + cp -a bfd bfd-pic + make -C bfd-pic clean + make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic + + # Rebuild libopcodes.a with -fPIC + cp -a opcodes opcodes-pic + make -C opcodes-pic clean + make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic +} + +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 + + # install libraries rebuilt with -fPIC + install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib + install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib + install -m644 opcodes/libopcodes.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 new file mode 100644 index 000000000..8bf9f3a47 --- /dev/null +++ b/testing/binutils/binutils.install @@ -0,0 +1,17 @@ +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/gcc/PKGBUILD b/testing/gcc/PKGBUILD index fdd534215..809e81190 100644 --- a/testing/gcc/PKGBUILD +++ b/testing/gcc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 151793 2012-03-03 01:34:23Z allan $ +# $Id: PKGBUILD 154192 2012-03-24 08:55:36Z 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' 'gcc-go') -pkgver=4.6.3 +pkgver=4.7.0 pkgrel=1 #_snapshot=4.6-20120120 -_libstdcppmanver=20111215 # Note: check source directory name when updating this +_libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -18,15 +18,14 @@ checkdepends=('dejagnu') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch - gcc-hash-style-both.patch - gcc-4.6.2-cloog-0.17.patch) -md5sums=('773092fe5194353b02bb0110052a972e' - '450772ce32daed97d7383199f8797f33' - '4030ee1c08dd1e843c0225b772360e76' - '4df25b623799b148a0703eaeec8fdf3f' - '6d9939a2e667376031679ac9f9c49263') + gcc-4.7.0-cloog-0.17.patch) +md5sums=('2a0f1d99fda235c29d40b561f81d9a77' + '489d2f5311535800a120efd8d18db719' + 'ced48436c1b3c981d721a829f1094de1' + '575f7d17b022e609447a590e481b18b5') + if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -44,12 +43,11 @@ build() { sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in if [ "${CARCH}" = "x86_64" ]; then - patch -Np1 -i ${srcdir}/gcc_pure64.patch + patch -p1 -i ${srcdir}/gcc_pure64.patch fi - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch # compatibility with latest cloog - patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch + patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch echo ${pkgver} > gcc/BASE-VER @@ -69,7 +67,9 @@ build() { --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ + --with-linker-hash-style=gnu \ --disable-multilib --disable-libssp \ + --disable-build-with-cxx --disable-build-poststage1-with-cxx \ --enable-checking=release make } @@ -90,23 +90,24 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC" groups=('base') - depends=('glibc>=2.14') + depends=('glibc>=2.15') install=gcc-libs.install cd gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src libitm; 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 -C $CHOST/libitm 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} + rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} # remove static libraries find ${pkgdir} -name *.a -delete @@ -125,8 +126,12 @@ package_gcc() cd gcc-build - # unfortunately it is much, much easier to install the lot and clean-up the mess... make -j1 DESTDIR=${pkgdir} install + + install -d $pkgdir/usr/share/gdb/auto-load + mv $pkgdir/usr/{lib/libstdc++.so.6.0.17-gdb.py,share/gdb/auto-load} + + # unfortunately it is much, much easier to install the lot and clean-up the mess... 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 @@ -135,25 +140,15 @@ package_gcc() 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/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.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++ - - # install gengtype for plugin support - install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - - # plugin headers are all over the place at the moment... - for i in common objc pragma pretty-print; do - ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h - done + ln -s /usr/bin/cpp ${pkgdir}/lib/cpp + ln -s gcc ${pkgdir}/usr/bin/cc # POSIX conformance launcher scripts for c89 and c99 cat > $pkgdir/usr/bin/c89 <<"EOF" @@ -186,7 +181,7 @@ EOF # install the libstdc++ man pages install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/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 \ @@ -209,7 +204,9 @@ package_gcc-fortran() # remove libraries included in gcc-libs rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* rm ${pkgdir}/usr/share/info/libquadmath.info - + + ln -s gfortran ${pkgdir}/usr/bin/f95 + # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION @@ -242,6 +239,8 @@ package_gcc-ada() cd gcc-build/gcc make -j1 DESTDIR=$pkgdir ada.install-{common,info} install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver + + ln -s gcc ${pkgdir}/usr/bin/gnatgcc # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ diff --git a/testing/gcc/gcc-4.7.0-cloog-0.17.patch b/testing/gcc/gcc-4.7.0-cloog-0.17.patch new file mode 100644 index 000000000..c7146fa04 --- /dev/null +++ b/testing/gcc/gcc-4.7.0-cloog-0.17.patch @@ -0,0 +1,24 @@ +diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure +--- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 ++++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 +@@ -6049,8 +6049,8 @@ + LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" + + if test "${cloog_org}" = yes ; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 +-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 ++$as_echo_n "checking for version 0.17 of CLooG... " >&6; } + if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +@@ -6061,8 +6061,7 @@ + main () + { + #if CLOOG_VERSION_MAJOR != 0 \ +- || CLOOG_VERSION_MINOR != 16 \ +- || CLOOG_VERSION_REVISION < 1 ++ || CLOOG_VERSION_MINOR != 17 + choke me + #endif + ; diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch index 8c0baf8e2..a9b09bbcf 100644 --- a/testing/gcc/gcc_pure64.patch +++ b/testing/gcc/gcc_pure64.patch @@ -1,26 +1,26 @@ -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,8 +49,8 @@ - When the -shared link option is used a final link is not being - done. */ +diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h +--- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000 ++++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000 +@@ -28,6 +28,6 @@ + #define GNU_USER_LINK_EMULATION64 "elf_x86_64" + #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.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 + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" +diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64 +--- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000 ++++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000 +@@ -34,8 +34,8 @@ + comma=, + MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) + MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) +-MULTILIB_OSDIRNAMES = m64=../lib64 +-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) ++MULTILIB_OSDIRNAMES = m64=../lib ++MULTILIB_OSDIRNAMES+= m32=../lib32 + MULTILIB_OSDIRNAMES+= mx32=../libx32 LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index aee5ee01b..58cfee44d 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151703 2012-03-01 05:49:13Z allan $ +# $Id: PKGBUILD 154260 2012-03-25 02:50:05Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,14 +6,14 @@ pkgname=glibc pkgver=2.15 -pkgrel=7 +pkgrel=9 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.1.6' 'tzdata') +depends=('linux-api-headers>=3.3' 'tzdata') makedepends=('gcc>=4.6') backup=(etc/gai.conf etc/locale.gen @@ -21,7 +21,8 @@ backup=(etc/gai.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.15-do-not-install-timezone-files.patch + glibc-2.15-do-not-install-timezone-files-2.patch glibc-__i686.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.14-libdl-crash.patch @@ -48,11 +49,13 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.15-non-signalling-comparisons.patch glibc-2.15-rintf-rounding.patch glibc-2.15-nearbyintf-rounding.patch + glibc-2.15-confstr-strdup.patch nscd locale.gen.txt locale-gen) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '4dadb9203b69a3210d53514bb46f41c3' + '7ef69c530a15106de93e4de2df2d393e' + 'b6c619e5cf91829a15ce34dccef676d5' '40cd342e21f71f5e49e32622b25acc52' 'e60e33591c9ec1447e4cddadcbb9cf3a' '6970bcfeb3bf88913436d5112d16f588' @@ -73,12 +76,13 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7a2998a04ebfcf8bf820540f490ce714' '0d77d20fa7fe2f87ad945cb9edb4d91d' 'bfdefac3d705f41fbf84b1de1dc945af' - 'dded423e264cdd178500f3e8ad62fe66' + '3443e89c1e98089cd6c3e3c23f0c3d85' '340deaa582a95ddde86edb624c3bfea0' '6bbac50e6ff82187654e6a0a7bd849e7' 'c483504cf404ed0b44480af627813a97' '1419d61fd1dbc6cdc48bb59da86fa66f' '7ff501435078b1a2622124fbeaafc921' + '41f94da2f8db856b091a2d670d68eee3' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -98,9 +102,12 @@ build() { cd ${srcdir}/glibc # timezone data is in separate package (tzdata) - patch -p1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch + # http://sourceware.org/git/?p=glibc.git;a=commit;h=482ff4da + patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files.patch + # http://sourceware.org/git/?p=glibc.git;a=commit;h=a458e7fe + patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch - # undefine __i686 for gcc <= 4.6 + # undefine __i686 # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting... patch -p1 -i ${srcdir}/glibc-__i686.patch @@ -115,9 +122,9 @@ build() { # re-export RPC interface until libtirpc is ready as a replacement # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch + patch -p1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + patch -p1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch # fix res_query assertion # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 @@ -125,25 +132,25 @@ build() { # fix up regcomp/regexec # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 - patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + patch -p1 -i ${srcdir}/glibc-2.15-regex.patch # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (fedora branch) - patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch + patch -p1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch # revert commit c5a0802a - causes various hangs # https://bugzilla.redhat.com/show_bug.cgi?id=769421 # Note: fedora may have actual fix (not submitted upstream yet...) # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch - patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch + patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch # fix realloc usage in vfscanf # http://sourceware.org/git/?p=glibc.git;a=commit;h=20b38e03 - patch -Np1 -i ${srcdir}/glibc-2.15-scanf.patch + patch -p1 -i ${srcdir}/glibc-2.15-scanf.patch # fix ifunc relocations # http://sourceware.org/git/?p=glibc.git;a=commit;h=6ee65ed6 - patch -Np1 -i ${srcdir}/glibc-2.15-ifunc.patch + patch -p1 -i ${srcdir}/glibc-2.15-ifunc.patch # fix AVX detection # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09 @@ -184,8 +191,7 @@ build() { patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch # vfprintf nargs overflow - CVE-2012-0864 - # http://sourceware.org/bugzilla/show_bug.cgi?id=13656 - # http://sourceware.org/ml/libc-alpha/2012-02/msg00328.html + # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c1f4834 patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch # avoid out ouf bounds read in __libc_res_nquerydomain @@ -208,6 +214,9 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47 patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch + # fix varaible scope issue exposed with gcc-4.7 and -O2 + patch -p1 -i ${srcdir}/glibc-2.15-confstr-strdup.patch + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf diff --git a/testing/glibc/glibc-2.15-confstr-strdup.patch b/testing/glibc/glibc-2.15-confstr-strdup.patch new file mode 100644 index 000000000..5ce9cd232 --- /dev/null +++ b/testing/glibc/glibc-2.15-confstr-strdup.patch @@ -0,0 +1,31 @@ +diff --git a/posix/confstr.c b/posix/confstr.c +index 3c9566d..3ba9e5a 100644 +--- a/posix/confstr.c ++++ b/posix/confstr.c +@@ -104,7 +104,7 @@ confstr (name, buf, len) + } + #endif + restenvs[string_len++] = '\0'; +- string = restenvs; ++ string = strdup(restenvs); + } + break; + +@@ -167,7 +167,7 @@ confstr (name, buf, len) + } + #endif + restenvs[string_len++] = '\0'; +- string = restenvs; ++ string = strdup(restenvs); + } + break; + +@@ -230,7 +230,7 @@ confstr (name, buf, len) + } + #endif + restenvs[string_len++] = '\0'; +- string = restenvs; ++ string = strdup(restenvs); + } + break; + diff --git a/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch new file mode 100644 index 000000000..d28237f85 --- /dev/null +++ b/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch @@ -0,0 +1,20 @@ +diff --git a/timezone/Makefile b/timezone/Makefile +index 00bfba6..9e55a6a 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -45,7 +45,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. + CPPFLAGS-zic = -DNOT_IN_libc + + ifeq ($(have-ksh),yes) +-install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab + install-bin-script = tzselect + generated += tzselect + endif +@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make + -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new + chmod 555 $@.new + mv -f $@.new $@ +- +-$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \ +- $(inst_zonedir)/%: % $(+force) +- $(do-install) diff --git a/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch b/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch new file mode 100644 index 000000000..e4f29bc1a --- /dev/null +++ b/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch @@ -0,0 +1,124 @@ +diff --git a/timezone/Makefile b/timezone/Makefile +index e8fb716..d5ea538 100644 +--- a/timezone/Makefile ++++ b/timezone/Makefile +@@ -1,4 +1,4 @@ +-# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc. ++# Copyright (C) 1998-2000,2002,2005,2007,2012 Free Software Foundation, Inc. + # This file is part of the GNU C Library. + + # The GNU C Library is free software; you can redistribute it and/or +@@ -49,33 +49,6 @@ include ../Makeconfig # Get objpfx defined so we can use it below. + + CPPFLAGS-zic = -DNOT_IN_libc + +-# z.* use this variable. +-define nl +- +- +-endef +-ifndef avoid-generated +-ifndef inhibit_timezone_rules +--include $(addprefix $(objpfx)z.,$(tzfiles)) +-endif +-endif +- +-# Make these absolute file names. +-installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \ +- $(addprefix $(inst_zonedir)/, \ +- $(localtime-file))) +-installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \ +- $(addprefix $(inst_zonedir)/, \ +- $(posixrules-file))) +- +-ifeq ($(cross-compiling),no) +-# Don't try to install the zoneinfo files since we can't run zic. +-install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \ +- $(zonenames:%=posix/%) \ +- $(zonenames:%=right/%)) \ +- $(installed-localtime-file) $(installed-posixrules-file) +-endif +- + ifeq ($(have-ksh),yes) + install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab + install-bin-script = tzselect +@@ -85,79 +58,6 @@ endif + include ../Rules + + +-$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile +-# Kludge alert: we use an implicit rule (in what we are generating here) +-# because that is the only way to tell Make that the one command builds all +-# the files. +-# The extra kludge for the $(tzlinks) files is necessary since running zic +-# this file requires all other files to exist. Blech! +- $(make-target-directory) +- (echo 'define $*-zones' ;\ +- $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\ +- echo 'endef' ;\ +- echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))' ;\ +- echo 'ifdef $*-zones' ;\ +- if test x$(findstring $*, $(tzlinks)) != x; then \ +- echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\ +- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\ +- echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\ +- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\ +- echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \' ;\ +- echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\ +- fi ;\ +- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\ +- echo '$< $$(objpfx)zic leapseconds yearistype' ;\ +- echo ' $$(tzcompile)' ;\ +- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\ +- echo '$< $$(objpfx)zic /dev/null yearistype' ;\ +- echo ' $$(tzcompile)' ;\ +- echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\ +- echo '$< $$(objpfx)zic $$(leapseconds) yearistype' ;\ +- echo ' $$(tzcompile)' ;\ +- echo 'endif' ;\ +- echo 'zonenames := $$(zonenames) $$($*-zones)' ;\ +- ) > $@.new +- mv $@.new $@ +- +-.PHONY: echo-zonenames +-echo-zonenames: +- @echo 'Known zones: $(zonenames)' +- +- +-# We have to use `-d $(inst_zonedir)' to explictly tell zic where to +-# place the output files although $(zonedir) is compiled in. But the +-# user might have set $(install_root) on the command line of `make install'. +-zic-cmd = $(built-program-cmd) -d $(inst_zonedir) +-tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \ +- -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $< +- +-# The source files specify the zone names relative to the -d directory, +-# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix +-# and the like. This magic extracts /posix or /right if it's the first +-# component after $(inst_zonedir) in the target name $@. +-target-zone-flavor = $(filter /posix /right, \ +- /$(firstword $(subst /, , \ +- $(patsubst $(inst_zonedir)/%,%,$@)))) +- +-ifdef localtime +-$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \ +- $(+force) +- $(make-target-directory) +- if test -r $@; then \ +- echo Site timezone NOT reset to Factory.; \ +- else \ +- rm -f $@T; \ +- $(SHELL) $(..)scripts/rellns-sh $< $@T; \ +- mv -f $@T $@; \ +- fi +-endif +-ifdef posixrules +-$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \ +- $(+force) +- $(zic-cmd) -p $(posixrules) +-endif +- +- + $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o + + tz-cflags = -DTZDIR='"$(zonedir)"' \ diff --git a/testing/glibc/glibc-2.15-vfprintf-nargs.patch b/testing/glibc/glibc-2.15-vfprintf-nargs.patch index 6a37bde68..f8dde53f5 100644 --- a/testing/glibc/glibc-2.15-vfprintf-nargs.patch +++ b/testing/glibc/glibc-2.15-vfprintf-nargs.patch @@ -97,7 +97,7 @@ index 0000000..13c66c0 +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c -index 863cd5d..022e72b 100644 +index 863cd5d..c802e46 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) @@ -123,22 +123,26 @@ index 863cd5d..022e72b 100644 /* Positional parameters refer to arguments directly. This could also determine the maximum number of arguments. Track the -@@ -1698,13 +1702,33 @@ do_positional: +@@ -1698,13 +1702,38 @@ do_positional: /* Determine the number of arguments the format string consumes. */ nargs = MAX (nargs, max_ref_arg); ++ /* Calculate total size needed to represent a single argument across ++ all three argument-related arrays. */ + bytes_per_arg = sizeof (*args_value) + sizeof (*args_size) + + sizeof (*args_type); + + /* Check for potential integer overflow. */ -+ if (nargs > SIZE_MAX / bytes_per_arg) ++ if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0)) + { ++ __set_errno (ERANGE); + done = -1; + goto all_done; + } - /* Allocate memory for the argument descriptions. */ +- /* Allocate memory for the argument descriptions. */ - args_type = alloca (nargs * sizeof (int)); ++ /* Allocate memory for all three argument arrays. */ + if (__libc_use_alloca (nargs * bytes_per_arg)) + args_value = alloca (nargs * bytes_per_arg); + else @@ -151,6 +155,8 @@ index 863cd5d..022e72b 100644 + } + } + ++ /* Set up the remaining two arrays to each point past the end of the ++ prior array, since space for all three has been allocated now. */ + args_size = &args_value[nargs].pa_int; + args_type = &args_size[nargs]; memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0', @@ -161,7 +167,7 @@ index 863cd5d..022e72b 100644 /* XXX Could do sanity check here: If any element in ARGS_TYPE is still zero after this loop, format is invalid. For now we -@@ -1973,8 +1997,8 @@ do_positional: +@@ -1973,8 +2002,8 @@ do_positional: } all_done: diff --git a/testing/gnupg/PKGBUILD b/testing/gnupg/PKGBUILD new file mode 100644 index 000000000..bd22ebb27 --- /dev/null +++ b/testing/gnupg/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 154248 2012-03-24 20:57:26Z bisson $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=gnupg +pkgver=2.0.18 +pkgrel=2 +pkgdesc='Complete and free implementation of the OpenPGP standard' +url='http://www.gnupg.org/' +license=('GPL') +arch=('i686' 'x86_64') +optdepends=('curl: gpg2keys_curl' + 'libldap: gpg2keys_ldap' + 'libusb-compat: scdaemon' + 'texinfo: documentation') +makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo') +depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') +install=${pkgname}.install +source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig}) +sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46' + 'c1b15a6c204434081e2bd8249dde233b6c88c4d0') + +conflicts=('gnupg2') +provides=("gnupg2=${pkgver}") +replaces=('gnupg2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz +} diff --git a/testing/gnupg/gnupg.install b/testing/gnupg/gnupg.install new file mode 100644 index 000000000..0a6f3d518 --- /dev/null +++ b/testing/gnupg/gnupg.install @@ -0,0 +1,21 @@ +info_dir=/usr/share/info +info_files=(gnupg.info gnupg.info-1 gnupg.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f ${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 + usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} +# vim:set ts=2 sw=2 et: diff --git a/testing/gpgme/PKGBUILD b/testing/gpgme/PKGBUILD new file mode 100644 index 000000000..09182b057 --- /dev/null +++ b/testing/gpgme/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 154244 2012-03-24 17:10:41Z bisson $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Roman Kyrylych <roman@archlinux.org> +# Contributor: Sarah Hay <sarah@archlinux.org> + +pkgname=gpgme +pkgver=1.3.1 +pkgrel=4 +pkgdesc="A C wrapper library for GnuPG" +arch=('i686' 'x86_64') +url="http://www.gnupg.org/related_software/gpgme/" +license=('GPL') +depends=('libgpg-error' 'pth' 'gnupg>=2') +install=${pkgname}.install +options=('!libtool' '!emptydirs') +source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('90afa8436ce2b2683c001c824bd22601' + 'a032ddc27177ef4ee54e25a231e62da5') +sha1sums=('7d19a95a2239da13764dad7f97541be884ec5a37' + '93316a81a8f903c5b604716b6937884ea7b0917a') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/gpgme/gpgme.install b/testing/gpgme/gpgme.install new file mode 100644 index 000000000..b54620d9a --- /dev/null +++ b/testing/gpgme/gpgme.install @@ -0,0 +1,18 @@ +infodir=/usr/share/info +filelist=(gpgme.info gpgme.info-1 gpgme.info-2) + +post_install() { + for file in ${filelist[@]}; do + install-info $infodir/$file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file $infodir/dir 2> /dev/null + done +} diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD new file mode 100644 index 000000000..54dc69ec4 --- /dev/null +++ b/testing/iptables/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 154240 2012-03-24 13:43:51Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Thomas Baechler <thomas@archlinux.org> + +pkgname=iptables +pkgver=1.4.12.2 +pkgrel=3 +pkgdesc='Linux kernel packet control tool' +arch=('i686' 'x86_64') +license=('GPL2') +url='http://www.netfilter.org/projects/iptables/index.html' +depends=('glibc' 'bash') +makedepends=('linux-api-headers') +options=('!libtool') +source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" + iptables + ip6tables + empty.rules + simple_firewall.rules + iptables.conf.d + empty-filter.rules + empty-mangle.rules + empty-nat.rules + empty-raw.rules + empty-security.rules) +backup=(etc/conf.d/iptables) +sha1sums=('4dc8cdf1b711b23ed88eaaaa0e0e157d2bf2d81c' + '5bb6fa526665cdd728c26f0f282f5a51f220cf88' + '2db68906b603e5268736f48c8e251f3a49da1d75' + '83b3363878e3660ce23b2ad325b53cbd6c796ecf' + '9907f9e815592837abc7fa3264a401567b7606ab' + 'cdb830137192bbe002c6d01058656bd053ed0ddd' + 'd9f9f06b46b4187648e860afa0552335aafe3ce4' + 'c45b738b5ec4cfb11611b984c21a83b91a2d58f3' + '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' + '7db53bb882f62f6c677cc8559cff83d8bae2ef73' + 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # http://bugs.archlinux.org/task/17046 + sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in + sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in + + # use system one + rm include/linux/types.h + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ + --with-xtlibdir=/usr/lib/iptables \ + --enable-devel --enable-libipq \ + --enable-shared --enable-static +# build fails when not enabling static, see if we can remove it on next build + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + cd "${srcdir}" + install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables + install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables + install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules + install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules + install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables + + mkdir -p "${pkgdir}"/var/lib/iptables + install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables +} diff --git a/testing/iptables/empty-filter.rules b/testing/iptables/empty-filter.rules new file mode 100644 index 000000000..5a4de4876 --- /dev/null +++ b/testing/iptables/empty-filter.rules @@ -0,0 +1,6 @@ +# Empty iptables filter table rule file +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-mangle.rules b/testing/iptables/empty-mangle.rules new file mode 100644 index 000000000..49d493c4d --- /dev/null +++ b/testing/iptables/empty-mangle.rules @@ -0,0 +1,8 @@ +# Empty iptables mangle table rules file +*mangle +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +:POSTROUTING ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-nat.rules b/testing/iptables/empty-nat.rules new file mode 100644 index 000000000..437e96411 --- /dev/null +++ b/testing/iptables/empty-nat.rules @@ -0,0 +1,7 @@ +# Empty iptables nat table rules file +*nat +:PREROUTING ACCEPT [0:0] +:INPUT ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +:POSTROUTING ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-raw.rules b/testing/iptables/empty-raw.rules new file mode 100644 index 000000000..8dc50d23e --- /dev/null +++ b/testing/iptables/empty-raw.rules @@ -0,0 +1,5 @@ +# Empty iptables raw table rules file +*raw +:PREROUTING ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty-security.rules b/testing/iptables/empty-security.rules new file mode 100644 index 000000000..4531fa13f --- /dev/null +++ b/testing/iptables/empty-security.rules @@ -0,0 +1,6 @@ +# Empty iptables security table rules file +*security +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/empty.rules b/testing/iptables/empty.rules new file mode 100644 index 000000000..e24e1aa30 --- /dev/null +++ b/testing/iptables/empty.rules @@ -0,0 +1,6 @@ +# Empty iptables rule file +*filter +:INPUT ACCEPT [0:0] +:FORWARD ACCEPT [0:0] +:OUTPUT ACCEPT [0:0] +COMMIT diff --git a/testing/iptables/ip6tables b/testing/iptables/ip6tables new file mode 100755 index 000000000..2d119e3ed --- /dev/null +++ b/testing/iptables/ip6tables @@ -0,0 +1,69 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables + +# Set defaults if settings are missing +[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + if [ ! -f "$IP6TABLES_CONF" ]; then + echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2 + exit 1 + fi + stat_busy "Starting IP6 Tables" + if [ "$IPTABLES_FORWARD" = "1" ]; then + echo 1 >/proc/sys/net/ipv6/conf/default/forwarding + echo 1 >/proc/sys/net/ipv6/conf/all/forwarding + fi + if ck_daemon ip6tables; then + /usr/sbin/ip6tables-restore < $IP6TABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ip6tables + stat_done + fi + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping IP6 Tables" + if ! ck_daemon ip6tables; then + fail=0 + for table in $(cat /proc/net/ip6_tables_names); do + ip6tables-restore < /var/lib/iptables/empty-$table.rules + [ $? -gt 0 ] && fail=1 + done + if [ $fail -gt 0 ]; then + stat_fail + else + rm_daemon ip6tables + stat_done + fi + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + save) + stat_busy "Saving IP6 Tables" + /usr/sbin/ip6tables-save >$IP6TABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|save}" +esac +exit 0 diff --git a/testing/iptables/iptables b/testing/iptables/iptables new file mode 100755 index 000000000..fbb02face --- /dev/null +++ b/testing/iptables/iptables @@ -0,0 +1,68 @@ +#!/bin/bash + +# source application-specific settings +[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables + +# Set defaults if settings are missing +[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + if [ ! -f "$IPTABLES_CONF" ]; then + echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2 + exit 1 + fi + stat_busy "Starting IP Tables" + if [ "$IPTABLES_FORWARD" = "1" ]; then + echo 1 >/proc/sys/net/ipv4/ip_forward + fi + if ck_daemon iptables; then + /usr/sbin/iptables-restore < $IPTABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon iptables + stat_done + fi + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping IP Tables" + if ! ck_daemon iptables; then + fail=0 + for table in $(cat /proc/net/ip_tables_names); do + iptables-restore < /var/lib/iptables/empty-$table.rules + [ $? -gt 0 ] && fail=1 + done + if [ $fail -gt 0 ]; then + stat_fail + else + rm_daemon iptables + stat_done + fi + else + stat_fail + fi + ;; + restart) + $0 stop + $0 start + ;; + save) + stat_busy "Saving IP Tables" + /usr/sbin/iptables-save >$IPTABLES_CONF + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|restart|save}" +esac +exit 0 diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d new file mode 100644 index 000000000..1c6cc7b5d --- /dev/null +++ b/testing/iptables/iptables.conf.d @@ -0,0 +1,12 @@ +# Configuration for iptables rules +IPTABLES_CONF=/etc/iptables/iptables.rules +IP6TABLES_CONF=/etc/iptables/ip6tables.rules + +# Enable IP forwarding (both IPv4 and IPv6) +# NOTE: this is not the recommended way to do this, and is supported only for +# backward compatibility. Instead, use /etc/sysctl.conf and set the following +# options: +# * net.ipv4.ip_forward=1 +# * net.ipv6.conf.default.forwarding=1 +# * net.ipv6.conf.all.forwarding=1 +#IPTABLES_FORWARD=0 diff --git a/testing/iptables/simple_firewall.rules b/testing/iptables/simple_firewall.rules new file mode 100644 index 000000000..e1604cc36 --- /dev/null +++ b/testing/iptables/simple_firewall.rules @@ -0,0 +1,11 @@ +*filter +:INPUT DROP [0:0] +:FORWARD DROP [0:0] +:OUTPUT ACCEPT [0:0] +-A INPUT -p icmp -j ACCEPT +-A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT +-A INPUT -i lo -j ACCEPT +-A INPUT -p tcp -j REJECT --reject-with tcp-reset +-A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable +-A INPUT -j REJECT --reject-with icmp-proto-unreachable +COMMIT diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD index a575b0f11..8c23e224e 100644 --- a/testing/krb5/PKGBUILD +++ b/testing/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152709 2012-03-09 01:03:05Z stephane $ +# $Id: PKGBUILD 154246 2012-03-24 18:09:09Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.10.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -15,10 +15,12 @@ replaces=('heimdal') conflicts=('heimdal') backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar + krb5-1.10.1-gcc47.patch krb5-kadmind krb5-kdc krb5-kpropd) sha1sums=('f9f3b77173f68b268b43e4f9c29bf7c9f3fd1f0e' + '78b759d566b1fdefd9bbcd06df14f07f12effe96' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' '7f402078fa65bb9ff1beb6cbbbb017450df78560') @@ -28,6 +30,12 @@ build() { tar zxvf ${pkgname}-${pkgver}.tar.gz cd "${srcdir}/${pkgname}-${pkgver}/src" + # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized + # in this function [-Werror=maybe-uninitialized] + # As this is generated code, just ignore the complaint. + patch -Np2 -i ../../krb5-1.10.1-gcc47.patch + rm lib/krb5/krb/deltat.c + # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 diff --git a/testing/krb5/krb5-1.10.1-gcc47.patch b/testing/krb5/krb5-1.10.1-gcc47.patch new file mode 100644 index 000000000..ffd01c2a3 --- /dev/null +++ b/testing/krb5/krb5-1.10.1-gcc47.patch @@ -0,0 +1,11 @@ +diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y +--- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400 ++++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400 +@@ -44,6 +44,7 @@ + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wuninitialized" ++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + #endif + + #include <ctype.h> diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD index fc7ece352..33a320580 100644 --- a/testing/libtool/PKGBUILD +++ b/testing/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 151795 2012-03-03 02:45:49Z allan $ +# $Id: PKGBUILD 154194 2012-03-24 09:14:13Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> @@ -6,7 +6,7 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" @@ -28,7 +28,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.3') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.0') groups=('base-devel') install=libtool.install diff --git a/testing/xfsprogs/PKGBUILD b/testing/xfsprogs/PKGBUILD new file mode 100644 index 000000000..309fbad3e --- /dev/null +++ b/testing/xfsprogs/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 154211 2012-03-24 10:24:07Z tpowa $ +# Maintainer: Paul Mattal <paul@archlinux.org> +pkgname=xfsprogs +pkgver=3.1.8 +pkgrel=1 +pkgdesc="XFS filesystem utilities" +arch=('i686' 'x86_64') +license=('LGPL') +url="http://oss.sgi.com/projects/xfs/" +groups=('base') +depends=('util-linux-ng>=2.16') +options=('!makeflags' '!libtool') +# We mirror the sources as upstream tends to move them once a new release is out +source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz") +md5sums=('f70b2e7200d4c29f0af1cf70e7be1db6') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export OPTIMIZER="-march=${CARCH/_/-} -O1" + export DEBUG=-DNDEBUG + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DIST_ROOT="${pkgdir}" install install-dev + chown -R root $pkgdir + chgrp -R root $pkgdir +} |