diff options
47 files changed, 1070 insertions, 178 deletions
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index 186d4cae9..b94a1b1ae 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 56835 2011-10-14 14:22:51Z stephane $ +# $Id: PKGBUILD 60373 2011-12-12 11:44:22Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + pkgname=cppcheck -pkgver=1.51 +pkgver=1.52 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64') @@ -9,7 +10,7 @@ url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('pcre') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d6774e123b9fa086cb6cc3722743e1de7a1f0b0c') +sha1sums=('56cc54f9d0af41dcfee5560e897fd3e1357712bc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/libpqxx/PKGBUILD b/community/libpqxx/PKGBUILD index c66e1ff07..fbefdafa7 100644 --- a/community/libpqxx/PKGBUILD +++ b/community/libpqxx/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=libpqxx -pkgver=3.1 +pkgver=4.0 pkgrel=1 pkgdesc="C++ client API for PostgreSQL" arch=('i686' 'x86_64') @@ -12,12 +12,12 @@ depends=('postgresql-libs>=8.4.1') options=('!libtool') source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz" build-fix.patch) -md5sums=('4993a516eb88d8a51125607db30ad2ef' +md5sums=('bd7541f858400a96cbe2a48cb342ad0e' 'e59f5f63e1800406bf494e19cea479a4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/build-fix.patch +# patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr --enable-shared make make prefix="${pkgdir}/usr" install diff --git a/community/lorcon-old-svn/PKGBUILD b/community/lorcon-old-svn/PKGBUILD index fedfc4e34..271937ec6 100644 --- a/community/lorcon-old-svn/PKGBUILD +++ b/community/lorcon-old-svn/PKGBUILD @@ -1,43 +1,27 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 60383 2011-12-12 18:03:48Z andrea $ +# Maintainer: +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: fnord0 [fnord0 <AT> riseup <DOT> net] pkgname=lorcon-old-svn -pkgver=197 -pkgrel=2 -makedepends=('subversion') -pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames, capable of injection via multiple driver frameworks, without forcing modification of the application code." -url="http://802.11ninja.net" -license="GPL" +pkgver=224 +pkgrel=1 +pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames" +url='http://802.11ninja.net' +license=('GPL') arch=('i686' 'x86_64') - -_svntrunk=http://802.11ninja.net/svn/lorcon/branch/lorcon-old/ -_svnmod=lorcon-old +depends=('libnl') +options=('!libtool') +source=("ftp://ftp.archlinux.org/other/community/lorcon-old/lorcon-old-${pkgver}.tar.bz2") +md5sums=('7a939cc8ec0d70d1b312b9fe9f0dfaf8') build() { - cd ${srcdir} - - # Fetch latest svn build - if [ -d ${_svnmod}/.svn ]; then - msg "Updating lorcon-old SVN..." - cd ${_svnmod} && svn up - else - msg "Checking out lorcon-old SVN..." - svn co ${_svntrunk} -r 224 ${_svnmod} - fi - - msg "SVN checkout done or server timeout" - - # Compile - cd ${srcdir}/${_svnmod} - msg "Starting make..." - ./configure --prefix=/usr - make + cd "${srcdir}/lorcon-old-${pkgver}" + ./configure --prefix=/usr + make } package() { - cd ${srcdir}/${_svnmod} - - # Install - make DESTDIR="${pkgdir}" install + cd "${srcdir}/lorcon-old-${pkgver}" + make DESTDIR="${pkgdir}" install } - diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 2fb3842b7..64aba857b 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59301 2011-11-22 22:07:16Z ttopper $ +# $Id: PKGBUILD 60369 2011-12-12 10:37:01Z ttopper $ # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> # Contributor: Daniel Hommel <dhommel@gmail.com> pkgname=mksh -pkgver=R40c -pkgrel=2 -pkgdesc="The MirOS KornShell - an enhanced version of the public domain ksh" +pkgver=R40d +pkgrel=1 +pkgdesc="The MirBSD Korn Shell - an enhanced version of the public domain ksh" url="http://mirbsd.de/mksh" license=("custom") makedepends=('cpio') @@ -13,8 +13,8 @@ arch=('i686' 'x86_64') install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.cpio.gz" "https://www.mirbsd.org/TaC-mksh.txt") -md5sums=('43a79f721091833bdab3d00fbfe54a14' - '6baf6a174d89c47cac86118dc9e93faa') +md5sums=('c6428401103367730a95b99284bf47dc' + '5376e528781247238d103ac24aceaf3d') build() { cd "$srcdir" @@ -24,7 +24,7 @@ build() { cd "$srcdir/$pkgname" sh Build.sh -r -c lto ./test.sh - gzip mksh.1 + gzip -n9 mksh.1 } package() { diff --git a/community/mksh/mksh.install b/community/mksh/mksh.install index 859fa51c2..3e5f2a924 100644 --- a/community/mksh/mksh.install +++ b/community/mksh/mksh.install @@ -7,7 +7,7 @@ post_upgrade() { } post_remove() { - sed -i "/\/bin\/mksh/d" /etc/shells + sed -i "/^\/bin\/mksh$/d" /etc/shells } # vim:set ts=2 sw=2 et: diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index fa751f92b..f8b9e0806 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 58532 2011-11-13 16:04:52Z andrea $ +# $Id: PKGBUILD 60371 2011-12-12 11:39:44Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,7 +7,8 @@ # Contributor: delor <bartekpiech gmail com> pkgname="qtcreator" -pkgver=2.3.1 +pkgver=2.4.0rc +_pkgver=2.4.0-rc pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') @@ -16,9 +17,10 @@ license=('LGPL') depends=('qt>=4.7.4') makedepends=('qt-private-headers>=4.7.4' 'git') options=('docs') -source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz" +install=qtcreator.install +source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz" 'qtcreator.desktop') -md5sums=('8aa296ed9034f847bd53ee0424e5ef08' +md5sums=('1967144101796674ce6e994e66213f81' 'f1f4680b9838ff0b8f4cf11eb850d662') build() { @@ -26,7 +28,7 @@ build() { [[ -d build ]] && rm -r build mkdir build && cd build - qmake ${srcdir}/qt-creator-${pkgver}-src/qtcreator.pro + qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro make } @@ -45,6 +47,6 @@ package() { install -Dm644 ${srcdir}/qtcreator.desktop \ ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ + install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \ ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT } diff --git a/community/qtcreator/qtcreator.install b/community/qtcreator/qtcreator.install new file mode 100644 index 000000000..4d4a283db --- /dev/null +++ b/community/qtcreator/qtcreator.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD new file mode 100644 index 000000000..2b9f4ec71 --- /dev/null +++ b/community/quagga/PKGBUILD @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> + +pkgname=quagga +pkgver=0.99.20 +pkgrel=1 +pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite' +arch=('i686' 'x86_64') +url='http://www.quagga.net' +license=('GPL2') +depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses') +options=('!libtool' '!buildflags') +backup=() +install=quagga.install +source=("http://www.quagga.net/download/$pkgname-$pkgver.tar.gz" + 'quagga.rc' + 'quagga.conf') +md5sums=('64cc29394eb8a4e24649d19dac868f64' + '6ebd2be39c45361eabe3e278bb21efa0' + '0c4f2dd13c7dac1b73de923d1d5e4e17') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc/quagga --localstatedir=/run/quagga \ + --enable-exampledir=/usr/share/doc/quagga/examples \ + --enable-vtysh \ + --enable-isisd \ + --enable-isis-topology \ + --enable-netlink \ + --enable-snmp \ + --enable-tcp-zebra \ + --enable-irdp \ + --enable-pcreposix \ + --enable-multipath=64 \ + --enable-user=nobody \ + --enable-group=nobody \ + --enable-configfile-mask=0640 \ + --enable-logfile-mask=0640 + make +} + +package() { + # initscripts files + for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do + install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$d" + install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$d" + backup+=("etc/conf.d/$d") + done + + # create /run/quagga directory at startup + install -D -m 644 /dev/null "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + echo "d /run/$pkgname 0750 $pkgname $pkgname" > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf" + + # soft + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/quagga/quagga.conf b/community/quagga/quagga.conf new file mode 100644 index 000000000..26f24daa8 --- /dev/null +++ b/community/quagga/quagga.conf @@ -0,0 +1,3 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +DAEMON_OPTS="-d -u quagga -g quagga -A 127.0.0.1" diff --git a/community/quagga/quagga.install b/community/quagga/quagga.install new file mode 100644 index 000000000..058f4f1d7 --- /dev/null +++ b/community/quagga/quagga.install @@ -0,0 +1,22 @@ +post_install() { + groupadd -r quagga + useradd -MNr -s /bin/false -d /run/quagga -g quagga quagga && passwd -l quagga &>/dev/null + install -d -m 750 -o quagga -g quagga /{run,etc,var/log}/quagga + : +} + +pre_remove() { + for d in zebra ripd ripngd bgpd ospfd ospf6d isisd; do + /etc/rc.d/$d stop &>/dev/null + done + : +} + +post_remove() { + userdel quagga &>/dev/null + groupdel quagga &>/dev/null + rmdir /{etc,var/log}/quagga + : +} + +# vim: ft=sh ts=2 sw=2 et: diff --git a/community/quagga/quagga.rc b/community/quagga/quagga.rc new file mode 100644 index 000000000..f938c6f8a --- /dev/null +++ b/community/quagga/quagga.rc @@ -0,0 +1,34 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/${0##*/} + +NAME=${0##*/} +DAEMON=/usr/sbin/$NAME +PID=$(pidof -o %PPID $DAEMON) + +case "$1" in + start) + stat_busy "Starting Quagga $NAME daemon" + [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + stop) + stat_busy "Stopping $NAME daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 + stat_fail + ;; + restart) + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; +esac + +exit 1 + +# vim:set ts=2 sw=2 ft=sh noet: diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 97f4111dc..53671e957 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58423 2011-11-12 17:18:54Z ibiru $ +# $Id: PKGBUILD 60363 2011-12-12 09:57:03Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.63.02 -pkgrel=2 +pkgver=0.63.03 +pkgrel=1 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) url="http://synfig.org" @@ -16,9 +16,11 @@ conflicts=('synfig-core') replaces=('synfig-core') options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz - build-fix.patch ffmpeg-0.8.patch) -md5sums=('4286d5e1887275107d760d1b678aec24' - '2de5e74159a38e4b1788c20d4c4b6f68') + build-fix.patch + ffmpeg-0.8.patch) +md5sums=('9bd77cd2fc2381adfbd50a7b9c1c6e7c' + 'b5568b06fae1a7ee465b5380b1139b83' + 'ebf41046097cfd778dee9a9854561dae') build() { cd $srcdir/$pkgname-$pkgver @@ -33,9 +35,3 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('4286d5e1887275107d760d1b678aec24' - '2de5e74159a38e4b1788c20d4c4b6f68' - 'f1f22b1ce2c13e25d5eb51a664a9551f') -md5sums=('4286d5e1887275107d760d1b678aec24' - '2de5e74159a38e4b1788c20d4c4b6f68' - 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfig/build-fix.patch b/community/synfig/build-fix.patch index 9124a517a..be45fdc68 100644 --- a/community/synfig/build-fix.patch +++ b/community/synfig/build-fix.patch @@ -29,15 +29,3 @@ diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/sr return picture; } -diff -wbBur synfig-core/src/modules/mod_png/mptr_png.cpp synfig-core.my/src/modules/mod_png/mptr_png.cpp ---- synfig-core/src/modules/mod_png/mptr_png.cpp 2011-06-05 13:04:07.000000000 +0400 -+++ synfig-core.my/src/modules/mod_png/mptr_png.cpp 2011-06-14 14:32:49.000000000 +0400 -@@ -309,7 +309,7 @@ - float b=gamma().b_U8_to_F32((unsigned char)png_ptr->palette[row_pointers[y][x]].blue); - float a=1.0; - if(info_ptr->valid & PNG_INFO_tRNS) -- a = (float)(unsigned char)png_ptr->trans[row_pointers[y][x]]*(1.0/255.0); -+ a = (float)(unsigned char)png_ptr->trans_alpha[row_pointers[y][x]]*(1.0/255.0); - surface_buffer[y][x]=Color( - r, - g, diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index cd9990a7d..bbd4b7842 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56133 2011-10-02 08:10:11Z spupykin $ +# $Id: PKGBUILD 60377 2011-12-12 14:49:30Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -pkgver=0.63.02 -pkgrel=1 +pkgver=0.63.03 +pkgrel=2 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64) url="http://synfig.org" @@ -13,8 +13,9 @@ depends=('gtkmm' 'synfig') makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' 'xorg-fonts-misc' 'xorg-fonts-type1') install=synfigstudio.install +options=('!libtool') source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('939595974cc56551fa89ae4f4dddbfb0') +md5sums=('a166ff4917b0e058cae96e51aa273080') build() { cd $srcdir/synfigstudio-$pkgver @@ -40,4 +41,5 @@ package() { rm -f $pkgdir/usr/share/mime/subclasses rm -f $pkgdir/usr/share/mime/treemagic rm -f $pkgdir/usr/share/mime/types + rm -f $pkgdir/usr/share/mime/version } diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD index 51267430a..6e0d58232 100644 --- a/community/unrealircd/PKGBUILD +++ b/community/unrealircd/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 58295 2011-11-10 13:02:48Z spupykin $ +# $Id: PKGBUILD 60367 2011-12-12 09:58:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zerial <fernando@zerial.org> pkgname=unrealircd pkgver=3.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Open Source IRC Server" arch=('i686' 'x86_64') url="http://unrealircd.com" license=('GPL2') -depends=('openssl' 'curl') -makedepends=('c-ares') +depends=('openssl' 'curl' 'c-ares') conflicts=('ircd') provides=('ircd') backup=(etc/unrealircd/unrealircd.conf) @@ -18,7 +17,7 @@ source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz unrealircd.rc arch-fixes.patch) md5sums=('bde023695347969f545ce5f2a9ac9aed' - '0d728240132a97a2cef61be9558750b1' + '07ffa1e82a01f319a8b997e155d2af1d' '77807313c4578f2c30286b9f9e3fb21c') build() { @@ -56,6 +55,9 @@ build() { touch $pkgdir/var/log/unrealircd/ircd.log ln -s /var/log/unrealircd/ircd.log $pkgdir/etc/unrealircd/ircd.log + mkdir -p $pkgdir/etc/conf.d/ + echo 'UNREALIRCD_USER=root' >$pkgdir/etc/conf.d/unrealircd + find $pkgdir/usr -type f -exec chmod ugo+r {} \; find $pkgdir/usr -type d -exec chmod ugo+rx {} \; } diff --git a/community/unrealircd/unrealircd.rc b/community/unrealircd/unrealircd.rc index 551781760..2cede46c8 100755 --- a/community/unrealircd/unrealircd.rc +++ b/community/unrealircd/unrealircd.rc @@ -2,6 +2,7 @@ daemon_name=unrealircd +. /etc/conf.d/unrealircd . /etc/rc.conf . /etc/rc.d/functions @@ -18,7 +19,7 @@ case "$1" in [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid # RUN export PID_FILE="/var/run/unrealircd.pid" - /usr/bin/unrealircd 1>>/var/log/unrealircd/ircd.log 2>>/var/log/unrealircd/ircd.log + su -c /usr/bin/unrealircd -p - $UNREALIRCD_USER 1>>/var/log/unrealircd/ircd.log 2>>/var/log/unrealircd/ircd.log # if [ $? -gt 0 ]; then stat_fail diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index f7575f818..ca45661be 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59976 2011-12-02 21:01:36Z ibiru $ +# $Id: PKGBUILD 60381 2011-12-12 16:41:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64') url="http://www.webtoolkit.eu/" @@ -40,4 +40,5 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver}/build make DESTDIR=${pkgdir} install + rm -rf $pkgdir/var/run } diff --git a/community/yajl/PKGBUILD b/community/yajl/PKGBUILD index cd3afc507..a333a7cef 100644 --- a/community/yajl/PKGBUILD +++ b/community/yajl/PKGBUILD @@ -4,15 +4,15 @@ # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=yajl -pkgver=2.0.2 -pkgrel=2 +pkgver=2.0.3 +pkgrel=1 pkgdesc='Yet Another JSON Library.' arch=('i686' 'x86_64') url='http://lloyd.github.com/yajl/' license=('ISC') makedepends=('cmake') source=("$pkgname-$pkgver.tar.gz::https://github.com/lloyd/$pkgname/tarball/$pkgver") -md5sums=('0cea435187c45e02972093ae537a2831') +md5sums=('2356068635e8b93c09896a72c5b9cb8b') build() { dirname=$(tar tf "$srcdir/$pkgname-$pkgver.tar.gz" | sed 1q); diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD index a999277f1..53eb06d0b 100644 --- a/core/syslinux/PKGBUILD +++ b/core/syslinux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134206 2011-08-02 14:26:49Z ibiru $ +# $Id: PKGBUILD 144967 2011-12-12 09:45:24Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=syslinux -pkgver=4.04 -pkgrel=2 +pkgver=4.05 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE" url="http://syslinux.zytor.com/" @@ -21,8 +21,8 @@ source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.t syslinux-dont-build-dos-windows-targets.patch syslinux.cfg syslinux-install_update) -md5sums=('a3936208767eb7ced65320abe2e33a10' - '5274062f91931eae6573f1ec3cd5b640' +md5sums=('82299242418385da1274c9479a778cb2' + '1528c376e43f0eaccaa80d8ad1bc13b4' '4dc27d8ab3802f8e50f3dda28168ce6d' 'b5b4953c0a5a01cd16441402f6321765') @@ -33,7 +33,7 @@ build() { # Do not try to build the Windows or DOS installers patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch # Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i MCONFIG + sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk make } diff --git a/core/syslinux/syslinux-dont-build-dos-windows-targets.patch b/core/syslinux/syslinux-dont-build-dos-windows-targets.patch index 7355e4acb..2b86ab828 100644 --- a/core/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ b/core/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -1,7 +1,7 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile --- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 +++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ # files that depend only on the B phase, but may have to be regenerated # for "make installer". BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD index 750e87407..12587fced 100644 --- a/extra/fakechroot/PKGBUILD +++ b/extra/fakechroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139553 2011-10-03 12:37:11Z allan $ +# $Id: PKGBUILD 144961 2011-12-12 08:42:45Z allan $ # Maintainer : Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=fakechroot -pkgver=2.15 +pkgver=2.16 pkgrel=1 pkgdesc="Gives a fake chroot environment" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ license=('LGPL') options=('!libtool') install=fakechroot.install source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz) -md5sums=('ce8bdde1d30274e124e8ecf8f59681ff') +md5sums=('3ea5efb76664e787450e0cfcefc1b807') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot + ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot --sysconfdir=/etc make } diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index 9605f2daa..32981bc0c 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 144956 2011-12-12 01:44:18Z andrea $ +# $Id: PKGBUILD 144973 2011-12-12 18:32:32Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -11,7 +11,7 @@ pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdelibs''subversion' 'qjson') +depends=('kdelibs' 'subversion' 'qjson') optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD index bd8338961..7bd21048b 100644 --- a/extra/ristretto/PKGBUILD +++ b/extra/ristretto/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 142271 2011-11-07 18:53:02Z eric $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 144969 2011-12-12 17:23:28Z andrea $ +# Maintainer: +# Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ristretto -pkgver=0.2.3 +pkgver=0.3.0 pkgrel=1 -pkgdesc="An image viewer for Xfce" +pkgdesc="A fast and lightweight picture-viewer for Xfce" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/applications/ristretto" license=('GPL') -depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('libxfce4ui' 'libexif' 'exo' 'desktop-file-utils') makedepends=('intltool') -options=('!libtool') groups=('xfce4-goodies') install=ristretto.install -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('62924c8abf17a921262ea9987ff8f5db') +source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") +sha1sums=('c7034ad543bea3c1b99a2336dcee9d5ba480b2bb') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index d94f628a3..ede7489cd 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,28 +1,23 @@ -# $Id: PKGBUILD 140761 2011-10-18 19:07:53Z andrea $ +# $Id: PKGBUILD 144965 2011-12-12 09:11:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=strigi -pkgver=0.7.6 -pkgrel=2 +pkgver=0.7.7 +pkgrel=1 pkgdesc="Fast crawling desktop search engine with Qt4 GUI" arch=('i686' 'x86_64') url="http://www.vandenoever.info/software/strigi/" license=('GPL2') -depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs') +depends=('exiv2' 'libxml2' 'boost-libs') makedepends=('qt' 'cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') #source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" - 'libstreamanalyzer_pdf.patch') -md5sums=('41cddd39e4ae3f590d82c859a14e9261' - '3e722a93cf5c6238e625ca58463afac2') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") +md5sums=('ca0a0fd5c2b99879f6330837aeede996') build() { - cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer - patch -p1 -i "${srcdir}"/libstreamanalyzer_pdf.patch - cd "${srcdir}" mkdir build cd build diff --git a/libre/abs-libre/PKGBUILD b/libre/abs-libre/PKGBUILD index a9be5a541..1abcd02dc 100644 --- a/libre/abs-libre/PKGBUILD +++ b/libre/abs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 101993 2010-12-03 13:48:19Z allan $ +# $Id: PKGBUILD 134858 2011-08-08 04:45:57Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> _pkgname=abs pkgname=abs-libre -#CARCH=x86_64 +#CARCH=mips64el pkgver=2.4.3 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities to download and work with the Arch Build System (ABS)" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/abs.git/" @@ -14,6 +14,9 @@ depends=('bash' 'rsync') backup=(etc/abs.conf) source=(ftp://ftp.archlinux.org/other/abs/${_pkgname}-${pkgver}.tar.gz) md5sums=('b8b46b22d2f9a2aec2c994ccf230b4fd') +provides=("${_pkgname}=${pkgver}") +replaces=("${_pkgname}") +conflicts=("${_pkgname}") build() { cd ${srcdir}/${_pkgname} diff --git a/libre/python2-libre/PKGBUILD b/libre/python2-libre/PKGBUILD index 78550b63f..c4f09188d 100644 --- a/libre/python2-libre/PKGBUILD +++ b/libre/python2-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=python2 pkgname=python2-libre pkgver=2.7.2 -pkgrel=2 +pkgrel=4 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64') @@ -17,30 +17,15 @@ makedepends=('tk') optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') -source=(http://repo.parabolagnulinux.org/other/Python-${pkgver}.tar.xz +source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz doc_license_change.patch - WDAS.patch) -md5sums=('5f8a18361784411b16dbb1cdcd6f6664' - '1e6595f85a1da7f42b69456119924d50' - '3f8c0e310a0be0bd8b319d6c46bbd427') + WDAS.patch + linux2.patch + gdbm-magic-values.patch) provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") replaces=("$_pkgname") -mksource() { - [ ! -d "Python-${pkgver}" ] && \ - wget -O - http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz |\ - tar -xJf - - - cd "Python-${pkgver}" -# http://bugs.python.org/issue12417 - patch -Np1 -i ../WDAS.patch || return 1 - patch -Np0 -i ../doc_license_change.patch || return 1 - - cd .. - tar -cJf Python-${pkgver}.tar.xz "Python-${pkgver}" -} - build() { cd "${srcdir}/Python-${pkgver}" @@ -54,6 +39,14 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + # Make sure sys.platform is set to linux2, even on kernel 3.X + # cf http://bugs.python.org/issue12326 + patch -Np1 -i ../linux2.patch + + # gdbm has new magic that whichdb does not recognize + # http://bugs.python.org/issue13007 + patch -Np1 -i ../gdbm-magic-values.patch + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -62,9 +55,10 @@ build() { export OPT="${CFLAGS}" ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ - --enable-unicode=ucs4 --with-system-expat --with-system-ffi + --enable-unicode=ucs4 --with-system-expat --with-system-ffi \ + --with-dbmliborder=gdbm:ndbm - make + make MACHDEP=linux2 } package() { @@ -101,5 +95,10 @@ package() { "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" # license - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } +md5sums=('456d053a5d418adc913a4971e95fe918' + '1e6595f85a1da7f42b69456119924d50' + '3f8c0e310a0be0bd8b319d6c46bbd427' + '74c04694573e0d331e2a99d7b9179460' + '2874e9d93f4f46c1460605a5c7751372') diff --git a/libre/python2-libre/SRCBUILD b/libre/python2-libre/SRCBUILD new file mode 100644 index 000000000..f021d6624 --- /dev/null +++ b/libre/python2-libre/SRCBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 123066 2011-05-07 23:01:49Z stephane $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> +# Maintainer (Parabola): xihh + +pkgname=python2-libre +pkgver=2.7.2 +pkgrel=4 +pkgdesc="A high-level scripting language" +arch=('any') +license=('PSF') +url="http://www.python.org/" +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz + doc_license_change.patch + WDAS.patch) +md5sums=('75c87a80c6ddb0b785a57ea3583e04fa' + '1e6595f85a1da7f42b69456119924d50' + '3f8c0e310a0be0bd8b319d6c46bbd427') +options=(!strip docs libtool emptydirs !zipman !purge) + +build() { + cd "${srcdir}/Python-${pkgver}" + + export PKGEXT=.src.tar.xz + + patch -Np1 -i ../WDAS.patch + patch -Np0 -i ../doc_license_change.patch + +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${startdir} + + mv "${srcdir}/Python-${pkgver}" ${pkgdir} + +} diff --git a/libre/python2-libre/gdbm-magic-values.patch b/libre/python2-libre/gdbm-magic-values.patch new file mode 100644 index 000000000..5613ae35c --- /dev/null +++ b/libre/python2-libre/gdbm-magic-values.patch @@ -0,0 +1,14 @@ +diff -up Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic Python-2.7.2/Lib/whichdb.py +--- Python-2.7.2/Lib/whichdb.py.gdbm-1.9-magic 2011-06-11 11:46:26.000000000 -0400 ++++ Python-2.7.2/Lib/whichdb.py 2011-09-30 15:45:21.778872290 -0400 +@@ -91,7 +91,7 @@ def whichdb(filename): + return "" + + # Check for GNU dbm +- if magic == 0x13579ace: ++ if magic in (0x13579ace, 0x13579acd, 0x13579acf): + return "gdbm" + + # Check for old Berkeley db hash file format v2 +diff -up Python-2.7.2/Misc/NEWS.gdbm-1.9-magic Python-2.7.2/Misc/NEWS + diff --git a/libre/python2-libre/linux2.patch b/libre/python2-libre/linux2.patch new file mode 100644 index 000000000..74ae2aa12 --- /dev/null +++ b/libre/python2-libre/linux2.patch @@ -0,0 +1,24 @@ +http://hg.python.org/cpython/rev/c816479f6aaf/ +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -2995,6 +2995,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -293,6 +293,7 @@ then + MACHDEP="$ac_md_system$ac_md_release" + + case $MACHDEP in ++ linux*) MACHDEP="linux2";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; + atheos*) MACHDEP="atheos";; + diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 76c2de5e4..8ca94ddab 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -5,15 +5,15 @@ pkgname=texlive-bin-libre pkgver=2011.1 _luatex_ver=0.70.1 -pkgrel=4 +pkgrel=5 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') -depends=('t1lib' 'gd' 'libgraphite' 'poppler>=0.18.1' 'libsigsegv' 'zziplib') +depends=('t1lib' 'gd' 'poppler>=0.18.1' 'libsigsegv' 'zziplib') makedepends=('perl' 'clisp' 'ffcall' 'pkg-config') optdepends=('ed: for texconfig') provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin') -conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.19') +conflicts=('pdfjam' 'texlive-bin' 'poppler>=0.18.2') replaces=('texlive-bin') options=('!libtool') url='http://tug.org/texlive/' @@ -52,8 +52,7 @@ md5sums=('ff30d6813babd2e41c414365eea9c147' build() { cd $srcdir # Remove bundled packages available in Parabola or not needed. - # TODO remove also icu - rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler,graphite},utils/dialog} + rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler},utils/dialog} rm -rf luatex-beta-0.70.1/source/libs/{libpng,zziplib,zlib,poppler} # Building LuaTeX # cd luatex-beta-${_luatex_ver} @@ -71,7 +70,7 @@ build() { --disable-ptex \ --enable-luatex \ --without-system-ptexenc \ - --with-system-graphite \ + --without-system-graphite \ --without-system-icu \ --without-system-kpathsea \ --with-system-freetype2 \ @@ -99,6 +98,8 @@ build() { cd "$srcdir" # this patch removes spurious error message with locale "xx_YY.utf8" patch -p0 -i fix-fontforge-encoding.patch + # t4ht expects to be un /usr/share/texmf/bin/t4ht (FS#27251) + sed -i s/SELFAUTOPARENT/TEXMFROOT/ source/texk/tex4htk/t4ht.c ############################################################# ### configure cd source @@ -134,7 +135,7 @@ build() { --with-system-poppler \ --with-system-xpdf \ --with-system-freetype2 \ - --with-system-graphite \ + --without-system-graphite \ --with-system-icu \ --with-freetype2-libdir=/usr/lib \ --with-freetype2-include=/usr/include/freetype2 \ @@ -222,6 +223,8 @@ package() { # clean updmap.cfg sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg + # Don't list formats which need removed packages to work. + sed -i '/csplain\|mex\|jadetex/d' $pkgdir/etc/texmf/web2c/fmtutil.cnf ############################################################# ### install diff --git a/multilib/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD index 026d52a1b..cdd799467 100644 --- a/multilib/lib32-util-linux/PKGBUILD +++ b/multilib/lib32-util-linux/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 41742 2011-03-08 19:17:58Z dreisner $ +# $Id: PKGBUILD 60379 2011-12-12 14:54:24Z dreisner $ # Maintainer: judd <jvinet@zeroflux.org> _pkgbasename=util-linux pkgname=lib32-$_pkgbasename -pkgver=2.19 +pkgver=2.20.1 pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux (32-bit)" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('x86_64') -depends=('lib32-glibc' $_pkgbasename) +depends=('lib32-glibc' "$_pkgbasename") makedepends=('gcc-multilib') provides=('lib32-util-linux-ng') conflicts=('lib32-util-linux-ng') replaces=('lib32-util-linux-ng') license=('GPL2') options=('!libtool' '!emptydirs') -source=(ftp://ftp.kernel.org/pub/linux/utils/${_pkgbasename}/v2.19/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('590ca71aad0b254e2631d84401f28255') +source=(ftp://ftp.infradead.org/pub/$_pkgbasename/v2.20/$_pkgbasename-$pkgver.tar.bz2) +md5sums=('079b37517fd4e002a2e6e992e8b4e361') shopt -s extglob build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - # hardware clock - sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c - mkdir -p "${pkgdir}/var/lib/hwclock" + cd "$srcdir/$_pkgbasename-$pkgver" export CC="gcc -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" @@ -33,20 +29,16 @@ build() { ./autogen.sh ./configure --without-ncurses --libdir=/usr/lib32 - cd shlibs - for lib in *; do - make -C $lib + for lib in lib{mount,blkid,uuid}; do + make -C "$lib" done } package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" + cd "$srcdir/$_pkgbasename-$pkgver" make DESTDIR="$pkgdir" install - # remove unnecessary files - cd "$pkgdir" - rm -rf !(usr) - cd usr - rm -rf !(lib32) + # remove everything but libs + rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32) } diff --git a/staging/cloog/PKGBUILD b/staging/cloog/PKGBUILD new file mode 100644 index 000000000..148d10d70 --- /dev/null +++ b/staging/cloog/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 144977 2011-12-12 23:18:46Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=cloog +pkgver=0.17.0 +pkgrel=1 +pkgdesc="Library that generates loops for scanning polyhedra" +arch=('i686' 'x86_64') +url="http://www.bastoul.net/cloog/" +license=('GPL') +depends=('isl' 'gmp') +conflicts=('cloog-ppl<0.15.10-2') +options=('!libtool') +source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) +md5sums=('8562effdf567ea94b008510bd83b6ea9') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --with-isl=system --with-gmp=system + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD new file mode 100644 index 000000000..c7d2789f4 --- /dev/null +++ b/staging/gcc/PKGBUILD @@ -0,0 +1,259 @@ +# $Id: PKGBUILD 144979 2011-12-12 23:21:41Z 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.2 +pkgrel=4 +_snapshot=4.6-20111125 +_libstdcppmanver=20110814 # Note: check source directory name when updating this +pkgdesc="The GNU Compiler Collection" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL' 'FDL' 'custom') +url="http://gcc.gnu.org" +makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada') +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++-api.${_libstdcppmanver}.man.tar.bz2 + gcc_pure64.patch + gcc-hash-style-both.patch + gcc-pr49720.patch) +md5sums=('922b0ee688669c188d237bbd21d42d07' + 'ce920d2550ff7e042b9f091d27764d8f' + '4030ee1c08dd1e843c0225b772360e76' + '4df25b623799b148a0703eaeec8fdf3f' + 'f9d7e5b792c59175f3da3f8421447512') + +if [ -n "${_snapshot}" ]; then + _basedir="${srcdir}/gcc-${_snapshot}" +else + _basedir="${srcdir}/gcc-${pkgver}" +fi + +build() { + cd ${_basedir} + + # Do not install libiberty + sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + if [ "${CARCH}" = "x86_64" ]; then + patch -Np1 -i ${srcdir}/gcc_pure64.patch + fi + patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch + + # fix compiler segfault in binutils testsuite + patch -Np1 -i ${srcdir}/gcc-pr49720.patch + + echo ${pkgver} > gcc/BASE-VER + + cd ${srcdir} + mkdir gcc-build && cd gcc-build + + ${_basedir}/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --enable-gnu-unique-object --enable-linker-build-id \ + --with-ppl --enable-cloog-backend=isl \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --disable-multilib --disable-libssp --disable-libstdcxx-pch \ + --enable-checking=release + make +} + +check() { + cd gcc-build + + # increase stack size to prevent test failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 + ulimit -s 32768 + + # do not abort on error as some are "expected" + make -k check || true + ${_basedir}/contrib/test_summary +} + +package_gcc-libs() +{ + pkgdesc="Runtime libraries shipped by GCC" + groups=('base') + depends=('glibc>=2.14') + 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 + make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES + done + make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install + make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info + + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=${pkgdir} install-target-libgfortran + make -j1 DESTDIR=${pkgdir} install-target-libobjc + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} + + # remove static libraries + find ${pkgdir} -name *.a -delete + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc() +{ + pkgdesc="The GNU Compiler Collection - C and C++ frontends" + depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl') + groups=('base-devel') + install=gcc.install + + cd gcc-build + + # unfortunately it is much, much easier to install the lot and clean-up the mess... + make -j1 DESTDIR=${pkgdir} install + rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm $pkgdir/usr/lib/*.so* + rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm $pkgdir/usr/lib/libgfortran.spec + rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} + rm -r $pkgdir/usr/lib/go + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info + rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo + rm $pkgdir/usr/share/man/man1/{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}/ + + # POSIX conformance launcher scripts for c89 and c99 + cat > $pkgdir/usr/bin/c89 <<"EOF" +#!/bin/sh +fl="-std=c89" +for opt; do + case "$opt" in + -ansi|-std=c89|-std=iso9899:1990) fl="";; + -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + cat > $pkgdir/usr/bin/c99 <<"EOF" +#!/bin/sh +fl="-std=c99" +for opt; do + case "$opt" in + -std=c99|-std=iso9899:1999) fl="";; + -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 + exit 1;; + esac +done +exec gcc $fl ${1+"$@"} +EOF + + chmod 755 $pkgdir/usr/bin/c{8,9}9 + + # install the libstdc++ man pages + install -dm755 ${pkgdir}/usr/share/man/man3 + install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-fortran() +{ + pkgdesc="Fortran front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-fortran.install + + cd gcc-build + make -j1 DESTDIR=${pkgdir} install-target-libquadmath + make -j1 DESTDIR=$pkgdir install-target-libgfortran + make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS + make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} + install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 + + # remove libraries included in gcc-libs + rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* + rm ${pkgdir}/usr/share/info/libquadmath.info + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-objc() +{ + pkgdesc="Objective-C front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libobjc + install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ + install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ + + # remove libraries included in gcc-libs + rm ${pkgdir}/usr/lib/libobjc.so* + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-ada() +{ + pkgdesc="Ada front-end for GCC (GNAT)" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-ada.install + + cd gcc-build/gcc + make -j1 DESTDIR=$pkgdir ada.install-{common,info} + install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION +} + +package_gcc-go() +{ + pkgdesc="Go front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-go.install + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libgo + make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION +} diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install new file mode 100644 index 000000000..df0553a4f --- /dev/null +++ b/staging/gcc/gcc-ada.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gnat-style.info gnat_rm.info gnat_ugn.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install new file mode 100644 index 000000000..b15d89a97 --- /dev/null +++ b/staging/gcc/gcc-fortran.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +file="gfortran.info" + +post_install() { + [ -x usr/bin/install-info ] || return 0 + install-info $infodir/$file.gz $infodir/dir 2> /dev/null +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null +} diff --git a/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install new file mode 100644 index 000000000..7dc50dee5 --- /dev/null +++ b/staging/gcc/gcc-go.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gccgo.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/staging/gcc/gcc-hash-style-both.patch b/staging/gcc/gcc-hash-style-both.patch new file mode 100644 index 000000000..8b59f4535 --- /dev/null +++ b/staging/gcc/gcc-hash-style-both.patch @@ -0,0 +1,122 @@ +--- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 +@@ -41,7 +41,7 @@ + + #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER + +-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ ++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ + %{O*:-O3} %{!O*:-O1} \ + %{shared:-shared} \ + %{!shared: \ +--- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 ++++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -78,7 +78,7 @@ + %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + + #undef LINK_SPEC +-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ ++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 ++++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -104,7 +104,7 @@ + { "dynamic_linker", LINUX_DYNAMIC_LINKER } + + #undef LINK_SPEC +-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ ++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -64,7 +64,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "\ ++#define LINK_SPEC "--hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 ++++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 +@@ -389,11 +389,11 @@ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + + +-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" + +-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" + +--- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 ++++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 +@@ -830,7 +830,7 @@ + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + +-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" + +--- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -77,7 +77,7 @@ + + #undef LINK_SPEC + #define LINK_SPEC \ +- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ ++ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{static:-static} \ +--- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 ++++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -113,7 +113,7 @@ + { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ + { "link_arch", LINK_ARCH_SPEC }, + +-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ ++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ + " + +-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ + #else /* !SPARC_BI_ARCH */ + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ ++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 ++++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -74,7 +74,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ + %{!shared: \ + %{!static: \ diff --git a/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install new file mode 100644 index 000000000..23553b8f0 --- /dev/null +++ b/staging/gcc/gcc-libs.install @@ -0,0 +1,16 @@ +infodir=usr/share/info +filelist=(libgomp.info libquadmath.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/staging/gcc/gcc-pr49720.patch b/staging/gcc/gcc-pr49720.patch new file mode 100644 index 000000000..8f50c4120 --- /dev/null +++ b/staging/gcc/gcc-pr49720.patch @@ -0,0 +1,26 @@ +--- trunk/gcc/simplify-rtx.c 2011/10/28 05:55:10 180603 ++++ trunk/gcc/simplify-rtx.c 2011/10/28 06:35:31 180604 +@@ -4352,10 +4352,20 @@ + { + rtx x = XEXP (op0, 0); + rtx c = XEXP (op0, 1); ++ enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS; ++ rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c); + +- c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS, +- cmp_mode, op1, c); +- return simplify_gen_relational (code, mode, cmp_mode, x, c); ++ /* Detect an infinite recursive condition, where we oscillate at this ++ simplification case between: ++ A + B == C <---> C - B == A, ++ where A, B, and C are all constants with non-simplifiable expressions, ++ usually SYMBOL_REFs. */ ++ if (GET_CODE (tem) == invcode ++ && CONSTANT_P (x) ++ && rtx_equal_p (c, XEXP (tem, 1))) ++ return NULL_RTX; ++ ++ return simplify_gen_relational (code, mode, cmp_mode, x, tem); + } + + /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is diff --git a/staging/gcc/gcc.install b/staging/gcc/gcc.install new file mode 100644 index 000000000..3407a5e1f --- /dev/null +++ b/staging/gcc/gcc.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch new file mode 100644 index 000000000..8c0baf8e2 --- /dev/null +++ b/staging/gcc/gcc_pure64.patch @@ -0,0 +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. */ + +-#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 + + LIBGCC = stmp-multilib + INSTALL_LIBGCC = install-multilib diff --git a/staging/isl/PKGBUILD b/staging/isl/PKGBUILD new file mode 100644 index 000000000..6c4dcf315 --- /dev/null +++ b/staging/isl/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 144975 2011-12-12 23:17:00Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=isl +pkgver=0.08 +pkgrel=1 +pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" +arch=('i686' 'x86_64') +url="http://www.kotnet.org/~skimo/isl/" +license=('LGPL2.1') +options=('!libtool') +source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) +md5sums=('ea6d534348cae97ff9b20ac5ea13d6bc') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir/" install + + # this seems a better place for this file... + install -dm755 $pkgdir/usr/share/gdb/auto-load/ + mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.8.0.0-gdb.py +} diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD new file mode 100644 index 000000000..88e858d56 --- /dev/null +++ b/testing/pcre/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 144981 2011-12-13 00:29:03Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: John Proctor <jproctor@prium.net> + +pkgname=pcre +pkgver=8.21 +pkgrel=1 +pkgdesc="A library that implements Perl 5-style regular expressions" +arch=('i686' 'x86_64') +url="http://www.pcre.org/" +license=('BSD') +depends=('gcc-libs') +options=('!libtool') +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig}) +md5sums=('0a7b592bea64b7aa7f4011fc7171a730' + '4768871445dff956e620a9e902b4db55') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + + [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" + ./configure --prefix=/usr --enable-jit \ + --enable-utf8 --enable-unicode-properties + make +} + +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + + # grep uses pcre, so we need the libs in /lib + install -dm755 "${pkgdir}"/lib + mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/ + ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so + + install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/texinfo/PKGBUILD b/testing/texinfo/PKGBUILD new file mode 100644 index 000000000..cc20f22b7 --- /dev/null +++ b/testing/texinfo/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 144959 2011-12-12 08:29:38Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=texinfo +pkgver=4.13a +pkgrel=7 +pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/texinfo/" +license=('GPL3') +groups=('base') +depends=('ncurses' 'findutils' 'gzip') +install=texinfo.install +source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} + texinfo-4.13a-data_types.patch) +md5sums=('71ba711519209b5fb583fed2b3d86fcb' + 'db2ca82c831684cd7cef181234017c46' + 'd8574782ff7def1e2dc5c291dbeaec18') + +build() { + cd ${srcdir}/${pkgname}-4.13 + patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-4.13 + make DESTDIR=${pkgdir} install + + # fix this here as it prevents make from trying to rebuild manual pages + sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi +} diff --git a/testing/texinfo/texinfo-4.13a-data_types.patch b/testing/texinfo/texinfo-4.13a-data_types.patch new file mode 100644 index 000000000..2a87c2146 --- /dev/null +++ b/testing/texinfo/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c +--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 ++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); +- int replen; ++ size_t cur_len = mb_len (mbi_cur (iter)); ++ size_t replen; + + if (cur_ptr >= endp) + break; diff --git a/testing/texinfo/texinfo.install b/testing/texinfo/texinfo.install new file mode 100644 index 000000000..f1554e4f4 --- /dev/null +++ b/testing/texinfo/texinfo.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3) + +post_install() { + # Scan *all* info files on install + for file in $(find $infodir -type f ! -name dir); do + install-info $file $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD index 81cc7981d..dc6b251dd 100644 --- a/~fauno/notmuch/PKGBUILD +++ b/~fauno/notmuch/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Richard Murri <admin@richardmurri.com> pkgname=notmuch -pkgver=0.10 +pkgver=0.10.2 pkgrel=1 pkgdesc="Notmuch is not much of an email program" arch=(i686 x86_64 mips64el) @@ -60,4 +60,4 @@ package(){ sed -i -e 's,/site_ruby,,g' Makefile make prefix=${pkgdir}/usr install } -md5sums=('58c005357395bb6f66d06cfa07534d22') +md5sums=('d3905ae96546ef33f4c186e53f19ec56') |