From 52bfe6ef8818437221948dd2c28b22672f20f4d2 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Tue, 21 Jun 2011 11:38:37 -0300 Subject: ~fauno/distcc-zeroconf-3.1-1 --- ~fauno/distccd-zeroconf/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++ ~fauno/distccd-zeroconf/distccd | 38 ++++++++++++++++++++++++++ ~fauno/distccd-zeroconf/distccd.conf.d | 8 ++++++ 3 files changed, 96 insertions(+) create mode 100644 ~fauno/distccd-zeroconf/PKGBUILD create mode 100755 ~fauno/distccd-zeroconf/distccd create mode 100644 ~fauno/distccd-zeroconf/distccd.conf.d diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD new file mode 100644 index 000000000..2faf6acb3 --- /dev/null +++ b/~fauno/distccd-zeroconf/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $ +# Maintainer: Judd Vinet +# Contributor: Giovanni Scafora + +pkgname=distcc-zeroconf +_pkgname=distcc +pkgver=3.1 +pkgrel=1 +pkgdesc="A distributed C, C++, Obj C compiler with zeroconf support" +arch=('i686' 'x86_64') +url="http://code.google.com/p/distcc/" +license=('GPL') +depends=('gcc' 'popt' 'avahi') +makedepends=('gtk2' 'pkgconfig') +optdepends=('gtk2: for distccmon-gnome') +provides=('distcc') +conflicts=('distcc') +replaces=('distcc') +backup=(etc/conf.d/distccd) +options=(!distcc) +source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2 + distccd + distccd.conf.d) +md5sums=('a1a9d3853df7133669fffec2a9aab9f3' + '1c918474372c09304772c20c4de484fa' + '89aaf6e9072092e283465a14e83f0f94') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-gtk \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --disable-Werror + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd + install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd + + install -d ${pkgdir}/usr/lib/${_pkgname}/bin + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++ + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp + ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++ +} diff --git a/~fauno/distccd-zeroconf/distccd b/~fauno/distccd-zeroconf/distccd new file mode 100755 index 000000000..4702d6820 --- /dev/null +++ b/~fauno/distccd-zeroconf/distccd @@ -0,0 +1,38 @@ +#!/bin/bash + +[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/bin/distccd` +case "$1" in + start) + stat_busy "Starting distcc Daemon" + [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon distccd + stat_done + fi + ;; + stop) + stat_busy "Stopping distcc Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon distccd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d new file mode 100644 index 000000000..8f90cb503 --- /dev/null +++ b/~fauno/distccd-zeroconf/distccd.conf.d @@ -0,0 +1,8 @@ +# +# Parameters to be passed to distccd +# +# You must explicitly add IPs (or subnets) that are allowed to connect, +# using the --allow switch. See the distccd manpage for more info. +# +DISTCC_ARGS="--user nobody --allow 127.0.0.1" + -- cgit v1.2.3-54-g00ecf From 6f7a8ccae9226e8cdaa8176f6daa750480b042c9 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Fri, 24 Jun 2011 17:15:33 -0500 Subject: Added cleansystem --- libre/libretools/PKGBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 7f859fa3f..a7024228a 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -23,7 +23,7 @@ build() { ## Git checkout if [ -d $srcdir/${_gitname} ] ; then msg "Git checkout: Updating existing tree" - cd ${_gitname} && git pull origin + cd ${_gitname} && git pull ${_gitroot} msg "Git checkout: Tree has been updated" else msg "Git checkout: Retrieving sources" @@ -34,12 +34,14 @@ build() { } package() { - install -d ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/sbin - install -d ${pkgdir}/etc + install -d ${pkgdir}/etc install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ + install -d ${pkgdir}/etc/libretools.d + install -m644 ${_gitname}/cleansystem ${pkgdir}/etc/libretools.d + + install -d ${pkgdir}/usr/bin install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin install -m755 ${_gitname}/aur ${pkgdir}/usr/bin @@ -59,6 +61,7 @@ package() { install -m755 ${_gitname}/toru ${pkgdir}/usr/bin install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin + install -d ${pkgdir}/usr/sbin install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/ } \ No newline at end of file -- cgit v1.2.3-54-g00ecf From e0f8a4595a22bfcfd309088bf2b0d6fccb20e896 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Wed, 22 Jun 2011 04:02:02 -0500 Subject: new libretools.install --- libre/libretools/libretools.install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 8eea37689..f8f447e2f 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,4 +1,3 @@ - # arg 1: the new package version post_install() { cat < Date: Wed, 22 Jun 2011 13:13:17 -0300 Subject: mplayer-libre-33690-1 --- libre/mplayer-libre/PKGBUILD | 116 +++++++++++++++++++++--------------- libre/mplayer-libre/mplayer.desktop | 2 +- 2 files changed, 68 insertions(+), 50 deletions(-) diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 238fa973b..c3b4a0830 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,59 +1,77 @@ -# $Id$ +# $Id: PKGBUILD 128080 2011-06-21 18:32:19Z ibiru $ # Maintainer : Ionut Biru # Contributor: Hugo Doria -# Maintainer for Parabola GNU/Linux: Omar Botta -pkgname=mplayer-libre -pkgver=33159 +_pkgbase=mplayer +pkgbase=mplayer-libre +pkgname=('mplayer-libre' 'mencoder-libre') +pkgver=33690 pkgrel=1 -pkgdesc="A movie player for linux. Libre version without faac." arch=('i686' 'x86_64') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' - 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'libvdpau' - 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'speex' 'fribidi' 'desktop-file-utils') +makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' +'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' +'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig') license=('GPL') url="http://www.mplayerhq.hu/" -makedepends=('unzip' 'mesa' 'live-media' 'yasm' 'git') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png) -provides=("mplayer=$pkgver") -conflicts=('mplayer') -replaces=('mplayer') -md5sums=('caedcdc1e50b5575c38c2a85f9c53afc' - '647b9f4ab5284a7fef3f84f992214e77' - 'd00874ccc644b7f43d6ef1c942fcef28') +options=(!buildflags !emptydirs !distcc) +source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop) +md5sums=('7efa332d381a1461f8518730f8c52e4d' + 'c0d6ef795cf6de48e3b87ff7c23f0319') build() { - # Custom CFLAGS break the mplayer build - unset CFLAGS LDFLAGS - - cd ${srcdir}/${pkgname%-libre} - - ./configure --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --enable-speex \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --disable-faac \ - --enable-xvmc \ - --language=all \ - --confdir=/etc/mplayer - - [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak - - make - make -j1 DESTDIR=${pkgdir} install - install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ - install -dm755 ${pkgdir}/usr/share/mplayer/ - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf - rm -rf ${pkgdir}/usr/share/mplayer/font - #desktop file FS#14770 - install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop - install -Dm644 ${srcdir}/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png + cd ${srcdir}/${_pkgbase} + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-gui \ + --disable-arts \ + --disable-liblzo \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-esd \ + --disable-mga \ + --enable-xvmc \ + --language=all \ + --confdir=/etc/mplayer + [ "$CARCH" = "i686" ] && sed 's|-march=i486|-march=i686|g' -i config.mak + + make +} + +package_mplayer-libre() { + pkgdesc="A movie player for linux (no unfree faac support)" + install=mplayer.install + backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') + depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' + 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + 'libjpeg' 'faad2' 'libxvmc' 'schroedinger') + provides=("mplayer=$pkgver") + replaces=('mplayer') + conflicts=('mplayer') + + cd ${srcdir}/${_pkgbase} + + make DESTDIR=${pkgdir} install-mplayer install-mplayer-man + install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/ + install -dm755 ${pkgdir}/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf + rm -rf ${pkgdir}/usr/share/mplayer/font + #desktop file FS#14770 + install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop + install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png +} + +package_mencoder-libre() { + pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger') + provides=("mencoder=$pkgver") + replaces=('mencoder') + conflicts=('mencoder') + + cd ${srcdir}/${_pkgbase} + make DESTDIR=${pkgdir} install-mencoder install-mencoder-man + find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; } diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop index e3229d042..07acea13f 100644 --- a/libre/mplayer-libre/mplayer.desktop +++ b/libre/mplayer-libre/mplayer.desktop @@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器 Comment[pl]=Odtwarzaj filmy i muzykę Icon=mplayer TryExec=mplayer -Exec=mplayer -really-quiet %F +Exec=mplayer %F Terminal=false NoDisplay=true Categories=GTK;AudioVideo;Audio;Video;Player;TV; -- cgit v1.2.3-54-g00ecf From 4fe7f3d22b5ea63f277c0048aacdae6605191e47 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 22 Jun 2011 17:33:58 -0300 Subject: libquicktime-libre-1.2.2-3 --- libre/kernel26-libre/get_configs | 17 ----------------- libre/libquicktime-libre/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 17 deletions(-) delete mode 100755 libre/kernel26-libre/get_configs create mode 100644 libre/libquicktime-libre/PKGBUILD diff --git a/libre/kernel26-libre/get_configs b/libre/kernel26-libre/get_configs deleted file mode 100755 index 624ea1048..000000000 --- a/libre/kernel26-libre/get_configs +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -source PKGBUILD - -pkgname=${pkgname/-libre/} -KERNEL_VERSION=${2:-${_basekernel}-ARCH} -from=${1:-core} - -for pkgarch in ${arch[@]}; do - wget -nc "http://mirrors.kernel.org/archlinux/$from/os/${pkgarch}/${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" - tar -xOf "${pkgname}-headers-${pkgver}-${pkgrel}-${pkgarch}.pkg.tar.xz" usr/src/linux-${KERNEL_VERSION}/.config > config.${pkgarch} -done - -sed -i "s/-ARCH/-LIBRE/" config.* - -exit 0 - diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD new file mode 100644 index 000000000..c6e4ab588 --- /dev/null +++ b/libre/libquicktime-libre/PKGBUILD @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Mateusz Herych + +pkgname=libquicktime-libre +_pkgname=libquicktime +pkgver=1.2.2 +pkgrel=3 +pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." +arch=('i686' 'x86_64') +license=('GPL') +url="http://libquicktime.sourceforge.net/" +depends=('gtk2' 'ffmpeg' 'alsa-lib' 'libxv' 'libgl' 'libxaw' 'x264' 'faad2') +options=('!libtool') +source=(http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz) +sha256sums=('a83ddaaeaf98231d9f224190dcb8810ebdabd3edb5c8cebe2fb083d25edb7436') +provides=("$_pkgname=$pkgver") +conflicts=($_pkgname) +replaces=($_pkgname) + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-gpl \ + --with-ffmpeg \ + --with-x264 \ + --without-doxygen + make +} + +package() { + cd $srcdir/$_pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + -- cgit v1.2.3-54-g00ecf From d9fa128959ed1cbf9dc5b636eb18932746844ada Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 23 Jun 2011 01:23:46 -0300 Subject: ~fauno/transmission-remote-cli-git-20110623-1 --- ~fauno/transmission-remote-cli-git/PKGBUILD | 48 ++++++++++++++++++++++++ ~fauno/transmission-remote-cli-git/python2.patch | 9 +++++ 2 files changed, 57 insertions(+) create mode 100644 ~fauno/transmission-remote-cli-git/PKGBUILD create mode 100644 ~fauno/transmission-remote-cli-git/python2.patch diff --git a/~fauno/transmission-remote-cli-git/PKGBUILD b/~fauno/transmission-remote-cli-git/PKGBUILD new file mode 100644 index 000000000..3e513edd7 --- /dev/null +++ b/~fauno/transmission-remote-cli-git/PKGBUILD @@ -0,0 +1,48 @@ +# Maintainer: fauno +pkgname=transmission-remote-cli-git +pkgver=20110623 +pkgrel=1 +pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission" +arch=('any') +url="http://github.com/fagga/transmission-remote-cli" +license=('GPL3') +depends=('python2') +optdepends=('adns-python: Resolve IPs to host names' + 'python-geoip: Guess which country peers come from') +makedepends=('git') +provides=('transmission-remote-cli') +conflicts=('transmission-remote-cli') +install= +source=(python2.patch) + +_gitroot="http://github.com/fagga/transmission-remote-cli.git" +_gitname="transmission-remote-cli" + +build() { + cd "$srcdir" + msg "Connecting to the GIT repository..." + + if [ -d "$srcdir/$_gitname" ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + fi + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + cd $srcdir/$_gitname-build + + patch -Np1 -i ${srcdir}/python2.patch + + install -d $pkgdir/usr/bin/ + install -D transmission-remote-cli.py $pkgdir/usr/bin/transmission-remote-cli + +} + +md5sums=('6273609fb3a7294328aeaa526b76411c') diff --git a/~fauno/transmission-remote-cli-git/python2.patch b/~fauno/transmission-remote-cli-git/python2.patch new file mode 100644 index 000000000..256b676f0 --- /dev/null +++ b/~fauno/transmission-remote-cli-git/python2.patch @@ -0,0 +1,9 @@ +diff -Nur transmission-remote-cli/transmission-remote-cli.py transmission-remote-cli-python2//transmission-remote-cli.py +--- transmission-remote-cli/transmission-remote-cli.py 2010-10-19 10:33:49.544594708 -0300 ++++ transmission-remote-cli-python2//transmission-remote-cli.py 2010-10-19 10:42:51.278983745 -0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + ######################################################################## + # This is transmission-remote-cli, whereas 'cli' stands for 'Curses # + # Luminous Interface', a client for the daemon of the BitTorrent # -- cgit v1.2.3-54-g00ecf From 2bb3f0fc554caa25effd1e3076280c6078b61f81 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 23 Jun 2011 01:59:41 -0300 Subject: libre/kernel26-libre-2.6.39.1-1 --- libre/kernel26-libre/PKGBUILD | 11 +++++------ libre/kernel26-libre/config.i686 | 23 +++++++++++++++-------- libre/kernel26-libre/config.x86_64 | 23 +++++++++++++++-------- libre/kernel26-libre/kernel26.install | 4 ++-- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 736bb1c9b..621a30245 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -9,8 +9,7 @@ _basekernel=2.6.39 pkgver=${_basekernel}.1 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') -#_patchname="patch-${pkgver}-${pkgrel}-LIBRE" -_patchname="patch-2.6.39-1-LIBRE" +_patchname="patch-${pkgver}-${pkgrel}-LIBRE" arch=(i686 x86_64) license=('GPL2') url="http://linux-libre.fsfla.org/" @@ -241,8 +240,8 @@ find $pkgdir -type d -exec chmod 755 {} \; rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } md5sums=('923210b0c4190733bf314e48f588c112' - 'abad63eab1f9485f6b1af76f5109f1e4' - '5d40a23419b48f5b49f1f10be0e733c3' - 'af5937ac06a78907ceb499351bdff7ab' + '252cbddfd9a8bb97181c087fdd5e2377' + 'd5c6c675662d98011513f6cbc81d66db' + '00e8553b44dac65fc093db60a1cde842' '25584700a0a679542929c4bed31433b6' - 'ba583747f515e51ec0f16d535e4be6e0') + 'fdfed5e8b46f289617ee6def01978090') diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686 index 0d9636f62..e31c29f87 100644 --- a/libre/kernel26-libre/config.i686 +++ b/libre/kernel26-libre/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/i386 2.6.39 Kernel Configuration -# Thu May 19 19:49:50 2011 +# Mon Jun 6 20:12:12 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1094,7 +1094,8 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y -# CONFIG_BATMAN_ADV is not set +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -5417,6 +5418,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -5425,7 +5427,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y @@ -5434,20 +5438,24 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set +CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -5458,7 +5466,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64 index 5f6e24386..a373f420b 100644 --- a/libre/kernel26-libre/config.x86_64 +++ b/libre/kernel26-libre/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.39 Kernel Configuration -# Thu May 19 21:49:53 2011 +# Mon Jun 6 22:07:19 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -1061,7 +1061,8 @@ CONFIG_NET_CLS_IND=y CONFIG_NET_SCH_FIFO=y # CONFIG_DCB is not set CONFIG_DNS_RESOLVER=y -# CONFIG_BATMAN_ADV is not set +CONFIG_BATMAN_ADV=m +# CONFIG_BATMAN_ADV_DEBUG is not set CONFIG_RPS=y CONFIG_RFS_ACCEL=y CONFIG_XPS=y @@ -5161,6 +5162,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -5169,7 +5171,9 @@ CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y @@ -5178,20 +5182,24 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_STACK_TRACER is not set +CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -5202,7 +5210,6 @@ CONFIG_ASYNC_RAID6_TEST=m CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_TEST_KSTRTOX=m CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y diff --git a/libre/kernel26-libre/kernel26.install b/libre/kernel26-libre/kernel26.install index 0a7bc7772..8c0c80c85 100644 --- a/libre/kernel26-libre/kernel26.install +++ b/libre/kernel26-libre/kernel26.install @@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.39-LIBRE post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION # generate init ramdisks echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" @@ -84,7 +84,7 @@ post_upgrade() { fi # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" if [ "`vercmp $2 2.6.18`" -lt 0 ]; then -- cgit v1.2.3-54-g00ecf From c8dae906cde38a6fe29988b8e6ca316ce528bbed Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 23 Jun 2011 02:31:09 -0300 Subject: social/ruby-headers-1.9.2_p180-2 --- social/ruby-headers/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/social/ruby-headers/PKGBUILD b/social/ruby-headers/PKGBUILD index 73b85c3c1..9deedb708 100644 --- a/social/ruby-headers/PKGBUILD +++ b/social/ruby-headers/PKGBUILD @@ -5,12 +5,12 @@ pkgname=ruby-headers _pkgname=ruby pkgver=1.9.2_p180 _pkgver=1.9.2-p180 -pkgrel=1 +pkgrel=2 pkgdesc="A package of all Ruby headers needed by some gems like ruby-debug." arch=('any') url="http://www.ruby-lang.org/en/" license=('custom') -depends=('ruby') +depends=("ruby=$pkgver") source=("ftp://ftp.ruby-lang.org/pub/ruby/1.9/$_pkgname-$_pkgver.tar.bz2") build() { -- cgit v1.2.3-54-g00ecf From 10ce50c685654e072132c857d7cc401cdea8e15f Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 23 Jun 2011 02:31:48 -0300 Subject: social/diaspora-git-20110623-1 --- social/diaspora-git/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/social/diaspora-git/PKGBUILD b/social/diaspora-git/PKGBUILD index b19241655..b15f66916 100644 --- a/social/diaspora-git/PKGBUILD +++ b/social/diaspora-git/PKGBUILD @@ -6,7 +6,7 @@ # https://wiki.archlinux.org/index.php/Diaspora pkgname=diaspora-git -pkgver=20110417 +pkgver=20110623 pkgrel=1 pkgdesc="A privacy aware, personally controlled, do-it-all, open source social network" arch=('i686' 'x86_64') -- cgit v1.2.3-54-g00ecf From 2cd16989348cf6c5c60d18ba23d6b619297a2479 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 23 Jun 2011 13:02:41 -0300 Subject: libre/mplayer-libre Readded speex support --- libre/mplayer-libre/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index c3b4a0830..36fcc4aae 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -6,10 +6,10 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=33690 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' -'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' +'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex' 'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig') license=('GPL') url="http://www.mplayerhq.hu/" @@ -26,7 +26,7 @@ build() { --disable-gui \ --disable-arts \ --disable-liblzo \ - --disable-speex \ + --enable-speex \ --disable-openal \ --disable-libdv \ --disable-musepack \ @@ -44,8 +44,8 @@ package_mplayer-libre() { pkgdesc="A movie player for linux (no unfree faac support)" install=mplayer.install backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') - depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' - 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' + depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'speex' + 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger') provides=("mplayer=$pkgver") replaces=('mplayer') @@ -65,7 +65,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" - depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' + depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia' 'speex' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger') provides=("mencoder=$pkgver") replaces=('mencoder') -- cgit v1.2.3-54-g00ecf From 303faf0535f6413f98fd9cd06ac6f55eeebbb156 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Thu, 23 Jun 2011 13:22:50 -0300 Subject: libre/liferea-libre-1.6.5-3 --- libre/liferea-libre/PKGBUILD | 56 ++++++++++++++++++++++ libre/liferea-libre/libnotify-0.7.patch | 21 ++++++++ libre/liferea-libre/liferea.install | 21 ++++++++ .../remove-non-free-suggestions.patch | 31 ++++++++++++ 4 files changed, 129 insertions(+) create mode 100644 libre/liferea-libre/PKGBUILD create mode 100644 libre/liferea-libre/libnotify-0.7.patch create mode 100644 libre/liferea-libre/liferea.install create mode 100644 libre/liferea-libre/remove-non-free-suggestions.patch diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD new file mode 100644 index 000000000..044663626 --- /dev/null +++ b/libre/liferea-libre/PKGBUILD @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Eric Bélanger +# Contributor: bitlord + +pkgbasename=liferea +pkgname=liferea-libre +pkgver=1.6.5 +pkgrel=3 +pkgdesc="A desktop news aggregator for online news feeds and weblogs" +arch=('i686' 'x86_64') +url="http://liferea.sourceforge.net/" +provides=("liferea=$pkgver") +replaces=('liferea') +conflicts=('liferea') +license=('GPL') +depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme') +makedepends=('pkg-config' 'intltool' 'lua' 'libnotify') +optdepends=('lua: for lua scripting support' + 'libnotify: for notification support') +options=('!libtool' '!emptydirs') +install=liferea.install +source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz + libnotify-0.7.patch + remove-non-free-suggestions.patch) +md5sums=('f2d0ae5fb9f763451ba8b9fe2216de9c' + 'fca97e3316c1c51e0179c4c7dcce47a2' + '380284dc0b54ab9488f0659e832e59fa') + +# source PKGBUILD ; mksource +mksource() { + wget http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz \ + -O - | tar xzf - + + pushd liferea-$pkgver >/dev/null + patch -Np1 -i "../remove-non-free-suggestions.patch" || return 1 + popd >/dev/null + + tar cvzf $pkgname-$pkgver.tar.gz liferea-$pkgver/ + rm -rvf liferea-$pkgver/ +} + +build() { + cd "${srcdir}/liferea-${pkgver}" + patch -Np1 -i "$srcdir/libnotify-0.7.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install + make +} + +package() { + cd "${srcdir}/liferea-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas +} diff --git a/libre/liferea-libre/libnotify-0.7.patch b/libre/liferea-libre/libnotify-0.7.patch new file mode 100644 index 000000000..6dbbffb87 --- /dev/null +++ b/libre/liferea-libre/libnotify-0.7.patch @@ -0,0 +1,21 @@ +diff -u -Nr liferea-1.6.5/src/notification/libnotify.c liferea-1.6.5-libnotify/src/notification/libnotify.c +--- liferea-1.6.5/src/notification/libnotify.c 2009-06-20 20:33:19.000000000 +0200 ++++ liferea-1.6.5-libnotify/src/notification/libnotify.c 2011-03-06 23:53:45.783336455 +0100 +@@ -150,7 +150,7 @@ + // notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL); + // notify_notification_clear_actions(n); + +- n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL); ++ n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL); + + notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p)); + +@@ -244,7 +244,7 @@ + + labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), + node_get_title (node), item_count); +- n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL); ++ n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL); + g_free(labelSummary_p); + + notify_notification_set_icon_from_pixbuf (n, node_get_icon (node)); diff --git a/libre/liferea-libre/liferea.install b/libre/liferea-libre/liferea.install new file mode 100644 index 000000000..369a55727 --- /dev/null +++ b/libre/liferea-libre/liferea.install @@ -0,0 +1,21 @@ +pkgname=liferea-libre +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch new file mode 100644 index 000000000..0230fdb78 --- /dev/null +++ b/libre/liferea-libre/remove-non-free-suggestions.patch @@ -0,0 +1,31 @@ +--- liferea-1.6.5/src/ui/ui_prefs.c_orig 2011-06-23 01:33:39.761555322 +0200 ++++ liferea-1.6.5/src/ui/ui_prefs.c 2011-06-23 01:38:02.121556890 +0200 +@@ -76,24 +76,10 @@ + NULL, NULL + }, + { +- /* tested with SeaMonkey 1.0.6 */ +- "mozilla", "Mozilla", "mozilla %s", +- NULL, "mozilla -remote openURL(%s)", +- NULL, "mozilla -remote 'openURL(%s,new-window)'", +- NULL, "mozilla -remote 'openURL(%s,new-tab)'" +- }, +- { +- /* tested with Firefox 1.5 and 2.0 */ +- "firefox", "Firefox","firefox \"%s\"", +- NULL, "firefox -a firefox -remote \"openURL(%s)\"", +- NULL, "firefox -a firefox -remote 'openURL(%s,new-window)'", +- NULL, "firefox -a firefox -remote 'openURL(%s,new-tab)'" +- }, +- { +- "opera", "Opera","opera \"%s\"", +- "opera \"%s\"", "opera -remote \"openURL(%s)\"", +- "opera -newwindow \"%s\"", NULL, +- "opera -newpage \"%s\"", NULL ++ "icecat", "IceCat","icecat \"%s\"", ++ NULL, "icecat -a icecat -remote \"openURL(%s)\"", ++ NULL, "icecat -a icecat -remote 'openURL(%s,new-window)'", ++ NULL, "icecat -a icecat -remote 'openURL(%s,new-tab)'" + }, + { + "epiphany", "Epiphany","epiphany \"%s\"", -- cgit v1.2.3-54-g00ecf From 9e180e3b60b0b17a88041bdcb863db823a2cd54d Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Fri, 24 Jun 2011 10:10:11 -0500 Subject: add mips64el to cups, gtk2, llvm, sane --- extra/cups/PKGBUILD | 2 +- extra/gtk2/PKGBUILD | 2 +- extra/llvm/PKGBUILD | 2 +- extra/sane/PKGBUILD | 9 ++++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD index 4fcd1e8d9..686a8ae63 100644 --- a/extra/cups/PKGBUILD +++ b/extra/cups/PKGBUILD @@ -5,7 +5,7 @@ pkgbase="cups" pkgname=('libcups' 'cups') pkgver=1.4.6 pkgrel=4 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.cups.org/" makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3' diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index de3a8f515..c6db52ab5 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') pkgver=2.24.5 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'krb5' 'gnutls' 'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection') diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD index 234b009b6..76504197a 100644 --- a/extra/llvm/PKGBUILD +++ b/extra/llvm/PKGBUILD @@ -13,7 +13,7 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=2.9 _gcc_ver=4.6.0 pkgrel=5 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('gcc-libs' 'libffi' 'python2' 'ocaml' "gcc=$_gcc_ver") diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index a53386c7b..d54651ccc 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -25,12 +25,19 @@ build() { patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch + if [ ${CARCH} == 'mips64el' ]; then + EXTRAOPTS="--without-snm" + else + EXTRAOPTS="" + fi + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ --enable-avahi \ - --disable-locking + --disable-locking \ + $EXTRAOPTS make } -- cgit v1.2.3-54-g00ecf From 89a9382e3851a12a973da2d255ebfbf654b6125e Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Fri, 24 Jun 2011 10:21:47 -0500 Subject: Commiting libre package $pkg-$pkgver-$pkgrel --- ~xihh/abiword/PKGBUILD | 58 ++++++ ~xihh/abiword/compat_libwpg_0_9.patch | 371 ++++++++++++++++++++++++++++++++++ 2 files changed, 429 insertions(+) create mode 100644 ~xihh/abiword/PKGBUILD create mode 100644 ~xihh/abiword/compat_libwpg_0_9.patch diff --git a/~xihh/abiword/PKGBUILD b/~xihh/abiword/PKGBUILD new file mode 100644 index 000000000..b2e9ef2ca --- /dev/null +++ b/~xihh/abiword/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 102234 2010-12-06 22:32:25Z ibiru $ +# Maintainer: Giovanni Scafora +# Contributor: Maël Lavault + +pkgbase=abiword +pkgname=('abiword' 'abiword-plugins') +pkgver=2.8.6 +pkgrel=4 +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://www.abisource.com" +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup') +options=('!makeflags' '!libtool') +source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbase}-${pkgver}.tar.gz" + compat_libwpg_0_9.patch) +sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df' + 'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" + libtoolize --force + autoreconf + + ./configure --prefix=/usr --enable-clipart --enable-templates --enable-collab-backend-xmpp --enable-collab-backend-tcp --enable-collab-backend-service --disable-collab-backend-sugar --enable-plugins --without-gnomevfs --with-gio --with-goffice --disable-static --with-psiconv-config=/nothere + make +} + +package_abiword() { + pkgdesc="A fully-featured word processor" + depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant') + optdepends=('abiword-plugins') + conflicts=("abiword-plugins<${pkgver}-${pkgrel}") + + cd "${srcdir}/${pkgbase}-${pkgver}" + sed -i plugins/Makefile \ + -e 's/ collab / /' \ + -e 's/ wpg / /' \ + -e 's/ wmf / /' \ + -e 's/ grammar / /' \ + -e 's/ mathview / /' \ + -e 's/ aiksaurus / /' \ + -e 's/ latex / /' \ + -e 's/ ots / /' \ + -e 's/ wordperfect / /' + make DESTDIR="${pkgdir}" install +} + +package_abiword-plugins() { + pkgdesc="Additional plugins for Abiword" + depends=("abiword=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots') + + cd "${srcdir}/${pkgbase}-${pkgver}/plugins" + for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do + make -C ${dir} DESTDIR="${pkgdir}" install + done +} diff --git a/~xihh/abiword/compat_libwpg_0_9.patch b/~xihh/abiword/compat_libwpg_0_9.patch new file mode 100644 index 000000000..cf36e188e --- /dev/null +++ b/~xihh/abiword/compat_libwpg_0_9.patch @@ -0,0 +1,371 @@ +diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4 +--- abiword-2.8.6.orig//plugin-configure.m4 2010-06-13 14:17:27.000000000 -0700 ++++ abiword-2.8.6/plugin-configure.m4 2010-12-06 13:59:43.083048588 -0800 +@@ -794,7 +794,7 @@ + AC_SUBST([OPENXML_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1497,8 +1497,8 @@ + AC_SUBST([EML_LIBS]) + + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4 +--- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,6 +1,6 @@ + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 13:06:11.000000000 -0800 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-06 13:59:53.926381921 -0800 +@@ -60,7 +60,7 @@ + + // Stream class + +-#include ++#include + + #include + #include +@@ -70,12 +70,7 @@ + #include + #endif + +-class AbiWordperfectInputStream : +-#ifdef HAVE_LIBWPS +- public WPSInputStream +-#else +- public WPXInputStream +-#endif ++class AbiWordperfectInputStream : public WPXInputStream + { + public: + AbiWordperfectInputStream(GsfInput *input); +@@ -86,7 +81,7 @@ + + virtual WPXInputStream * getDocumentOLEStream(const char * name); + +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -98,11 +93,7 @@ + }; + + AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : +-#ifdef HAVE_LIBWPS +- WPSInputStream(), +-#else +- WPXInputStream(true), +-#endif ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -117,9 +108,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -256,19 +247,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); ++ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPD_CONFIDENCE_NONE: +- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) +- // however, we'll let the text importer handle such cases +- case WPD_CONFIDENCE_POOR: + return UT_CONFIDENCE_ZILCH; +- case WPD_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPD_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPD_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +@@ -328,7 +312,7 @@ + UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPDResult error = WPDocument::parse(&gsfInput, static_cast(this)); ++ WPDResult error = WPDocument::parse(&gsfInput, static_cast(this), NULL); + + if (error != WPD_OK) + { +@@ -381,9 +365,9 @@ + float marginLeft = 1.0f, marginRight = 1.0f; + + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ + /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) +@@ -456,15 +440,15 @@ + float marginTop = 0.0f, marginBottom = 0.0f; + float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; + if (propList["fo:margin-top"]) +- marginTop = propList["fo:margin-top"]->getFloat(); ++ marginTop = propList["fo:margin-top"]->getDouble(); + if (propList["fo:margin-bottom"]) +- marginBottom = propList["fo:margin-bottom"]->getFloat(); ++ marginBottom = propList["fo:margin-bottom"]->getDouble(); + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + if (propList["fo:text-indent"]) +- textIndent = propList["fo:text-indent"]->getFloat(); ++ textIndent = propList["fo:text-indent"]->getDouble(); + + m_topMargin = marginTop; + m_bottomMargin = marginBottom; +@@ -487,7 +471,7 @@ + + float lineSpacing = 1.0f; + if (propList["fo:line-height"]) +- lineSpacing = propList["fo:line-height"]->getFloat(); ++ lineSpacing = propList["fo:line-height"]->getDouble(); + + UT_String tmpBuffer; + UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", +@@ -504,7 +488,7 @@ + propBuffer += tmpBuffer; + if (i()["style:position"]) + { +- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); ++ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); + propBuffer += tmpBuffer; + } + +@@ -640,9 +624,9 @@ + + // TODO: support spaceAfter + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) + m_bSectionChanged = true; +@@ -709,9 +693,9 @@ + if (propList["style:num-format"]) + listType = propList["style:num-format"]->getStr().cstr()[0]; + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || + m_pCurrentListDefinition->getOutlineHash() != listID || +@@ -749,9 +733,9 @@ + if (propList["libwpd:level"]) + level = propList["libwpd:level"]->getInt(); + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) + { +@@ -871,10 +855,10 @@ + + UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) + + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + + listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; +@@ -1263,7 +1247,7 @@ + virtual UT_Error _loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); ++ WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); + + if (error != WPS_OK) + { +@@ -1302,18 +1286,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPS_CONFIDENCE_NONE: + return UT_CONFIDENCE_ZILCH; +- case WPS_CONFIDENCE_POOR: +- return UT_CONFIDENCE_POOR; +- case WPS_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPS_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPS_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 01:55:49.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-06 13:59:53.929715254 -0800 +@@ -30,13 +30,7 @@ + #define IE_IMP_WP_H + + #include +-#ifdef _WIN32 +-#define POINT WPX_POINT +-#endif + #include +-#ifdef _WIN32 +-#undef POINT +-#endif + #include "ie_imp.h" + #include "ut_string.h" + #include "ut_string_class.h" +@@ -98,7 +92,7 @@ + IE_Imp ** ppie); + }; + +-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl ++class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface + { + public: + IE_Imp_WordPerfect(PD_Document * pDocument); +@@ -154,6 +148,21 @@ + virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} + virtual void closeTable(); + ++ virtual void definePageStyle(const WPXPropertyList&) {} ++ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void defineCharacterStyle(const WPXPropertyList&) {} ++ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void insertSpace() {} ++ virtual void insertField(const WPXString&, const WPXPropertyList&) {} ++ virtual void openComment(const WPXPropertyList&) {} ++ virtual void closeComment() {} ++ virtual void openTextBox(const WPXPropertyList&) {} ++ virtual void closeTextBox() {} ++ virtual void openFrame(const WPXPropertyList&) {} ++ virtual void closeFrame() {} ++ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} ++ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} ++ + + protected: + virtual UT_Error _loadFile(GsfInput * input); +diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4 +--- abiword-2.8.6.orig//plugins/wpg/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,5 +1,5 @@ + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp +--- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 14:52:32.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-06 13:59:53.923048588 -0800 +@@ -31,11 +31,10 @@ + #include + #include + #include +-#include ++#include + #include "xap_Module.h" + + using libwpg::WPGraphics; +-using libwpg::WPGString; + + ABI_PLUGIN_DECLARE("WPG") + +@@ -48,7 +47,7 @@ + virtual bool isOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(const char * name); +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -60,7 +59,7 @@ + }; + + AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : +- WPXInputStream(true), ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -75,9 +74,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -245,10 +244,10 @@ + UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) + { + AbiWordPerfectGraphicsInputStream gsfInput(input); +- WPGString svgOutput; ++ WPXString svgOutput; + if (WPGraphics::generateSVG(&gsfInput, svgOutput)) + { +- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); ++ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); + UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); + g_object_unref(svgInput); + return result; -- cgit v1.2.3-54-g00ecf From 11ab02aef805a5155a50334f61e782501c987325 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 24 Jun 2011 14:06:46 -0300 Subject: social/tinc-1.0.15-1 --- social/tinc/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index c2a7dc51c..1dd9ad328 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,5 +1,5 @@ pkgname=tinc -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64) @@ -7,7 +7,6 @@ url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'zlib' 'openssl') source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz) -md5sums=('967dfafc4aa41a614c1d2739df8a8372') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,3 +23,4 @@ package() { install -d $pkgdir/etc/tinc tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/ } +md5sums=('44bb7d1618955a0a56e9e159f1c46362') -- cgit v1.2.3-54-g00ecf From eb587dda1618381e0b3148121c6c8f46bf8cf1fa Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Fri, 24 Jun 2011 17:00:48 -0300 Subject: libre/kernel26-libre-lts-2.6.32.42-1 --- libre/kernel26-libre-lts/PKGBUILD | 8 +++--- libre/kernel26-libre-lts/config | 30 +++++++++++++--------- libre/kernel26-libre-lts/config.x86_64 | 30 +++++++++++++--------- .../kernel26-libre-lts/kernel26-libre-lts.install | 4 +-- 4 files changed, 42 insertions(+), 30 deletions(-) diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD index 63d0d83da..acbdde5ad 100644 --- a/libre/kernel26-libre-lts/PKGBUILD +++ b/libre/kernel26-libre-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k _kernelname=${pkgname#kernel26-libre} _basekernel=2.6.32 _preset=kernel26-lts.preset -pkgver=${_basekernel}.41 +pkgver=${_basekernel}.42 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -211,8 +211,8 @@ package_kernel26-libre-lts-headers() { # remove unneeded architectures rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa} } -md5sums=('759ac16149fea3bca10a2d723c03e53a' +md5sums=('4344dc9016b73a4910566e4a45087465' '3298f542840c52a8b8abc1b3795e455b' - 'e9fd751f4e7c4bbce027aa83ea90202d' + '9990806b3bf3cec6f8bd419249903613' '2cbfeb3e2a18d45f82f613e97fc23355' - 'fbfc7a1af3208c7b729055d91e1c149a') + 'a03a56a3cd700f0c9004b17e7391f8ff') diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config index fcf978f36..c538b3196 100644 --- a/libre/kernel26-libre-lts/config +++ b/libre/kernel26-libre-lts/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Mon Apr 18 12:31:05 2011 +# Tue Jun 7 06:41:37 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4517,6 +4517,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4524,7 +4525,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y @@ -4532,24 +4535,28 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_SYSPROF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BOOT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set +CONFIG_POWER_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_KMEMTRACE=y +CONFIG_WORKQUEUE_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -4558,7 +4565,6 @@ CONFIG_MMIOTRACE=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64 index 2202caeeb..5f7e05284 100644 --- a/libre/kernel26-libre-lts/config.x86_64 +++ b/libre/kernel26-libre-lts/config.x86_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue May 10 08:27:04 2011 +# Tue Jun 7 08:38:42 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -4328,6 +4328,7 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y # CONFIG_DEBUG_PAGEALLOC is not set CONFIG_USER_STACKTRACE_SUPPORT=y CONFIG_NOP_TRACER=y +CONFIG_HAVE_FTRACE_NMI_ENTER=y CONFIG_HAVE_FUNCTION_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y @@ -4335,7 +4336,9 @@ CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_TRACER_MAX_TRACE=y CONFIG_RING_BUFFER=y +CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_CONTEXT_SWITCH_TRACER=y CONFIG_RING_BUFFER_ALLOW_SWAP=y @@ -4343,24 +4346,28 @@ CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y CONFIG_FTRACE=y -# CONFIG_FUNCTION_TRACER is not set +CONFIG_FUNCTION_TRACER=y +CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set -# CONFIG_SYSPROF_TRACER is not set -# CONFIG_SCHED_TRACER is not set -# CONFIG_FTRACE_SYSCALLS is not set -# CONFIG_BOOT_TRACER is not set +CONFIG_SYSPROF_TRACER=y +CONFIG_SCHED_TRACER=y +CONFIG_FTRACE_SYSCALLS=y +CONFIG_BOOT_TRACER=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set -# CONFIG_POWER_TRACER is not set -# CONFIG_STACK_TRACER is not set -# CONFIG_KMEMTRACE is not set -# CONFIG_WORKQUEUE_TRACER is not set +CONFIG_POWER_TRACER=y +CONFIG_STACK_TRACER=y +CONFIG_KMEMTRACE=y +CONFIG_WORKQUEUE_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_FUNCTION_PROFILER=y +CONFIG_FTRACE_MCOUNT_RECORD=y # CONFIG_FTRACE_STARTUP_TEST is not set CONFIG_MMIOTRACE=y # CONFIG_MMIOTRACE_TEST is not set -# CONFIG_RING_BUFFER_BENCHMARK is not set +CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set # CONFIG_DYNAMIC_DEBUG is not set @@ -4369,7 +4376,6 @@ CONFIG_MMIOTRACE=y CONFIG_HAVE_ARCH_KGDB=y # CONFIG_KGDB is not set CONFIG_HAVE_ARCH_KMEMCHECK=y -# CONFIG_KMEMCHECK is not set CONFIG_STRICT_DEVMEM=y CONFIG_X86_VERBOSE_BOOTUP=y CONFIG_EARLY_PRINTK=y diff --git a/libre/kernel26-libre-lts/kernel26-libre-lts.install b/libre/kernel26-libre-lts/kernel26-libre-lts.install index c3249445a..8bc94634d 100644 --- a/libre/kernel26-libre-lts/kernel26-libre-lts.install +++ b/libre/kernel26-libre-lts/kernel26-libre-lts.install @@ -7,7 +7,7 @@ KERNEL_VERSION=2.6.32-lts post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION # generate init ramdisks echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" @@ -84,7 +84,7 @@ post_upgrade() { fi # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION + /sbin/depmod $KERNEL_VERSION echo ">>> MKINITCPIO SETUP" echo ">>> ----------------" if [ "`vercmp $2 2.6.18`" -lt 0 ]; then -- cgit v1.2.3-54-g00ecf From 3f505c1787bc9287a9e0d20dc99cd7103d009f90 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Sun, 26 Jun 2011 12:59:49 -0500 Subject: * rePKGBUILD for thunderbird-libre deletes symlinks --- libre/thunderbird-libre/rePKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD index 215f893a1..e71f6ad78 100644 --- a/libre/thunderbird-libre/rePKGBUILD +++ b/libre/thunderbird-libre/rePKGBUILD @@ -25,6 +25,7 @@ build() { } package() { + find ${srcdir} -type l -maxdepth 1 -delete cd ${srcdir} cp -a ./* ${pkgdir} } -- cgit v1.2.3-54-g00ecf From 65823a66fb938d6ed8ca56be8397cf1f09158a0d Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Sun, 26 Jun 2011 15:21:06 -0500 Subject: gdome 0.8.1-3.1 --- extra/gdome2/PKGBUILD | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/extra/gdome2/PKGBUILD b/extra/gdome2/PKGBUILD index 0a8aac671..c6e1eb377 100644 --- a/extra/gdome2/PKGBUILD +++ b/extra/gdome2/PKGBUILD @@ -4,7 +4,7 @@ pkgname=gdome2 pkgver=0.8.1 -pkgrel=3 +pkgrel=3.1 pkgdesc="Gnome DOM Engine" url="http://gdome2.cs.unibo.it/" arch=('i686' 'x86_64' 'mips64el') @@ -20,10 +20,17 @@ build() { CFLAGS="$CFLAGS -fpic" CXXFLAGS="$CXXFLAGS -fpic" fi - ./configure --prefix=/usr --mandir=/usr/share/man --host=${CARCH} + ./configure --prefix=/usr --mandir=/usr/share/man \ + --host=${CARCH} --disable-static make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install -- cgit v1.2.3-54-g00ecf From 0d019772dc265486535db5915b5a99c59e3d4488 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sun, 26 Jun 2011 17:41:46 -0300 Subject: social/tinc-1.0.15-2 Includes daemon script --- social/tinc/PKGBUILD | 17 +++++++++++++---- social/tinc/tincd.conf | 1 + social/tinc/tincd.rcd | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 social/tinc/tincd.conf create mode 100644 social/tinc/tincd.rcd diff --git a/social/tinc/PKGBUILD b/social/tinc/PKGBUILD index 1dd9ad328..a34d3785b 100644 --- a/social/tinc/PKGBUILD +++ b/social/tinc/PKGBUILD @@ -1,12 +1,15 @@ pkgname=tinc pkgver=1.0.15 -pkgrel=1 +pkgrel=2 pkgdesc="VPN (Virtual Private Network) daemon" arch=(i686 x86_64) url="http://www.tinc-vpn.org/" license=('GPL') depends=('lzo2' 'zlib' 'openssl') -source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz) +source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz + tincd.conf + tincd.rcd) +md5sums=('44bb7d1618955a0a56e9e159f1c46362') build() { cd "$srcdir/$pkgname-$pkgver" @@ -20,7 +23,13 @@ package() { make DESTDIR="$pkgdir" install - install -d $pkgdir/etc/tinc + install -d $pkgdir/etc/{tinc,rc.d,conf.d} + + install -Dm755 $srcdir/tincd.rcd $pkgdir/etc/rc.d/tincd + install -Dm755 $srcdir/tincd.conf $pkgdir/etc/conf.d/tincd + tar xzvf doc/sample-config.tar.gz -C $pkgdir/etc/tinc/ } -md5sums=('44bb7d1618955a0a56e9e159f1c46362') +md5sums=('44bb7d1618955a0a56e9e159f1c46362' + '9b40646cd898709e90ae3c32baecb075' + '75516d05803ee6c6b22516e10129ad99') diff --git a/social/tinc/tincd.conf b/social/tinc/tincd.conf new file mode 100644 index 000000000..84547936c --- /dev/null +++ b/social/tinc/tincd.conf @@ -0,0 +1 @@ +NETNAME=yournetname diff --git a/social/tinc/tincd.rcd b/social/tinc/tincd.rcd new file mode 100644 index 000000000..f0a456e17 --- /dev/null +++ b/social/tinc/tincd.rcd @@ -0,0 +1,43 @@ +#!/bin/bash + +daemon_name=tincd + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/$daemon_name.conf + +PID=`pidof -o %PPID /usr/sbin/tincd` + +case "$1" in + start) + stat_busy "Starting ${daemon_name}" + [ -z "$PID" ] && \ + /usr/sbin/tincd -n ${NETNAME} \ + --pidfile=/var/run/tinc.${NETNAME} &> /dev/null + + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ${daemon_name} + stat_done + fi + ;; + stop) + stat_busy "Stopping ${daemon_name}" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ${daemon_name} + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 -- cgit v1.2.3-54-g00ecf From eadaf245dcd43f5a3b33585ff80fdae7e64f850b Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Sun, 26 Jun 2011 18:47:37 -0500 Subject: Commiting libre package kernel26-libre-2.6.39.1-1 --- libre/kernel26-libre/PKGBUILD | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD index 36f75299f..e7b832957 100644 --- a/libre/kernel26-libre/PKGBUILD +++ b/libre/kernel26-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgver=${_basekernel}.1 pkgrel=1 makedepends=('xmlto' 'docbook-xsl') _patchname="patch-${pkgver}-${pkgrel}-LIBRE" -arch=(i686 x86_64) +arch=(i686 x86_64 'mips64el') license=('GPL2') url="http://linux-libre.fsfla.org/" options=(!strip) @@ -252,3 +252,9 @@ find $pkgdir -type d -exec chmod 755 {} \; # remove a file already in kernel26 package rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile } +md5sums=('923210b0c4190733bf314e48f588c112' + '252cbddfd9a8bb97181c087fdd5e2377' + 'd5c6c675662d98011513f6cbc81d66db' + '00e8553b44dac65fc093db60a1cde842' + '25584700a0a679542929c4bed31433b6' + 'fdfed5e8b46f289617ee6def01978090') -- cgit v1.2.3-54-g00ecf From 70d263e486c805e4cab5f6f34bf9d725a2107fe1 Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Mon, 27 Jun 2011 22:19:01 -0500 Subject: removed kde-unstable, multilib, multilib-testing --- kde-unstable/calligra/PKGBUILD | 342 --------------------- kde-unstable/kdebindings-kross/PKGBUILD | 51 --- kde-unstable/kdegraphics-okular/PKGBUILD | 33 -- .../kdegraphics-okular/kdegraphics-okular.install | 12 - multilib-testing/binutils-multilib/PKGBUILD | 75 ----- .../binutils-multilib/binutils.install | 17 - multilib-testing/gcc-multilib/PKGBUILD | 298 ------------------ multilib-testing/gcc-multilib/gcc-ada.install | 20 -- multilib-testing/gcc-multilib/gcc-fortran.install | 16 - multilib-testing/gcc-multilib/gcc-go.install | 20 -- .../gcc-multilib/gcc-hash-style-both.patch | 122 -------- multilib-testing/gcc-multilib/gcc-libs.install | 16 - multilib-testing/gcc-multilib/gcc.install | 20 -- multilib-testing/gcc-multilib/gcc_pure64.patch | 24 -- multilib-testing/lib32-glibc/PKGBUILD | 152 --------- .../lib32-glibc/glibc-2.10-bz4781.patch | 42 --- .../glibc-2.10-dont-build-timezone.patch | 13 - .../glibc-2.12.1-static-shared-getpagesize.patch | 11 - ....12.2-ignore-origin-of-privileged-program.patch | 26 -- .../lib32-glibc/glibc-2.13-futex.patch | 31 -- .../glibc-2.14-fix-resolver-crash-typo.patch | 22 -- .../lib32-glibc/glibc-2.14-libdl-crash.patch | 132 -------- .../glibc-2.14-reexport-rpc-interface.patch | 26 -- .../glibc-2.14-reinstall-nis-rpc-headers.patch | 28 -- .../lib32-glibc/glibc-2.14-revert-4462fad3.patch | 37 --- multilib-testing/lib32-glibc/glibc-__i686.patch | 13 - multilib-testing/lib32-glibc/lib32-glibc.conf | 1 - .../glibc-2.14-fix-resolver-crash-typo.patch | 22 -- multilib/lib32-glibc/glibc-2.14-libdl-crash.patch | 132 -------- .../glibc-2.14-reexport-rpc-interface.patch | 26 -- .../glibc-2.14-reinstall-nis-rpc-headers.patch | 28 -- .../lib32-glibc/glibc-2.14-revert-4462fad3.patch | 37 --- multilib/lib32-keyutils/PKGBUILD | 33 -- multilib/lib32-krb5/PKGBUILD | 61 ---- multilib/lib32-libao/PKGBUILD | 38 --- multilib/wine/PKGBUILD | 145 --------- 36 files changed, 2122 deletions(-) delete mode 100644 kde-unstable/calligra/PKGBUILD delete mode 100644 kde-unstable/kdebindings-kross/PKGBUILD delete mode 100644 kde-unstable/kdegraphics-okular/PKGBUILD delete mode 100644 kde-unstable/kdegraphics-okular/kdegraphics-okular.install delete mode 100644 multilib-testing/binutils-multilib/PKGBUILD delete mode 100644 multilib-testing/binutils-multilib/binutils.install delete mode 100644 multilib-testing/gcc-multilib/PKGBUILD delete mode 100644 multilib-testing/gcc-multilib/gcc-ada.install delete mode 100644 multilib-testing/gcc-multilib/gcc-fortran.install delete mode 100644 multilib-testing/gcc-multilib/gcc-go.install delete mode 100644 multilib-testing/gcc-multilib/gcc-hash-style-both.patch delete mode 100644 multilib-testing/gcc-multilib/gcc-libs.install delete mode 100644 multilib-testing/gcc-multilib/gcc.install delete mode 100644 multilib-testing/gcc-multilib/gcc_pure64.patch delete mode 100644 multilib-testing/lib32-glibc/PKGBUILD delete mode 100644 multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.13-futex.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch delete mode 100644 multilib-testing/lib32-glibc/glibc-__i686.patch delete mode 100644 multilib-testing/lib32-glibc/lib32-glibc.conf delete mode 100644 multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch delete mode 100644 multilib/lib32-glibc/glibc-2.14-libdl-crash.patch delete mode 100644 multilib/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch delete mode 100644 multilib/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch delete mode 100644 multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch delete mode 100644 multilib/lib32-keyutils/PKGBUILD delete mode 100644 multilib/lib32-krb5/PKGBUILD delete mode 100644 multilib/lib32-libao/PKGBUILD delete mode 100644 multilib/wine/PKGBUILD diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD deleted file mode 100644 index 985eb44db..000000000 --- a/kde-unstable/calligra/PKGBUILD +++ /dev/null @@ -1,342 +0,0 @@ -# $Id: PKGBUILD 127250 2011-06-11 13:55:04Z andrea $ -# Maintainer: Ronald van Haren -# Contributor: Andrea Scarpino - -pkgbase=calligra -pkgname=('calligra-filters' - 'calligra-interfaces' - 'calligra-libs' - 'calligra-plugins' - 'calligra-pics' - 'calligra-servicetypes' - 'calligra-templates' - 'calligra-tools' - 'calligra-karbon' - 'calligra-karbon-doc' - 'calligra-kexi' - 'calligra-kexi-doc' - 'calligra-kformula' - 'calligra-kformula-doc' - 'calligra-kounavail' - 'calligra-kplato' - 'calligra-stage' - 'calligra-stage-doc' - 'calligra-krita' - 'calligra-tables' - 'calligra-tables-doc' - 'calligra-words' - 'calligra-handbook' - 'calligra-thesaurus-doc' - 'calligra-braindump' - 'calligra-flow') -pkgver=2.3.72 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.calligra-suite.org' -license=('FDL1.2' 'GPL2' 'LGPL') -makedepends=('kdelibs' 'kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' - 'libgsf' 'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4' - 'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl') -groups=('calligra') -source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('3825e9b2d2fd2f161d4bb7242203e697') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgbase}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_mobile=OFF - make -} - -package_calligra-filters() { - pkgdesc="Filters for the Calligra office suite" - optdepends=('libgsf: Microsoft Word document importer' - 'libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' - 'pstoedit: Karbon EPS import filter' - 'libkdcraw: support for raw images') - conflicts=('koffice-filters') - replaces=('koffice-filters') - install=calligra-filters.install - - cd "${srcdir}"/build/filters - make DESTDIR="${pkgdir}" install -} - -package_calligra-interfaces() { - pkgdesc="Interfaces for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-interfaces') - replaces=('koffice-interfaces') - - cd "${srcdir}"/build/interfaces - make DESTDIR="${pkgdir}" install -} - -package_calligra-libs() { - pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') - conflicts=('koffice-libs') - replaces=('koffice-libs') - - cd "${srcdir}"/build/libs - make DESTDIR="${pkgdir}" install -} - -package_calligra-plugins() { - pkgdesc="Plugins for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-plugins' 'koffice-kchart') - replaces=('koffice-plugins' 'koffice-kchart') - - cd "${srcdir}"/build/plugins - make DESTDIR="${pkgdir}" install -} - -package_calligra-pics() { - pkgdesc="Icons for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-pics') - replaces=('koffice-pics') - install=calligra.install - - cd "${srcdir}"/build/pics - make DESTDIR="${pkgdir}" install -} - -package_calligra-servicetypes() { - pkgdesc="Servicetypes for the Calligra office suite" - conflicts=('koffice-servicetypes') - replaces=('koffice-servicetypes') - install=calligra.install - - cd "${srcdir}"/build/servicetypes - make DESTDIR="${pkgdir}" install -} - -package_calligra-templates() { - pkgdesc="Templates for the Calligra office suite" - conflicts=('koffice-templates') - replaces=('koffice-templates') - - cd "${srcdir}"/build/templates - make DESTDIR="${pkgdir}" install -} - -package_calligra-tools() { - pkgdesc="Tools for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-tools') - replaces=('koffice-tools') - install=calligra-tools.install - - cd "${srcdir}"/build/tools - make DESTDIR="${pkgdir}" install -} - -#### package common files done ##### - -#### package apps and their docs ##### - -package_calligra-karbon() { - pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'calligra-templates') - conflicts=('koffice-karbon') - replaces=('koffice-karbon') - install=calligra-karbon.install - - cd "${srcdir}"/build/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-karbon-doc() { - pkgdesc="Documentation for Karbon" - depends=('calligra-karbon') - conflicts=('koffice-karbon-doc') - replaces=('koffice-karbon-doc') - - cd "${srcdir}"/build/doc/karbon - make DESTDIR="${pkgdir}" install -} - -package_calligra-kexi() { - pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'calligra-templates') - conflicts=('koffice-kexi') - replaces=('koffice-kexi') - install=calligra-kexi.install - - cd "${srcdir}"/build/kexi - make DESTDIR="${pkgdir}" install -} - -package_calligra-kexi-doc() { - pkgdesc="Documentation for Kexi" - depends=('calligra-kexi') - conflicts=('koffice-kexi-doc') - replaces=('koffice-kexi-doc') - - cd "${srcdir}"/build/doc/kexi - make DESTDIR="${pkgdir}" install -} - -package_calligra-kformula() { - pkgdesc="Formula editor" - depends=('calligra-libs' 'calligra-templates') - conflicts=('koffice-kformula') - replaces=('koffice-kformula') - install=calligra-kformula.install - - cd "${srcdir}"/build/kformula - make DESTDIR="${pkgdir}" install -} - -package_calligra-kformula-doc() { - pkgdesc="Documentation for KFormula" - depends=('calligra-kformula') - conflicts=('koffice-kformula-doc') - replaces=('koffice-kformula-doc') - - cd "${srcdir}"/build/doc/kformula - make DESTDIR="${pkgdir}" install -} - -package_calligra-kounavail() { - pkgdesc="Unavailable Calligra Document" - depends=('calligra-libs') - conflicts=('koffice-kounavail') - replaces=('koffice-kounavail') - - cd "${srcdir}"/build/kounavail - make DESTDIR="${pkgdir}" install -} - -package_calligra-kplato() { - pkgdesc="Calligra Project Management Component" - depends=('calligra-words') - conflicts=('koffice-kplato') - replaces=('koffice-kplato') - install=calligra-kplato.install - - cd "${srcdir}"/build/kplato - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage() { - pkgdesc="Write presentation documents" - depends=('calligra-libs' 'calligra-templates') - optdepends=('calligra-filters: import/export filters') - conflicts=('koffice-kpresenter') - replaces=('koffice-kpresenter') - install=calligra-stage.install - - cd "${srcdir}"/build/kpresenter - make DESTDIR="${pkgdir}" install -} - -package_calligra-stage-doc() { - pkgdesc="Documentation for Stage" - depends=('calligra-stage') - conflicts=('koffice-kpresenter-doc') - replaces=('koffice-kpresenter-doc') - - cd "${srcdir}"/build/doc/stage - make DESTDIR="${pkgdir}" install -} - -package_calligra-krita() { - pkgdesc="Edit and paint images" - depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew' - 'qimageblitz' 'poppler-qt' 'openexr' 'opengtl') - optdepends=('calligra-filters: import/export filters') - conflicts=('koffice-krita') - replaces=('koffice-krita') - install=calligra-krita.install - - cd "${srcdir}"/build/krita - make DESTDIR="${pkgdir}" install -} - -package_calligra-tables() { - pkgdesc="Write spreadsheet documents" - depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl') - optdepends=('calligra-filters: import/export filters') - conflicts=('koffice-kspread') - replaces=('koffice-kspread') - install=calligra-tables.install - - cd "${srcdir}"/build/tables - make DESTDIR="${pkgdir}" install -} - -package_calligra-tables-doc() { - pkgdesc="Documentation for Tables" - depends=('calligra-tables') - conflicts=('koffice-kspread-doc') - replaces=('koffice-kspread-doc') - - cd "${srcdir}"/build/doc/tables - make DESTDIR="${pkgdir}" install -} - -package_calligra-words() { - pkgdesc="Word Processor" - depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'calligra-pics' - 'calligra-kounavail') - optdepends=('calligra-filters: import/export filters') - conflicts=('koffice-kword') - replaces=('koffice-kword') - install=calligra-words.install - - cd "${srcdir}"/build/words - make DESTDIR="${pkgdir}" install -} - -package_calligra-handbook() { - pkgdesc="Documentation for Calligra" - conflicts=('koffice-handbook') - replaces=('koffice-handbook') - - cd "${srcdir}"/build/doc/calligra - make DESTDIR="${pkgdir}" install -} - -package_calligra-thesaurus-doc() { - pkgdesc="Documentation for Thesaurus" - conflicts=('koffice-thesaurus-doc') - replaces=('koffice-thesaurus-doc') - - cd "${srcdir}"/build/doc/thesaurus - make DESTDIR="${pkgdir}" install -} - -package_calligra-braindump() { - pkgdesc="Notes and idea gathering" - install=calligra-braindump.install - - cd "${srcdir}"/build/braindump - make DESTDIR="${pkgdir}" install -} - -package_calligra-flow() { - pkgdesc="Flowchart & Diagram Editing" - install=calligra-flow.install - - cd "${srcdir}"/build/flow - make DESTDIR="${pkgdir}" install -} - -package_calligra-flow-doc() { - pkgdesc="Documentation for Flow" - depends=('calligra-flow') - - cd "${srcdir}"/build/doc/flow - make DESTDIR="${pkgdir}" install -} - -##### package apps done ##### diff --git a/kde-unstable/kdebindings-kross/PKGBUILD b/kde-unstable/kdebindings-kross/PKGBUILD deleted file mode 100644 index 8e23d9d30..000000000 --- a/kde-unstable/kdebindings-kross/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 128666 2011-06-25 12:00:22Z andrea $ -# Maintainer: Andrea Scarpino - -pkgbase=kdebindings-kross -pkgname=('kdebindings-kross-python' -# 'kdebindings-kross-ruby' - 'kdebindings-kross-java') -pkgver=4.6.90 -pkgrel=1 -url="http://kde.org/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kdebindings') -makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6') -source=("http://download.kde.org/unstable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2") -sha1sums=('db15d0957951a56bdb8c3727dc68cbc207b0e4b4') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../kross-interpreters-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_ruby=OFF - make -} - -package_kdebindings-kross-python() { - pkgdesc="Python2 language interpreters to enable in-process scripting with Kross" - depends=('kdelibs' 'python2') - - cd "${srcdir}"/build/python - make DESTDIR="${pkgdir}" install -} - -package_kdebindings-kross-java() { - pkgdesc="Java language interpreters to enable in-process scripting with Kross" - depends=('kdelibs' 'openjdk6') - - cd "${srcdir}"/build/java - make DESTDIR="${pkgdir}" install -} - -package_kdebindings-kross-ruby() { - pkgdesc="Ruby language interpreters to enable in-process scripting with Kross" - depends=('kdelibs' 'ruby') - - cd "${srcdir}"/build/ruby - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-okular/PKGBUILD b/kde-unstable/kdegraphics-okular/PKGBUILD deleted file mode 100644 index 6763efad0..000000000 --- a/kde-unstable/kdegraphics-okular/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 128529 2011-06-24 12:42:01Z andrea $ -# Maintainer: Andrea Scarpino - -pkgname=kdegraphics-okular -pkgver=4.6.90 -pkgrel=1 -pkgdesc='Document Viewer' -arch=('i686' 'x86_64') -url="http://kde.org/applications/graphics/okular/" -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdegraphics') -depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' - 'ebook-tools' 'libspectre') -makedepends=('pkgconfig' 'cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/okular-${pkgver}.tar.bz2") -sha1sums=('9de2423f525a82c28158ffd3add82196afce710f') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../okular-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdegraphics-okular/kdegraphics-okular.install b/kde-unstable/kdegraphics-okular/kdegraphics-okular.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdegraphics-okular/kdegraphics-okular.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD deleted file mode 100644 index f3be8bdc7..000000000 --- a/multilib-testing/binutils-multilib/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# $Id: PKGBUILD 48900 2011-06-07 12:25:49Z heftig $ -# Maintainer: Jan "heftig" Steffens -# Contributor: Allan McRae - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils-multilib -pkgver=2.21 -pkgrel=9 -_date=20110605 -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.14' '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=('a2e7784d5d66c1d692a0a1fa248ea66c') - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared \ - --enable-64-bit-bfd --enable-multilib - - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - make configure-host - - make tooldir=${pkgdir}/usr -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - make -k -j1 check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # Rebuild libiberty.a with -fPIC - make -C libiberty clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty - install -m644 libiberty/libiberty.a ${pkgdir}/usr/lib - - # Rebuild libbfd.a with -fPIC - make -C bfd clean - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd - install -m644 bfd/libbfd.a ${pkgdir}/usr/lib - - # Remove Windows/Novell specific man pages - rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* - - # Remove these symlinks, they are not ABI stable. - # Programs should compile static to the .a file. - rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so - echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so - echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so -} diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/multilib-testing/binutils-multilib/binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD deleted file mode 100644 index 952d22b11..000000000 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,298 +0,0 @@ -# $Id: PKGBUILD 48902 2011-06-07 12:26:35Z heftig $ -# Maintainer: Jan "heftig" Steffens -# Contributor: Allan McRae - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgbase='gcc-multilib' -pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.6.0 -pkgrel=7 -_snapshot=4.6-20110603 -_libstdcppmanver=20110201 # Note: check source directory name when updating this -pkgdesc="The GNU Compiler Collection for multilib" -arch=('x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'dejagnu' - 'lib32-glibc>=2.13') -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) -md5sums=('c97d52b2b4e6c8c5cf665ae3eb9e8e49' - '1e9fd2eaf0ee47ea64e82c48998f1999' - '22cec272f9cc2801d3cd348feaca888b' - '4df25b623799b148a0703eaeec8fdf3f') - -if [ -n "${_snapshot}" ]; then - _basedir="${srcdir}/gcc-${_snapshot}" -else - _basedir="${srcdir}/gcc-${pkgver}" -fi - -build() { - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - patch -Np1 -i ${srcdir}/gcc_pure64.patch - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - echo ${pkgver} > gcc/BASE-VER - - cd ${srcdir} - mkdir gcc-build && cd gcc-build - - ${_basedir}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --enable-gnu-unique-object --enable-linker-build-id \ - --with-ppl --enable-cloog-backend=isl \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --enable-multilib --disable-libstdcxx-pch \ - --enable-checking=release - make -} - -check() { - cd gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${_basedir}/contrib/test_summary -} - -package_gcc-libs-multilib() -{ - pkgdesc="Runtime libraries shipped by GCC for multilib" - depends=('glibc>=2.13' "lib32-gcc-libs=$pkgver-$pkgrel") - provides=("gcc-libs=$pkgver-$pkgrel") - conflicts=('gcc-libs') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install - make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} - - # remove stuff in lib32-gcc-libs - rm -rf ${pkgdir}/usr/lib32 - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_lib32-gcc-libs() -{ - pkgdesc="Runtime libraries shipped by GCC (32-bit)" - depends=('lib32-glibc>=2.13' "gcc-libs>=$pkgver") - - cd gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do - make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES - done - - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - - # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm ${pkgdir}/usr/lib32/libgfortran.spec - - # remove stuff in gcc-libs-multilib - rm -rf ${pkgdir}/usr/lib - rm -rf ${pkgdir}/usr/share/info - - # remove static libraries - find ${pkgdir} -name *.a -delete - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-multilib() -{ - pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib" - depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.21-9' 'libmpc' 'cloog' 'ppl') - groups=('multilib-devel') - provides=("gcc=$pkgver-$pkgrel") - conflicts=('gcc') - install=gcc.install - - cd gcc-build - - # unfortunately it is much, much easier to install the lot and clean-up the mess... - make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib{,32}/*.so* - rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib{,32}/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a} - rm -r $pkgdir/usr/lib{,32}/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* - - # many packages require these symlinks - install -dm755 ${pkgdir}/lib - ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp - ln -sf gcc ${pkgdir}/usr/bin/cc - ln -sf g++ ${pkgdir}/usr/bin/c++ - - # POSIX conformance launcher scripts for c89 and c99 - cat > $pkgdir/usr/bin/c89 <<"EOF" -#!/bin/sh -fl="-std=c89" -for opt; do - case "$opt" in - -ansi|-std=c89|-std=iso9899:1990) fl="";; - -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - cat > $pkgdir/usr/bin/c99 <<"EOF" -#!/bin/sh -fl="-std=c99" -for opt; do - case "$opt" in - -std=c99|-std=iso9899:1999) fl="";; - -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 - exit 1;; - esac -done -exec gcc $fl ${1+"$@"} -EOF - - chmod 755 $pkgdir/usr/bin/c{8,9}9 - - # install the libstdc++ man pages - install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-fortran-multilib() -{ - pkgdesc="Fortran front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-fortran=$pkgver-$pkgrel") - conflicts=('gcc-fortran') - install=gcc-fortran.install - - cd gcc-build - make -j1 DESTDIR=${pkgdir} install-target-libquadmath - make -j1 DESTDIR=$pkgdir install-target-libgfortran - make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS - make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} - install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-objc-multilib() -{ - pkgdesc="Objective-C front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-objc=$pkgver-$pkgrel") - conflicts=('gcc-objc') - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libobjc - install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ - - # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib{,32}/libobjc.so* - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-ada-multilib() -{ - pkgdesc="Ada front-end for GCC (GNAT) for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-ada=$pkgver-$pkgrel") - conflicts=('gcc-ada') - install=gcc-ada.install - - cd gcc-build/gcc - make -j1 DESTDIR=$pkgdir ada.install-{common,info} - install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver - - cd ../$CHOST/32/libada - make -j1 DESTDIR=${pkgdir} INSTALL="install" \ - INSTALL_DATA="install -m644" install-gnatlib - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION -} - -package_gcc-go-multilib() -{ - pkgdesc="Go front-end for GCC for multilib" - depends=("gcc-multilib=$pkgver-$pkgrel") - provides=("gcc-go=$pkgver-$pkgrel") - conflicts=('gcc-go') - install=gcc-go.install - - cd gcc-build - make -j1 DESTDIR=$pkgdir install-target-libgo - make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} - install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION -} diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/multilib-testing/gcc-multilib/gcc-ada.install +++ /dev/null @@ -1,20 +0,0 @@ -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/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib-testing/gcc-multilib/gcc-fortran.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -file="gfortran.info" - -post_install() { - [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null -} diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/multilib-testing/gcc-multilib/gcc-go.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(gccgo.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch +++ /dev/null @@ -1,122 +0,0 @@ ---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 -@@ -41,7 +41,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 -+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -78,7 +78,7 @@ - %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 -+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -104,7 +104,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -64,7 +64,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 -+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 -@@ -389,11 +389,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" - ---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 -+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 -@@ -830,7 +830,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" - ---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 -+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 -+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 -@@ -113,7 +113,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -121,7 +121,7 @@ - %{static:-static}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -193,7 +193,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ ---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 -+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 -@@ -74,7 +74,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!static: \ diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib-testing/gcc-multilib/gcc-libs.install +++ /dev/null @@ -1,16 +0,0 @@ -infodir=usr/share/info -filelist=(libgomp.info libquadmath.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib-testing/gcc-multilib/gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch deleted file mode 100644 index 8c6b08171..000000000 --- a/multilib-testing/gcc-multilib/gcc_pure64.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h ---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400 -@@ -49,7 +49,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #undef LINK_SPEC - #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \ -diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64 ---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400 -+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD deleted file mode 100644 index 276d465cd..000000000 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ /dev/null @@ -1,152 +0,0 @@ -# $Id: PKGBUILD 50168 2011-06-25 17:22:07Z heftig $ -# Maintainer: Jan "heftig" Steffens -# Contributor: Jan de Groot -# Contributor: Allan McRae - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuild with each new glibc version - -_pkgbasename=glibc -pkgname=lib32-$_pkgbasename -pkgver=2.14 -pkgrel=4 -_glibcdate=20110617 -pkgdesc="GNU C Library for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") -makedepends=('gcc-multilib>=4.4') -options=('!strip' '!emptydirs') -source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - glibc-2.12.1-static-shared-getpagesize.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.13-futex.patch - glibc-2.14-libdl-crash.patch - #glibc-2.14-fix-resolver-crash-typo.patch - glibc-2.14-revert-4462fad3.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch - lib32-glibc.conf) -md5sums=('e441d745609d93c907b72548ba646dad' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'a3ac6f318d680347bb6e2805d42b73b2' - 'b042647ea7d6f22ad319e12e796bd13e' - '7d0154b7e17ea218c9fa953599d24cc4' - 'cea62cc6b903d222c5f26e05a3c0e0e6' - '46e56492cccb1c9172ed3a235cf43c6c' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - '6e052f1cb693d5d3203f50f9d4e8c33b') - -build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781 - patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch - - # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - patch -Np1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=11929 - # using Fedora "fix" as patch in that bug report causes breakages... - patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch - - # http://www.exploit-db.com/exploits/15274/ - # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch - - # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch - - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...) - # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - - # This fixes the main segfault but not the assert fail (FS#24615) - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 - #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch - # resort to reverting the bad commit completely for the moment - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - - echo "slibdir=/usr/lib32" >> configparms - - export CC="gcc -m32" - - ${srcdir}/glibc/configure --prefix=/usr \ - --libdir=/usr/lib32 --libexecdir=/usr/lib32 \ - --with-headers=/usr/include \ - --enable-add-ons=nptl,libidn \ - --enable-kernel=2.6.27 \ - --with-tls --with-__thread \ - --enable-bind-now --without-gd \ - --without-cvs --disable-profile \ - --disable-multi-arch i686-unknown-linux-gnu - - make -} - -check() { - cd ${srcdir}/glibc-build - - # some errors are expected - manually check log files - make -k check || true -} - -package() { - cd ${srcdir}/glibc-build - make install_root=${pkgdir} install - - rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share}} - - # We need one 32 bit specific header file - find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete - - # manually strip files as stripping libpthread-*.so and libthread_db.so - # with the default $STRIP_SHARED breaks gdb and stripping ld-*.so breaks - # valgrind on x86_64 - - cd $pkgdir - strip $STRIP_BINARIES usr/lib32/getconf/* - - strip $STRIP_STATIC usr/lib32/*.a \ - usr/lib32/{{ld,libpthread}-${pkgver},libthread_db-1.0}.so - - strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libc,libcidn,libcrypt}-${pkgver}.so \ - usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ - usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib32/{pt_chown,{audit,gconv}/*.so} - - # Dynamic linker - install -d -m755 ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ - - # Add /usr/lib32 to the default library search path - install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" - - # Symlink /usr/lib32/locale to /usr/lib/locale - ln -s ../lib/locale "$pkgdir/usr/lib32/locale" -} diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -120,9 +120,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (eip); - /* Note: %esi is zero. */ - movl %esi,%ebp /* terminate the stack frame */ - #ifdef RESET_PID -@@ -155,7 +152,6 @@ - jmp L(haspid) - .previous - #endif -- cfi_endproc; - - cfi_startproc - PSEUDO_END (BP_SYM (__clone)) -diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S ---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000 -+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000 -@@ -89,9 +89,6 @@ - ret - - L(thread_start): -- cfi_startproc; -- /* Clearing frame pointer is insufficient, use CFI. */ -- cfi_undefined (rip); - /* Clear the frame pointer. The ABI suggests this be done, to mark - the outermost frame obviously. */ - xorl %ebp, %ebp -@@ -116,7 +113,6 @@ - /* Call exit with return value from function call. */ - movq %rax, %rdi - call HIDDEN_JUMPTARGET (_exit) -- cfi_endproc; - - cfi_startproc; - PSEUDO_END (BP_SYM (__clone)) diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -timezone data has been split into the package sys-libs/timezone-data - ---- glibc-2.4/Makeconfig -+++ glibc-2.4/Makeconfig -@@ -931,7 +931,7 @@ - stdlib stdio-common libio malloc string wcsmbs time dirent \ - grp pwd posix io termios resource misc socket sysvipc gmon \ - gnulib iconv iconvdata wctype manual shadow gshadow po argp \ -- crypt nss localedata timezone rt conform debug \ -+ crypt nss localedata rt conform debug \ - $(add-on-subdirs) $(dlfcn) $(binfmt-subdir) - - ifndef avoid-generated diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch deleted file mode 100644 index e84754279..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c -@@ -28,7 +28,7 @@ - int - __getpagesize () - { --#ifdef __ASSUME_AT_PAGESIZE -+#if 0 && defined __ASSUME_AT_PAGESIZE - assert (GLRO(dl_pagesize) != 0); - return GLRO(dl_pagesize); - #else diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch deleted file mode 100644 index 9b9c3ac45..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S -@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S -@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: - - 7: movq %rdx, %rax - --#ifndef __ASSUME_PRIVATE_FUTEX -+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME - addq $16, %rsp - cfi_adjust_cfa_offset(-16) - popq %r14 -@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: - cfi_restore(%r12) - retq - --#ifdef __ASSUME_PRIVATE_FUTEX -+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME - cfi_adjust_cfa_offset(16) - cfi_rel_offset(%r12, 8) - cfi_rel_offset(%r13, 0) diff --git a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7d2..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index ee29f8c20..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 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 -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - } -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 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 -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea881..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd822d..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e37492..000000000 --- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c ---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 -+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 -@@ -549,7 +549,7 @@ - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/multilib-testing/lib32-glibc/glibc-__i686.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf deleted file mode 100644 index 9b08c3f43..000000000 --- a/multilib-testing/lib32-glibc/lib32-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib32 diff --git a/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7d2..000000000 --- a/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index ee29f8c20..000000000 --- a/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/elf/dl-close.c b/elf/dl-close.c -index 73b2a2f..9bd91e3 100644 ---- a/elf/dl-close.c -+++ b/elf/dl-close.c -@@ -1,5 +1,5 @@ - /* Close a shared object opened by `_dl_open'. -- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1996-2007, 2009, 2010 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 -@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) - if (map->l_direct_opencount > 0 || map->l_type != lt_loaded - || dl_close_state != not_pending) - { -- if (map->l_direct_opencount == 0) -- { -- if (map->l_type == lt_loaded) -- dl_close_state = rerun; -- else if (map->l_type == lt_library) -- { -- struct link_map **oldp = map->l_initfini; -- map->l_initfini = map->l_orig_initfini; -- _dl_scope_free (oldp); -- } -- } -+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) -+ dl_close_state = rerun; - - /* There are still references to this object. Do nothing more. */ - if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) -diff --git a/elf/dl-deps.c b/elf/dl-deps.c -index 9e30594..3890d00 100644 ---- a/elf/dl-deps.c -+++ b/elf/dl-deps.c -@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, - nneeded * sizeof needed[0]); - atomic_write_barrier (); - l->l_initfini = l_initfini; -+ l->l_free_initfini = 1; - } - - /* If we have no auxiliary objects just go on to the next map. */ -@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING")); - l_initfini[nlist] = NULL; - atomic_write_barrier (); - map->l_initfini = l_initfini; -+ map->l_free_initfini = 1; - if (l_reldeps != NULL) - { - atomic_write_barrier (); -@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); - _dl_scope_free (old_l_reldeps); - } - if (old_l_initfini != NULL) -- map->l_orig_initfini = old_l_initfini; -+ _dl_scope_free (old_l_initfini); - } -diff --git a/elf/dl-libc.c b/elf/dl-libc.c -index 7be9483..a13fce3 100644 ---- a/elf/dl-libc.c -+++ b/elf/dl-libc.c -@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) - - for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) - { -- /* Remove all additional names added to the objects. */ - for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) - { - struct libname_list *lnp = l->l_libname->next; - - l->l_libname->next = NULL; - -+ /* Remove all additional names added to the objects. */ - while (lnp != NULL) - { - struct libname_list *old = lnp; -@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) - if (! old->dont_free) - free (old); - } -+ -+ /* Free the initfini dependency list. */ -+ if (l->l_free_initfini) -+ free (l->l_initfini); - } - - if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 -diff --git a/elf/rtld.c b/elf/rtld.c -index 4a9109e..617e30e 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lnp->dont_free = 1; - lnp = lnp->next; - } -+ l->l_free_initfini = 0; - - if (l != &GL(dl_rtld_map)) - _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, -diff --git a/include/link.h b/include/link.h -index e877104..051b99a 100644 ---- a/include/link.h -+++ b/include/link.h -@@ -1,6 +1,6 @@ - /* Data structure for communication from the run-time dynamic linker for - loaded ELF shared objects. -- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. -+ Copyright (C) 1995-2006, 2007, 2009, 2010 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 -@@ -192,6 +192,9 @@ struct link_map - during LD_TRACE_PRELINKING=1 - contains any DT_SYMBOLIC - libraries. */ -+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be -+ freed, ie. not allocated with -+ the dummy malloc in ld.so. */ - - /* Collected information about own RPATH directories. */ - struct r_search_path_struct l_rpath_dirs; -@@ -240,9 +243,6 @@ struct link_map - - /* List of object in order of the init and fini calls. */ - struct link_map **l_initfini; -- /* The init and fini list generated at startup, saved when the -- object is also loaded dynamically. */ -- struct link_map **l_orig_initfini; - - /* List of the dependencies introduced through symbol binding. */ - struct link_map_reldeps diff --git a/multilib/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch deleted file mode 100644 index e2beea881..000000000 --- a/multilib/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/include/libc-symbols.h b/include/libc-symbols.h -index 67e1ca2..5e7cca5 100644 ---- a/include/libc-symbols.h -+++ b/include/libc-symbols.h -@@ -635,7 +635,7 @@ for linking") - # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) - # define libc_hidden_def(name) hidden_def (name) - # define libc_hidden_weak(name) hidden_weak (name) --# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) -+# define libc_hidden_nolink(name, version) hidden_def (name) - # define libc_hidden_ver(local, name) hidden_ver (local, name) - # define libc_hidden_data_def(name) hidden_data_def (name) - # define libc_hidden_data_weak(name) hidden_data_weak (name) -diff --git a/sunrpc/Makefile b/sunrpc/Makefile -index 5134ce9..40c73d1 100644 ---- a/sunrpc/Makefile -+++ b/sunrpc/Makefile -@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ - des_crypt.h) - headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ - $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h --headers = rpc/netdb.h -+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) - install-others = $(inst_sysconfdir)/rpc - generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ - $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen diff --git a/multilib/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch deleted file mode 100644 index eb0fd822d..000000000 --- a/multilib/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 -From: Andreas Schwab -Date: Tue, 17 May 2011 17:42:30 +0200 -Subject: [PATCH] Reinstall NIS RPC headers - ---- - nis/Makefile | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nis/Makefile b/nis/Makefile -index b5c9609..d2934d9 100644 ---- a/nis/Makefile -+++ b/nis/Makefile -@@ -23,9 +23,9 @@ subdir := nis - - aux := nis_hash - -+headers := $(wildcard rpcsvc/*.[hx]) - distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ -- nisplus-parser.h nis_xdr.h nss \ -- $(wildcard rpcsvc/*.[hx]) -+ nisplus-parser.h nis_xdr.h nss - - # These are the databases available for the nis (and perhaps later nisplus) - # service. This must be a superset of the services in nss. --- -1.7.5.4 - diff --git a/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e37492..000000000 --- a/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c ---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 -+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 -@@ -549,7 +549,7 @@ - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or -@@ -1275,14 +1275,10 @@ - (*thisresplenp > *thisanssizp) - ? *thisanssizp : *thisresplenp); - -- if (recvresp1 || (buf2 != NULL && recvresp2)) { -- *resplen2 = 0; -+ if (recvresp1 || (buf2 != NULL && recvresp2)) - return resplen; -- } - if (buf2 != NULL) - { -- /* No data from the first reply. */ -- resplen = 0; - /* We are waiting for a possible second reply. */ - if (hp->id == anhp->id) - recvresp1 = 1; diff --git a/multilib/lib32-keyutils/PKGBUILD b/multilib/lib32-keyutils/PKGBUILD deleted file mode 100644 index 347bbe56a..000000000 --- a/multilib/lib32-keyutils/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ -# Maintainer: Tobias Powalowski -_pkgbasename=keyutils -pkgname=lib32-$_pkgbasename -pkgver=1.4 -pkgrel=1 -pkgdesc="Linux Key Management Utilities (32-bit)" -arch=(x86_64) -url="http://www.kernel.org" -license=('GPL2' 'LGPL2.1') -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib) -source=(http://people.redhat.com/~dhowells/$_pkgbasename/$_pkgbasename-$pkgver.tar.bz2) - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - sed -i -e '/CFLAGS/s|:= -g -O2|+=|' Makefile - sed -i -e 's/^\(USR\)\?LIBDIR\s*:=.*$/\1LIBDIR=\/usr\/lib32/' Makefile - make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install - - rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc,{s,}bin} -} -md5sums=('e168c1bdaf5aa93c2cbf8a5e7f8ef27b') diff --git a/multilib/lib32-krb5/PKGBUILD b/multilib/lib32-krb5/PKGBUILD deleted file mode 100644 index 32debcbae..000000000 --- a/multilib/lib32-krb5/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $ -# Maintainer: Florian Pritz -# Contributor: Stéphane Gaudreault - -_pkgbasename=krb5 -pkgname=lib32-$_pkgbasename -pkgver=1.9.1 -pkgrel=1 -pkgdesc="The Kerberos network authentication system (32-bit)" -arch=('x86_64') -url="http://web.mit.edu/kerberos/" -license=('custom') -depends=('lib32-e2fsprogs' 'lib32-libldap' lib32-keyutils $_pkgbasename) -makedepends=('perl' gcc-multilib) -provides=('lib32-heimdal') -replaces=('lib32-heimdal') -conflicts=('lib32-heimdal') -source=(http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.9/${_pkgbasename}-${pkgver}-signed.tar) -sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066') -options=('!emptydirs') - -build() { - tar zxvf ${_pkgbasename}-${pkgver}.tar.gz - cd "${srcdir}/${_pkgbasename}-${pkgver}/src" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" - export CPPFLAGS+=" -I/usr/include/et" - ./configure --prefix=/usr \ - --sysconfdir=/etc/krb5 \ - --mandir=/usr/share/man \ - --localstatedir=/var/lia \ - --libdir=/usr/lib32 \ - --enable-shared \ - --with-system-et \ - --with-system-ss \ - --disable-rpath \ - --without-tcl \ - --enable-dns-for-realm \ - --with-ldap - - make -} - -check() { - # We can't do this in the build directory. - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -C src check -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}/src" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libao/PKGBUILD b/multilib/lib32-libao/PKGBUILD deleted file mode 100644 index dc91bedeb..000000000 --- a/multilib/lib32-libao/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 49586 2011-06-18 08:35:08Z bluewind $ -# Maintainer: Florian Pritz -# Contributor: Alexander Rødseth -# Contributor: Christoph Zeiler -# Contributor: dorphell -_pkgbasename=libao -pkgname=lib32-$_pkgbasename -pkgver=1.1.0 -pkgrel=1 -pkgdesc="A cross-platform audio output library and plugins (32-bit)" -url="http://www.xiph.org/ao/" -arch=('x86_64') -license=('GPL') -depends=($_pkgbasename 'lib32-glibc' 'lib32-alsa-lib' 'lib32-libpulse') -makedepends=('gcc-multilib') -groups=('lib32') -options=('!libtool') -source=("http://downloads.xiph.org/releases/ao/$_pkgbasename-$pkgver.tar.gz") -md5sums=('2b2508c29bc97e4dc218fa162cf883c8') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - - make DESTDIR=$pkgdir/ install - rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} -} -# vim:set ts=2 sw=2 et: diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD deleted file mode 100644 index 3130209de..000000000 --- a/multilib/wine/PKGBUILD +++ /dev/null @@ -1,145 +0,0 @@ -# $Id: PKGBUILD 50118 2011-06-24 23:27:03Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Jan "heftig" Steffens -# Contributor: Eduardo Romero -# Contributor: Giovanni Scafora - -pkgname=wine -pkgver=1.3.23 -pkgrel=1 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('71f05bf37c25648f8dbc793dda3da45c') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64) -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - mesa lib32-mesa - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxxf86dga lib32-libxxf86dga - libxi lib32-libxi - alsa-lib lib32-alsa-lib - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libxpm lib32-libxpm - libpng lib32-libpng - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libxslt lib32-libxslt - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - jack lib32-jack - libcups lib32-libcups - gnutls lib32-gnutls - v4l-utils lib32-v4l-utils - oss -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib \ - --with-x \ - --enable-win64 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-x \ - "${_wine32opts[@]}" - - make -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 901f55c6ae5b4888857cbdff1b6bc905264add5f Mon Sep 17 00:00:00 2001 From: Joshua Ismael Haase Hernández Date: Wed, 29 Jun 2011 11:20:12 -0500 Subject: gcc 4.6.0-7 without conflicts --- core/gcc/PKGBUILD | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index c10f0e015..82019ab6e 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -13,7 +13,7 @@ pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu') +makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' '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 @@ -119,17 +119,17 @@ package_gcc() # 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} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec + rm $pkgdir/usr/lib/*.so* # gcc-libs + rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo # gcc-libs + rm $pkgdir/usr/share/info/libgomp.info # gcc-libs + rm $pkgdir/usr/bin/{$CHOST-,}gfortran # gcc-fortran + rm $pkgdir/usr/lib/libgfortran.{spec,a} # gcc-fortran + rm $pkgdir/usr/share/info/gfortran.info #gcc-fortran + rm $pkgdir/usr/lib/lib{objc,gomp}.a rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{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,libgfortranbegin.a} - rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,libgfortranbegin.a} + rm $pkgdir/usr/share/man/man1/gfortran.1 - rm $pkgdir/usr/share/man/man3/ffi* # many packages require these symlinks install -dm755 ${pkgdir}/lib @@ -189,8 +189,7 @@ package_gcc-fortran() 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 + rm ${pkgdir}/usr/lib/libgfortran.so* # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -215,3 +214,8 @@ package_gcc-objc() ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION } +md5sums=('c97d52b2b4e6c8c5cf665ae3eb9e8e49' + '1e9fd2eaf0ee47ea64e82c48998f1999' + '4030ee1c08dd1e843c0225b772360e76' + '67e337993d821d72fccacbed52d48c34' + '4df25b623799b148a0703eaeec8fdf3f') -- cgit v1.2.3-54-g00ecf