diff options
Diffstat (limited to 'multilib')
188 files changed, 0 insertions, 8213 deletions
diff --git a/multilib/binutils-multilib/PKGBUILD b/multilib/binutils-multilib/PKGBUILD deleted file mode 100644 index f80d4cfe9..000000000 --- a/multilib/binutils-multilib/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 62199 2012-01-18 10:46:41Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc - -pkgname=binutils-multilib -pkgver=2.22 -pkgrel=4.1 -_date=20111227 -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=('c2377089c15bb1a1bfaeca8d0e59dd4d') - -build() { - cd ${srcdir} - mkdir binutils-build && cd binutils-build - - ${srcdir}/binutils/configure --prefix=/usr \ - --enable-ld=default --enable-gold \ - --enable-plugins --enable-threads \ - --enable-shared \ - --enable-64-bit-bfd --enable-multilib - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=${pkgdir}/usr - - # Rebuild libiberty.a with -fPIC - cp -a libiberty libiberty-pic - make -C libiberty-pic clean - make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic - - # Rebuild libbfd.a with -fPIC - # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API - cp -a bfd bfd-pic - make -C bfd-pic clean - make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic -} - -check() { - cd ${srcdir}/binutils-build - - # do not abort on errors - manually check log files - make -k -j1 check || true -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Add some useful headers - install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include - install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include - - # install libraries rebuilt with -fPIC - install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib - install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib - - # 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/binutils-multilib/binutils.install b/multilib/binutils-multilib/binutils.install deleted file mode 100644 index 8bf9f3a47..000000000 --- a/multilib/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/chuck/PKGBUILD b/multilib/chuck/PKGBUILD deleted file mode 100644 index a06c7da6a..000000000 --- a/multilib/chuck/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 62200 2012-01-18 10:46:43Z heftig $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Contributor: Jeff Mickey <jeff@archlinux.org> -# Contributor: tardo <tardo@nagi-fanboi.net> - -pkgname=chuck -pkgver=1.2.1.3 -pkgrel=5.1 -pkgdesc="Concurrent, on-the-fly audio programming language." -arch=('i686' 'x86_64') -url="http://chuck.cs.princeton.edu/" -license=('GPL') -depends=('gcc-libs' 'libsndfile' 'alsa-lib') -makedepends=('bison' 'flex') -source=(http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz) -md5sums=('ac8459b4067c2491fbdeb61d122a5985') - -if [[ $CARCH == x86_64 ]]; then - depends=('lib32-gcc-libs' 'lib32-libsndfile' 'lib32-alsa-lib') - makedepends+=('gcc-multilib') -fi - -build() { - if [[ $CARCH == x86_64 ]]; then - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - fi - - cd $srcdir/$pkgname-$pkgver/src - CFLAGS="$CFLAGS -fno-strict-aliasing" - - # This can be linux-alsa linux-jack linux-oss osx win32 - make linux-alsa -} - -package() { - cd $srcdir/$pkgname-$pkgver/src - install -D -m 755 chuck $pkgdir/usr/bin/chuck -} diff --git a/multilib/dev86/PKGBUILD b/multilib/dev86/PKGBUILD deleted file mode 100644 index bde7ba3be..000000000 --- a/multilib/dev86/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 59310 2011-11-23 10:19:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Alessio 'mOLOk' Bolognino <themolok@gmail.com> -# Contributor: Suat SARIALP <muhendis.suat@gmail.com> - -pkgname=dev86 -pkgver=0.16.18 -pkgrel=3 -pkgdesc="Simple C compiler to generate 8086 code" -arch=('i686' 'x86_64') -url="http://www.debath.co.uk/dev86/" -license=(GPL) -if [ "${CARCH}" == "x86_64" ]; then - depends=('lib32-glibc') - makedepends=('bin86' 'gcc-multilib') -else - makedepends=('bin86') -fi -options=('!libtool' '!strip' '!makeflags') -source=(http://www.debath.co.uk/dev86/Dev86src-$pkgver.tar.gz - dev86-pic.patch - dev86-0.16.17-fortify.patch) -md5sums=('f2e06b547397383b2b2650b9c4fd9bab' - '1b750c5561a4bde5f83f65e5827feb73' - '07238f9203c6528ea1e34198e771ea12') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -Np0 -i $srcdir/dev86-pic.patch - patch -Np1 -i $srcdir/dev86-0.16.17-fortify.patch - if [ "${CARCH}" = "x86_64" ]; then - # x86_64 fix - sed -i.orig -e 's,alt-libs elksemu,alt-libs,' \ - -e 's,install-lib install-emu,install-lib,' \ - $srcdir/$pkgname-$pkgver/makefile.in - sed -i -e "s/-O2 -g/-O2 -g -m32/" makefile.in - sed -i 's|^LDFLAGS.*=$|LDFLAGS=-m32|' makefile.in - fi - - unset CFLAGS - unset LDFLAGS - unset CPPFLAGS - unset CXXFLAGS - - make PREFIX=/usr DIST="$pkgdir" - make install-all DIST="$pkgdir" - mkdir -p $pkgdir/usr/share - mv $pkgdir/usr/man $pkgdir/usr/share - # remove all the stuff supplied by bin86 - rm $pkgdir/usr/bin/{as,ld,nm,objdump,size}86 - rm $pkgdir/usr/share/man/man1/{as,ld}86.1 -} diff --git a/multilib/dev86/dev86-0.16.17-fortify.patch b/multilib/dev86/dev86-0.16.17-fortify.patch deleted file mode 100644 index 715d0c4ca..000000000 --- a/multilib/dev86/dev86-0.16.17-fortify.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- dev86-0.16.17/bcc/bcc.c -+++ dev86-0.16.17/bcc/bcc.c -@@ -19,6 +19,7 @@ - #ifdef __STDC__ - #include <stdlib.h> - #ifndef MSDOS -+#include <limits.h> - #include <unistd.h> - #endif - #else -@@ -596,12 +597,17 @@ - } - } - --void --command_reset() --{ - #ifndef MAXPATHLEN -+#ifdef PATH_MAX -+#define MAXPATHLEN PATH_MAX -+#else - #define MAXPATHLEN 1024 - #endif -+#endif -+ -+void -+command_reset() -+{ - char buf[MAXPATHLEN]; - char ** prefix; - char * saved_cmd; -@@ -1308,11 +1314,7 @@ - - for(d=s=ptr; d && *s; s=d) - { --#ifdef MAXPATHLEN - char buf[MAXPATHLEN]; --#else -- char buf[1024]; --#endif - - free(temp); - d=strchr(s, ':'); diff --git a/multilib/dev86/dev86-pic.patch b/multilib/dev86/dev86-pic.patch deleted file mode 100644 index 439c2648b..000000000 --- a/multilib/dev86/dev86-pic.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- elksemu/elks.c.orig 2005-11-04 01:35:37.000000000 +0100 -+++ elksemu/elks.c 2005-11-04 01:45:28.000000000 +0100 -@@ -129,8 +129,17 @@ - static inline int vm86_mine(struct vm86_struct* v86) - { - int __res; -+#ifndef __PIC__ - __asm__ __volatile__("int $0x80\n" - :"=a" (__res):"a" ((int)OLD_SYS_vm86), "b" ((int)v86)); -+#else -+ __asm__ __volatile__( -+ "movl %%ebx,%%ecx\n\t" -+ "movl %2,%%ebx\n\t" -+ "int $0x80\n\t" -+ "movl %%ecx,%%ebx\n\t" -+ :"=a" (__res):"a" ((int)OLD_SYS_vm86), "r" ((int)v86) : "ecx"); -+#endif - return __res; - } - #endif diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD deleted file mode 100644 index cecc0212b..000000000 --- a/multilib/gcc-multilib/PKGBUILD +++ /dev/null @@ -1,314 +0,0 @@ -# $Id: PKGBUILD 63480 2012-02-05 03:55:21Z allan $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: libtool requires rebuilt with each new gcc version - -pkgbase='gcc-multilib' -pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -pkgver=4.6.2 -pkgrel=7 -_snapshot=4.6-20120120 -_libstdcppmanver=20111215 -pkgdesc="The GNU Compiler Collection for multilib" -arch=('x86_64') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' - 'lib32-glibc>=2.14') -checkdepends=('dejagnu') -options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2 - gcc_pure64-multilib.patch - gcc-hash-style-both.patch - gcc-4.6.2-cloog-0.17.patch) -md5sums=('f7ca5d9f7a07216577f81318b7cf56ef' - '450772ce32daed97d7383199f8797f33' - '7da5b7ab75b3c29993f953b18bc38579' - '4df25b623799b148a0703eaeec8fdf3f' - '6d9939a2e667376031679ac9f9c49263') - -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-multilib.patch - patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch - - # compatibility with latest cloog - patch -Np1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch - - 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 \ - --disable-libstdcxx-pch --enable-libstdcxx-time \ - --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-libssp \ - --enable-checking=release --with-fpmath=sse - 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.14' "lib32-gcc-libs=$pkgver-$pkgrel") - provides=("gcc-libs=$pkgver-$pkgrel") - conflicts=('gcc-libs') - install=gcc-libs.install - - cd gcc-build - make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do - 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.14' "gcc-libs>=$pkgver") - - cd gcc-build - make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libstdc++-v3/src; do - 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.22' '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++ - - # install gengtype for plugin support - install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ - - # plugin headers are all over the place at the moment... - for i in common objc pragma pretty-print; do - ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h - done - - # 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}/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/gcc-multilib/gcc-4.6.2-cloog-0.17.patch b/multilib/gcc-multilib/gcc-4.6.2-cloog-0.17.patch deleted file mode 100644 index 0503a05ed..000000000 --- a/multilib/gcc-multilib/gcc-4.6.2-cloog-0.17.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure ---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000 -+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000 -@@ -6049,8 +6049,8 @@ - LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}" - - if test "${cloog_org}" = yes ; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5 --$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5 -+$as_echo_n "checking for version 0.17 of CLooG... " >&6; } - if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -@@ -6061,8 +6061,7 @@ - main () - { - #if CLOOG_VERSION_MAJOR != 0 \ -- || CLOOG_VERSION_MINOR != 16 \ -- || CLOOG_VERSION_REVISION < 1 -+ || CLOOG_VERSION_MINOR != 17 - choke me - #endif - ; -diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c ---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c 2011-03-13 08:05:38.000000000 +1000 -+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c 2012-02-03 17:51:47.943463879 +1000 -@@ -1367,7 +1367,7 @@ - /* Change cloog output language to C. If we do use FORTRAN instead, cloog - will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if - we pass an incomplete program to cloog. */ -- options->language = LANGUAGE_C; -+ options->language = CLOOG_LANGUAGE_C; - - /* Enable complex equality spreading: removes dummy statements - (assignments) in the generated code which repeats the diff --git a/multilib/gcc-multilib/gcc-ada.install b/multilib/gcc-multilib/gcc-ada.install deleted file mode 100644 index df0553a4f..000000000 --- a/multilib/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/gcc-multilib/gcc-fortran.install b/multilib/gcc-multilib/gcc-fortran.install deleted file mode 100644 index b15d89a97..000000000 --- a/multilib/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/gcc-multilib/gcc-go.install b/multilib/gcc-multilib/gcc-go.install deleted file mode 100644 index 7dc50dee5..000000000 --- a/multilib/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/gcc-multilib/gcc-hash-style-both.patch b/multilib/gcc-multilib/gcc-hash-style-both.patch deleted file mode 100644 index 8b59f4535..000000000 --- a/multilib/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/gcc-multilib/gcc-libs.install b/multilib/gcc-multilib/gcc-libs.install deleted file mode 100644 index 23553b8f0..000000000 --- a/multilib/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/gcc-multilib/gcc.install b/multilib/gcc-multilib/gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/multilib/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/gcc-multilib/gcc_pure64-multilib.patch b/multilib/gcc-multilib/gcc_pure64-multilib.patch deleted file mode 100644 index 73df6b873..000000000 --- a/multilib/gcc-multilib/gcc_pure64-multilib.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r gcc-4.6-20111223/gcc/config/i386/linux64.h gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h ---- gcc-4.6-20111223/gcc/config/i386/linux64.h 2011-09-08 11:12:35.000000000 +0200 -+++ gcc-4.6-20111223-pure64/gcc/config/i386/linux64.h 2012-01-14 19:52:33.688573352 +0100 -@@ -63,7 +63,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #if TARGET_64BIT_DEFAULT - #define SPEC_32 "m32" -diff -u -r gcc-4.6-20111223/gcc/config/i386/t-linux64 gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 ---- gcc-4.6-20111223/gcc/config/i386/t-linux64 2009-04-21 21:03:23.000000000 +0200 -+++ gcc-4.6-20111223-pure64/gcc/config/i386/t-linux64 2012-01-14 19:50:27.346242617 +0100 -@@ -25,7 +25,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/multilib/jack2-multilib/40-hpet-permissions.rules b/multilib/jack2-multilib/40-hpet-permissions.rules deleted file mode 100644 index 7af3780f9..000000000 --- a/multilib/jack2-multilib/40-hpet-permissions.rules +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL=="rtc0", GROUP="audio" -KERNEL=="hpet", GROUP="audio" diff --git a/multilib/jack2-multilib/99-audio.conf b/multilib/jack2-multilib/99-audio.conf deleted file mode 100644 index eb76ef920..000000000 --- a/multilib/jack2-multilib/99-audio.conf +++ /dev/null @@ -1,2 +0,0 @@ -@audio - rtprio 99 -@audio - memlock unlimited diff --git a/multilib/jack2-multilib/PKGBUILD b/multilib/jack2-multilib/PKGBUILD deleted file mode 100644 index 6c45b64d6..000000000 --- a/multilib/jack2-multilib/PKGBUILD +++ /dev/null @@ -1,143 +0,0 @@ -# $Id: PKGBUILD 52694 2011-07-27 17:23:48Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: SpepS <dreamspepser at yahoo dot it> - -# This one is in response to a need for an equivalent to lib32-jack for -# jack2. A lib32-jack2 would require much patching and invading the pure -# jack2 package, and what's more, the buildsystem provides a flag just to -# build a hybrid jack2 in full. As such, we have opted to provide multilib -# users with a replacement package instead of the usual lib32 add-on. -# -# See http://mailman.archlinux.org/pipermail/arch-multilib/2011-December/000251.html - -pkgbase=jack2-multilib -pkgname=('jack2-multilib' 'jack2-dbus-multilib') -#pkgname= # single build (overrides split) -_tarname=jack -pkgver=1.9.8 -pkgrel=1 -arch=('x86_64') -url="http://jackaudio.org/" -backup=(etc/security/limits.d/99-audio.conf) -license=('GPL') -makedepends=('python2' 'doxygen' 'libffado' - 'libsamplerate' 'lib32-dbus-core' 'lib32-celt' - 'gcc-multilib') -source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" - '99-audio.conf' - '40-hpet-permissions.rules') -md5sums=('1dd2ff054cab79dfc11d134756f27165' - 'ae65b7c9ebe0fff6c918ba9d97ae342d' - '471aad533ff56c5d3cbbf65ce32cadef') - -_pyfix() { - sed -i 's:bin/env python:bin/env python2:' \ - "$pkgdir/usr/bin/jack_control" -} - -_wafconf() { - python2 waf configure --prefix=/usr \ - --alsa \ - --firewire \ - --mixed \ - --doxygen $@ -} - -_isbuild() { - printf "%s\n" ${pkgname[@]} | grep -qx $1 -} - -_mklinks() { - ln -s /usr/lib32/libjack.so.0.1.0 "$pkgdir/usr/lib32/libjack.so.0" - ln -s /usr/lib32/libjack.so.0 "$pkgdir/usr/lib32/libjack.so" -} - -build() { - cd "$srcdir/$_tarname-$pkgver" - - export LINKFLAGS="$LDFLAGS" - - # fix doxygen building - sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript - - # we may do 2 different builds - cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver - - # mixed dbus/classic build - if _isbuild jack2-multilib; then - cd $_tarname-$pkgver - msg2 "Running Mixed D-Bus/Classic build" - _wafconf --classic --dbus - python2 waf build $MAKEFLAGS - cd .. - fi - - # dbus-ONLY build - if _isbuild jack2-dbus-multilib; then - cd $_tarname-dbus-$pkgver - msg2 "Running D-Bus-only build" - _wafconf --dbus - python2 waf build $MAKEFLAGS - cd .. - fi -} - -package_jack2-multilib() { - ! _isbuild jack2-multilib && return 0 - - pkgdesc="The next-generation JACK with SMP support & mixed mode" - depends=('libsamplerate' 'lib32-celt' 'lib32-gcc-libs') - optdepends=('libffado: FireWire support' - 'lib32-dbus-core: jackdbus' - 'python2: jack_control') - conflicts=('jack' 'jack2' 'lib32-jack') - provides=('jack' 'jackmp' 'jackdmp' 'jackdbus' - 'jack2' 'lib32-jack' 'lib32-jack2') - - cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver" - - python2 waf install --destdir="$pkgdir" - - # fix for major python transition - _pyfix - - # configure realtime access/scheduling - # see https://bugs.archlinux.org/task/26343 - install -Dm644 "$srcdir/99-audio.conf" \ - "$pkgdir/etc/security/limits.d/99-audio.conf" - - install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" - - # should be done by upstream - # see http://trac.jackaudio.org/ticket/200 - _mklinks -} - -package_jack2-dbus-multilib() { - ! _isbuild jack2-dbus-multilib && return 0 - - pkgdesc="The next-generation JACK with SMP support & mixed mode (for D-BUS interaction only)" - depends=('libsamplerate' 'lib32-celt' 'lib32-dbus-core' 'lib32-gcc-libs') - optdepends=('libffado: FireWire support' - 'python2: jack_control') - conflicts=('jack' 'jack2' 'lib32-jack' 'jack2-multilib') - provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus' - 'jack2-dbus' 'jack2-multilib' 'lib32-jack' 'lib32-jack2') - - cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver" - - python2 waf install --destdir="$pkgdir" - - _pyfix - - install -Dm644 "$srcdir/99-audio.conf" \ - "$pkgdir/etc/security/limits.d/99-audio.conf" - - install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" - - _mklinks -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-acl/PKGBUILD b/multilib/lib32-acl/PKGBUILD deleted file mode 100644 index 6654ef38c..000000000 --- a/multilib/lib32-acl/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 57960 2011-11-04 22:18:21Z lcarlier $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=lib32-acl -pkgver=2.2.51 -pkgrel=2 -pkgdesc="Access control list libraries (32-bit)" -arch=('x86_64') -url="http://savannah.nongnu.org/projects/acl" -license=('LGPL') -depends=('lib32-attr>=2.4.46' 'acl') -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://download.savannah.gnu.org/releases/acl/acl-${pkgver}.src.tar.gz) -sha256sums=('06854521cf5d396801af7e54b9636680edf8064355e51c07657ec7442a185225') - -build() { - cd "${srcdir}/acl-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/acl-${pkgver}" - - make DIST_ROOT="${pkgdir}" install install-lib install-dev - - rm -rf ${pkgdir}/usr/{bin,include,share} -} diff --git a/multilib/lib32-alsa-lib/PKGBUILD b/multilib/lib32-alsa-lib/PKGBUILD deleted file mode 100644 index 5f25c3e12..000000000 --- a/multilib/lib32-alsa-lib/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 62814 2012-01-27 09:25:15Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=alsa-lib -pkgname=lib32-${_pkgbasename} -pkgver=1.0.25 -pkgrel=1 -pkgdesc="An alternative implementation of Linux sound support (32 bit)" -arch=('x86_64') -url="http://www.alsa-project.org" -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -license=('GPL') -options=(!libtool) -source=(ftp://ftp.alsa-project.org/pub/lib/${_pkgbasename}-$pkgver.tar.bz2) - -build() { - cd $srcdir/${_pkgbasename}-$pkgver - export CC='gcc -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-python - make -} - -package() { - cd $srcdir/${_pkgbasename}-$pkgver - make DESTDIR=$pkgdir install - - # Clean up lib32 package - rm -rf "${pkgdir}"/usr/{bin,include,share} -} -md5sums=('06fe5819020c6684b991dcffc5471304') diff --git a/multilib/lib32-alsa-oss/PKGBUILD b/multilib/lib32-alsa-oss/PKGBUILD deleted file mode 100644 index 51273a145..000000000 --- a/multilib/lib32-alsa-oss/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 62816 2012-01-27 09:25:54Z bluewind $ -# Maintainer: judd <jvinet@zeroflux.org> - -_pkgbasename=alsa-oss -pkgname=lib32-${_pkgbasename} -pkgver=1.0.25 -pkgrel=1 -pkgdesc="OSS compatibility library (32 bit)" -arch=(x86_64) -license=('GPL') -url="http://www.alsa-project.org" -options=(!libtool) -depends=('lib32-glibc' 'lib32-alsa-lib' 'alsa-oss') -source=(ftp://ftp.alsa-project.org/pub/oss-lib/${_pkgbasename}-$pkgver.tar.bz2) -md5sums=('922ea177db15c72f1b5037181c73f934') - -build() { - cd $srcdir/${_pkgbasename}-$pkgver - - export CC='gcc -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/${_pkgbasename}-$pkgver - - make DESTDIR="$pkgdir" install - - # Clean up lib32 package - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-alsa-plugins/PKGBUILD b/multilib/lib32-alsa-plugins/PKGBUILD deleted file mode 100644 index 87d8c90f9..000000000 --- a/multilib/lib32-alsa-plugins/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 62831 2012-01-27 15:59:19Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -_pkgbasename=alsa-plugins -pkgname=lib32-$_pkgbasename -pkgver=1.0.25 -pkgrel=1 -pkgdesc="Extra alsa plugins (32-bit)" -arch=(x86_64) -url="http://www.alsa-project.org" -license=(GPL) -depends=(lib32-alsa-lib $_pkgbasename) -makedepends=(lib32-libpulse lib32-jack lib32-speex lib32-libsamplerate gcc-multilib) -optdepends=('lib32-libpulse: PulseAudio plugin' - 'lib32-jack: Jack plugin' - 'lib32-libsamplerate: libsamplerate resampling plugin' - 'lib32-speex: libspeexdsp resampling plugin') -options=('!libtool') -source=("ftp://ftp.alsa-project.org/pub/plugins/$_pkgbasename-$pkgver.tar.bz2") -md5sums=('038c023eaa51171f018fbf7141255185') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-avcodec - make -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install - rm -r "$pkgdir/usr/share" -} diff --git a/multilib/lib32-atk/PKGBUILD b/multilib/lib32-atk/PKGBUILD deleted file mode 100644 index 89fdf434c..000000000 --- a/multilib/lib32-atk/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 56310 2011-10-05 14:32:13Z bluewind $ -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Maintainer: Mikko Seppälä <t-r-a-y@mbnet.fi> -_pkgbasename=atk -pkgname=lib32-$_pkgbasename -pkgver=2.2.0 -pkgrel=1 -pkgdesc="A library providing a set of interfaces for accessibility (32-bit)" -arch=('x86_64') -license=('LGPL') -depends=('lib32-glib2>=2.25.17' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.xz) -url='http://www.gtk.org/' -sha256sums=('8b22f0e7803dd3734c676ccd68ea999ff1156ca49d99c3de5c1d269ad0c3739d') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --disable-introspection - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} -} diff --git a/multilib/lib32-attr/PKGBUILD b/multilib/lib32-attr/PKGBUILD deleted file mode 100644 index 3f5840333..000000000 --- a/multilib/lib32-attr/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 61159 2011-12-22 21:02:10Z lcarlier $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -_pkgbasename=attr -pkgname=lib32-$_pkgbasename -pkgver=2.4.46 -pkgrel=2 -pkgdesc="Extended attribute support library for ACL support (32-bit)" -arch=(x86_64) -url="http://savannah.nongnu.org/projects/attr" -license=('LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib' 'gettext') -options=('!libtool') -source=(http://download.savannah.gnu.org/releases/attr/attr-${pkgver}.src.tar.gz) -sha256sums=('dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f') - -build() { - cd ${srcdir}/attr-${pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - export INSTALL_USER=root INSTALL_GROUP=root - ./configure --prefix=/usr --libdir=/usr/lib32 --libexecdir=/usr/lib32 - make - - # Doesn't like building as non-root - -# make prefix=${pkgdir}/usr \ -# PKG_LIB_DIR=$pkgdir/usr/lib32 \ -# PKG_DEVLIB_DIR=$pkgdir/usr/lib32 \ - make DIST_ROOT="${pkgdir}" \ - install-lib install-dev - - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-bzip2/PKGBUILD b/multilib/lib32-bzip2/PKGBUILD deleted file mode 100644 index 3b81ad3ec..000000000 --- a/multilib/lib32-bzip2/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -#$Id: PKGBUILD 53422 2011-08-03 14:41:13Z ibiru $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: TryA <tryagainprod {at} gmail.com> - -_pkgbasename=bzip2 -pkgname=lib32-bzip2 -pkgver=1.0.6 -pkgrel=1 -pkgdesc="A high-quality data compression program (32-bit)" -arch=('x86_64') -license=('custom') -url="http://sources.redhat.com/bzip2" -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz) -md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - sed -i "s|CC=gcc|CC=gcc -m32|" Makefile - sed -i "s|CC=gcc|CC=gcc -m32|" Makefile-libbz2_so - - # add large-file support - sed -e 's/^CFLAGS=\(.*\)$/CFLAGS=\1 \$(BIGFILES)/' -i ./Makefile-libbz2_so - - # use our optimization - sed -i "s|-O2|${CFLAGS}|g" Makefile - sed -i "s|-O2|${CFLAGS}|g" Makefile-libbz2_so - - make -f Makefile-libbz2_so - make libbz2.a -} - -package(){ - cd "${srcdir}/${_pkgbasename}-${pkgver}" - install -Dm755 libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so.1.0.6 - ln -s libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so - ln -s libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so.1 - ln -s libbz2.so.1.0.6 "${pkgdir}"/usr/lib32/libbz2.so.1.0 - - install -Dm644 libbz2.a ${pkgdir}/usr/lib32/libbz2.a -} diff --git a/multilib/lib32-cairo/PKGBUILD b/multilib/lib32-cairo/PKGBUILD deleted file mode 100644 index 1af993d35..000000000 --- a/multilib/lib32-cairo/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63485 2012-02-05 11:45:09Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=cairo -pkgname=lib32-$_pkgbasename -pkgver=1.10.2 -pkgrel=3 -pkgdesc="Cairo vector graphics library (32-bit)" -arch=('x86_64') -url="http://cairographics.org/" -license=('LGPL' 'MPL') -depends=('lib32-libpng' 'lib32-libxrender' 'lib32-fontconfig' - 'lib32-pixman' 'lib32-glib2' ${_pkgbasename}) -makedepends=('gcc-multilib') -source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.gz - cairo-1.10.0-buggy_gradients.patch) -sha1sums=('ccce5ae03f99c505db97c286a0c9a90a926d3c6e' - '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --sysconfdir=/etc --localstatedir=/var \ - --disable-static --enable-tee - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib/lib32-cairo/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index 368e356d3..000000000 --- a/multilib/lib32-cairo/cairo-1.10.0-buggy_gradients.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cairo-xlib-display.c.ubuntu 2010-08-04 11:57:49.000000000 +0200
-+++ b/src/cairo-xlib-display.c 2010-08-04 11:58:28.000000000 +0200
-@@ -353,11 +353,7 @@
- /* Prior to Render 0.10, there is no protocol support for gradients and
- * we call function stubs instead, which would silently consume the drawing.
- */
--#if RENDER_MAJOR == 0 && RENDER_MINOR < 10
- display->buggy_gradients = TRUE;
--#else
-- display->buggy_gradients = FALSE;
--#endif
- display->buggy_pad_reflect = FALSE;
- display->buggy_repeat = FALSE;
diff --git a/multilib/lib32-celt/PKGBUILD b/multilib/lib32-celt/PKGBUILD deleted file mode 100644 index 8c4124eb7..000000000 --- a/multilib/lib32-celt/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Contributor: see .contrib - -_realname=celt -pkgname=lib32-$_realname -pkgver=0.11.1 -pkgrel=1 -pkgdesc='Low-latency audio communication codec (32 bit)' -arch=('x86_64') -url='http://www.celt-codec.org' -license=('BSD') -depends=('lib32-glibc' "$_realname=$pkgver") -makedepends=('gcc-multilib') -options=('!libtool') -source=("http://downloads.xiph.org/releases/$_realname/$_realname-$pkgver.tar.gz") -md5sums=('94fe4acd241da8702c295bcd13a555e6') - -build() { - cd "$srcdir/$_realname-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -C libcelt -} - -package() { - cd "$srcdir/$_realname-$pkgver" - - make DESTDIR="$pkgdir" install-pkgconfigDATA - make -C libcelt DESTDIR="$pkgdir" install - - # remove unneeded stuff - rm -rf "$pkgdir/usr/include" -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-dbus-core/PKGBUILD b/multilib/lib32-dbus-core/PKGBUILD deleted file mode 100644 index 79ebc590e..000000000 --- a/multilib/lib32-dbus-core/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 60258 2011-12-08 19:35:30Z bluewind $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -pkgname=lib32-dbus-core -_pkgbasename=dbus-core -pkgver=1.4.16 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system (32-bit)" -arch=('x86_64') -url="http://www.freedesktop.org/Software/dbus" -license=('GPL' 'custom') -depends=('lib32-glibc' 'lib32-expat' 'dbus-core') -makedepends=('gcc-multilib' lib32-libx11) -options=(!libtool) -source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz) -md5sums=('44a2a10678e7e50460879c3eb4453a65') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/dbus-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \ - --with-system-pid-file=/var/run/dbus.pid \ - --enable-inotify --disable-dnotify \ - --disable-verbose-mode --disable-static \ - --disable-tests --disable-asserts - make -} - -package() { - cd "${srcdir}/dbus-${pkgver}" - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{bin,include,lib,share} - rm -rf "${pkgdir}"/{etc,var} - - mkdir -p "${pkgdir}/usr/share/licenses" - ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/multilib/lib32-e2fsprogs/PKGBUILD b/multilib/lib32-e2fsprogs/PKGBUILD deleted file mode 100644 index 86fec5870..000000000 --- a/multilib/lib32-e2fsprogs/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: mightyjaym <jm.ambrosino@free.fr> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=e2fsprogs -pkgname=lib32-e2fsprogs -pkgver=1.42 -pkgrel=1 -pkgdesc="Ext2 filesystem libraries (32-bit)" -arch=(x86_64) -license=('GPL' 'LGPL' 'MIT') -url="http://e2fsprogs.sourceforge.net" -depends=('lib32-util-linux' $_pkgbasename) -makedepends=('bc' 'gcc-multilib') -source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz") -sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6') - - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --with-root-prefix="" --enable-elf-shlibs \ - --disable-{debugfs,imager,resizer,fsck,uuidd,libuuid,libblkid} - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install-libs - - rm -rf "${pkgdir}"/usr/{bin,include,share} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-expat/CVE-2009-3560.patch b/multilib/lib32-expat/CVE-2009-3560.patch deleted file mode 100644 index 5fe9c36c8..000000000 --- a/multilib/lib32-expat/CVE-2009-3560.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urNad trunk~/lib/xmlparse.c trunk/lib/xmlparse.c ---- trunk~/lib/xmlparse.c 2007-05-08 04:25:35.000000000 +0200 -+++ trunk/lib/xmlparse.c 2009-12-29 21:57:22.141732904 +0100 -@@ -3703,6 +3703,9 @@ - return XML_ERROR_UNCLOSED_TOKEN; - case XML_TOK_PARTIAL_CHAR: - return XML_ERROR_PARTIAL_CHAR; -+ case -XML_TOK_PROLOG_S: -+ tok = -tok; -+ break; - case XML_TOK_NONE: - #ifdef XML_DTD - /* for internal PE NOT referenced between declarations */ diff --git a/multilib/lib32-expat/CVE-2009-3720.patch b/multilib/lib32-expat/CVE-2009-3720.patch deleted file mode 100644 index 65d16431f..000000000 --- a/multilib/lib32-expat/CVE-2009-3720.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urNad trunk~/lib/xmltok_impl.c trunk/lib/xmltok_impl.c ---- trunk~/lib/xmltok_impl.c 2006-11-26 18:34:46.000000000 +0100 -+++ trunk/lib/xmltok_impl.c 2009-10-22 21:42:41.000000000 +0200 -@@ -1744,7 +1744,7 @@ - const char *end, - POSITION *pos) - { -- while (ptr != end) { -+ while (ptr < end) { - switch (BYTE_TYPE(enc, ptr)) { - #define LEAD_CASE(n) \ - case BT_LEAD ## n: \ diff --git a/multilib/lib32-expat/PKGBUILD b/multilib/lib32-expat/PKGBUILD deleted file mode 100644 index c50cb9c79..000000000 --- a/multilib/lib32-expat/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 26535 2010-09-15 22:31:07Z bluewind $ - -_pkgbasename=expat -pkgname=lib32-${_pkgbasename} -pkgver=2.0.1 -pkgrel=7 -pkgdesc="An XML Parser library written in C (32 bit)" -arch=('x86_64') -url="http://expat.sourceforge.net/" -license=('custom') -makedepends=('gcc-multilib') -depends=('lib32-glibc' "${_pkgbasename}") -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/expat/${_pkgbasename}-${pkgver}.tar.gz - CVE-2009-3560.patch - CVE-2009-3720.patch) -md5sums=('ee8b492592568805593f81f8cdf2a04c' - '50603cac0f03aabc7087415251f592be' - 'f3eeb796f28945899216b815e5901996') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i $srcdir/CVE-2009-3560.patch - patch -Np1 -i $srcdir/CVE-2009-3720.patch - export CC='gcc -m32' - export PKG_CONFIG_PATH=/usr/lib32/pkgconfig - ./configure --prefix=/usr --libdir=/usr/lib32 --mandir=/usr/share/man - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/" - ln -s ${_pkgbasename} "${pkgdir}/usr/share/licenses/${pkgname}" - - # Clean up lib32 package - rm -rf "${pkgdir}"/usr/{bin,include,share/man} -} diff --git a/multilib/lib32-flac/PKGBUILD b/multilib/lib32-flac/PKGBUILD deleted file mode 100644 index 00c2b8791..000000000 --- a/multilib/lib32-flac/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 26539 2010-09-15 22:31:33Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=flac -pkgname=lib32-$_pkgbasename -pkgver=1.2.1 -pkgrel=7 -pkgdesc="Free Lossless Audio Codec (32-bit)" -arch=('x86_64') -url="http://flac.sourceforge.net/" -license=('custom:Xiph' 'LGPL' 'GPL' 'FDL') -depends=('lib32-libogg' 'lib32-gcc-libs' $_pkgbasename) -makedepends=('nasm' gcc-multilib) -options=('!libtool' '!makeflags') -source=(http://downloads.sf.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz - flac-1.2.1-gcc-4.3-includes.patch) -md5sums=('153c8b15a54da428d1f0fadc756c22c7' - 'b9d245422bbc547b18a72897366bea77') -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' - '7e9f8c2ef4d9daf5ddd20df63b608fe19b8c1560') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - patch -Np1 -i ${srcdir}/flac-1.2.1-gcc-4.3-includes.patch - ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared \ - --disable-rpath --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch b/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch deleted file mode 100644 index 52fec8be5..000000000 --- a/multilib/lib32-flac/flac-1.2.1-gcc-4.3-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur flac-1.2.1-orig/examples/cpp/encode/file/main.cpp flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1-orig/examples/cpp/encode/file/main.cpp 2007-09-13 09:58:03.000000000 -0600 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2007-11-18 12:59:45.000000000 -0600 -@@ -30,6 +30,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <cstring> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" - diff --git a/multilib/lib32-fontconfig/30-urw-aliases.patch b/multilib/lib32-fontconfig/30-urw-aliases.patch deleted file mode 100644 index 8077b869e..000000000 --- a/multilib/lib32-fontconfig/30-urw-aliases.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/conf.d/30-urw-aliases.conf 2009-08-06 16:23:57.000000000 +0100 -+++ b/conf.d/30-urw-aliases.conf 2009-08-06 16:25:07.000000000 +0100 -@@ -29,6 +29,10 @@ - <family>Zapf Dingbats</family> - <accept><family>Dingbats</family></accept> - </alias> -+ <alias binding="same"> -+ <family>ZapfDingbats</family> -+ <accept><family>Dingbats</family></accept> -+ </alias> - <match target="pattern"> - <test name="family"> - <string>Symbol</string> diff --git a/multilib/lib32-fontconfig/PKGBUILD b/multilib/lib32-fontconfig/PKGBUILD deleted file mode 100644 index 36f52ba32..000000000 --- a/multilib/lib32-fontconfig/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 26542 2010-09-15 22:31:59Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -_pkgbasename=fontconfig -pkgname=lib32-$_pkgbasename -pkgver=2.8.0 -pkgrel=3 -pkgdesc="A library for configuring and customizing font access (32-bit)" -arch=(x86_64) -url="http://www.fontconfig.org/release/" -license=('custom') -depends=('lib32-expat>=2.0.1' 'lib32-freetype2>=2.3.11' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.gz - 30-urw-aliases.patch) -md5sums=('77e15a92006ddc2adbb06f840d591c0e' - '51bc6cb633b50f3c28793361738aac5b') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/30-urw-aliases.patch" - # enable Position Independent Code for prelinking - export CFLAGS="${CFLAGS} -fPIC" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir"/{etc,var} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-freetype2/PKGBUILD b/multilib/lib32-freetype2/PKGBUILD deleted file mode 100644 index 434785cd9..000000000 --- a/multilib/lib32-freetype2/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 59294 2011-11-22 20:49:51Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=freetype2 -pkgname=lib32-$_pkgbasename -pkgver=2.4.8 -pkgrel=1 -pkgdesc="TrueType font rendering library (32-bit)" -arch=(x86_64) -license=('GPL') -url="http://freetype.sourceforge.net" -depends=('lib32-zlib' 'lib32-bzip2' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2 - freetype-2.3.0-enable-spr.patch - freetype-2.2.1-enable-valid.patch) -md5sums=('dbf2caca1d3afd410a29217a9809d397' - '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" - patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/freetype-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch b/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch deleted file mode 100644 index c78b6b70f..000000000 --- a/multilib/lib32-freetype2/freetype-2.2.1-enable-valid.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 -+++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 -@@ -110,7 +110,7 @@ - AUX_MODULES += cache - - # TrueType GX/AAT table validation. Needs ftgxval.c below. --# AUX_MODULES += gxvalid -+AUX_MODULES += gxvalid - - # Support for streams compressed with gzip (files with suffix .gz). - # -@@ -124,7 +124,7 @@ - - # OpenType table validation. Needs ftotval.c below. - # --# AUX_MODULES += otvalid -+AUX_MODULES += otvalid - - # Auxiliary PostScript driver component to share common code. - # diff --git a/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch b/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch deleted file mode 100644 index 8432e28a4..000000000 --- a/multilib/lib32-freetype2/freetype-2.3.0-enable-spr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 -+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 -@@ -92,7 +92,7 @@ - /* This is done to allow FreeType clients to run unmodified, forcing */ - /* them to display normal gray-level anti-aliased glyphs. */ - /* */ --/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - - /*************************************************************************/ diff --git a/multilib/lib32-gdk-pixbuf2/PKGBUILD b/multilib/lib32-gdk-pixbuf2/PKGBUILD deleted file mode 100644 index 28b102d55..000000000 --- a/multilib/lib32-gdk-pixbuf2/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 91063 2010-09-21 19:21:24Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -_pkgbasename=gdk-pixbuf2 -pkgname=lib32-$_pkgbasename -pkgver=2.24.1 -pkgrel=2 -pkgdesc="An image loading library (32-bit)" -arch=('x86_64') -url="http://www.gtk.org/" -license=('GPL2') -depends=(lib32-glib2 lib32-libpng lib32-libtiff lib32-libjpeg lib32-libx11 - $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool' '!docs') -install=gdk-pixbuf2.install -source=(http://download.gnome.org/sources/gdk-pixbuf/2.24/gdk-pixbuf-${pkgver}.tar.xz) -sha256sums=('da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/gdk-pixbuf-${pkgver}" - - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --without-libjasper \ - --with-x11 \ - --with-included-loaders=png - make -} - -package() { - cd "${srcdir}/gdk-pixbuf-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/{include,share} - - cd "${pkgdir}"/usr/bin - mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-32 - rm gdk-pixbuf-csource -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-gdk-pixbuf2/gdk-pixbuf2.install b/multilib/lib32-gdk-pixbuf2/gdk-pixbuf2.install deleted file mode 100644 index 92d58ef04..000000000 --- a/multilib/lib32-gdk-pixbuf2/gdk-pixbuf2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/gdk-pixbuf-query-loaders-32 --update-cache -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f usr/lib32/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache -} diff --git a/multilib/lib32-gettext/PKGBUILD b/multilib/lib32-gettext/PKGBUILD deleted file mode 100644 index 94f9b4aa5..000000000 --- a/multilib/lib32-gettext/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Joakim Hernberg <jhernberg at alchemy dot lu> -_pkgbasename=gettext -pkgname=lib32-$_pkgbasename -pkgver=0.18.1.1 -pkgrel=2 -pkgdesc="GNU internationalization library (32-bit)" -arch=('x86_64') -url="http://www.gnu.org/software/gettext/" -license=('GPL') -depends=('lib32-acl' $_pkgbasename) -makedepends=(gcc-multilib) -optdepends=('cvs: for autopoint tool') -options=(!libtool !docs) -source=(ftp://ftp.gnu.org/pub/gnu/gettext/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('3dd55b952826d2b32f51308f2f91aa89') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - sed -i -e 's/libexpat.so.0/libexpat.so.1/' gettext-tools/src/x-glade.c - ./configure --prefix=/usr --enable-csharp --libdir=/usr/lib32 - make -} - -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make check -#} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-giflib/PKGBUILD b/multilib/lib32-giflib/PKGBUILD deleted file mode 100644 index a311cfa8e..000000000 --- a/multilib/lib32-giflib/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> -# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> -# Contributor: mightyjaym <jm.ambrosino@free.fr> - -_pkgbasename=giflib -pkgname=lib32-$_pkgbasename -pkgver=4.1.6 -pkgrel=5 -pkgdesc="A library for reading and writing gif images (32-bit)" -url="http://sourceforge.net/projects/giflib/" -arch=('x86_64') -license=('MIT') -depends=('lib32-libx11' 'lib32-libsm' $_pkgbasename) -makedepends=(gcc-multilib) -provides=("lib32-libungif=${pkgver}") -conflicts=('lib32-libungif') -replaces=('lib32-libungif') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/giflib/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('7125644155ae6ad33dbc9fc15a14735f') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - make DESTDIR=${pkgdir} install - - # libungif compatibility - instructions taken from Redhat specfile - MAJOR=`echo ${pkgver} | sed 's/\([0-9]\+\)\..*/\1/'` - gcc -shared -Wl,-soname,libungif.so.${MAJOR} -Llib/.libs -lgif -o libungif.so.${pkgver} - install -m755 libungif.so.${pkgver} ${pkgdir}/usr/lib32/ - ln -sf libungif.so.${pkgver} ${pkgdir}/usr/lib32/libungif.so.4 - ln -sf libungif.so.4 ${pkgdir}/usr/lib32/libungif.so - - rm -rf "${pkgdir}"/usr/{include,share,bin} - install -m755 -d ${pkgdir}/usr/share/licenses - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-glew/PKGBUILD b/multilib/lib32-glew/PKGBUILD deleted file mode 100644 index 57a7580e9..000000000 --- a/multilib/lib32-glew/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 55986 2011-09-28 09:25:54Z bluewind $ -# Maintainer: Florian Pritz <flo@xinu.at> - -_pkgbasename=glew -pkgname=lib32-$_pkgbasename -pkgver=1.7.0 -pkgrel=1 -pkgdesc="A cross-platform C/C++ extension loading library (32 bit)" -arch=('x86_64') -url="http://glew.sourceforge.net" -license=('BSD' 'MIT' 'GPL') -depends=('lib32-libxmu' 'lib32-libxi' 'lib32-mesa' "$_pkgbasename>=$pkgver") -makedepends=('gcc-multilib') -source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz) -sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - sed -i 's|CC = cc|CC = gcc -m32|' config/Makefile.linux - sed -i 's|LD = cc|LD = gcc -m32|' config/Makefile.linux - sed -i 's|lib64|lib32|' config/Makefile.linux - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make GLEW_DEST="${pkgdir}/usr" install - chmod 0755 "${pkgdir}/usr/lib32/libGLEW.so.${pkgver}" - - rm -rf "${pkgdir}"/usr/{include,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-glib/PKGBUILD b/multilib/lib32-glib/PKGBUILD deleted file mode 100644 index a863c66f6..000000000 --- a/multilib/lib32-glib/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 29612 2010-10-17 13:00:45Z pschmitz $ - -_pkgbasename=glib -pkgname=lib32-$_pkgbasename -pkgver=1.2.10 -pkgrel=11 -pkgdesc="Common C routines used by Gtk+ and other libs (32-bit)" -arch=('x86_64') -url="http://www.gtk.org/" -license=('LGPL') -depends=('lib32-glibc' "${_pkgbasename}") -makedepends=('gcc-multilib') -options=('!libtool' '!docs') -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/${_pkgbasename}-${pkgver}.tar.gz" - 'gcc340.patch' - 'aclocal-fixes.patch') -md5sums=('6fe30dad87c77b91b632def29dd69ef9' - '877b3330e822a4be69a0f8a8c268cfd7' - 'e52c4b88427b9785bb8049dbdc9ff6fb') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - patch -Np1 -i ../gcc340.patch - patch -Np0 -i ../aclocal-fixes.patch - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --libdir=/usr/lib32 \ - --infodir=/usr/share/info \ - --host=x86_64-unknown-linux-gnu \ - --target=x86_64-unknown-linux-gnu - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{share,include,bin,lib32/glib} -} diff --git a/multilib/lib32-glib/aclocal-fixes.patch b/multilib/lib32-glib/aclocal-fixes.patch deleted file mode 100644 index b064074aa..000000000 --- a/multilib/lib32-glib/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- glib.m4.orig 2006-03-05 13:13:24.000000000 +0000 -+++ glib.m4 2006-03-05 13:13:35.000000000 +0000 -@@ -5,7 +5,7 @@ - dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or - dnl gthread is specified in MODULES, pass to glib-config - dnl --AC_DEFUN(AM_PATH_GLIB, -+AC_DEFUN([AM_PATH_GLIB], - [dnl - dnl Get the cflags and libraries from the glib-config script - dnl diff --git a/multilib/lib32-glib/gcc340.patch b/multilib/lib32-glib/gcc340.patch deleted file mode 100644 index 941111ae7..000000000 --- a/multilib/lib32-glib/gcc340.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur glib-1.2.10.orig/glib.h glib-1.2.10/glib.h ---- glib-1.2.10.orig/glib.h 2001-02-27 04:44:38.000000000 +0100 -+++ glib-1.2.10/glib.h 2004-05-27 15:50:32.436527848 +0200 -@@ -271,8 +271,10 @@ - - /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with - * macros, so we can refer to them as strings unconditionally. -+ * -+ * Unfortunately these are _not_ treated as strings anymore in GCC3.4. - */ --#ifdef __GNUC__ -+#if defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4) - #define G_GNUC_FUNCTION __FUNCTION__ - #define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__ - #else /* !__GNUC__ */ diff --git a/multilib/lib32-glib2/PKGBUILD b/multilib/lib32-glib2/PKGBUILD deleted file mode 100644 index 24695d4a6..000000000 --- a/multilib/lib32-glib2/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 62205 2012-01-18 10:47:06Z heftig $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=glib2 -pkgname=lib32-$_pkgbasename -pkgver=2.30.2 -pkgrel=2 -pkgdesc="Common C routines used by GTK+ 2.4 and other libs (32-bit)" -url="http://www.gtk.org/" -arch=('x86_64') -license=('LGPL') -depends=('lib32-pcre' 'lib32-zlib' 'lib32-dbus-core' lib32-libffi $_pkgbasename) -makedepends=('gcc-multilib' python2) -options=('!libtool' '!docs') -source=(http://ftp.gnome.org/pub/GNOME/sources/glib/2.30/glib-${pkgver}.tar.xz) -sha256sums=('f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/glib-${pkgver}" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 \ - --enable-static --enable-shared --with-pcre=system --disable-fam - make -} - -package() { - cd "${srcdir}/glib-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/{etc,usr/{share,include}} - - cd "${pkgdir}"/usr/bin - mv gio-querymodules gio-querymodules-32 - rm -f gdbus glib* gobject-query gsettings gtester* - rm -rf "$pkgdir"/usr/{bin/gdbus-codegen,lib32/gdbus-2.0} -} diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD deleted file mode 100644 index 5f73ba36f..000000000 --- a/multilib/lib32-glibc/PKGBUILD +++ /dev/null @@ -1,186 +0,0 @@ -# $Id: PKGBUILD 62829 2012-01-27 15:39:54Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each major glibc version - -_pkgbasename=glibc -pkgname=lib32-$_pkgbasename -pkgver=2.15 -pkgrel=4 -_glibcdate=20111227 -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.6') -options=('!strip' '!emptydirs') -source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.10-dont-build-timezone.patch - glibc-2.10-bz4781.patch - glibc-__i686.patch - glibc-2.12.2-ignore-origin-of-privileged-program.patch - glibc-2.14-libdl-crash.patch - glibc-2.14-revert-4768ae77.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch - glibc-2.15-regex.patch - glibc-2.15-lddebug-scopes.patch - glibc-2.15-revert-c5a0802a.patch - glibc-2.15-strcmp-disable-avx.patch - lib32-glibc.conf) -md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '4dadb9203b69a3210d53514bb46f41c3' - '0c5540efc51c0b93996c51b57a8540ae' - '40cd342e21f71f5e49e32622b25acc52' - 'b042647ea7d6f22ad319e12e796bd13e' - '6970bcfeb3bf88913436d5112d16f588' - '7da8c554a3b591c7401d7023b1928afc' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' - 'b3526cbd5e29773560dba725db99af5a' - '3c219ddfb619b6df903cac4cc42c611d' - '7ae3e426251ae33e73dbad71f9c91378' - '7a44dd821835e4984aa75ad44fad3baf' - '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://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/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 - - # Revert commit causing issues with crappy DNS servers... - # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER! - # Note that both these patches appear not to fix the issue completely: - # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.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 - - # Fix up regcomp/regexec - # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 - patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch - - # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...) - patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch - - # revert commit c5a0802a - causes various hangs - # https://bugzilla.redhat.com/show_bug.cgi?id=769421 - patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - - # Disable AVX in strcmp as this breaks Xen - # http://sourceware.org/bugzilla/show_bug.cgi?id=13583 - patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch - - # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743) - # http://sourceware.org/bugzilla/show_bug.cgi?id=13618 - rm sysdeps/x86_64/fpu/multiarch/* - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - export CC="gcc -m32" - - # 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 - - # remove hardening options from CFLAGS for building libraries - CFLAGS=${CFLAGS/-fstack-protector/} - CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} - - ${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 \ - --enable-multi-arch i686-unknown-linux-gnu - - # build libraries with hardening disabled - echo "build-programs=no" >> configparms - make - - # re-enable hardening for programs - sed -i "s#=no#=yes#" configparms - echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - make - - # remove harding in preparation to run test-suite - sed -i '2,4d' configparms -} - -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},var} - - # We need one 32 bit specific header file - find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete - - # Do not strip the following files for improved debugging support - # ("improved" as in not breaking gdb and valgrind...): - # ld-${pkgver}.so - # libc-${pkgver}.so - # libpthread-${pkgver}.so - # libthread_db-1.0.so - - cd $pkgdir - strip $STRIP_BINARIES usr/lib32/getconf/* - - strip $STRIP_STATIC usr/lib32/*.a - - strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ - usr/lib32/libnss_{compat,db,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 - mkdir ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ - - # Add lib32 paths 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/lib32-glibc/glibc-2.10-bz4781.patch b/multilib/lib32-glibc/glibc-2.10-bz4781.patch deleted file mode 100644 index cf1a97a18..000000000 --- a/multilib/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/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib/lib32-glibc/glibc-2.10-dont-build-timezone.patch deleted file mode 100644 index d3abeff17..000000000 --- a/multilib/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/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch deleted file mode 100644 index ce089b49c..000000000 --- a/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Thu, 9 Dec 2010 15:00:59 +0100 -Subject: [PATCH 1/1] Ignore origin of privileged program - ---- - ChangeLog | 5 +++++ - elf/dl-object.c | 3 +++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/elf/dl-object.c b/elf/dl-object.c -index 22a1635..7674d49 100644 ---- a/elf/dl-object.c -+++ b/elf/dl-object.c -@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type, - out: - new->l_origin = origin; - } -+ else if (INTUSE(__libc_enable_secure) && type == lt_executable) -+ /* The origin of a privileged program cannot be trusted. */ -+ new->l_origin = (char *) -1; - - return new; - } --- -1.7.2 diff --git a/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib/lib32-glibc/glibc-2.14-libdl-crash.patch deleted file mode 100644 index 6c9d2718e..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 <schwab@redhat.com> -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-4768ae77.patch b/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.patch deleted file mode 100644 index 11f087cb7..000000000 --- a/multilib/lib32-glibc/glibc-2.14-revert-4768ae77.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-glibc/glibc-2.15-lddebug-scopes.patch b/multilib/lib32-glibc/glibc-2.15-lddebug-scopes.patch deleted file mode 100644 index 808cf8d7c..000000000 --- a/multilib/lib32-glibc/glibc-2.15-lddebug-scopes.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab@redhat.com> -Date: Fri, 7 Oct 2011 09:31:27 +0200 -Subject: [PATCH] Horrible workaround for horribly broken software - ---- - elf/rtld.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/elf/rtld.c b/elf/rtld.c -index 978c609..8422b9f 100644 ---- a/elf/rtld.c -+++ b/elf/rtld.c -@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\ - char *copy = malloc (len); - if (copy == NULL) - _dl_fatal_printf ("out of memory\n"); -- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len); -+ l->l_libname->name = memcpy (copy, dsoname, len); -+ if (GLRO(dl_debug_mask)) -+ l->l_name = copy; - } - - /* Add the vDSO to the object list. */ --- -1.7.3.4 - diff --git a/multilib/lib32-glibc/glibc-2.15-regex.patch b/multilib/lib32-glibc/glibc-2.15-regex.patch deleted file mode 100644 index 6385f2c08..000000000 --- a/multilib/lib32-glibc/glibc-2.15-regex.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/posix/regex_internal.c b/posix/regex_internal.c -index bc19243..124f8cc 100644 ---- a/posix/regex_internal.c -+++ b/posix/regex_internal.c -@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) - } - - static unsigned char --internal_function __attribute ((pure)) -+internal_function - re_string_fetch_byte_case (re_string_t *pstr) - { - if (BE (!pstr->mbs_allocated, 1)) --- -1.7.3.4 - diff --git a/multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch deleted file mode 100644 index f532b95e8..000000000 --- a/multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch +++ /dev/null @@ -1,229 +0,0 @@ -diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S ---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 -@@ -137,7 +137,6 @@ __pthread_cond_wait: - cmpl $PI_BIT, %eax - jne 18f - --90: - movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx - movl %ebp, %edx - xorl %esi, %esi -@@ -151,9 +150,6 @@ __pthread_cond_wait: - sete 16(%esp) - je 19f - -- cmpl $-EAGAIN, %eax -- je 91f -- - /* Normal and PI futexes dont mix. Use normal futex functions only - if the kernel does not support the PI futex functions. */ - cmpl $-ENOSYS, %eax -@@ -398,78 +394,6 @@ __pthread_cond_wait: - #endif - call __lll_unlock_wake - jmp 11b -- --91: --.LcleanupSTART2: -- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to -- call it again. */ -- -- /* Get internal lock. */ -- movl $1, %edx -- xorl %eax, %eax -- LOCK --#if cond_lock == 0 -- cmpxchgl %edx, (%ebx) --#else -- cmpxchgl %edx, cond_lock(%ebx) --#endif -- jz 92f -- --#if cond_lock == 0 -- movl %ebx, %edx --#else -- leal cond_lock(%ebx), %edx --#endif --#if (LLL_SHARED-LLL_PRIVATE) > 255 -- xorl %ecx, %ecx --#endif -- cmpl $-1, dep_mutex(%ebx) -- setne %cl -- subl $1, %ecx -- andl $(LLL_SHARED-LLL_PRIVATE), %ecx --#if LLL_PRIVATE != 0 -- addl $LLL_PRIVATE, %ecx --#endif -- call __lll_lock_wait -- --92: -- /* Increment the cond_futex value again, so it can be used as a new -- expected value. */ -- addl $1, cond_futex(%ebx) -- movl cond_futex(%ebx), %ebp -- -- /* Unlock. */ -- LOCK --#if cond_lock == 0 -- subl $1, (%ebx) --#else -- subl $1, cond_lock(%ebx) --#endif -- je 93f --#if cond_lock == 0 -- movl %ebx, %eax --#else -- leal cond_lock(%ebx), %eax --#endif --#if (LLL_SHARED-LLL_PRIVATE) > 255 -- xorl %ecx, %ecx --#endif -- cmpl $-1, dep_mutex(%ebx) -- setne %cl -- subl $1, %ecx -- andl $(LLL_SHARED-LLL_PRIVATE), %ecx --#if LLL_PRIVATE != 0 -- addl $LLL_PRIVATE, %ecx --#endif -- call __lll_unlock_wake -- --93: -- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ -- xorl %ecx, %ecx -- movl dep_mutex(%ebx), %edi -- jmp 90b --.LcleanupEND2: -- - .size __pthread_cond_wait, .-__pthread_cond_wait - versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, - GLIBC_2_3_2) -@@ -642,10 +566,6 @@ __condvar_w_cleanup: - .long .LcleanupEND-.Lsub_cond_futex - .long __condvar_w_cleanup-.LSTARTCODE - .uleb128 0 -- .long .LcleanupSTART2-.LSTARTCODE -- .long .LcleanupEND2-.LcleanupSTART2 -- .long __condvar_w_cleanup-.LSTARTCODE -- .uleb128 0 - .long .LcallUR-.LSTARTCODE - .long .LENDCODE-.LcallUR - .long 0 -Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig -diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S ---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000 -+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000 -@@ -23,7 +23,6 @@ - #include <lowlevelcond.h> - #include <tcb-offsets.h> - #include <pthread-pi-defines.h> --#include <pthread-errnos.h> - - #include <kernel-features.h> - -@@ -137,14 +136,11 @@ __pthread_cond_wait: - cmpl $PI_BIT, %eax - jne 61f - --90: - movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi - movl $SYS_futex, %eax - syscall - - movl $1, %r8d -- cmpq $-EAGAIN, %rax -- je 91f - #ifdef __ASSUME_REQUEUE_PI - jmp 62f - #else -@@ -331,70 +327,6 @@ __pthread_cond_wait: - - 13: movq %r10, %rax - jmp 14b -- --91: --.LcleanupSTART2: -- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to -- call it again. */ -- movq 8(%rsp), %rdi -- -- /* Get internal lock. */ -- movl $1, %esi -- xorl %eax, %eax -- LOCK --#if cond_lock == 0 -- cmpxchgl %esi, (%rdi) --#else -- cmpxchgl %esi, cond_lock(%rdi) --#endif -- jz 92f -- --#if cond_lock != 0 -- addq $cond_lock, %rdi --#endif -- cmpq $-1, dep_mutex-cond_lock(%rdi) -- movl $LLL_PRIVATE, %eax -- movl $LLL_SHARED, %esi -- cmovne %eax, %esi -- callq __lll_lock_wait --#if cond_lock != 0 -- subq $cond_lock, %rdi --#endif --92: -- /* Increment the cond_futex value again, so it can be used as a new -- expected value. */ -- incl cond_futex(%rdi) -- movl cond_futex(%rdi), %edx -- -- /* Release internal lock. */ -- LOCK --#if cond_lock == 0 -- decl (%rdi) --#else -- decl cond_lock(%rdi) --#endif -- jz 93f -- --#if cond_lock != 0 -- addq $cond_lock, %rdi --#endif -- cmpq $-1, dep_mutex-cond_lock(%rdi) -- movl $LLL_PRIVATE, %eax -- movl $LLL_SHARED, %esi -- cmovne %eax, %esi -- /* The call preserves %rdx. */ -- callq __lll_unlock_wake --#if cond_lock != 0 -- subq $cond_lock, %rdi --#endif --93: -- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ -- xorq %r10, %r10 -- movq dep_mutex(%rdi), %r8 -- leaq cond_futex(%rdi), %rdi -- jmp 90b --.LcleanupEND2: -- - .size __pthread_cond_wait, .-__pthread_cond_wait - versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, - GLIBC_2_3_2) -@@ -547,15 +479,11 @@ __condvar_cleanup1: - .uleb128 .LcleanupSTART-.LSTARTCODE - .uleb128 .LcleanupEND-.LcleanupSTART - .uleb128 __condvar_cleanup1-.LSTARTCODE -- .uleb128 0 -- .uleb128 .LcleanupSTART2-.LSTARTCODE -- .uleb128 .LcleanupEND2-.LcleanupSTART2 -- .uleb128 __condvar_cleanup1-.LSTARTCODE -- .uleb128 0 -+ .uleb128 0 - .uleb128 .LcallUR-.LSTARTCODE - .uleb128 .LENDCODE-.LcallUR - .uleb128 0 -- .uleb128 0 -+ .uleb128 0 - .Lcstend: - - -Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig -Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej diff --git a/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch b/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch deleted file mode 100644 index 7f1f5b8f2..000000000 --- a/multilib/lib32-glibc/glibc-2.15-strcmp-disable-avx.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S -index f93c83d..d8aa889 100644 ---- a/sysdeps/x86_64/multiarch/strcmp.S -+++ b/sysdeps/x86_64/multiarch/strcmp.S -@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) - jne 1f - call __init_cpu_features - 1: --# ifdef HAVE_AVX_SUPPORT -- leaq __strcasecmp_avx(%rip), %rax -- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) -- jnz 2f --# endif - leaq __strcasecmp_sse42(%rip), %rax - testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) - jnz 2f -@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) - jne 1f - call __init_cpu_features - 1: --# ifdef HAVE_AVX_SUPPORT -- leaq __strncasecmp_avx(%rip), %rax -- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) -- jnz 2f --# endif - leaq __strncasecmp_sse42(%rip), %rax - testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) - jnz 2f -@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) - # include "strcmp-sse42.S" - - --# ifdef HAVE_AVX_SUPPORT --# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L --# define LABEL(l) .L##l##_avx --# define GLABEL(l) l##_avx --# define USE_AVX 1 --# undef STRCMP_SSE42 --# define STRCMP_SSE42 STRCMP_AVX --# define SECTION avx --# include "strcmp-sse42.S" --# endif --# endif -- -- - # undef ENTRY - # define ENTRY(name) \ - .type STRCMP_SSE2, @function; \ diff --git a/multilib/lib32-glibc/glibc-__i686.patch b/multilib/lib32-glibc/glibc-__i686.patch deleted file mode 100644 index 28d5dd424..000000000 --- a/multilib/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/lib32-glibc/lib32-glibc.conf b/multilib/lib32-glibc/lib32-glibc.conf deleted file mode 100644 index 9b08c3f43..000000000 --- a/multilib/lib32-glibc/lib32-glibc.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib32 diff --git a/multilib/lib32-gmp/538dfce27f41.patch b/multilib/lib32-gmp/538dfce27f41.patch deleted file mode 100644 index 2e0a1af50..000000000 --- a/multilib/lib32-gmp/538dfce27f41.patch +++ /dev/null @@ -1,38 +0,0 @@ - -# HG changeset patch -# User Torbjorn Granlund <tege@gmplib.org> -# Date 1310730221 -7200 -# Node ID 538dfce27f410b910d5e2f011119269e224d16a3 -# Parent 03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366 -(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right. - -diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c ---- a/mpn/generic/dcpi1_bdiv_q.c Thu Jun 16 12:22:24 2011 +0200 -+++ b/mpn/generic/dcpi1_bdiv_q.c Fri Jul 15 13:43:41 2011 +0200 -@@ -7,7 +7,7 @@ - SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES. IN FACT, IT IS ALMOST - GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE. - --Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc. -+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. - - This file is part of the GNU MP Library. - -@@ -28,7 +28,6 @@ - #include "gmp-impl.h" - - -- - mp_size_t - mpn_dcpi1_bdiv_q_n_itch (mp_size_t n) - { -@@ -130,7 +129,7 @@ - qn = nn - qn; - while (qn > dn) - { -- mpn_sub_1 (np + dn, np + dn, qn, cy); -+ mpn_sub_1 (np + dn, np + dn, qn - dn, cy); - cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp); - qp += dn; - np += dn; - diff --git a/multilib/lib32-gmp/PKGBUILD b/multilib/lib32-gmp/PKGBUILD deleted file mode 100644 index 853b14c70..000000000 --- a/multilib/lib32-gmp/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: josephgbr <rafael.f.f1@gmail.com> - -_pkgbasename=gmp -pkgname=lib32-$_pkgbasename -pkgver=5.0.3 -pkgrel=1 -pkgdesc="A free library for arbitrary precision arithmetic (32-bit)" -arch=('x86_64') -url="http://gmplib.org/" -depends=('lib32-gcc-libs' $_pkgbasename) -makedepends=(gcc-multilib) -license=('LGPL3') -options=(!libtool) -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2) -md5sums=('8061f765cc86b9765921a0c800615804') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export ABI=32 - ./configure \ - --prefix=/usr --infodir=/usr/share/info \ - --enable-cxx --libdir=/usr/lib32 \ - --includedir=/usr/lib32/gmp - - #Put gmp.h in the same folder as gmpxx.h - sed -i 's/$(exec_prefix)\/include/$\(includedir\)/' Makefile - - make -} - -check() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-gnutls/PKGBUILD b/multilib/lib32-gnutls/PKGBUILD deleted file mode 100644 index 7cc6e57ca..000000000 --- a/multilib/lib32-gnutls/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Christoph Vigano <mail at cvigano dot de> -# Contributor: Biru Ionut <ionut@archlinux.ro> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -_pkgbasename=gnutls -pkgname=lib32-$_pkgbasename -pkgver=3.0.12 -pkgrel=1 -pkgdesc="A library which provides a secure layer over a reliable transport layer (32-bit)" -arch=('x86_64') -license=('GPL3' 'LGPL') -url="http://www.gnu.org/software/gnutls/" -options=('!libtool' '!makeflags') -depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit' $_pkgbasename) -makedepends=('gcc-multilib' 'lib32-libidn') -source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz) -md5sums=('685fe5c00786c04b39e9aac362fa0cac') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - - # build fails without --disable-hardware-acceleration because of assembler errors - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --with-zlib \ - --disable-static \ - --disable-guile \ - --disable-valgrind-tests --disable-hardware-acceleration - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - find $pkgdir - - rm -rf "${pkgdir}"/usr/{bin,include,share} -} diff --git a/multilib/lib32-gtk/PKGBUILD b/multilib/lib32-gtk/PKGBUILD deleted file mode 100644 index 3ae2ae7ff..000000000 --- a/multilib/lib32-gtk/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 55430 2011-09-12 10:13:10Z pschmitz $ - -_pkgbasename=gtk -pkgname=lib32-$_pkgbasename -pkgver=1.2.10 -pkgrel=12 -pkgdesc="The GTK+ toolkit (32-bit)" -arch=('x86_64') -url="http://www.gtk.org/" -license=('LGPL') -depends=('lib32-libxi' 'lib32-glib' "${_pkgbasename}") -makedepends=('gcc-multilib' 'lib32-libxt') -options=('!libtool') -source=("ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz" - 'aclocal-fixes.patch') -md5sums=('4d5cb2fc7fb7830e4af9747a36bfce20' - 'c59d4906602d99a7468f7334b6fc3b4e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/gtk+-${pkgver} - patch -p0 -i ${srcdir}/aclocal-fixes.patch - - ./configure --prefix=/usr \ - --libdir=/usr/lib32 \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --host=x86_64-unknown-linux-gnu \ - --target=x86_64-unknown-linux-gnu \ - --with-xinput=xfree - make -} - -package() { - cd ${srcdir}/gtk+-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}/"{usr/{share,include,bin},etc} -} diff --git a/multilib/lib32-gtk/aclocal-fixes.patch b/multilib/lib32-gtk/aclocal-fixes.patch deleted file mode 100644 index dd2ffbd44..000000000 --- a/multilib/lib32-gtk/aclocal-fixes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gtk.m4.orig 2006-03-05 13:18:09.000000000 +0000 -+++ gtk.m4 2006-03-05 13:18:20.000000000 +0000 -@@ -4,7 +4,7 @@ - dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS - dnl --AC_DEFUN(AM_PATH_GTK, -+AC_DEFUN([AM_PATH_GTK], - [dnl - dnl Get the cflags and libraries from the gtk-config script - dnl diff --git a/multilib/lib32-gtk2/PKGBUILD b/multilib/lib32-gtk2/PKGBUILD deleted file mode 100644 index cb3528ebc..000000000 --- a/multilib/lib32-gtk2/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 62948 2012-01-29 13:05:44Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> - -_pkgbasename=gtk2 -pkgname=lib32-$_pkgbasename -pkgver=2.24.9 -pkgrel=1 -pkgdesc="The GTK+ Toolkit (v2) (32-bit)" -arch=('x86_64') -url="http://www.gtk.org/" -install=gtk2.install -depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','gdk-pixbuf2>=2.22.1'} - lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage} - $_pkgbasename) -makedepends=('pkgconfig' 'gcc-multilib') -options=('!libtool' '!docs') -license=('LGPL') -source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz - xid-collision-debug.patch - gtk-modules-32.patch) -sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/gtk+-${pkgver}" - patch -Np1 -i "${srcdir}/xid-collision-debug.patch" - patch -p1 -i ${srcdir}/gtk-modules-32.patch - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib32 \ - --with-xinput=yes - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd "${srcdir}/gtk+-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/{include,share} - - cd "${pkgdir}"/usr/bin - mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32 - rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache -} diff --git a/multilib/lib32-gtk2/gtk-modules-32.patch b/multilib/lib32-gtk2/gtk-modules-32.patch deleted file mode 100644 index a2530c3bf..000000000 --- a/multilib/lib32-gtk2/gtk-modules-32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c ---- gtk+-2.20.1/gtk/gtkrc.c 2010-05-03 01:28:21.000000000 +0200 -+++ gtk+-2.20.1-32/gtk/gtkrc.c 2010-08-26 07:22:42.316920033 +0200 -@@ -450,7 +450,7 @@ - if (im_module_file) - result = g_strdup (im_module_file); - else -- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); -+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL); - } - - return result; diff --git a/multilib/lib32-gtk2/gtk2.install b/multilib/lib32-gtk2/gtk2.install deleted file mode 100644 index 49f86f550..000000000 --- a/multilib/lib32-gtk2/gtk2.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32 -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null -} diff --git a/multilib/lib32-gtk2/xid-collision-debug.patch b/multilib/lib32-gtk2/xid-collision-debug.patch deleted file mode 100644 index d61238c3b..000000000 --- a/multilib/lib32-gtk2/xid-collision-debug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 -+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 -@@ -56,10 +56,10 @@ - if (!display_x11->xid_ht) - display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, - (GEqualFunc) gdk_xid_equal); -- -+/* - if (g_hash_table_lookup (display_x11->xid_ht, xid)) - g_warning ("XID collision, trouble ahead"); -- -+*/ - g_hash_table_insert (display_x11->xid_ht, xid, data); - } - diff --git a/multilib/lib32-jack/PKGBUILD b/multilib/lib32-jack/PKGBUILD deleted file mode 100644 index 4b1f9b35c..000000000 --- a/multilib/lib32-jack/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 56009 2011-09-28 20:00:34Z bluewind $ -# Maintainer: tobias <tobias@archlinux.net> -# Maintainer: Ray Rashif <schivmeister@gmail.com> -# Contributor: Robert Emil Berge <robert@rebi.no> - -_pkgbasename=jack -pkgname=lib32-$_pkgbasename -_longname=jack-audio-connection-kit -pkgver=0.121.3 -pkgrel=1 -pkgdesc="A low-latency audio server (32-bit)" -arch=('x86_64') -license=('GPL' 'LGPL') -depends=('lib32-glibc' "$_pkgbasename=$pkgver") -makedepends=(gcc-multilib) -url="http://jackaudio.org/" -options=('!libtool') -source=(http://jackaudio.org/downloads/${_longname}-${pkgver}.tar.gz) -md5sums=('35f470f7422c37b33eb965033f7a42e8') - -build() { - cd ${srcdir}/${_longname}-${pkgver} - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -C libjack -} - -package() { - cd ${srcdir}/${_longname}-${pkgver} - - make DESTDIR=${pkgdir} install-pkgconfigDATA - make -C libjack DESTDIR=${pkgdir} install -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-json-c/PKGBUILD b/multilib/lib32-json-c/PKGBUILD deleted file mode 100644 index 07670938e..000000000 --- a/multilib/lib32-json-c/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> -# Contributor: congyiwu <congyiwu AT gmail DOT com> - -_pkgbasename=json-c -pkgname=lib32-$_pkgbasename -pkgver=0.9 -pkgrel=1 -pkgdesc="A JSON implementation in C (32-bit)" -url="http://oss.metaparadigm.com/json-c/" -license=("MIT") -arch=('x86_64') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib' 'libtool-multilib') -source=(http://oss.metaparadigm.com/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz) -md5sums=('3a13d264528dcbaf3931b0cede24abae') -options=(!libtool) -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -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 -r "$pkgdir/usr/include" - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-keyutils/PKGBUILD b/multilib/lib32-keyutils/PKGBUILD deleted file mode 100644 index 4a840c87b..000000000 --- a/multilib/lib32-keyutils/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 116950 2011-03-26 15:07:29Z tpowa $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -_pkgbasename=keyutils -pkgname=lib32-$_pkgbasename -pkgver=1.5.5 -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) -md5sums=('9e8ab5164bc8f84be148761cc89e9d6f') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - 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} -} diff --git a/multilib/lib32-kmod/PKGBUILD b/multilib/lib32-kmod/PKGBUILD deleted file mode 100644 index 5f860b7b3..000000000 --- a/multilib/lib32-kmod/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 146696 2012-01-16 19:19:14Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgname=lib32-kmod -_pkgbasename=kmod -pkgver=4 -pkgrel=1 -pkgdesc="Linux kernel module handling" -arch=('x86_64') -url="http://git.profusion.mobi/cgit.cgi/kmod.git" -license=('GPL2') -depends=('lib32-glibc' 'lib32-zlib' "$_pkgbasename") -makedepends=('gcc-multilib') -options=('!libtool') -source=("http://packages.profusion.mobi/$_pkgbasename/$_pkgbasename-$pkgver.tar.xz") -md5sums=('e14450a066a48accd0af1995b3c0232d') - -build() { - cd "$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure \ - --libdir=/usr/lib32 \ - --sysconfdir=/etc \ - --disable-tools \ - --with-rootprefix= \ - --with-zlib - - make -} - -package() { - make -C "$_pkgbasename-$pkgver" DESTDIR="$pkgdir" install - - # nuke manpages and headers - rm -rf "$pkgdir"/usr/{share,include,bin} -} - -# vim: ft=sh syn=sh et diff --git a/multilib/lib32-krb5/PKGBUILD b/multilib/lib32-krb5/PKGBUILD deleted file mode 100644 index 1b70b9d2b..000000000 --- a/multilib/lib32-krb5/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 122855 2011-05-06 19:36:38Z stephane $ -# Maintainer: Florian Pritz <flo@xinu.at> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> - -_pkgbasename=krb5 -pkgname=lib32-$_pkgbasename -pkgver=1.9.2 -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 -krb5-1.9.1-2011-007.patch) -sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92' - '31a130542e92b70c807b2dbe6f9b182dc14f5e9f') -options=('!emptydirs') - -build() { - tar zxvf ${_pkgbasename}-${pkgver}.tar.gz - cd "${srcdir}/${_pkgbasename}-${pkgver}/src" - - # Apply upstream patch to fix a null pointer dereference when processing TGS requests - # CVE-2011-1530 - # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt - patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch - - 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-krb5/krb5-1.9.1-2011-007.patch b/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch deleted file mode 100644 index f1ffdd4d1..000000000 --- a/multilib/lib32-krb5/krb5-1.9.1-2011-007.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in -index f46cad3..102fbaa 100644 ---- a/src/kdc/Makefile.in -+++ b/src/kdc/Makefile.in -@@ -67,6 +67,7 @@ check-unix:: rtest - - check-pytests:: - $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS) -+ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS) - - install:: - $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc -diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c -index c169c54..840a2ef 100644 ---- a/src/kdc/do_tgs_req.c -+++ b/src/kdc/do_tgs_req.c -@@ -243,7 +243,8 @@ tgt_again: - if (!tgs_1 || !data_eq(*server_1, *tgs_1)) { - errcode = find_alternate_tgs(request, &server); - firstpass = 0; -- goto tgt_again; -+ if (errcode == 0) -+ goto tgt_again; - } - } - status = "UNKNOWN_SERVER"; -diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py -new file mode 100644 -index 0000000..1760bcd ---- /dev/null -+++ b/src/kdc/t_emptytgt.py -@@ -0,0 +1,8 @@ -+#!/usr/bin/python -+from k5test import * -+ -+realm = K5Realm(start_kadmind=False, create_host=False) -+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1) -+if 'not found in Kerberos database' not in output: -+ fail('TGT lookup for empty realm failed in unexpected way') -+success('Empty tgt lookup.') diff --git a/multilib/lib32-lcms/PKGBUILD b/multilib/lib32-lcms/PKGBUILD deleted file mode 100644 index 8d1c5279f..000000000 --- a/multilib/lib32-lcms/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 26566 2010-09-15 22:35:39Z bluewind $ -# Maintainer: Tobias Kieslich <neri@archlinux.org> -# Contributor: Ben <contrasutra@myrealbox.com> - -_pkgbasename=lcms -pkgname=lib32-$_pkgbasename -pkgver=1.19 -pkgrel=3 -pkgdesc="Lightweight color management development library/engine (32-bit)" -arch=(x86_64) -license=('custom') -depends=('lib32-libtiff>=3.9.4' $_pkgbasename) -makedepends=(gcc-multilib) -url="http://www.littlecms.com" -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('8af94611baf20d9646c7c2c285859818') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libao/PKGBUILD b/multilib/lib32-libao/PKGBUILD deleted file mode 100644 index 1feed2e8d..000000000 --- a/multilib/lib32-libao/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> -# Contributor: dorphell <dorphell@archlinux.org> -_pkgbasename=libao -pkgname=lib32-$_pkgbasename -pkgver=1.1.0 -pkgrel=2 -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') -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/lib32-libasyncns/PKGBUILD b/multilib/lib32-libasyncns/PKGBUILD deleted file mode 100644 index 83a1aae24..000000000 --- a/multilib/lib32-libasyncns/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 26569 2010-09-15 22:36:05Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -_pkgbasename=libasyncns -pkgname=lib32-$_pkgbasename -pkgver=0.8 -pkgrel=5 -pkgdesc="A C library for Linux/Unix for executing name service queries asynchronously (32-bit)" -arch=(x86_64) -url="http://0pointer.de/lennart/projects/libasyncns" -license=('LGPL') -options=('!libtool') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://0pointer.de/lennart/projects/libasyncns/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('1f553d6ce1ad255bc83b3d8e9384f515') - -build() { - cd ${srcdir}/libasyncns-${pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - # Fix libdir - sed -i '/^libdir=/s:/lib:/lib32:' *.pc.in - - ./configure --prefix=/usr --disable-lynx --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libasyncns-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{include,share} -} diff --git a/multilib/lib32-libcanberra/PKGBUILD b/multilib/lib32-libcanberra/PKGBUILD deleted file mode 100644 index e72787f26..000000000 --- a/multilib/lib32-libcanberra/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 63487 2012-02-05 11:45:14Z ibiru $ -# Maintainer: Florian Pritz <flo@xssn.at> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libcanberra -pkgbase=lib32-$_pkgbasename -pkgname=(lib32-libcanberra lib32-libcanberra-pulse) -pkgver=0.28 -pkgrel=2 -pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)" -arch=(x86_64) -license=('LGPL') -depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb' - $_pkgbasename) -makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib) -options=(!emptydirs) -url=http://0pointer.de/lennart/projects/libcanberra -source=("$url/$_pkgbasename-$pkgver.tar.gz") -md5sums=('c198b4811598c4c161ff505e4531b02c') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \ - --disable-static --with-builtin=dso --enable-null --disable-oss \ - --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \ - --libdir=/usr/lib32 - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool - - make -} - -package_lib32-libcanberra() { - optdepends=("$pkgbase-pulse: PulseAudio driver") - - cd "$srcdir/$_pkgbasename-$pkgver" - - make -j1 DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la" - rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la - - - # Split libcanberra-pulse - mkdir pulse-plugin - mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin - - rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}} -} - -package_lib32-libcanberra-pulse() { - pkgdesc="PulseAudio plugin for libcanberra (32-bit)" - depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse') - - cd "$srcdir/$_pkgbasename-$pkgver" - - mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" - mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" -} diff --git a/multilib/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD deleted file mode 100644 index 5f5c6ba46..000000000 --- a/multilib/lib32-libcap/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -#$Id: PKGBUILD 64614 2010-01-21 11:40:53Z allan $ -# Maintainer: Hugo Doria <hugo@archlinux.org> - -_pkgbasename=libcap -pkgname=lib32-$_pkgbasename -pkgver=2.22 -pkgrel=1 -pkgdesc="POSIX 1003.1e capabilities (32-bit)" -arch=(x86_64) -url="http://www.kernel.org/pub/linux/libs/security/linux-privs/" -license=('GPL2') -depends=('lib32-attr' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${_pkgbasename}-${pkgver}.tar.gz{,.asc}) -md5sums=('b4896816b626bea445f0b3849bdd4077' - '9d0983e25e5a251d098507f9561d2b27') - -build() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - make -C libcap CC="gcc -m32" prefix=/usr lib=lib32 DESTDIR=${pkgdir} install - chmod 755 ${pkgdir}/usr/lib32/libcap.so.${pkgver} - - rm -rf "${pkgdir}/usr/include" -} diff --git a/multilib/lib32-libcups/PKGBUILD b/multilib/lib32-libcups/PKGBUILD deleted file mode 100644 index bd87da0ee..000000000 --- a/multilib/lib32-libcups/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 63488 2012-02-05 11:45:17Z ibiru $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -_pkgbasename=libcups -pkgname=lib32-$_pkgbasename -pkgver=1.5.0 -pkgrel=2 -pkgdesc="The CUPS Printing System - client libraries (32-bit)" -arch=('x86_64') -license=('GPL') -url="http://www.cups.org/" -depends=(lib32-krb5 lib32-libtiff lib32-libpng $_pkgbasename) -makedepends=(gcc-multilib) -source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2) -md5sums=('e54ed09ede2340fc3014913333520fe4') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/cups-${pkgver} - - aclocal -I config-scripts - autoconf -I config-scripts - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-ldap --enable-raw-printing --disable-gssapi --disable-dbus \ - --enable-ssl=no --disable-gnutls --enable-threads \ - --with-optim="$CFLAGS" --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/cups-${pkgver} - make BUILDROOT=${pkgdir} install-libs -} - diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD deleted file mode 100644 index 60333e3f7..000000000 --- a/multilib/lib32-libdrm/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 61866 2012-01-09 17:59:00Z lcarlier $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libdrm -pkgname=lib32-$_pkgbasename -pkgver=2.4.30 -pkgrel=1 -pkgdesc="Userspace interface to kernel DRM services (32-bit)" -arch=(x86_64) -license=('custom') -depends=('lib32-libpciaccess' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -url="http://dri.freedesktop.org/" -source=(http://dri.freedesktop.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 - no-pthread-stubs.patch) -# git_fixes.diff) -md5sums=('9f57a68b2c0836b55ebcbc241f6ca175' - '0c423f6f886a3a8d6a8834224de95bcf') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" - - # git fixes - currently none - # patch -Np1 -i ${srcdir}/git_fixes.diff - - # libtoolize --force - autoreconf --force --install - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-udev \ - --enable-intel \ - --enable-radeon \ - --enable-vmwgfx-experimental-api \ - --enable-nouveau-experimental-api - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libdrm/git_fixes.diff b/multilib/lib32-libdrm/git_fixes.diff deleted file mode 100644 index dc80155f2..000000000 --- a/multilib/lib32-libdrm/git_fixes.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c -index 19441f3..eb9dd32 100644 ---- a/intel/intel_bufmgr_gem.c -+++ b/intel/intel_bufmgr_gem.c -@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem) - bufmgr_gem->vma_cache.next, - vma_list); - assert(bo_gem->map_count == 0); -- DRMLISTDEL(&bo_gem->vma_list); -+ DRMLISTDELINIT(&bo_gem->vma_list); - - if (bo_gem->mem_virtual) { - munmap(bo_gem->mem_virtual, bo_gem->bo.size); diff --git a/multilib/lib32-libdrm/no-pthread-stubs.patch b/multilib/lib32-libdrm/no-pthread-stubs.patch deleted file mode 100644 index 6ad4a48ee..000000000 --- a/multilib/lib32-libdrm/no-pthread-stubs.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac ---- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 -+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 -@@ -47,10 +47,6 @@ - LT_INIT([disable-static]) - - --PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) --AC_SUBST(PTHREADSTUBS_CFLAGS) --AC_SUBST(PTHREADSTUBS_LIBS) -- - PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) - AC_SUBST(PCIACCESS_CFLAGS) - AC_SUBST(PCIACCESS_LIBS) ---- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 -@@ -26,7 +26,6 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intel \ -- $(PTHREADSTUBS_CFLAGS) \ - $(PCIACCESS_CFLAGS) \ - -I$(top_srcdir)/include/drm - -@@ -34,7 +33,6 @@ - libdrm_intel_ladir = $(libdir) - libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined - libdrm_intel_la_LIBADD = ../libdrm.la \ -- @PTHREADSTUBS_LIBS@ \ - @PCIACCESS_LIBS@ \ - @CLOCK_LIB@ - ---- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 -@@ -26,13 +26,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/radeon \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la - libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_radeon_la_LIBADD = ../libdrm.la - - libdrm_radeon_la_SOURCES = \ - radeon_bo_gem.c \ ---- libdrm-2.4.16/nouveau/Makefile.am 2009-11-20 23:54:36.000000000 +0000 -+++ libdrm-2.4.16/nouveau/Makefile.am.new 2009-12-07 08:13:01.489072320 +0000 -@@ -2,13 +2,12 @@ - $(WARN_CFLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/nouveau \ -- $(PTHREADSTUBS_CFLAGS) \ - -I$(top_srcdir)/include/drm - - libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la - libdrm_nouveau_ladir = $(libdir) - libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined --libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ -+libdrm_nouveau_la_LIBADD = ../libdrm.la - - libdrm_nouveau_la_SOURCES = \ - nouveau_device.c \ diff --git a/multilib/lib32-libffi/PKGBUILD b/multilib/lib32-libffi/PKGBUILD deleted file mode 100644 index 9d5ef76fa..000000000 --- a/multilib/lib32-libffi/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 57969 2011-11-04 23:32:00Z lcarlier $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=lib32-libffi -pkgver=3.0.10 -pkgrel=3 -pkgdesc="A portable, high level programming interface to various calling conventions (32 bits version)" -arch=('x86_64') -license=('MIT') -url="http://sourceware.org/libffi" -depends=('lib32-glibc') -options=('!libtool') -source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -md5sums=('79390673f5d07a8fb342bc09b5055b6f') - -build() { - cd "${srcdir}/libffi-${pkgver}" - - export CC="gcc -m32" - - ./configure --prefix=/usr \ - --libdir=/usr/lib32 --libexecdir=/usr/lib32 - - make -} - -package() { - cd "${srcdir}/libffi-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/" - rm -r "${pkgdir}"/usr/share/{info,man} -} diff --git a/multilib/lib32-libgcrypt/PKGBUILD b/multilib/lib32-libgcrypt/PKGBUILD deleted file mode 100644 index 784f095ef..000000000 --- a/multilib/lib32-libgcrypt/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 60260 2011-12-08 19:40:31Z bluewind $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> - -_pkgbasename=libgcrypt -pkgname=lib32-$_pkgbasename -pkgver=1.5.0 -pkgrel=1 -pkgdesc="a general purpose crypto library based on the code used (32-bit)" -arch=(x86_64) -url="http://www.gnupg.org" -license=('LGPL') -depends=('lib32-libgpg-error>=1.7' $_pkgbasename) -makedepends=(gcc-multilib libtool-multilib) -options=(!libtool) -source=(ftp://ftp.gnupg.org/gcrypt/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2 - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${_pkgbasename}-${pkgver}.tar.bz2 -) -md5sums=('693f9c64d50c908bc4d6e01da3ff76d8') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - - # Use 32-bit assembler - sed 's:path="amd64":path="i586 i386":' -i mpi/config.links - - # keep static library for , needed for cryptsetup - ./configure --prefix=/usr --disable-padlock-support --libdir=/usr/lib32 --enable-shared - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} -} diff --git a/multilib/lib32-libglade/PKGBUILD b/multilib/lib32-libglade/PKGBUILD deleted file mode 100644 index ebea314ea..000000000 --- a/multilib/lib32-libglade/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> -# Contributor: TryA <tryagainprod {at} gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libglade -pkgname=lib32-libglade -pkgver=2.6.4 -pkgrel=5 -pkgdesc="Allows you to load glade interface files in a program at runtime (32-bit)" -arch=('x86_64') -license=('LGPL') -depends=('lib32-gtk2' 'lib32-libxml2' "${_pkgbasename}") -makedepends=('python2' 'pkgconfig' 'gcc-multilib') -options=('!libtool') -source=("http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/2.6/${_pkgbasename}-${pkgver}.tar.bz2" - 'libglade-2.0.1-nowarning.patch') -url='http://www.gnome.org' -md5sums=('d1776b40f4e166b5e9c107f1c8fe4139' - '4f879c0ce550004905aa0fb24f25c353') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch" - PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf ${pkgdir}/usr/{bin,include,share} -} diff --git a/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch b/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch deleted file mode 100644 index fd071215f..000000000 --- a/multilib/lib32-libglade/libglade-2.0.1-nowarning.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- libglade-2.0.1/glade/glade-gtk.c.nowarning 2003-08-29 14:50:10.000000000 -0400 -+++ libglade-2.0.1/glade/glade-gtk.c 2003-08-29 14:58:41.000000000 -0400 -@@ -639,9 +639,8 @@ - if (!strcmp (childinfo->properties[j].name, "label")) { - label = childinfo->properties[j].value; - break; -- } else { -- g_warning ("Unknown CList child property: %s", childinfo->properties[j].name); - } -+ /* Ignore all other properties */ - } - - if (label) { -@@ -683,6 +682,7 @@ - char *icon = NULL; - gboolean use_stock = FALSE, active = FALSE, new_group = FALSE; - gboolean use_underline = FALSE; -+ gboolean sensitive = TRUE; - GtkWidget *iconw = NULL; - int j; - -@@ -708,6 +708,8 @@ - group_name = value; - } else if (!strcmp (name, "new_group")) { - new_group = BOOL (value); -+ } else if (!strcmp (name, "sensitive")) { -+ sensitive = BOOL (value); - } else if (!strcmp (name, "visible")) { - /* ignore for now */ - } else if (!strcmp (name, "tooltip")) { -@@ -785,6 +787,8 @@ - gtk_label_set_use_underline (GTK_LABEL (toolbar_child->label), - TRUE); - } -+ -+ gtk_widget_set_sensitive (child, sensitive); - - glade_xml_set_common_params (xml, child, childinfo->child); - } else { diff --git a/multilib/lib32-libgpg-error/PKGBUILD b/multilib/lib32-libgpg-error/PKGBUILD deleted file mode 100644 index b0d16156b..000000000 --- a/multilib/lib32-libgpg-error/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 60262 2011-12-08 19:42:28Z bluewind $ -# Maintainer: judd <jvinet@zeroflux.org> - -_pkgbasename=libgpg-error -pkgname=lib32-$_pkgbasename -pkgver=1.10 -pkgrel=1 -pkgdesc="Support library for libgcrypt (32-bit)" -arch=(x86_64) -url="http://www.gnupg.org" -license=('LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -options=(!libtool) -source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${_pkgbasename}-${pkgver}.tar.bz2) - #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2) -md5sums=('736a03daa9dc5873047d4eb4a9c22a16') - - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}"/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}"/${_pkgbasename}-${pkgver} - make DESTDIR="${pkgdir}/" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-libice/PKGBUILD b/multilib/lib32-libice/PKGBUILD deleted file mode 100644 index 6e65dd044..000000000 --- a/multilib/lib32-libice/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 31526 2010-11-01 23:47:50Z heftig $ -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Maintainer: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libice -pkgname=lib32-$_pkgbasename -pkgver=1.0.7 -pkgrel=1 -pkgdesc="X11 Inter-Client Exchange library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -depends=('lib32-glibc' 'xproto>=7.0.18' $_pkgbasename) -makedepends=('pkgconfig' 'xtrans>=1.2.5' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2) -license=('custom') -sha1sums=('c7d0f4c5b0e999385445b8be1bc89aec4e5de71d') - -build() { - cd "${srcdir}/libICE-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - - make -} - -package() { - cd "${srcdir}/libICE-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libidn/PKGBUILD b/multilib/lib32-libidn/PKGBUILD deleted file mode 100644 index 77659db5e..000000000 --- a/multilib/lib32-libidn/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -_pkgbasename=libidn -pkgname=lib32-$_pkgbasename -pkgver=1.24 -pkgrel=1 -pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications (32 bit)" -url="http://www.gnu.org/software/libidn/" -arch=('x86_64') -license=('GPL3' 'LGPL') -depends=('lib32-glibc' "$_pkgbasename>=$pkgver") -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://ftp.gnu.org/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('764d7258eeb273941680499fab2c7367') - -build() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 CC='gcc -m32' - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{bin,include,share} -} diff --git a/multilib/lib32-libjpeg-turbo/PKGBUILD b/multilib/lib32-libjpeg-turbo/PKGBUILD deleted file mode 100644 index 09102ad96..000000000 --- a/multilib/lib32-libjpeg-turbo/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 48100 2011-05-28 16:27:44Z bluewind $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> - -_pkgbasename=libjpeg-turbo -pkgname=lib32-$_pkgbasename -pkgver=1.1.1 -pkgrel=1 -pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)" -arch=('x86_64') -url="http://libjpeg-turbo.virtualgl.org/" -license=('GPL' 'custom') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('nasm' gcc-multilib) -provides=('lib32-libjpeg=8.0.2') -conflicts=('lib32-libjpeg') -replaces=('lib32-libjpeg') -options=('!libtool') -source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz) -md5sums=('03b9c1406c7bfdc204313c2917ce6962') - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure - ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd - make -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - - 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-libldap/PKGBUILD b/multilib/lib32-libldap/PKGBUILD deleted file mode 100644 index 51138f076..000000000 --- a/multilib/lib32-libldap/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 61133 2011-12-22 08:04:24Z bluewind $ -# Maintainer: -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -_pkgbasename=libldap -pkgname=lib32-$_pkgbasename -pkgver=2.4.28 -pkgrel=1 -pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries (32-bit)" -arch=('x86_64') -license=('custom') -url="http://www.openldap.org/" -depends=('lib32-openssl' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz" - 'ntlm.patch') -md5sums=('196023e552eeb259e048edcd61a9645b' - '4258ddbef923d1f29f2843bc050f8c56') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/openldap-${pkgver} - - patch -Np1 -i ${srcdir}/ntlm.patch - - ./configure --prefix=/usr \ - --libexecdir=/usr/sbin \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --localstatedir=/var/lib/openldap \ - --enable-crypt --enable-dynamic \ - --with-threads --disable-wrappers \ - --disable-spasswd --without-cyrus-sasl \ - --disable-bdb --disable-hdb --libdir=/usr/lib32 - - cd include - make - - cd ../libraries - make depend - make - -} - -package() { - cd ${srcdir}/openldap-${pkgver} - - cd include - make DESTDIR=${pkgdir} install - - cd ../libraries - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/etc" - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libldap/ntlm.patch b/multilib/lib32-libldap/ntlm.patch deleted file mode 100644 index 6804b610d..000000000 --- a/multilib/lib32-libldap/ntlm.patch +++ /dev/null @@ -1,230 +0,0 @@ -Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is -actually called by evolution-data-server, checked at version 1.12.2. -Without this patch, the Exchange addressbook integration uses simple binds -with cleartext passwords. - -Russ checked with openldap-software for upstream's opinion on this patch -on 2007-12-21. Upstream had never received it as a patch submission and -given that it's apparently only for older Exchange servers that can't do -SASL and DIGEST-MD5, it's not very appealing. - -Bug#457374 filed against evolution-data-server asking if this support is -still required on 2007-12-21. - -Index: trunk/include/ldap.h -=================================================================== ---- trunk.orig/include/ldap.h -+++ trunk/include/ldap.h -@@ -2461,5 +2461,25 @@ - LDAPControl **ctrls, - LDAPDerefRes **drp )); - -+/* -+ * hacks for NTLM -+ */ -+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU) -+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU) -+LDAP_F( int ) -+ldap_ntlm_bind LDAP_P(( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp )); -+LDAP_F( int ) -+ldap_parse_ntlm_bind_result LDAP_P(( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge)); -+ - LDAP_END_DECL - #endif /* _LDAP_H */ -Index: trunk/libraries/libldap/ntlm.c -=================================================================== ---- /dev/null -+++ trunk/libraries/libldap/ntlm.c -@@ -0,0 +1,138 @@ -+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */ -+/* -+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. -+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file -+ */ -+ -+/* Mostly copied from sasl.c */ -+ -+#include "portable.h" -+ -+#include <stdlib.h> -+#include <stdio.h> -+ -+#include <ac/socket.h> -+#include <ac/string.h> -+#include <ac/time.h> -+#include <ac/errno.h> -+ -+#include "ldap-int.h" -+ -+int -+ldap_ntlm_bind( -+ LDAP *ld, -+ LDAP_CONST char *dn, -+ ber_tag_t tag, -+ struct berval *cred, -+ LDAPControl **sctrls, -+ LDAPControl **cctrls, -+ int *msgidp ) -+{ -+ BerElement *ber; -+ int rc; -+ ber_int_t id; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( msgidp != NULL ); -+ -+ if( msgidp == NULL ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ /* create a message to send */ -+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ assert( LBER_VALID( ber ) ); -+ -+ LDAP_NEXT_MSGID( ld, id ); -+ rc = ber_printf( ber, "{it{istON}" /*}*/, -+ id, LDAP_REQ_BIND, -+ ld->ld_version, dn, tag, -+ cred ); -+ -+ /* Put Server Controls */ -+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) { -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) { -+ ld->ld_errno = LDAP_ENCODING_ERROR; -+ ber_free( ber, 1 ); -+ return ld->ld_errno; -+ } -+ -+ /* send the message */ -+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id ); -+ -+ if(*msgidp < 0) -+ return ld->ld_errno; -+ -+ return LDAP_SUCCESS; -+} -+ -+int -+ldap_parse_ntlm_bind_result( -+ LDAP *ld, -+ LDAPMessage *res, -+ struct berval *challenge) -+{ -+ ber_int_t errcode; -+ ber_tag_t tag; -+ BerElement *ber; -+ ber_len_t len; -+ -+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 ); -+ -+ assert( ld != NULL ); -+ assert( LDAP_VALID( ld ) ); -+ assert( res != NULL ); -+ -+ if ( ld == NULL || res == NULL ) { -+ return LDAP_PARAM_ERROR; -+ } -+ -+ if( res->lm_msgtype != LDAP_RES_BIND ) { -+ ld->ld_errno = LDAP_PARAM_ERROR; -+ return ld->ld_errno; -+ } -+ -+ if ( ld->ld_error ) { -+ LDAP_FREE( ld->ld_error ); -+ ld->ld_error = NULL; -+ } -+ if ( ld->ld_matched ) { -+ LDAP_FREE( ld->ld_matched ); -+ ld->ld_matched = NULL; -+ } -+ -+ /* parse results */ -+ -+ ber = ber_dup( res->lm_ber ); -+ -+ if( ber == NULL ) { -+ ld->ld_errno = LDAP_NO_MEMORY; -+ return ld->ld_errno; -+ } -+ -+ tag = ber_scanf( ber, "{ioa" /*}*/, -+ &errcode, challenge, &ld->ld_error ); -+ ber_free( ber, 0 ); -+ -+ if( tag == LBER_ERROR ) { -+ ld->ld_errno = LDAP_DECODING_ERROR; -+ return ld->ld_errno; -+ } -+ -+ ld->ld_errno = errcode; -+ -+ return( ld->ld_errno ); -+} -+ -Index: trunk/libraries/libldap/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap/Makefile.in -+++ trunk/libraries/libldap/Makefile.in -@@ -27,7 +27,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - - OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ -@@ -40,7 +40,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include -Index: trunk/libraries/libldap_r/Makefile.in -=================================================================== ---- trunk.orig/libraries/libldap_r/Makefile.in -+++ trunk/libraries/libldap_r/Makefile.in -@@ -29,7 +29,7 @@ - init.c options.c print.c string.c util-int.c schema.c \ - charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ - tls2.c tls_o.c tls_g.c tls_m.c \ -- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ -+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \ - assertion.c deref.c ldif.c fetch.c - SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ - thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \ -@@ -47,7 +47,7 @@ - init.lo options.lo print.lo string.lo util-int.lo schema.lo \ - charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ - tls2.lo tls_o.lo tls_g.lo tls_m.lo \ -- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ -+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \ - assertion.lo deref.lo ldif.lo fetch.lo - - LDAP_INCDIR= ../../include diff --git a/multilib/lib32-libmikmod/PKGBUILD b/multilib/lib32-libmikmod/PKGBUILD deleted file mode 100644 index 4f29981ef..000000000 --- a/multilib/lib32-libmikmod/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: Peter Lewis <plewis@aur.archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Jesse Juhani Jaara <jesse.jaara@gmail.com> - -pkgname=lib32-libmikmod -pkgver=3.1.12 -pkgrel=5 -pkgdesc="A portable sound library" -license=('GPL' 'LGPL') -url="http://sourceforge.net/projects/mikmod/" -arch=('x86_64') -depends=('libmikmod' 'lib32-glibc') -makedepends=('gcc-multilib') -options=('!libtool') -install= -source=(http://downloads.sourceforge.net/mikmod/libmikmod-${pkgver}.tar.gz - libmikmod-3.1.12-64bit-fix.diff - libmikmod-3.1.12-exitcrash-fix.diff - libmikmod-3.1.12-loopingvolume-fix.diff - libmikmod-3.1.12-md_sngchn-fix.diff - libmikmod-CVE-2009-0179.patch) -md5sums=('9f3c740298260d5f88981fc0d51f6f16' - 'dc7ffd8d6d355e9d6ec671b7f2b2adc7' - '03a4f5bfcecddf5f515672d6d477b7f7' - 'a837fd876cbd2ac27419b802504489db' - '076d39de19de36b880ed90297f1ee0d1' - 'fa91f4bc17164be32bec0ea7a73f2aaa') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/libmikmod-$pkgver - - # patches from sdl_mixer-1.2.11 source - patch -Np1 -i $srcdir/libmikmod-3.1.12-64bit-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-exitcrash-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff - patch -Np1 -i $srcdir/libmikmod-3.1.12-md_sngchn-fix.diff - patch -Np1 -i $srcdir/libmikmod-CVE-2009-0179.patch - - ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/libmikmod-$pkgver - make DESTDIR=$pkgdir install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} - diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff deleted file mode 100644 index cd7800881..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-64bit-fix.diff +++ /dev/null @@ -1,47 +0,0 @@ -Date: Sun, 04 Jul 2004 11:53:23 +0200 -From: Josselin Mouette -Subject: Re: sdl 64bit problem [PATCH] - -Le sam, 03/07/2004 � 18:20 +0200, Hans-Frieder Vogt a �crit : -> Hi list, -> -> I found the problem that lead to the distorted sound in tuxracer on AMD64. It -> may have also been the cause for the other reported sound problems with SDL. -> The problem is not in SDL, but in SDL-mixer. -> There, music files (*.it, and probably others as well) are incorrectly read on -> all 64 bit architectures but Alpha, due to an incorrect data type definition. -> The attached patch should solve the problem for all 64 bit architectures on -> Linux, since at least cpp defines _LP64 and __LP64__ for them. -> _LP64 indicates that long ints and pointers are 64 bits, but integers are 32 -> bits. -> I am not sure whether the usage of _LP64 is also standard for the commercial -> compilers, and for other Unixes, but at least Solaris 9 defines _LP64 in the -> 64 bit environment as well. -> -> Josselin, -> could you include this patch into your next debian packages? - -diff -ru libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in ---- libmikmod-3.1.12.orig/include/mikmod.h.in 2007-12-15 01:24:19.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod.h.in 2009-10-05 00:18:56.000000000 -0700 -@@ -85,7 +85,7 @@ - - @DOES_NOT_HAVE_SIGNED@ - --#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - /* 64 bit architectures */ - - typedef signed char SBYTE; /* 1 byte, signed */ -diff -ru libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h ---- libmikmod-3.1.12.orig/include/mikmod_internals.h 2007-12-15 04:24:51.000000000 -0800 -+++ libmikmod-3.1.12/include/mikmod_internals.h 2009-10-05 00:19:15.000000000 -0700 -@@ -50,7 +50,7 @@ - /*========== More type definitions */ - - /* SLONGLONG: 64bit, signed */ --#if defined (__arch64__) || defined(__alpha) -+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(_LP64) - typedef long SLONGLONG; - #define NATIVE_64BIT_INT - #elif defined(__WATCOMC__) diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff deleted file mode 100644 index fe62892b5..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-exitcrash-fix.diff +++ /dev/null @@ -1,21 +0,0 @@ -Date: 15 Apr 2002 11:01:19 +0200 -From: Guillaume Cottenceau <gc@mandrakesoft.com> - -Unfortunately, I should have double checked that the following -fix (authored by Dave Goehrig <dave@cthulhu-burger.org>, not me), -was really in the CVS... it's not, as of stable 1.2.3 at least. -Please include it, it fixes a segfault on exiting a program which -disabled MOD music during its execution. - -diff -ru libmikmod-3.1.12.orig/playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c ---- libmikmod-3.1.12.orig/playercode/virtch_common.c 2007-12-15 01:26:53.000000000 -0800 -+++ libmikmod-3.1.12/playercode/virtch_common.c 2009-10-05 00:37:12.000000000 -0700 -@@ -347,7 +347,7 @@ - - void VC1_SampleUnload(SWORD handle) - { -- if (handle<MAXSAMPLEHANDLES) { -+ if (Samples && handle<MAXSAMPLEHANDLES) { - if (Samples[handle]) - free(Samples[handle]); - Samples[handle]=NULL; diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff deleted file mode 100644 index f0ce70e34..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-loopingvolume-fix.diff +++ /dev/null @@ -1,15 +0,0 @@ -Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001 - * Fixed MOD music volume when looping - -diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- libmikmod-3.1.12.orig/playercode/mplayer.c 2009-10-05 00:19:59.000000000 -0700 -+++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-05 00:44:35.000000000 -0700 -@@ -3019,7 +3019,7 @@ - { - MUTEX_LOCK(vars); - if (pf) -- pf->volume=(volume<0)?0:(volume>128)?128:volume; -+ pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume; - MUTEX_UNLOCK(vars); - } - diff --git a/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff b/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff deleted file mode 100644 index 45cc355ae..000000000 --- a/multilib/lib32-libmikmod/libmikmod-3.1.12-md_sngchn-fix.diff +++ /dev/null @@ -1,112 +0,0 @@ -This patch fixes "buffer overflow due to md_numchn - ID: 1630158" - -diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c ---- libmikmod-3.1.12.orig/playercode/mplayer.c 2007-12-15 01:26:28.000000000 -0800 -+++ libmikmod-3.1.12/playercode/mplayer.c 2009-10-04 23:48:36.000000000 -0700 -@@ -52,6 +52,8 @@ - will wait */ - /*static*/ MODULE *pf = NULL; - -+#define NUMVOICES(mod) (md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices) -+ - #define HIGH_OCTAVE 2 /* number of above-range octaves */ - - static UWORD oldperiods[OCTAVE*2]={ -@@ -248,14 +250,14 @@ - MP_VOICE *a; - ULONG t,k,tvol,pp; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (((mod->voice[t].main.kick==KICK_ABSENT)|| - (mod->voice[t].main.kick==KICK_ENV))&& - Voice_Stopped_internal(t)) - return t; - - tvol=0xffffffUL;t=-1;a=mod->voice; -- for (k=0;k<md_sngchn;k++,a++) { -+ for (k=0;k<NUMVOICES(mod);k++,a++) { - /* allow us to take over a nonexisting sample */ - if (!a->main.s) - return k; -@@ -2249,12 +2251,12 @@ - - switch (dat) { - case 0x0: /* past note cut */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.fadevol=0; - break; - case 0x1: /* past note off */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) { - mod->voice[t].main.keyoff|=KEY_OFF; - if ((!(mod->voice[t].venv.flg & EF_ON))|| -@@ -2263,7 +2265,7 @@ - } - break; - case 0x2: /* past note fade */ -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if (mod->voice[t].master==a) - mod->voice[t].main.keyoff|=KEY_FADE; - break; -@@ -2318,7 +2320,7 @@ - SAMPLE *s; - - mod->totalchn=mod->realchn=0; -- for (channel=0;channel<md_sngchn;channel++) { -+ for (channel=0;channel<NUMVOICES(mod);channel++) { - aout=&mod->voice[channel]; - i=aout->main.i; - s=aout->main.s; -@@ -2736,7 +2738,7 @@ - if (a->dct!=DCT_OFF) { - int t; - -- for (t=0;t<md_sngchn;t++) -+ for (t=0;t<NUMVOICES(mod);t++) - if ((!Voice_Stopped_internal(t))&& - (mod->voice[t].masterchn==channel)&& - (a->main.sample==mod->voice[t].main.sample)) { -@@ -2978,6 +2980,11 @@ - if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE)))) - return 1; - -+ /* mod->numvoices was used during loading to clamp md_sngchn. -+ After loading it's used to remember how big mod->voice is. -+ */ -+ mod->numvoices = md_sngchn; -+ - Player_Init_internal(mod); - return 0; - } -@@ -3086,7 +3093,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3111,7 +3118,7 @@ - pf->patbrk=0; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; -@@ -3138,7 +3145,7 @@ - pf->sngpos=pos; - pf->vbtick=pf->sngspd; - -- for (t=0;t<md_sngchn;t++) { -+ for (t=0;t<NUMVOICES(pf);t++) { - Voice_Stop_internal(t); - pf->voice[t].main.i=NULL; - pf->voice[t].main.s=NULL; diff --git a/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch b/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch deleted file mode 100644 index 0c47e6545..000000000 --- a/multilib/lib32-libmikmod/libmikmod-CVE-2009-0179.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c ---- libmikmod-3.1.11.orig/loaders/load_xm.c 2004-01-21 18:43:53.000000000 +0100 -+++ libmikmod-3.1.11/loaders/load_xm.c 2008-04-16 04:30:45.000000000 +0200 -@@ -622,7 +622,8 @@ - /* read the remainder of the header */ - for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader); - -- if(_mm_eof(modreader)) { -+ /* last instrument is at the end of file in version 0x0104 */ -+ if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) { - free(nextwav);free(wh); - nextwav=NULL;wh=NULL; - _mm_errno = MMERR_LOADING_SAMPLEINFO; -diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c ---- libmikmod-3.1.11.orig/playercode/mloader.c 2004-01-21 18:43:53.000000000 +0100 -+++ libmikmod-3.1.11/playercode/mloader.c 2008-04-16 04:30:45.000000000 +0200 -@@ -450,10 +450,12 @@ - if (!l->Init || l->Init()) { - _mm_rewind(modreader); - ok = l->Load(curious); -- /* propagate inflags=flags for in-module samples */ -- for (t = 0; t < of.numsmp; t++) -- if (of.samples[t].inflags == 0) -- of.samples[t].inflags = of.samples[t].flags; -+ if (ok) { -+ /* propagate inflags=flags for in-module samples */ -+ for (t = 0; t < of.numsmp; t++) -+ if (of.samples[t].inflags == 0) -+ of.samples[t].inflags = of.samples[t].flags; -+ } - } else - ok = 0; - diff --git a/multilib/lib32-libmng/PKGBUILD b/multilib/lib32-libmng/PKGBUILD deleted file mode 100644 index 354ca8b16..000000000 --- a/multilib/lib32-libmng/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 58042 2011-11-05 19:32:02Z lcarlier $ -# Maintainer: Florian Pritz <flo@xssn.at> - -_pkgbasename=libmng -pkgname=lib32-$_pkgbasename -pkgver=1.0.10 -pkgrel=6 -pkgdesc="A collection of routines used to create and manipulate MNG format graphics files (32-bit)" -arch=('x86_64') -url="http://www.libmng.com/" -license=('custom') -depends=('lib32-zlib' 'lib32-libjpeg>=8' $_pkgbasename) -makedepends=(gcc-multilib) -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz) -md5sums=('a464ae7d679781beebdf7440d144b7bd') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/$_pkgbasename-$pkgver - ln -s makefiles/configure.in . - ln -s makefiles/Makefile.am . - autoreconf --force --install - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/$_pkgbasename-$pkgver - - make DESTDIR=$pkgdir install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libogg/PKGBUILD b/multilib/lib32-libogg/PKGBUILD deleted file mode 100644 index 966a76789..000000000 --- a/multilib/lib32-libogg/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 60957 2011-12-19 19:09:59Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=libogg -pkgname=lib32-$_pkgbasename -pkgver=1.3.0 -pkgrel=1 -pkgdesc="Ogg bitstream and framing library (32-bit)" -arch=('x86_64') -url="http://www.xiph.org/ogg/" -license=('BSD') -depends=('lib32-glibc' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.xiph.org/releases/ogg/$_pkgbasename-$pkgver.tar.gz) -md5sums=('0a7eb40b86ac050db3a789ab65fe21c2') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/${_pkgbasename}-${pkgver} - - make DESTDIR=$pkgdir install - - rm -rf "$pkgdir"/usr/{share,bin} - find "$pkgdir"/usr/include/ogg -type f -not -name config_types.h -delete - mv "$pkgdir"/usr/include/ogg/config_types{,-32}.h - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libpciaccess/PKGBUILD b/multilib/lib32-libpciaccess/PKGBUILD deleted file mode 100644 index be80aab83..000000000 --- a/multilib/lib32-libpciaccess/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 58044 2011-11-05 19:35:56Z lcarlier $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -_pkgbasename=libpciaccess -pkgname=lib32-${_pkgbasename} -pkgver=0.12.1 -pkgrel=3 -pkgdesc="X11 PCI access library (32-bit" -arch=(i686 x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-glibc' ${_pkgbasename}) -makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros') -options=('!libtool') -source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2) -sha1sums=('4933bda545df37395e57ff6b4bd61e17a5431770') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib32 - make - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/include - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD deleted file mode 100644 index afde907c6..000000000 --- a/multilib/lib32-libpng/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 63797 2012-02-05 12:43:41Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Travis Willard <travis@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -_pkgbasename=libpng -pkgname=lib32-$_pkgbasename -pkgver=1.5.8 -_apngver=1.5.7 -pkgrel=1 -pkgdesc="A collection of routines used to create PNG format graphics files (32-bit)" -arch=('x86_64') -url="http://www.libpng.org/pub/png/libpng.html" -license=('custom') -depends=('lib32-zlib' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=("http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.xz" - "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-${_apngver}-apng.patch.gz") -md5sums=('0f7ae352beadaff78073733905613041' - '6c6a674048cec94db1bc35decf0d142c') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - # Add animated PNG (apng) support - # see http://sourceforge.net/projects/libpng-apng/ - patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - cd contrib/pngminus - make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD deleted file mode 100644 index 2118ef01b..000000000 --- a/multilib/lib32-libpulse/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 62215 2012-01-18 10:54:20Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -_pkgbasename=libpulse -pkgname=lib32-$_pkgbasename -pkgdesc="A featureful, general-purpose sound server (32-bit client libraries)" -pkgver=1.1 -pkgrel=2 -arch=(x86_64) -url="http://pulseaudio.org/" -license=(GPL LGPL) -depends=(lib32-dbus-core lib32-json-c - lib32-libasyncns lib32-libcap lib32-libxtst lib32-libsm lib32-libsndfile - $_pkgbasename) -makedepends=(gcc-multilib libtool-multilib intltool lib32-glib2 lib32-speex lib32-gtk2) -optdepends=('lib32-alsa-plugins: ALSA support') -provides=("lib32-pulseaudio=$pkgver") -conflicts=(lib32-pulseaudio) -replaces=(lib32-pulseaudio) -options=(!emptydirs !libtool) -source=("http://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz") -sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee') - -_libs="libpulsecommon-$pkgver.la libpulse.la libpulse-simple.la libpulse-mainloop-glib.la libpulsedsp.la" - -build() { - cd "$srcdir/pulseaudio-$pkgver" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libdir=/usr/lib32 \ - --libexecdir=/usr/lib32 \ - --localstatedir=/var \ - --disable-hal \ - --disable-tcpwrap \ - --disable-rpath \ - --disable-default-build-tests - - # fight unused direct deps - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -C src $_libs -} - -package() { - cd "$srcdir/pulseaudio-$pkgver" - make -j1 -C src DESTDIR="$pkgdir" \ - lib_LTLIBRARIES="$_libs" install-libLTLIBRARIES - make -j1 DESTDIR="$pkgdir" install-pkgconfigDATA -} diff --git a/multilib/lib32-libsamplerate/PKGBUILD b/multilib/lib32-libsamplerate/PKGBUILD deleted file mode 100644 index 72a06a49e..000000000 --- a/multilib/lib32-libsamplerate/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 61682 2012-01-06 14:16:07Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=libsamplerate -pkgname=lib32-$_pkgbasename -pkgver=0.1.8 -pkgrel=1 -pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio (32-bit)" -arch=('x86_64') -url="http://www.mega-nerd.com/SRC/index.html" -license=('GPL') -depends=('lib32-libsndfile' $_pkgbasename) -makedepedns=('gcc-multilib') -options=('!libtool') -source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz) -md5sums=('1c7fb25191b4e6e3628d198a66a84f47') -sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70') - -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} -} diff --git a/multilib/lib32-libsm/PKGBUILD b/multilib/lib32-libsm/PKGBUILD deleted file mode 100644 index 8a88d6e4e..000000000 --- a/multilib/lib32-libsm/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31529 2010-11-01 23:52:46Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libsm -pkgname=lib32-$_pkgbasename -pkgver=1.2.0 -pkgrel=1 -pkgdesc="X11 Session Management library (32-bit)" -arch=(x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libice' 'lib32-util-linux-ng' $_pkgbasename) -makedepends=('xorg-util-macros' 'xtrans' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2) -sha1sums=('f78bc72f0b3ec26cbf980f84f014422ba854544d') - -build() { - cd "${srcdir}/libSM-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libSM-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libsndfile/PKGBUILD b/multilib/lib32-libsndfile/PKGBUILD deleted file mode 100644 index 9debdca3d..000000000 --- a/multilib/lib32-libsndfile/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 53155 2011-07-31 05:20:20Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=libsndfile -pkgname=lib32-$_pkgbasename -pkgver=1.0.25 -pkgrel=1 -pkgdesc="A C library for reading and writing files containing sampled sound (32-bit)" -arch=('x86_64') -url="http://www.mega-nerd.com/libsndfile" -license=('LGPL') -depends=('lib32-flac' 'lib32-libvorbis' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'gcc-multilib') -options=('!libtool') -source=(http://www.mega-nerd.com/libsndfile/files/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('e2b7bb637e01022c7d20f95f9c3990a2') -sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - export GETCONF="getconf -v POSIX_V7_ILP32_OFFBIG" - export GETCONF_DIR="/usr/lib32/getconf" - - ./configure --prefix=/usr --disable-sqlite --libdir=/usr/lib32 - make -C src -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -C src DESTDIR="${pkgdir}" install - make DESTDIR="$pkgdir" install-pkgconfigDATA - - rm -rf "$pkgdir/usr/include" -} diff --git a/multilib/lib32-libssh2/PKGBUILD b/multilib/lib32-libssh2/PKGBUILD deleted file mode 100644 index 88ac921e1..000000000 --- a/multilib/lib32-libssh2/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Florian Pritz <flo@xssn.at> -# $Id: PKGBUILD 60959 2011-12-19 19:12:57Z bluewind $ -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: ice-man <icemanf@gmail.com> - -_pkgbasename=libssh2 -pkgname=lib32-$_pkgbasename -pkgver=1.3.0 -pkgrel=1 -pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts (32-bit)" -url="http://www.libssh2.org/" -arch=('i686' 'x86_64') -license=('BSD') -depends=('lib32-openssl' $_pkgbasename) -makedepends=('zlib' "gcc-multilib") -options=('!libtool') -source=("http://www.libssh2.org/download/${_pkgbasename}-${pkgver}.tar.gz") -md5sums=('6425331899ccf1015f1ed79448cb4709') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - 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-libstdc++5/PKGBUILD b/multilib/lib32-libstdc++5/PKGBUILD deleted file mode 100644 index 3d30a4b0e..000000000 --- a/multilib/lib32-libstdc++5/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 26620 2010-09-15 22:43:15Z bluewind $ - -pkgname=lib32-libstdc++5 -pkgver=3.3.6 -pkgrel=5 -pkgdesc="Legacy GNU Standard C++ library version 3 (32 bit)" -arch=(x86_64) -url="http://gcc.gnu.org" -license=('GPL' 'LGPL') -depends=('lib32-gcc-libs') -makedepends=('gcc-multilib' 'binutils-multilib') -options=('!libtool' '!makeflags') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 - gcc-3.4.3-no_multilib_amd64.patch) -md5sums=('18c52e6fb8966b7700665dca289d077f' - '6b3d00b8d079805be1b895f7f6ce47a0' - 'b2a96584f4cee72362695ba44c911c40') - -build(){ - export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||') - export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||') - cd ${srcdir}/gcc-${pkgver} - - patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch - # No fixincludes - sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - mkdir ../gcc-build - cd ../gcc-build - # We build the full multilib libstdc++5 here, no idea how to restrict - # the build process to the 32 bit version only. - ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \ - --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \ - --enable-multilib - make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" -} - -package() { - cd ${srcdir}/gcc-build - make DESTDIR=${pkgdir} install-target-libstdc++-v3 - - # Only install the lib32 files - rm -rf ${pkgdir}/usr/{include,share,lib} - rm -f ${pkgdir}/usr/lib32/*.a - rm -f ${pkgdir}/usr/lib32/libstdc++.so -} diff --git a/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch b/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch deleted file mode 100644 index 6ba6694db..000000000 --- a/multilib/lib32-libstdc++5/gcc-3.4.3-no_multilib_amd64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc/config/i386/t-linux64.orig 2003-06-28 00:19:59.000000000 +0000 -+++ gcc/config/i386/t-linux64 2003-06-28 00:20:07.000000000 +0000 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 ../lib -+MULTILIB_OSDIRNAMES = ../lib ../lib32 - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD deleted file mode 100644 index aa897475c..000000000 --- a/multilib/lib32-libtiff/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 63490 2012-02-05 11:45:27Z ibiru $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -_pkgbasename=libtiff -pkgname=lib32-$_pkgbasename -pkgver=4.0.0 -pkgrel=1 -pkgdesc="Library for manipulation of TIFF images (32-bit)" -arch=('x86_64') -url="http://www.remotesensing.org/libtiff/" -license=('custom') -depends=('lib32-libjpeg' 'lib32-zlib' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz) -sha1sums=('85d85520fea40fc9291995a60e3d40cf980b5522') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/tiff-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib32 - make -} - -check() { - cd "${srcdir}/tiff-${pkgver}" - make check -} - -package() { - cd "${srcdir}/tiff-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib/lib32-libtiff/libtiff-CVE-2009-2285.patch deleted file mode 100644 index 435a84b53..000000000 --- a/multilib/lib32-libtiff/libtiff-CVE-2009-2285.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: tiff-3.8.2/libtiff/tif_lzw.c -=================================================================== ---- tiff-3.8.2.orig/libtiff/tif_lzw.c -+++ tiff-3.8.2/libtiff/tif_lzw.c -@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize - NextCode(tif, sp, bp, code, GetNextCode); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); -@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0, - NextCode(tif, sp, bp, code, GetNextCodeCompat); - if (code == CODE_EOI) - break; -- if (code == CODE_CLEAR) { -+ if (code >= CODE_CLEAR) { - TIFFErrorExt(tif->tif_clientdata, tif->tif_name, - "LZWDecode: Corrupted LZW table at scanline %d", - tif->tif_row); diff --git a/multilib/lib32-libusb-compat/PKGBUILD b/multilib/lib32-libusb-compat/PKGBUILD deleted file mode 100644 index d6d74d770..000000000 --- a/multilib/lib32-libusb-compat/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 58048 2011-11-05 19:41:45Z lcarlier $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: arjan <arjan@archlinux.org> - -pkgname=lib32-libusb-compat -pkgver=0.1.3 -pkgrel=2 -pkgdesc="Library to enable user space application programs to communicate with USB devices" -arch=('x86_64') -depends=('lib32-libusb' 'libusb-compat') -makedepends=('gcc-multilib') -url="http://libusb.sourceforge.net/" -license=('LGPL') -source=(http://downloads.sourceforge.net/libusb/libusb-compat-0.1/libusb-compat-$pkgver/libusb-compat-${pkgver}.tar.bz2) -options=('!libtool') -md5sums=('570ac2ea085b80d1f74ddc7c6a93c0eb') - -build() { - cd ${srcdir}/libusb-compat-${pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libusb-compat-${pkgver} - - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{bin,include} -} diff --git a/multilib/lib32-libusb/PKGBUILD b/multilib/lib32-libusb/PKGBUILD deleted file mode 100644 index 69498b604..000000000 --- a/multilib/lib32-libusb/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 58046 2011-11-05 19:39:36Z lcarlier $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=lib32-libusb -pkgver=1.0.8 -pkgrel=2 -pkgdesc="Library to enable user space application programs to communicate with USB devices. (32-bit)" -arch=('x86_64') -url="http://libusb.sourceforge.net/" -license=('LGPL') -depends=('lib32-glibc' 'libusb') -makedepends=('gcc-multilib') -source=(http://downloads.sourceforge.net/libusb/libusb-${pkgver}.tar.bz2) -options=(!libtool) -md5sums=('37d34e6eaa69a4b645a19ff4ca63ceef') - -build() { - cd "${srcdir}/libusb-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --libdir=/usr/lib32 - - make -} - -package () { - cd "${srcdir}/libusb-${pkgver}" - - make DESTDIR="${pkgdir}" install - rm -rf ${pkgdir}/usr/include -} - diff --git a/multilib/lib32-libvorbis/PKGBUILD b/multilib/lib32-libvorbis/PKGBUILD deleted file mode 100644 index 6f0b9fb1d..000000000 --- a/multilib/lib32-libvorbis/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 33990 2010-11-30 15:16:40Z bluewind $ -# Maintainer: Tobias Kieslich <tobias@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -_pkgbasename=libvorbis -pkgname=lib32-$_pkgbasename -pkgver=1.3.2 -pkgrel=1 -pkgdesc="Vorbis codec library (32-bit)" -arch=('x86_64') -license=('custom') -url="http://www.xiph.org/ogg/vorbis/" -depends=('lib32-libogg' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.xiph.org/releases/vorbis/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('c870b9bd5858a0ecb5275c14486d9554') - -build() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - #-march=i686 optimizes too much, strip it out - CFLAGS=${CFLAGS/-march=$CARCH} ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-${pkgver} - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libx11/PKGBUILD b/multilib/lib32-libx11/PKGBUILD deleted file mode 100644 index f5392d36d..000000000 --- a/multilib/lib32-libx11/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 55180 2011-09-05 08:14:08Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libx11 -pkgname=lib32-$_pkgbasename -pkgver=1.4.4 -pkgrel=1 -pkgdesc="X11 client-side library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -depends=('lib32-libxcb' 'xproto' 'kbproto' $_pkgbasename) -makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib') -options=('!libtool') -license=('custom:XFREE86') -source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2) -sha1sums=('2d9d38bfd7003ec60eea0b1999ab72cfd5fa3b90') - -build() { - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libX11-${pkgver}" - ./configure --prefix=/usr --disable-static --disable-xf86bigfont \ - --libdir=/usr/lib32 --disable-specs - make - make check -} - -package() { - cd "${srcdir}/libX11-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxau/PKGBUILD b/multilib/lib32-libxau/PKGBUILD deleted file mode 100644 index 728804d46..000000000 --- a/multilib/lib32-libxau/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 26632 2010-09-15 22:44:58Z bluewind $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libxau -pkgname=lib32-$_pkgbasename -pkgver=1.0.6 -pkgrel=2 -pkgdesc="X11 authorisation library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -depends=('lib32-glibc' $_pkgbasename) -makedepends=('pkgconfig' 'xproto>=7.0.15' 'gcc-multilib') -license=('custom') -options=('!libtool') -source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2) -sha1sums=('0e1ab449f98026e4599f6e0d7491810d36c8fe4d') - -build() { - cd "${srcdir}/libXau-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXau-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxcb/PKGBUILD b/multilib/lib32-libxcb/PKGBUILD deleted file mode 100644 index 8e68f1911..000000000 --- a/multilib/lib32-libxcb/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 62579 2012-01-21 16:17:25Z ibiru $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libxcb -pkgname=lib32-$_pkgbasename -pkgver=1.7 -pkgrel=3 -pkgdesc="X11 client-side library (32-bit)" -arch=(x86_64) -url="http://xcb.freedesktop.org/" -depends=('xcb-proto>=1.6' 'lib32-libxdmcp' 'lib32-libxau' - $_pkgbasename) -makedepends=('pkgconfig' 'libxslt' 'python2' 'gcc-multilib' - 'autoconf') -options=('!libtool') -license=('custom') -source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2 - libxcb-1.1-no-pthread-stubs.patch) -sha1sums=('7540f0587907bce421914f0ddb813810cb2f36f8' - '3455e84642283bc91c8313af319002a20bbcbdf4') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - PYTHON=/usr/bin/python2 ./autogen.sh --prefix=/usr --enable-xinput --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch deleted file mode 100644 index f17de1b1d..000000000 --- a/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac ---- libxcb-1.1/configure.ac.pthread-stubs 2007-11-04 18:17:11.000000000 -0500 -+++ libxcb-1.1/configure.ac 2007-11-12 10:27:06.000000000 -0500 -@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT) - - # Checks for pkg-config packages - PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6) --NEEDED="pthread-stubs xau >= 0.99.2" -+NEEDED="xau >= 0.99.2" - PKG_CHECK_MODULES(NEEDED, $NEEDED) - - have_xdmcp="no" diff --git a/multilib/lib32-libxcomposite/PKGBUILD b/multilib/lib32-libxcomposite/PKGBUILD deleted file mode 100644 index 8eb4d24ab..000000000 --- a/multilib/lib32-libxcomposite/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31532 2010-11-01 23:56:56Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxcomposite -pkgname=lib32-$_pkgbasename -pkgver=0.4.3 -pkgrel=1 -pkgdesc="X11 Composite extension library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxfixes' 'compositeproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=(!libtool) -source=(${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2) -sha1sums=('081b26b556d55e20d7956c80a2ea2854962aecec') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXcomposite-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXcomposite-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxcursor/PKGBUILD b/multilib/lib32-libxcursor/PKGBUILD deleted file mode 100644 index 75d09684a..000000000 --- a/multilib/lib32-libxcursor/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 60955 2011-12-19 19:05:52Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -_pkgbasename=libxcursor -pkgname=lib32-$_pkgbasename -pkgver=1.1.12 -pkgrel=1 -pkgdesc="X cursor management library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxfixes' 'lib32-libxrender' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2) -sha1sums=('f68d7baed5ecf4b1ae88004dd05ef4680d63ee2c') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXcursor-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXcursor-${pkgver}" - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxdamage/PKGBUILD b/multilib/lib32-libxdamage/PKGBUILD deleted file mode 100644 index 17e003925..000000000 --- a/multilib/lib32-libxdamage/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26644 2010-09-15 22:46:36Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxdamage -pkgname=lib32-$_pkgbasename -pkgver=1.1.3 -pkgrel=3 -pkgdesc="X11 damaged region extension library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxfixes>=4.0.4' $_pkgbasename) -makedepends=('pkg-config' 'damageproto>=1.2.0' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2) -sha1sums=('7d96e8de107fede16951cb47d5e147630fbc7dee') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXdamage-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXdamage-${pkgver}" - - make DESTDIR="${pkgdir}" install || return 1 - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxdmcp/PKGBUILD b/multilib/lib32-libxdmcp/PKGBUILD deleted file mode 100644 index 9f8ebf468..000000000 --- a/multilib/lib32-libxdmcp/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 35270 2010-12-18 01:18:05Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxdmcp -pkgname=lib32-$_pkgbasename -pkgver=1.1.0 -pkgrel=1 -pkgdesc="X11 Display Manager Control Protocol library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('xproto' 'lib32-glibc' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2) -sha1sums=('28132db24727552f77e998e6a6798a5b9b30789f') - -build() { - cd ${srcdir}/libXdmcp-${pkgver} - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libXdmcp-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxext/PKGBUILD b/multilib/lib32-libxext/PKGBUILD deleted file mode 100644 index 00c6cb8e5..000000000 --- a/multilib/lib32-libxext/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 60953 2011-12-19 19:05:14Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxext -pkgname=lib32-$_pkgbasename -pkgver=1.3.0 -pkgrel=1 -pkgdesc="X11 miscellaneous extensions library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libx11' 'xextproto' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2) -sha1sums=('0bf3708177b9320091ebc069e905c042c31d859d') - -build() { - cd "${srcdir}/libXext-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXext-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxfixes/PKGBUILD b/multilib/lib32-libxfixes/PKGBUILD deleted file mode 100644 index 2e2e1553e..000000000 --- a/multilib/lib32-libxfixes/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 60948 2011-12-19 19:00:52Z bluewind $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxfixes -pkgname=lib32-$_pkgbasename -pkgver=5.0 -pkgrel=1 -pkgdesc="X11 miscellaneous 'fixes' extension library (32-bit)" -arch=('x86_64') -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libx11' $_pkgbasename) -makedepends=('pkg-config' gcc-multilib ) -options=('!libtool') -source=(${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2) -sha1sums=('3e4d374e9026111a04cd669d4b3434273fc34fe0') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXfixes-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXfixes-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxft/PKGBUILD b/multilib/lib32-libxft/PKGBUILD deleted file mode 100644 index 6036674d0..000000000 --- a/multilib/lib32-libxft/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 31474 2010-10-31 22:37:35Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -_pkgbasename=libxft -pkgname=lib32-$_pkgbasename -pkgver=2.2.0 -pkgrel=1 -pkgdesc="FreeType-based font drawing library for X (32-bit)" -arch=('x86_64') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-fontconfig' 'lib32-libxrender') -makedepends=('gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2) -sha1sums=('ed29784259f4e26df78141035560ae8a7c62e83f') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/libXft-${pkgver} - ./configure --prefix=/usr \ - --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd "${srcdir}/libXft-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{bin,include,share} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxi/PKGBUILD b/multilib/lib32-libxi/PKGBUILD deleted file mode 100644 index c4ad68595..000000000 --- a/multilib/lib32-libxi/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 61219 2011-12-24 18:33:43Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxi -pkgname=lib32-$_pkgbasename -pkgver=1.4.5 -pkgrel=1 -pkgdesc="X11 Input extension library (32-bit)" -arch=('x86_64') -url="http://xorg.freedesktop.org" -depends=('lib32-libxext' 'inputproto' $_pkgbasename) -makedepends=('pkgconfig' 'xorg-util-macros' gcc-multilib) -options=(!libtool) -license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) -sha1sums=('8ac24dec8e488f49fd6a6b256c815da9ceec9737') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXi-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXi-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxinerama/PKGBUILD b/multilib/lib32-libxinerama/PKGBUILD deleted file mode 100644 index ba7920554..000000000 --- a/multilib/lib32-libxinerama/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 31546 2010-11-02 00:05:46Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -_pkgbasename=libxinerama -pkgname=lib32-$_pkgbasename -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X11 Xinerama extension library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxext' 'xineramaproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=(!libtool) -source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2) -sha1sums=('f030b0cfcce15502aac78188524f32a6f29bd0a4') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXinerama-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXinerama-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxml2/PKGBUILD b/multilib/lib32-libxml2/PKGBUILD deleted file mode 100644 index 94cd5c9d8..000000000 --- a/multilib/lib32-libxml2/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 33687 2010-11-27 15:36:04Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: John Proctor <jproctor@prium.net> - -_pkgbasename=libxml2 -pkgname=lib32-$_pkgbasename -pkgver=2.7.8 -pkgrel=1 -pkgdesc="XML parsing library, version 2 (32-bit)" -arch=(x86_64) -license=('custom') -depends=('lib32-zlib>=1.2.4' 'lib32-readline>=6.1' 'lib32-ncurses>=5.7' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -url="http://www.xmlsoft.org/" -source=(ftp://ftp.xmlsoft.org/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz - shared_library_versionning.patch) -md5sums=('8127a65e8c3b08856093099b52599c86' - '84aeb7c6db023eae044e95d9211dba53') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -Np1 -i "${srcdir}/shared_library_versionning.patch" - autoreconf -fi - ./configure --prefix=/usr --with-threads --with-history --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/usr/lib32/xml2Conf.sh" - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxml2/shared_library_versionning.patch b/multilib/lib32-libxml2/shared_library_versionning.patch deleted file mode 100644 index a0b62bca9..000000000 --- a/multilib/lib32-libxml2/shared_library_versionning.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 04 Nov 2010 20:53:14 +0000 -Subject: Reactivate the shared library versionning script - ---- -diff --git a/configure.in b/configure.in -index 59d0629..a1d2c89 100644 ---- a/configure.in -+++ b/configure.in -@@ -84,7 +84,7 @@ else - esac - fi - AC_SUBST(VERSION_SCRIPT_FLAGS) --AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) -+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) - - dnl - dnl We process the AC_ARG_WITH first so that later we can modify --- -cgit v0.8.3.1 diff --git a/multilib/lib32-libxmu/PKGBUILD b/multilib/lib32-libxmu/PKGBUILD deleted file mode 100644 index 269d698d7..000000000 --- a/multilib/lib32-libxmu/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 35276 2010-12-18 01:22:30Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxmu -pkgname=lib32-$_pkgbasename -pkgver=1.1.0 -pkgrel=1 -pkgdesc="X11 miscellaneous micro-utility library (32-bit)" -arch=('x86_64') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'lib32-libxt' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -license=('custom') -options=('!libtool') -source=(${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2) -sha1sums=('81876a0848070bfc4476a2538fc16898eb6d96cd') - -build() { - cd "${srcdir}/libXmu-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXmu-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxrandr/PKGBUILD b/multilib/lib32-libxrandr/PKGBUILD deleted file mode 100644 index 9f8e38ce7..000000000 --- a/multilib/lib32-libxrandr/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 60945 2011-12-19 18:58:48Z bluewind $ -# Maintainer: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Jan de Groot <jgc@archlinux.org> -_pkgbasename=libxrandr -pkgname=lib32-$_pkgbasename -pkgver=1.3.2 -pkgrel=1 -pkgdesc="X11 RandR extension library (32-bit)" -arch=('x86_64') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'lib32-libxrender' 'randrproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2) -sha1sums=('0c844a4c5237f96794f0c18a5af16dc5ab7a36ec') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXrandr-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXrandr-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxrender/PKGBUILD b/multilib/lib32-libxrender/PKGBUILD deleted file mode 100644 index 67dcf1678..000000000 --- a/multilib/lib32-libxrender/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 26677 2010-09-15 22:51:11Z bluewind $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxrender -pkgname=lib32-$_pkgbasename -pkgver=0.9.6 -pkgrel=4 -pkgdesc="X Rendering Extension client library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libx11>=1.3.4' $_pkgbasename) -makedepends=('pkgconfig' 'gcc-multilib' renderproto) -options=('!libtool') -source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2) -sha1sums=('65bd96dc17da6b064f95109da02d9c9d14cb06dc') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXrender-${pkgver}" - ./configure --prefix=/usr --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXrender-${pkgver}" - - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxss/PKGBUILD b/multilib/lib32-libxss/PKGBUILD deleted file mode 100644 index b796a93a5..000000000 --- a/multilib/lib32-libxss/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 35282 2010-12-18 01:28:22Z heftig $ -# Maintainer: Florian Pritz <flo@xssn.at> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -_pkgbasename=libxss -pkgname=lib32-$_pkgbasename -pkgver=1.2.1 -pkgrel=1 -pkgdesc="X11 Screen Saver extension library (32-bit)" -arch=(x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'scrnsaverproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2) -sha1sums=('3c29e2222fd68e26e408234c51c6d8b2edf6ab19') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXScrnSaver-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXScrnSaver-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxt/PKGBUILD b/multilib/lib32-libxt/PKGBUILD deleted file mode 100644 index 8f592db58..000000000 --- a/multilib/lib32-libxt/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 45006 2011-04-14 08:11:26Z lcarlier $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxt -pkgname=lib32-$_pkgbasename -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X11 toolkit intrinsics library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libsm' 'lib32-libx11' $_pkgbasename) -makedepends=('xorg-util-macros' 'gcc-multilib') -options=('!libtool') -source=(${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2) -sha1sums=('a29a97f8521bdc7a95364e163f0ce474de572ae5') - -build() { - cd "${srcdir}/libXt-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXt-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxtst/PKGBUILD b/multilib/lib32-libxtst/PKGBUILD deleted file mode 100644 index bbddb6c40..000000000 --- a/multilib/lib32-libxtst/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 35285 2010-12-18 01:30:43Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxtst -pkgname=lib32-$_pkgbasename -pkgver=1.2.0 -pkgrel=1 -pkgdesc="X11 Testing -- Resource extension library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxext' 'lib32-libxi' 'recordproto' 'inputproto' $_pkgbasename) -makedepends=('gcc-multilib' 'xorg-util-macros') -options=('!libtool') -source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2) -sha1sums=('9fb06ed599caf7f9e7115cbbfadf02b47c17aa72') - -build() { - cd "${srcdir}/libXtst-${pkgver}" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXtst-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxv/PKGBUILD b/multilib/lib32-libxv/PKGBUILD deleted file mode 100644 index 317fe2281..000000000 --- a/multilib/lib32-libxv/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 35288 2010-12-18 01:31:33Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxv -pkgname=lib32-$_pkgbasename -pkgver=1.0.6 -pkgrel=1 -pkgdesc="X11 Video extension library (32-bit)" -arch=(x86_64) -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'videoproto' $_pkgbasename) -makedepends=('pkgconfig' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2) -sha1sums=('9ebb6d7936a7b247b9b0f6dc81def39a18e4214c') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${startdir}/src/libXv-${pkgver} - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd ${startdir}/src/libXv-${pkgver} - - make DESTDIR=${startdir}/pkg install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-libxvmc/PKGBUILD b/multilib/lib32-libxvmc/PKGBUILD deleted file mode 100644 index 539b563f2..000000000 --- a/multilib/lib32-libxvmc/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 26695 2010-09-15 22:53:40Z bluewind $ -#Maintainer: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxvmc -pkgname=lib32-$_pkgbasename -pkgver=1.0.6 -pkgrel=3 -pkgdesc="X11 Video Motion Compensation extension library (32-bit)" -arch=(x86_64) -url="http://xorg.freedesktop.org/" -license=('custom') -depends=('lib32-libxv>=1.0.5' $_pkgbasename) -makedepends=('pkgconfig' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2) -sha1sums=('4ace7e7ce6b646b5715b2efa561affc89bc87f91') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/libXvMC-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --disable-static --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/libXvMC-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" - -} diff --git a/multilib/lib32-libxxf86vm/PKGBUILD b/multilib/lib32-libxxf86vm/PKGBUILD deleted file mode 100644 index e455615c8..000000000 --- a/multilib/lib32-libxxf86vm/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 35294 2010-12-18 01:34:58Z heftig $ -# Contributor: Jan de Groot <jgc@archlinux.org> - -_pkgbasename=libxxf86vm -pkgname=lib32-$_pkgbasename -pkgver=1.1.1 -pkgrel=1 -pkgdesc="X11 XFree86 video mode extension library (32-bit)" -arch=('x86_64') -license=('custom') -url="http://xorg.freedesktop.org/" -depends=('lib32-libxext' 'xf86vidmodeproto' $_pkgbasename) -makedepends=('xorg-util-macros' gcc-multilib) -options=('!libtool') -source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2) -sha1sums=('2ff2d2b3c60a5c5c0cc4e0a18492d3b7168a03af') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/libXxf86vm-${pkgver}" - ./configure --prefix=/usr --disable-static \ - --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/libXxf86vm-${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-llvm/PKGBUILD b/multilib/lib32-llvm/PKGBUILD deleted file mode 100644 index e7ff5c5ef..000000000 --- a/multilib/lib32-llvm/PKGBUILD +++ /dev/null @@ -1,115 +0,0 @@ -# $Id: PKGBUILD 60966 2011-12-19 19:56:09Z lcarlier $ -# Maintainer: Evangelos Foutras <foutrelis@gmail.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Sebastian Nowicki <sebnow@gmail.com> -# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor: Tobias Kieslich <tobias@justdreams.de> -# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> - -pkgname=('lib32-llvm') -pkgver=3.0 -pkgrel=1 -arch=('x86_64') -url="http://llvm.org/" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('lib32-libffi' 'python2' 'gcc-multilib') -source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.tar.gz - http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz - clang-plugin-loader-registry.patch) -sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477' - 'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d' - 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c') - -build() { - cd "$srcdir/llvm-$pkgver.src" - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - # Fix symbolic links from OCaml bindings to LLVM libraries - sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml - - # Fix installation directories, ./configure doesn't seem to set them right - sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \ - -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib32/llvm:' \ - -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \ - Makefile.config.in - - # Fix insecure rpath (http://bugs.archlinux.org/task/14017) - sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules - - # Get the correct list of symbols to export - # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html - patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch" - - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - _cxx_headers="/usr/include/c++/clang-$pkgver" - - _32bit_headers="" - if [[ $CARCH == x86_64 ]]; then - # Important for multilib - _32bit_headers="32" - fi - - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib32/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --disable-expensive-checks \ - --disable-debug-runtime \ - --disable-assertions \ - --with-binutils-include=/usr/include \ - --with-cxx-include-root=$_cxx_headers \ - --with-cxx-include-arch=$CHOST \ - --with-cxx-include-32bit-dir=$_32bit_headers \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package() { - pkgdesc="Low Level Virtual Machine (32 bits version)" - depends=('perl' 'lib32-libffi' 'llvm') - - cd "$srcdir/llvm-$pkgver.src" - - # We move the clang directory out of the tree so it won't get installed and - # then we bring it back in for the clang package - # mv tools/clang "$srcdir" - # -j1 is due to race conditions during the installation of the OCaml bindings - make -j1 DESTDIR="$pkgdir" install - - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib32/llvm/*.a - - # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487) - #sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config" - sed -i 's:ABS_RUN_DIR/lib:ABS_RUN_DIR/llvm:' "$pkgdir/usr/bin/llvm-config" - mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm/llvm-config" - # Get rid of example Hello transformation - rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.* - - # Symlink the gold plugin where clang expects it - ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so" - - # Add ld.so.conf.d entry - install -d "$pkgdir/etc/ld.so.conf.d" - echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf" - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}} -} diff --git a/multilib/lib32-llvm/cindexer-clang-path.patch b/multilib/lib32-llvm/cindexer-clang-path.patch deleted file mode 100644 index ddaab690e..000000000 --- a/multilib/lib32-llvm/cindexer-clang-path.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300 -+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300 -@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP - - // We now have the CIndex directory, locate clang relative to it. - LibClangPath.eraseComponent(); -+ LibClangPath.eraseComponent(); - #endif - - LibClangPath.appendComponent("clang"); diff --git a/multilib/lib32-llvm/clang-plugin-loader-registry.patch b/multilib/lib32-llvm/clang-plugin-loader-registry.patch deleted file mode 100644 index f46eb9fce..000000000 --- a/multilib/lib32-llvm/clang-plugin-loader-registry.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map ---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200 -+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300 -@@ -2,6 +2,7 @@ - global: main; - __progname; - environ; -+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE; - - local: *; - }; diff --git a/multilib/lib32-llvm/clang-pure64.patch b/multilib/lib32-llvm/clang-pure64.patch deleted file mode 100644 index 9bbbfaa8b..000000000 --- a/multilib/lib32-llvm/clang-pure64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3306,7 +3306,7 @@ - else if (ToolChain.getArch() == llvm::Triple::ppc64) - CmdArgs.push_back("/lib64/ld64.so.1"); - else -- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2"); -+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2"); - } - - CmdArgs.push_back("-o"); diff --git a/multilib/lib32-llvm/enable-lto.patch b/multilib/lib32-llvm/enable-lto.patch deleted file mode 100644 index 3c8691b17..000000000 --- a/multilib/lib32-llvm/enable-lto.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: lib/Driver/ToolChains.cpp -=================================================================== ---- lib/Driver/ToolChains.cpp (revision 123373) -+++ lib/Driver/ToolChains.cpp (working copy) -@@ -1398,7 +1398,7 @@ - PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" + - GCCInstallation.getTriple() + "/bin").str()); - -- Linker = GetProgramPath("ld"); -+ Linker = GetProgramPath("ld.gold"); - - LinuxDistro Distro = DetectLinuxDistro(Arch); - -Index: lib/Driver/Tools.cpp -=================================================================== ---- lib/Driver/Tools.cpp (revision 123373) -+++ lib/Driver/Tools.cpp (working copy) -@@ -3412,11 +3412,11 @@ - } - } - -- if (Args.hasArg(options::OPT_use_gold_plugin)) { -+ // if (Args.hasArg(options::OPT_use_gold_plugin)) { - CmdArgs.push_back("-plugin"); -- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so"; -+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so"; - CmdArgs.push_back(Args.MakeArgString(Plugin)); -- } -+ // } - - C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs)); - } diff --git a/multilib/lib32-llvm/fix-gold-lto-linking.patch b/multilib/lib32-llvm/fix-gold-lto-linking.patch deleted file mode 100644 index 84d166471..000000000 --- a/multilib/lib32-llvm/fix-gold-lto-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile ---- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300 -+++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200 -@@ -26,6 +26,6 @@ LINK_COMPONENTS := support - # Because off_t is used in the public API, the largefile parts are required for - # ABI compatibility. - CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 --CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT) -+CXXFLAGS+=-L $(SharedLibDir) -lLTO - - include $(LEVEL)/Makefile.common diff --git a/multilib/lib32-mesa/PKGBUILD b/multilib/lib32-mesa/PKGBUILD deleted file mode 100644 index b88939af8..000000000 --- a/multilib/lib32-mesa/PKGBUILD +++ /dev/null @@ -1,267 +0,0 @@ -# $Id: PKGBUILD 60968 2011-12-19 20:44:35Z lcarlier $ -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgbase=lib32-mesa -pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-unichrome-dri' - 'lib32-mach64-dri' 'lib32-mga-dri' 'lib32-r128-dri' 'lib32-savage-dri' 'lib32-sis-dri' 'lib32-tdfx-dri' 'lib32-nouveau-dri') -# prepare 7.12/8.0 -# pkgname=('lib32-mesa' 'lib32-libgl' 'lib32-libglapi' 'lib32-libgles' 'lib32-libegl' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri') - -#_git=true -_gitdate=20111031 -_git=false - -if [ "${_git}" = "true" ]; then - #pkgver=7.10.99.git20110709 - pkgver=7.11 - else - pkgver=7.11.2 -fi - -pkgrel=2 -arch=('x86_64') -makedepends=('glproto>=1.4.14' 'lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.3' - 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' imake 'lib32-udev' 'lib32-llvm' 'namcap') -url="http://mesa3d.sourceforge.net" -license=('custom') -if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - #source=('ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - source=("MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") - md5sums=('817a63bb60b81f4f817ffc9ed0a3dddd') -else - source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" fix-build-with-llvm-3.0.patch) - #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2") - md5sums=('0837c52698fe3252369c3fdb5195afcc' '73501728793dc895bfc80dfb3253d39e') -fi - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - # for our llvm-config for 32 bit - export LLVM_CONFIG=/usr/lib32/llvm/llvm-config - - cd ${srcdir}/?esa-* - - if [ "${_git}" = "false" ]; then - # fix building of mesa-7.11.2 with llvm-3.0 - patch -Np1 -i ../fix-build-with-llvm-3.0.patch - fi - - autoreconf -vfi - - if [ "${_git}" = "true" ]; then - ./autogen.sh --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ - --enable-gallium-llvm \ - --enable-gallium-egl --enable-shared-glapi \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-shared-dricore \ - --enable-32-bit \ - --libdir=/usr/lib32 - # --enable-gallium-svga \ - else - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,swrast \ - --enable-gallium-llvm \ - --enable-gallium-egl --enable-shared-glapi \ - --enable-glx-tls \ - --with-driver=dri \ - --enable-xcb \ - --disable-glut \ - --enable-gles1 \ - --enable-gles2 \ - --enable-egl \ - --enable-texture-float \ - --enable-shared-dricore \ - --enable-32-bit \ - --libdir=/usr/lib32 - fi - - make -} - -package_lib32-libgl() { - depends=('lib32-libdrm>=2.4.26' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libglapi' 'libgl') - pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/xorg/modules/extensions" - - bin/minstall lib32/libGL.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/libdricore.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/libglsl.so* "${pkgdir}/usr/lib32/" - - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install - ln -s swrastg_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/swrast_dri.so" - ln -s libglx.xorg "${pkgdir}/usr/lib32/xorg/modules/extensions/libglx.so" - - rm -rf "${pkgdir}"/usr/{include,share,bin} - install -m755 -d "${pkgdir}/usr/share/licenses/libgl" - ln -s libgl "$pkgdir/usr/share/licenses/libgl/lib32-libgl" -} - -package_lib32-libglapi() { - depends=('lib32-glibc' 'libglapi') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - bin/minstall lib32/libglapi.so* "${pkgdir}/usr/lib32/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" -} - -package_lib32-libgles() { - depends=('lib32-libglapi' 'libgles') - pkgdesc="Mesa GLES libraries (32-bit)" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - bin/minstall lib32/libGLESv* "${pkgdir}/usr/lib32/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib32/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libgles" - ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" -} - -package_lib32-libegl() { - depends=('lib32-libglapi' 'lib32-libdrm' 'lib32-udev' 'lib32-libxfixes' 'lib32-libxext' 'libegl') - pkgdesc="Mesa libEGL libraries (32-bit)" - - cd ${srcdir}/?esa-* - make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/lib32" - install -m755 -d "${pkgdir}/usr/lib32/pkgconfig" - install -m755 -d "${pkgdir}/usr/lib32/egl" - bin/minstall lib32/libEGL.so* "${pkgdir}/usr/lib32/" - bin/minstall lib32/egl/* "${pkgdir}/usr/lib32/egl/" - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib32/pkgconfig/" - - install -m755 -d "${pkgdir}/usr/share/licenses/libegl" - ln -s libgles "$pkgdir/usr/share/licenses/libegl/lib32-libegl" -} - -package_lib32-mesa() { - depends=('lib32-libgl' 'lib32-libx11>=1.4.3' 'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'mesa') - pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" - - cd ${srcdir}/?esa-* - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib32/libGL.so"* - rm -f "${pkgdir}/usr/lib32/libglapi.so"* - rm -f "${pkgdir}/usr/lib32/libGLESv"* - rm -f "${pkgdir}/usr/lib32/libEGL"* - rm -rf "${pkgdir}/usr/lib32/egl" - rm -f ${pkgdir}/usr/lib32/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc} - rm -rf "$pkgdir"/{usr/include,usr/lib32/xorg} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" -} - -package_lib32-ati-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" - conflicts=('xf86-video-ati<6.9.0-6') - - cd ${srcdir}/?esa-*/src/mesa/drivers/dri - # classic mesa drivers for radeon,r200 - make -C radeon DESTDIR="${pkgdir}" install - make -C r200 DESTDIR="${pkgdir}" install - # gallium3D driver for R300 and R600 r300_dri.so/r600_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install -} - -package_lib32-intel-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Intel (32-bit)" - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i810 DESTDIR="${pkgdir}" install # dead in 7.12 - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install -} - -package_lib32-unichrome-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Graphics/VIA Unichrome (32-bit)" - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/unichrome DESTDIR="${pkgdir}" install -} - -package_lib32-mach64-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Mach64 (32-bit)" - conflicts=('xf86-video-mach64<6.8.2') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mach64 DESTDIR="${pkgdir}" install -} - -package_lib32-mga-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for Matrox (32-bit)" - conflicts=('xf86-video-mga<1.4.11') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/mga DESTDIR="${pkgdir}" install -} - -package_lib32-r128-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for ATI Rage128 (32-bit)" - conflicts=('xf86-video-r128<6.8.1') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r128 DESTDIR="${pkgdir}" install -} - -package_lib32-savage-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for S3 Sraphics/VIA Savage (32-bit)" - conflicts=('xf86-video-savage<2.3.1') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/savage DESTDIR="${pkgdir}" install -} - -package_lib32-sis-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for SiS (32-bit)" - conflicts=('xf86-video-sis<0.10.2') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/sis DESTDIR="${pkgdir}" install -} - -package_lib32-tdfx-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI drivers for 3dfx (32-bit)" - conflicts=('xf86-video-tdfx<1.4.3') - - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/tdfx DESTDIR="${pkgdir}" install -} - -package_lib32-nouveau-dri() { - depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" - - # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so - make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install - # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so - make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install -} - diff --git a/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch b/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch deleted file mode 100644 index ceb5aa129..000000000 --- a/multilib/lib32-mesa/fix-build-with-llvm-3.0.patch +++ /dev/null @@ -1,330 +0,0 @@ -diff --git a/src/gallium/auxiliary/draw/draw_llvm.c b/src/gallium/auxiliary/draw/draw_llvm.c -index 56c26f5..d477c40 100644 ---- a/src/gallium/auxiliary/draw/draw_llvm.c -+++ b/src/gallium/auxiliary/draw/draw_llvm.c -@@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *var); - * Create LLVM type for struct draw_jit_texture - */ - static LLVMTypeRef --create_jit_texture_type(struct gallivm_state *gallivm) -+create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name) - { - LLVMTargetDataRef target = gallivm->target; - LLVMTypeRef texture_type; -@@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_state *gallivm) - elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] = - LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); - -+#if HAVE_LLVM >= 0x0300 -+ texture_type = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(texture_type, elem_types, -+ Elements(elem_types), 0); -+#else - texture_type = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); - -+ LLVMAddTypeName(gallivm->module, struct_name, texture_type); -+ - /* Make sure the target's struct layout cache doesn't return - * stale/invalid data. - */ - LLVMInvalidateStructLayout(gallivm->target, texture_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width, - target, texture_type, -@@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_state *gallivm) - */ - static LLVMTypeRef - create_jit_context_type(struct gallivm_state *gallivm, -- LLVMTypeRef texture_type) -+ LLVMTypeRef texture_type, const char *struct_name) - { - LLVMTargetDataRef target = gallivm->target; - LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context); -@@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_state *gallivm, - elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */ - elem_types[4] = LLVMArrayType(texture_type, - PIPE_MAX_VERTEX_SAMPLERS); /* textures */ -- -+#if HAVE_LLVM >= 0x0300 -+ context_type = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(context_type, elem_types, -+ Elements(elem_types), 0); -+#else - context_type = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, struct_name, context_type); - - LLVMInvalidateStructLayout(gallivm->target, context_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants, - target, context_type, 0); -@@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_state *gallivm, - * Create LLVM type for struct pipe_vertex_buffer - */ - static LLVMTypeRef --create_jit_vertex_buffer_type(struct gallivm_state *gallivm) -+create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name) - { - LLVMTargetDataRef target = gallivm->target; - LLVMTypeRef elem_types[3]; -@@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gallivm_state *gallivm) - elem_types[1] = LLVMInt32TypeInContext(gallivm->context); - elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */ - -+#if HAVE_LLVM >= 0x0300 -+ vb_type = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(vb_type, elem_types, -+ Elements(elem_types), 0); -+#else - vb_type = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, struct_name, vb_type); - - LLVMInvalidateStructLayout(gallivm->target, vb_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride, - target, vb_type, 0); -@@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems) - elem_types[1] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4); - elem_types[2] = LLVMArrayType(elem_types[1], data_elems); - -+#if HAVE_LLVM >= 0x0300 -+ vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name); -+ LLVMStructSetBody(vertex_header, elem_types, -+ Elements(elem_types), 0); -+#else - vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, struct_name, vertex_header); - - LLVMInvalidateStructLayout(gallivm->target, vertex_header); -+#endif - - /* these are bit-fields and we can't take address of them - LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask, -@@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems) - target, vertex_header, - DRAW_JIT_VERTEX_DATA); - -- LLVMAddTypeName(gallivm->module, struct_name, vertex_header); -- - return vertex_header; - } - -@@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm) - struct gallivm_state *gallivm = llvm->gallivm; - LLVMTypeRef texture_type, context_type, buffer_type, vb_type; - -- texture_type = create_jit_texture_type(gallivm); -- LLVMAddTypeName(gallivm->module, "texture", texture_type); -+ texture_type = create_jit_texture_type(gallivm, "texture"); - -- context_type = create_jit_context_type(gallivm, texture_type); -- LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type); -+ context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context"); - llvm->context_ptr_type = LLVMPointerType(context_type, 0); - - buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0); -- LLVMAddTypeName(gallivm->module, "buffer", buffer_type); - llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0); - -- vb_type = create_jit_vertex_buffer_type(gallivm); -- LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type); -+ vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer"); - llvm->vb_ptr_type = LLVMPointerType(vb_type, 0); - } - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index 8636cd6..f44749d 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -27,17 +27,23 @@ - - #include <llvm-c/Core.h> - #include <llvm/Target/TargetMachine.h> --#include <llvm/Target/TargetRegistry.h> --#include <llvm/Target/TargetSelect.h> - #include <llvm/Target/TargetInstrInfo.h> - #include <llvm/Support/raw_ostream.h> - #include <llvm/Support/MemoryObject.h> - -+#if HAVE_LLVM >= 0x0300 -+#include <llvm/Support/TargetRegistry.h> -+#include <llvm/Support/TargetSelect.h> -+#else /* HAVE_LLVM < 0x0300 */ -+#include <llvm/Target/TargetRegistry.h> -+#include <llvm/Target/TargetSelect.h> -+#endif /* HAVE_LLVM < 0x0300 */ -+ - #if HAVE_LLVM >= 0x0209 - #include <llvm/Support/Host.h> --#else -+#else /* HAVE_LLVM < 0x0209 */ - #include <llvm/System/Host.h> --#endif -+#endif /* HAVE_LLVM < 0x0209 */ - - #if HAVE_LLVM >= 0x0207 - #include <llvm/MC/MCDisassembler.h> -@@ -193,14 +199,23 @@ lp_disassemble(const void* func) - - InitializeAllDisassemblers(); - -+#if HAVE_LLVM >= 0x0300 -+ OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple)); -+#else - OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple)); -+#endif - - if (!AsmInfo) { - debug_printf("error: no assembly info for target %s\n", Triple.c_str()); - return; - } - -+#if HAVE_LLVM >= 0x0300 -+ const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), ""); -+ OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI)); -+#else - OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler()); -+#endif - if (!DisAsm) { - debug_printf("error: no disassembler for target %s\n", Triple.c_str()); - return; -@@ -213,7 +228,11 @@ lp_disassemble(const void* func) - #else - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif --#if HAVE_LLVM >= 0x0208 -+ -+#if HAVE_LLVM >= 0x0300 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); -+#elif HAVE_LLVM >= 0x0208 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo)); - #else -@@ -253,7 +272,11 @@ lp_disassemble(const void* func) - - if (!DisAsm->getInstruction(Inst, Size, memoryObject, - pc, -- nulls())) { -+#if HAVE_LLVM >= 0x0300 -+ nulls(), nulls())) { -+#else -+ nulls())) { -+#endif - debug_printf("invalid\n"); - pc += 1; - } -@@ -276,7 +299,9 @@ lp_disassemble(const void* func) - * Print the instruction. - */ - --#if HAVE_LLVM >= 0x208 -+#if HAVE_LLVM >= 0x0300 -+ Printer->printInst(&Inst, Out, ""); -+#elif HAVE_LLVM >= 0x208 - Printer->printInst(&Inst, Out); - #else - Printer->printInst(&Inst); -@@ -289,7 +314,11 @@ lp_disassemble(const void* func) - - pc += Size; - -+#if HAVE_LLVM >= 0x0300 -+ const MCInstrDesc &TID = TII->get(Inst.getOpcode()); -+#else - const TargetInstrDesc &TID = TII->get(Inst.getOpcode()); -+#endif - - /* - * Keep track of forward jumps to a nearby address. -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.c b/src/gallium/auxiliary/gallivm/lp_bld_type.c -index c5cf6d4..efd159f 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_type.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c -@@ -325,16 +325,18 @@ lp_typekind_name(LLVMTypeKind t) - return "LLVMArrayTypeKind"; - case LLVMPointerTypeKind: - return "LLVMPointerTypeKind"; -+#if HAVE_LLVM < 0x0300 - case LLVMOpaqueTypeKind: - return "LLVMOpaqueTypeKind"; -+#endif - case LLVMVectorTypeKind: - return "LLVMVectorTypeKind"; - case LLVMMetadataTypeKind: - return "LLVMMetadataTypeKind"; -- /* Only in LLVM 2.7 and later??? -+#if HAVE_LLVM == 0x0207 - case LLVMUnionTypeKind: - return "LLVMUnionTypeKind"; -- */ -+#endif - default: - return "unknown LLVMTypeKind"; - } -diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c -index 268f0fa..ce92a80 100644 ---- a/src/gallium/drivers/llvmpipe/lp_jit.c -+++ b/src/gallium/drivers/llvmpipe/lp_jit.c -@@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_context *lp) - elem_types[LP_JIT_TEXTURE_BORDER_COLOR] = - LLVMArrayType(LLVMFloatTypeInContext(lc), 4); - -+#if HAVE_LLVM >= 0x0300 -+ texture_type = LLVMStructCreateNamed(gallivm->context, "texture"); -+ LLVMStructSetBody(texture_type, elem_types, -+ Elements(elem_types), 0); -+#else - texture_type = LLVMStructTypeInContext(lc, elem_types, - Elements(elem_types), 0); -+ LLVMAddTypeName(gallivm->module, "texture", texture_type); - - LLVMInvalidateStructLayout(gallivm->target, texture_type); -+#endif - - LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width, - gallivm->target, texture_type, -@@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_context *lp) - - LP_CHECK_STRUCT_SIZE(struct lp_jit_texture, - gallivm->target, texture_type); -- -- LLVMAddTypeName(gallivm->module, "texture", texture_type); - } - - /* struct lp_jit_context */ -@@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_context *lp) - elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type, - PIPE_MAX_SAMPLERS); - -+#if HAVE_LLVM >= 0x0300 -+ context_type = LLVMStructCreateNamed(gallivm->context, "context"); -+ LLVMStructSetBody(context_type, elem_types, -+ Elements(elem_types), 0); -+#else - context_type = LLVMStructTypeInContext(lc, elem_types, - Elements(elem_types), 0); - - LLVMInvalidateStructLayout(gallivm->target, context_type); - -+ LLVMAddTypeName(gallivm->module, "context", context_type); -+#endif -+ - LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants, - gallivm->target, context_type, - LP_JIT_CTX_CONSTANTS); -@@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_context *lp) - LP_CHECK_STRUCT_SIZE(struct lp_jit_context, - gallivm->target, context_type); - -- LLVMAddTypeName(gallivm->module, "context", context_type); -- - lp->jit_context_ptr_type = LLVMPointerType(context_type, 0); - } - diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD deleted file mode 100644 index ea566be0d..000000000 --- a/multilib/lib32-mpg123/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 55271 2011-09-08 08:35:25Z bluewind $ -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -_pkgbasename=mpg123 -pkgname=lib32-$_pkgbasename -pkgver=1.13.4 -pkgrel=1 -pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bit)" -arch=('x86_64') -url="http://sourceforge.net/projects/mpg123" -license=('GPL2' 'LGPL2.1') -depends=('lib32-glibc' 'lib32-libtool' 'lib32-alsa-lib' $_pkgbasename) -makedepends=('lib32-sdl' gcc-multilib libtool-multilib) -optdepends=('lib32-sdl: for additional audio support') -options=('libtool') -source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('073620b3938c4cb9c4f70e8fe3e114b8') -sha1sums=('7fe195db9fe708c487a1d47a66e6e68d9b8e7a6e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - ./configure --prefix=/usr --with-audio="alsa sdl" --with-cpu=i586 --libdir=/usr/lib32 - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-ncurses/PKGBUILD b/multilib/lib32-ncurses/PKGBUILD deleted file mode 100644 index 31204d9c4..000000000 --- a/multilib/lib32-ncurses/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 56507 2011-10-07 13:54:05Z bluewind $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -_pkgbasename=ncurses -pkgname=lib32-${_pkgbasename} -pkgver=5.9 -pkgrel=1 -pkgdesc="System V Release 4.0 curses emulation library (32-bit)" -arch=('x86_64') -url="http://www.gnu.org/software/ncurses/" -license=('MIT') -depends=('lib32-glibc' ${_pkgbasename}) -makedepends=("gcc-multilib") -source=(ftp://ftp.gnu.org/pub/gnu/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('8cb9c412e5f2d96bc6f459aa8c6282a1') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/ - mkdir ncurses{,w}-build - - cd ${srcdir}/ncursesw-build - ../${_pkgbasename}-${pkgver}/configure --prefix=/usr --mandir=/usr/share/man \ - --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} --enable-widec --libdir=/usr/lib32 - make - - # libncurses.so.5 for external binary support - cd ${srcdir}/ncurses-build -# [ $CARCH = "x86_64" ] && CONFIGFLAG="--with-chtype=long" - ../${_pkgbasename}-${pkgver}/configure --prefix=/usr \ - --with-shared --with-normal --without-debug --without-ada \ - --with-install-prefix=${pkgdir} $CONFIGFLAG --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/ncursesw-build - make install - - install -dm755 ${pkgdir}/usr/lib32 - - # Fool packages looking to link to non-wide-character ncurses libraries - for lib in curses ncurses form panel menu; do - rm -f ${pkgdir}/usr/lib32/lib${lib}.so - echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib32/lib${lib}.so - ln -sf lib${lib}w.a ${pkgdir}/usr/lib32/lib${lib}.a - done - ln -sf libncurses++w.a ${pkgdir}/usr/lib32/libncurses++.a - - # Some packages look for -lcurses during build - rm -f ${pkgdir}/usr/lib32/libcursesw.so - echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib32/libcursesw.so - ln -sf libncurses.so ${pkgdir}/usr/lib32/libcurses.so - ln -sf libncursesw.a ${pkgdir}/usr/lib32/libcursesw.a - ln -sf libncurses.a ${pkgdir}/usr/lib32/libcurses.a - - # non-widec compatibility library - cd ${srcdir}/ncurses-build - install -Dm755 lib/libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.${pkgver} - ln -sf libncurses.so.${pkgver} ${pkgdir}/usr/lib32/libncurses.so.5 - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-nettle/PKGBUILD b/multilib/lib32-nettle/PKGBUILD deleted file mode 100644 index ebcc7f858..000000000 --- a/multilib/lib32-nettle/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Christoph Vigano <mail@cvigano.de> -# Contributor: Andreas Radke <andyrtr@archlinux.org> -# Contributor: bender02 at gmx dot com - -_pkgbasename=nettle -pkgname=lib32-$_pkgbasename -pkgver=2.4 -pkgrel=3 -pkgdesc="A low-level cryptographic library (32-bit)" -arch=('i686' 'x86_64') -url="http://www.lysator.liu.se/~nisse/nettle/" -license=('GPL2') -depends=('lib32-gmp' $_pkgbasename) -makedepends=(gcc-multilib) -source=(ftp://ftp.gnu.org/gnu/nettle/$_pkgbasename-$pkgver.tar.gz) -md5sums=('450be8c4886d46c09f49f568ad6fa013') - -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 \ - --enable-shared \ - --disable-static # <-- seems not working now - make -} - -check() { - cd "$srcdir/$_pkgbasename-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir/" install - - find $pkgdir - - # remove static libs - rm -f ${pkgdir}/usr/lib32/{libhogweed,libnettle}.a - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-openal/PKGBUILD b/multilib/lib32-openal/PKGBUILD deleted file mode 100644 index 6201cdf24..000000000 --- a/multilib/lib32-openal/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 42890 2011-03-22 08:03:47Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Jason Chu <jchu@xentac.net> - -_pkgbasename=openal -pkgname=lib32-$_pkgbasename -pkgver=1.13 -pkgrel=2 -pkgdesc="OpenAL audio library for use with opengl (32-bit)" -arch=('x86_64') -url="http://www.openal.org/" -license=('LGPL') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-sdl' 'lib32-libpulse' 'pkgconfig' 'cmake' gcc-multilib) -options=('!libtool') -source=(http://kcat.strangesoft.net/openal-releases/openal-soft-${pkgver}.tar.bz2) -md5sums=('58b7d2809790c70681b825644c5f3614') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/${_pkgbasename}-soft-${pkgver}/build - cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D LIB_SUFFIX=32 .. - make -} - -package() { - cd ${srcdir}/${_pkgbasename}-soft-${pkgver}/build - make DESTDIR=${pkgdir}/ install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-openssl/PKGBUILD b/multilib/lib32-openssl/PKGBUILD deleted file mode 100644 index ac6843135..000000000 --- a/multilib/lib32-openssl/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 62560 2012-01-21 10:57:52Z bluewind $ -# Maintainer: Pierre Schmitz <pierre@archlinux.de> - -_pkgbasename=openssl -pkgname=lib32-$_pkgbasename -_ver=1.0.0g -# use a pacman compatible version scheme -pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgrel=1 -pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)' -arch=('x86_64') -url='https://www.openssl.org' -license=('custom:BSD') -depends=(lib32-zlib $_pkgbasename) -optdepends=('ca-certificates' perl gcc-multilib) -options=('!makeflags') -source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz" - 'no-rpath.patch' - 'ca-dir.patch') -md5sums=('07ecbe4324f140d157478637d6beccf1' - 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90') - - -build() { - export CC="gcc -m32 -mstackrealign" - export CXX="g++ -m32 -mstackrealign" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/$_pkgbasename-$_ver - - # remove rpath: http://bugs.archlinux.org/task/14367 - patch -p0 -i $srcdir/no-rpath.patch - # set ca dir to /etc/ssl by default - patch -p0 -i $srcdir/ca-dir.patch - # mark stack as non-executable: http://bugs.archlinux.org/task/12434 - ./Configure linux-elf --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \ - shared zlib enable-md2 -Wa,--noexecstack - - make - - # the test fails due to missing write permissions in /etc/ssl - # revert this patch for make test - #patch -p0 -R -i $srcdir/ca-dir.patch - #make test - #patch -p0 -i $srcdir/ca-dir.patch -} - -package() { - cd $srcdir/$_pkgbasename-$_ver - make INSTALL_PREFIX=$pkgdir install - - rm -rf "${pkgdir}"/usr/{include,share,bin} "$pkgdir/etc" - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-openssl/ca-dir.patch b/multilib/lib32-openssl/ca-dir.patch deleted file mode 100644 index 41d1386d3..000000000 --- a/multilib/lib32-openssl/ca-dir.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200 -+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200 -@@ -53,7 +53,7 @@ - $X509="$openssl x509"; - $PKCS12="$openssl pkcs12"; - --$CATOP="./demoCA"; -+$CATOP="/etc/ssl"; - $CAKEY="cakey.pem"; - $CAREQ="careq.pem"; - $CACERT="cacert.pem"; ---- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200 -+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200 -@@ -68,7 +68,7 @@ - X509="$OPENSSL x509" - PKCS12="openssl pkcs12" - --if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi -+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi - CAKEY=./cakey.pem - CAREQ=./careq.pem - CACERT=./cacert.pem ---- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200 -+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200 -@@ -39,7 +39,7 @@ - #################################################################### - [ CA_default ] - --dir = ./demoCA # Where everything is kept -+dir = /etc/ssl # Where everything is kept - certs = $dir/certs # Where the issued certs are kept - crl_dir = $dir/crl # Where the issued crl are kept - database = $dir/index.txt # database index file. diff --git a/multilib/lib32-openssl/no-rpath.patch b/multilib/lib32-openssl/no-rpath.patch deleted file mode 100644 index ebd95e23d..000000000 --- a/multilib/lib32-openssl/no-rpath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.shared.no-rpath 2005-06-23 22:47:54.000000000 +0200 -+++ Makefile.shared 2005-11-16 22:35:37.000000000 +0100 -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/multilib/lib32-p11-kit/PKGBUILD b/multilib/lib32-p11-kit/PKGBUILD deleted file mode 100644 index b9963e719..000000000 --- a/multilib/lib32-p11-kit/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Christoph Vigano <mail@cvigano.de> - -_pkgbasename=p11-kit -pkgname=lib32-$_pkgbasename -pkgver=0.9 -pkgrel=3 -pkgdesc="Library to work with PKCS#11 modules (32-bit)" -arch=(i686 x86_64) -url="http://p11-glue.freedesktop.org" -license=('BSD') -depends=(lib32-glibc $_pkgbasename) -options=(!libtool) -source=($url/releases/$_pkgbasename-$pkgver.tar.gz) -md5sums=('029aa2a3a103e7eb81b4aa731b93539e') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd "$srcdir/$_pkgbasename-$pkgver" - - ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \ - --with-module-path=/usr/lib32/pkcs11 - make -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - make DESTDIR="$pkgdir" install - rm -rf "${pkgdir}"/etc - rm -rf "${pkgdir}"/usr/{bin,include,share} - install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/lib32-pango/PKGBUILD b/multilib/lib32-pango/PKGBUILD deleted file mode 100644 index 5c845b59a..000000000 --- a/multilib/lib32-pango/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 63491 2012-02-05 11:45:36Z ibiru $ -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -# Maintainer: Biru Ionut <ionut@archlinux.ro> -_pkgbasename=pango -pkgname=lib32-$_pkgbasename -pkgver=1.29.4 -pkgrel=3 -pkgdesc="A library for layout and rendering of text (32-bit)" -arch=('x86_64') -license=('LGPL') -depends=('lib32-glib2>=2.25.15' 'lib32-cairo>=1.10.0' 'lib32-libxft>=2.1.14' - 'lib32-freetype2>=2.4.2' $_pkgbasename) -makedepends=("gcc-multilib") -options=('!libtool' '!emptydirs') -install=pango.install -source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/1.29/${_pkgbasename}-${pkgver}.tar.xz - pango-modules-conffile.patch) -url="http://www.pango.org/" -sha256sums=('7ae8d1953e6098a2706df58c1f84555c06ace7006bb34c0e54ab9acd98c1127f' - '4a178b60dd420ae53baeabbecfaaeca4070a4b777b2b3f36d137cd70b5a270c3') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - patch -p0 < ${srcdir}/pango-modules-conffile.patch - # No libthai support yet - ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \ - --localstatedir=/var --with-included-modules=basic-fc \ - --with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc \ - --disable-introspection - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "$pkgdir"/etc - rm -rf "$pkgdir"/usr/{bin/pango-view,share,include} - mv "$pkgdir"/usr/bin/pango-querymodules "$pkgdir"/usr/bin/pango-querymodules-32 -} diff --git a/multilib/lib32-pango/pango-modules-conffile.patch b/multilib/lib32-pango/pango-modules-conffile.patch deleted file mode 100644 index a959cf1c8..000000000 --- a/multilib/lib32-pango/pango-modules-conffile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pango/modules.c.orig 2010-08-26 06:45:49.329259966 +0200 -+++ pango/modules.c 2010-08-26 06:46:13.786685177 +0200 -@@ -529,7 +529,7 @@ - - if (!file_str) - file_str = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ "pango.modules-32", - NULL); - - files = pango_split_file_list (file_str); -@@ -640,7 +640,7 @@ - if (!no_module_warning) - { - gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ "pango.modules-32", - NULL); - g_critical ("No modules found:\n" - "No builtin or dynamically loaded modules were found.\n" diff --git a/multilib/lib32-pango/pango.install b/multilib/lib32-pango/pango.install deleted file mode 100644 index 173b6820f..000000000 --- a/multilib/lib32-pango/pango.install +++ /dev/null @@ -1,21 +0,0 @@ -# arg 1: the new package version -post_install() { - # we need to ldconfig first, in case xfree86's libs aren't - # in ld.so.cache yet - sbin/ldconfig -r . - usr/bin/pango-querymodules-32 >etc/pango/pango.modules-32 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ -f etc/pango/pango.modules-32 ]; then - rm etc/pango/pango.modules-32 - fi - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - rm etc/pango/pango.modules-32 -} diff --git a/multilib/lib32-pcre/PKGBUILD b/multilib/lib32-pcre/PKGBUILD deleted file mode 100644 index b798dc530..000000000 --- a/multilib/lib32-pcre/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 60943 2011-12-19 18:57:19Z bluewind $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=pcre -pkgname=lib32-$_pkgbasename -pkgver=8.21 -pkgrel=1 -pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)" -arch=('x86_64') -url="http://pcre.sourceforge.net" -license=('custom') -depends=('lib32-gcc-libs' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('0a7b592bea64b7aa7f4011fc7171a730') - -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 \ - --enable-utf8 --enable-unicode-properties - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-pixman/PKGBUILD b/multilib/lib32-pixman/PKGBUILD deleted file mode 100644 index 6ad1341fe..000000000 --- a/multilib/lib32-pixman/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 63023 2012-01-30 15:40:06Z bluewind $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -_pkgbasename=pixman -pkgname=lib32-$_pkgbasename -pkgver=0.24.2 -pkgrel=1 -pkgdesc="Pixman library (32-bit)" -arch=('x86_64') -url="http://xorg.freedesktop.org" -license=('custom') -depends=('lib32-glibc' $_pkgbasename) -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2) -sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/include - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD deleted file mode 100644 index e15090c1a..000000000 --- a/multilib/lib32-qt/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 63492 2012-02-05 11:45:40Z ibiru $ -# Maintainer: Florian Pritz <flo@xssn.at> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -_pkgbasename=qt -pkgname=lib32-$_pkgbasename -pkgver=4.8.0 -pkgrel=2 -pkgdesc='A cross-platform application and UI framework (32-bit)' -arch=('x86_64') -url='http://qt-project.org/' -license=('GPL3' 'LGPL') -depends=(lib32-{fontconfig,sqlite3,alsa-lib,glib2,dbus-core,openssl} - lib32-lib{png,tiff,mng,gl,sm,xrandr,xv,xi} $_pkgbasename) -optdepends=('lib32-libxinerama: Xinerama support' - 'lib32-libxcursor: Xcursor support' - 'lib32-libxfixes: Xfixes support') -makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2}) -options=('!libtool') -_pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}" -source=("ftp://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz") -md5sums=('e8a5fdbeba2927c948d9f477a6abe904') - -build() { - cd $srcdir/$_pkgfqn - - export QT4DIR=$srcdir/$_pkgfqn - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - # some of those are likely unnecessary, but I'm too lazy to find and remove them - sed -i "/^QMAKE_LINK\s/s|g++|g++ -m32|g" mkspecs/common/g++-base.conf - sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/g++-base.conf - sed -i "s|-O2|${CXXFLAGS} -m32|" mkspecs/common/gcc-base.conf - sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf - sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS} -m32|g" mkspecs/common/gcc-base.conf - sed -i "s|-Wl,-O1|-m32 -Wl,-O1|" mkspecs/common/g++-unix.conf - sed -e "s|-O2|$CXXFLAGS -m32|" \ - -e "/^QMAKE_RPATH/s| -Wl,-rpath,||g" \ - -e "/^QMAKE_LINK\s/s|g++|g++ -m32|g" \ - -e "/^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g" \ - -i mkspecs/common/g++.conf - - ./configure -confirm-license -opensource -v -platform linux-g++-32 \ - -prefix /usr \ - -libdir /usr/lib32 \ - -plugindir /usr/lib32/qt/plugins \ - -importdir /usr/lib32/qt/imports \ - -datadir /usr/share/qt \ - -translationdir /usr/share/qt/translations \ - -sysconfdir /etc \ - -system-sqlite \ - -no-phonon \ - -no-phonon-backend \ - -no-webkit \ - -graphicssystem raster \ - -openssl-linked \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -nomake tools \ - -optimized-qmake \ - -no-rpath \ - -dbus-linked \ - -reduce-relocations \ - -no-openvg - - make -} - -package() { - cd $srcdir/$_pkgfqn - make INSTALL_ROOT=$pkgdir install - - # Fix wrong path in pkgconfig files - find ${pkgdir}/usr/lib32/pkgconfig -type f -name '*.pc' \ - -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \; - # Fix wrong path in prl files - find ${pkgdir}/usr/lib32 -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-readline/PKGBUILD b/multilib/lib32-readline/PKGBUILD deleted file mode 100644 index 7ec1ea250..000000000 --- a/multilib/lib32-readline/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 60938 2011-12-19 18:55:02Z bluewind $ -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -_pkgbasename=readline -pkgname=lib32-$_pkgbasename -_basever=6.2 -_patchlevel=002 #prepare for some patches -pkgver=$_basever.$_patchlevel -pkgrel=1 -pkgdesc="GNU readline library (32-bit)" -arch=(x86_64) -url="http://tiswww.case.edu/php/chet/readline/rltop.html" -license=('GPL') -depends=('lib32-glibc' 'lib32-ncurses' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz) -if [ $_patchlevel -gt 00 ]; then - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) - done -fi -md5sums=('67948acb2ca081f23359d0256e9a271c' - '83287d52a482f790dfb30ec0a8746669' - '8e6a51e2e0e6e45a82752e3692c111ac' - '0665020ea118e8434bd145fb71f452cc' - '285361ca6d48c51ae2428157e174e812') - -build() { - cd ${srcdir}/${_pkgbasename}-$_basever - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - for (( p=1; p<=$((10#${_patchlevel})); p++ )); do - msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) - done - - # Remove RPATH from shared objects (FS#14366) - sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf - - ./configure --prefix=/usr --libdir=/usr/lib32 - make SHLIB_LIBS=-lncurses -} - -package() { - cd ${srcdir}/${_pkgbasename}-$_basever - - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-sdl/PKGBUILD b/multilib/lib32-sdl/PKGBUILD deleted file mode 100644 index a4520d40f..000000000 --- a/multilib/lib32-sdl/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 62690 2012-01-24 18:20:52Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -_pkgbasename=sdl -pkgname=lib32-$_pkgbasename -pkgver=1.2.15 -pkgrel=1 -pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (32-bit)" -arch=('x86_64') -url="http://www.libsdl.org" -license=('LGPL') -depends=('lib32-libxext' 'lib32-libxrender' 'lib32-libx11' $_pkgbasename) -makedepends=('lib32-alsa-lib' 'lib32-mesa' 'lib32-libpulse' gcc-multilib) -options=('!libtool') -source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz - sdl-1.2.14-fix-mouse-clicking.patch) -md5sums=('9d96df8417572a2afb781a7c4c811a85' - '04d8c179f125e04bcd4c9d60e013c2d7') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/SDL-${pkgver} - patch -Np1 -i $srcdir/sdl-1.2.14-fix-mouse-clicking.patch - ./configure --prefix=/usr --disable-nasm --enable-alsa \ - --with-x --disable-rpath --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd ${srcdir}/SDL-${pkgver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch b/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch deleted file mode 100644 index 7d3e5acfc..000000000 --- a/multilib/lib32-sdl/sdl-1.2.14-fix-mouse-clicking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 -+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 -@@ -423,12 +423,15 @@ - if ( xevent.xcrossing.mode == NotifyUngrab ) - printf("Mode: NotifyUngrab\n"); - #endif -- if ( this->input_grab == SDL_GRAB_OFF ) { -- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ if ( (xevent.xcrossing.mode != NotifyGrab) && -+ (xevent.xcrossing.mode != NotifyUngrab) ) { -+ if ( this->input_grab == SDL_GRAB_OFF ) { -+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); -+ } -+ posted = SDL_PrivateMouseMotion(0, 0, -+ xevent.xcrossing.x, -+ xevent.xcrossing.y); - } -- posted = SDL_PrivateMouseMotion(0, 0, -- xevent.xcrossing.x, -- xevent.xcrossing.y); - } - break; - diff --git a/multilib/lib32-sdl_image/PKGBUILD b/multilib/lib32-sdl_image/PKGBUILD deleted file mode 100644 index 9acf0ed8d..000000000 --- a/multilib/lib32-sdl_image/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63483 2012-02-05 11:45:03Z ibiru $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: SpepS <dreamspepser at yahoo dot it> - -_pkgbasename=sdl_image -pkgname=lib32-$_pkgbasename -pkgver=1.2.12 -pkgrel=2 -pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)" -arch=('x86_64') -url="http://www.libsdl.org/projects/SDL_image/" -license=('LGPL') -depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' "$_pkgbasename") -makedepends=('gcc-multilib') -options=('!libtool') -source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz) -md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb') - -build() { - export CC='gcc -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - - cd ${srcdir}/SDL_image-${pkgver} - - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -package() { - cd ${srcdir}/SDL_image-${pkgver} - - make DESTDIR=$pkgdir install - rm -rf $pkgdir/usr/include -} - -# vim: sw=2:ts=2 et: diff --git a/multilib/lib32-sdl_ttf/PKGBUILD b/multilib/lib32-sdl_ttf/PKGBUILD deleted file mode 100644 index cffc2c0a6..000000000 --- a/multilib/lib32-sdl_ttf/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 62239 2012-01-18 17:44:28Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Esa lakaniemi <esalaka@gmail.com> - -_pkgbasename=sdl_ttf -pkgname=lib32-$_pkgbasename -pkgver=2.0.11 -pkgrel=1 -pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (32-bit)" -arch=('x86_64') -url="http://www.libsdl.org/projects/SDL_ttf/" -license=('LGPL') -options=('!libtool') -depends=('lib32-sdl' 'lib32-freetype2' $_pkgbasename) -makedepends=('gcc-multilib') -source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz) -md5sums=('61e29bd9da8d245bc2471d1b2ce591aa') - -build() { - cd "${srcdir}"/SDL_ttf-${pkgver} - ./configure --prefix=/usr --libdir=/usr/lib32 CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - make -} - -package() { - cd "${srcdir}"/SDL_ttf-${pkgver} - make DESTDIR=${pkgdir} install - rm -rf "${pkgdir}"/usr/include -} - -# vim: sw=2:ts=2 et: diff --git a/multilib/lib32-speex/PKGBUILD b/multilib/lib32-speex/PKGBUILD deleted file mode 100644 index d6f1ea20d..000000000 --- a/multilib/lib32-speex/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 26746 2010-09-15 23:03:23Z bluewind $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> - -_pkgbasename=speex -pkgname=lib32-$_pkgbasename -pkgver=1.2rc1 -pkgrel=3 -pkgdesc="A free codec for free speech (32-bit)" -arch=(x86_64) -license=('BSD') -depends=('lib32-libogg' $_pkgbasename) -makedepends=(gcc-multilib) -options=('!libtool') -source=(http://downloads.us.xiph.org/releases/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz) -md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae') -url="http://www.speex.org/" - -build() { - cd $srcdir/speex-$pkgver - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libdir=/usr/lib32 - make -} - -package() { - cd $srcdir/speex-$pkgver - make DESTDIR=$pkgdir install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-sqlite3/PKGBUILD b/multilib/lib32-sqlite3/PKGBUILD deleted file mode 100644 index 0b22d64ca..000000000 --- a/multilib/lib32-sqlite3/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Biru Ionut <ionut@archlinux.ro> -# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi> -# Contributor: Kaos < gianlucaatlas dot gmail dot com > - -_pkgbasename=sqlite3 -pkgname=lib32-sqlite3 -_amalgamationver=3071000 -pkgver=3.7.10 -pkgrel=1 -pkgdesc="A C library that implements an SQL database engine (32-bit)" -arch=('x86_64') -license=('custom') -url="http://www.sqlite.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=('tcl' 'gcc-multilib' 'lib32-readline') -source=(http://www.sqlite.org/sqlite-src-${_amalgamationver}.zip) -options=(!libtool) -md5sums=('16da2e08ce2233556965cdf20d614bd9') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/sqlite-src-${_amalgamationver} - export LTLINK_EXTRAS="-ldl" - export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" - ./configure --prefix=/usr --libdir=/usr/lib32 \ - --enable-threadsafe \ - --enable-threads-override-locks \ - --enable-cross-thread-connections \ - --disable-static --disable-tcl \ - --enable-load-extension - - # rpath removal - sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool - sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - - make -} - - -package() { - cd ${srcdir}/sqlite-src-${_amalgamationver} - make DESTDIR=${pkgdir} install - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-tdb/PKGBUILD b/multilib/lib32-tdb/PKGBUILD deleted file mode 100644 index 0ef20e391..000000000 --- a/multilib/lib32-tdb/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Florian Pritz <flo@xssn.at> - -_pkgbasename=tdb -pkgname=lib32-$_pkgbasename -pkgver=1.2.9 -pkgrel=1 -pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits (32-bit)" -arch=(x86_64) -license=('GPL3') -url="http://tdb.samba.org/" -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib libxslt python2) -source=(http://samba.org/ftp/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.gz) -md5sums=('4d97d18bbe9040038d4e003495bb8cd1') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - sed -i -e 's#python#python2#g' buildtools/bin/waf - - ./configure --prefix=/usr \ - --localstatedir=/var \ - --sysconfdir=/etc/samba \ - --libdir=/usr/lib32 \ - --disable-python - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make -j1 DESTDIR="$pkgdir" install - rm -rf "${pkgdir}"/usr/{include,share,bin} -} diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD deleted file mode 100644 index 562c1c471..000000000 --- a/multilib/lib32-udev/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 63389 2012-02-01 05:09:50Z lcarlier $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Bächler <thomas@archlinux.org> - -pkgname=('lib32-udev') -pkgver=180 -pkgrel=1 -arch=('x86_64') -pkgdesc="The userspace dev tools (udev) (32-bit)" -url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -license=('GPL') -options=(!makeflags !libtool) -depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'lib32-kmod' 'lib32-util-linux' 'udev') -makedepends=('gcc-multilib' 'gperf') -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.xz) -md5sums=('1cf124ab5a124ea35d4748ea414926ec') - -build() { - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd $srcdir/udev-$pkgver - - ./configure --libdir=/usr/lib32 --disable-introspection - make -} - -package() { - - cd $srcdir/udev-$pkgver - - make DESTDIR=${pkgdir} install - rm -rf ${pkgdir}/usr/{etc,include,lib,libexec,sbin,share} - rm -rf ${pkgdir}/usr/lib32/girepository* -} diff --git a/multilib/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD deleted file mode 100644 index cdd799467..000000000 --- a/multilib/lib32-util-linux/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 60379 2011-12-12 14:54:24Z dreisner $ -# Maintainer: judd <jvinet@zeroflux.org> - -_pkgbasename=util-linux -pkgname=lib32-$_pkgbasename -pkgver=2.20.1 -pkgrel=1 -pkgdesc="Miscellaneous system utilities for Linux (32-bit)" -url="http://userweb.kernel.org/~kzak/util-linux-ng/" -arch=('x86_64') -depends=('lib32-glibc' "$_pkgbasename") -makedepends=('gcc-multilib') -provides=('lib32-util-linux-ng') -conflicts=('lib32-util-linux-ng') -replaces=('lib32-util-linux-ng') -license=('GPL2') -options=('!libtool' '!emptydirs') -source=(ftp://ftp.infradead.org/pub/$_pkgbasename/v2.20/$_pkgbasename-$pkgver.tar.bz2) -md5sums=('079b37517fd4e002a2e6e992e8b4e361') - -shopt -s extglob - -build() { - cd "$srcdir/$_pkgbasename-$pkgver" - - export CC="gcc -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - ./autogen.sh - ./configure --without-ncurses --libdir=/usr/lib32 - - for lib in lib{mount,blkid,uuid}; do - make -C "$lib" - done -} - -package() { - cd "$srcdir/$_pkgbasename-$pkgver" - - make DESTDIR="$pkgdir" install - - # remove everything but libs - rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32) -} diff --git a/multilib/lib32-v4l-utils/PKGBUILD b/multilib/lib32-v4l-utils/PKGBUILD deleted file mode 100644 index b492b71f8..000000000 --- a/multilib/lib32-v4l-utils/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 88966 2010-08-26 18:32:27Z thomas $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -_pkgbasename=v4l-utils -pkgname=lib32-$_pkgbasename -pkgver=0.8.5 -pkgrel=1 -pkgdesc="Userspace tools and conversion library for Video 4 Linux (32-bit)" -arch=('x86_64') -url="http://freshmeat.net/projects/libv4l" -provides=("lib32-libv4l=$pkgver") -replaces=('lib32-libv4l') -conflicts=('lib32-libv4l') -license=('LGPL') -makedepends=('gcc-multilib') -depends=('lib32-gcc-libs' $_pkgbasename lib32-libjpeg-turbo) -source=(http://linuxtv.org/downloads/v4l-utils/${_pkgbasename}-${pkgver}.tar.bz2) -sha256sums=('c205848fbaf3489b97519dae04da31be4998bbc170a2ca9791357a8a549e594c') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - sed -i 's|CFLAGS :=|CFLAGS ?=|' Make.rules - - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - make PREFIX=/usr LIBDIR=/usr/lib32 -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make install PREFIX=/usr LIBDIR=/usr/lib32 DESTDIR="${pkgdir}/" - rm -rf "${pkgdir}"/{usr/{include,share,bin,sbin},etc,lib} -} diff --git a/multilib/lib32-xcb-util/PKGBUILD b/multilib/lib32-xcb-util/PKGBUILD deleted file mode 100644 index fe1051772..000000000 --- a/multilib/lib32-xcb-util/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 60278 2011-12-08 20:24:48Z bluewind $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> - -_pkgbasename=xcb-util -pkgname=lib32-xcb-util -pkgver=0.3.8 -pkgrel=1 -pkgdesc="Utility libraries for XC Binding (32-bit)" -arch=('x86_64') -url="http://xcb.freedesktop.org" -license=('custom') -depends=('lib32-glibc' 'lib32-libxcb' $_pkgbasename) -makedepends=('gperf' 'gcc-multilib') -options=('!libtool') -source=(http://xcb.freedesktop.org/dist/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('8ce019c4bbf20dce246b98f177cfccff') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd "${srcdir}/${_pkgbasename}-${pkgver}" - ./configure --prefix=/usr --libdir=/usr/lib32 --disable-static - make -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}"/usr/{include,share} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/lib32-zlib/PKGBUILD b/multilib/lib32-zlib/PKGBUILD deleted file mode 100644 index 4d7d57011..000000000 --- a/multilib/lib32-zlib/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 63384 2012-01-31 23:48:40Z pschmitz $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -_pkgbasename=zlib -pkgname=lib32-$_pkgbasename -pkgver=1.2.6 -pkgrel=1 -pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)' -arch=('x86_64') -license=('custom') -url="http://www.zlib.net/" -depends=('lib32-glibc' "$_pkgbasename") -makedepends=('gcc-multilib') -source=("http://zlib.net/current/zlib-${pkgver}.tar.gz") -md5sums=('618e944d7c7cd6521551e30b32322f4a') - -build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - - cd ${srcdir}/zlib-$pkgver - ./configure --prefix=/usr \ - --libdir=/usr/lib32 - make -} - -check() { - cd ${srcdir}/zlib-$pkgver - make test -j 1 -} - -package() { - cd ${srcdir}/zlib-$pkgver - make install DESTDIR=${pkgdir} - - rm -rf "${pkgdir}"/usr/{include,share,bin} - mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" -} diff --git a/multilib/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD deleted file mode 100644 index 22767d11a..000000000 --- a/multilib/libtool-multilib/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 62210 2012-01-18 10:47:35Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -# NOTE: requires rebuild with each new gcc version - -pkgbase=libtool-multilib -pkgname=(libtool-multilib lib32-libltdl) -pkgver=2.4.2 -pkgrel=2.1 -pkgdesc="A generic library support script for multilib" -arch=('x86_64') -url="http://www.gnu.org/software/libtool" -license=('GPL') -_gccver=4.6.2 -makedepends=("gcc-multilib=$_gccver") -options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/libtool-${pkgver}.tar.xz{,.sig}) -md5sums=('2ec8997e0c07249eb4cbd072417d70fe' - '1e6ba57420c82c663c85e745d11c7eed') - -build() { - cd "$srcdir" - - rm -rf libtool-64 libtool-32 - mv libtool-$pkgver libtool-64 - cp -a libtool-64 libtool-32 - - msg2 "Building libtool-64..." - cd "$srcdir/libtool-64" - ./configure --prefix=/usr - make - - msg2 "Building libtool-32..." - export CC="gcc -m32" - export CXX="g++ -m32" - - cd "$srcdir/libtool-32" - ./configure --prefix=/usr --libdir=/usr/lib32 - make -} - -check() { - cd "$srcdir/libtool-64" - make check - cd "$srcdir/libtool-32" - make check -} - -package_libtool-multilib() { - depends=('sh' "libltdl=$pkgver" 'tar' "gcc-multilib=$_gccver" "lib32-libltdl=$pkgver") - groups=('multilib-devel') - install=libtool.install - provides=("libtool=$pkgver-$pkgrel") - conflicts=(libtool) - - cd "$srcdir/libtool-64" - make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \ - install-data-local - rm -rf ${pkgdir}/usr/share/libtool/libltdl/ -} - -package_lib32-libltdl() { - pkgdesc="A system independent dlopen wrapper for GNU libtool (32-bit)" - depends=(lib32-glibc libltdl) - replaces=(lib32-libtool) - provides=("lib32-libtool=$pkgver-$pkgrel") - conflicts=(lib32-libtool) - - cd "$srcdir/libtool-32" - make DESTDIR="$pkgdir" install-libLTLIBRARIES -} diff --git a/multilib/libtool-multilib/libtool.install b/multilib/libtool-multilib/libtool.install deleted file mode 100644 index 424c8cb88..000000000 --- a/multilib/libtool-multilib/libtool.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=/usr/share/info -filelist=(libtool.info libtool.info-1 libtool.info-2) - -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 -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/nspluginwrapper/PKGBUILD b/multilib/nspluginwrapper/PKGBUILD deleted file mode 100644 index d02b29590..000000000 --- a/multilib/nspluginwrapper/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 62211 2012-01-18 10:47:40Z heftig $ -# Maintainer: Thomas Bächler <thomas@archlinux.org> -pkgname=nspluginwrapper -pkgver=1.4.4 -pkgrel=2.1 -pkgdesc="Cross-platform NPAPI compatible plugin viewer" -arch=('i686' 'x86_64') -url="http://nspluginwrapper.davidben.net/" -license=('GPL') -depends=( - 'curl' - 'libxt' 'lib32-libxt' - 'gcc-libs' 'lib32-gcc-libs' - 'gtk2' 'lib32-gtk2' -) -makedepends=('gcc-multilib') -install="install" -source=(http://nspluginwrapper.davidben.net/download/$pkgname-$pkgver.tar.gz - 'fix_missing_lib.patch') -md5sums=('36f3e290fc4ce56f65ee695078961188' - 'd40ad2f55d9989e04e3ef0cf4326b1df') - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -fi - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -p0 -i "$srcdir/fix_missing_lib.patch" - - configure_args="" - if [[ $CARCH == x86_64 ]]; then - configure_args="$configure_args --with-lib32=lib32 --with-lib64=lib" - fi - - ./configure $configure_args - make -j1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make -j1 DESTDIR="$pkgdir/" install -} - -# vim:set ts=2 sw=2 et: diff --git a/multilib/nspluginwrapper/fix_missing_lib.patch b/multilib/nspluginwrapper/fix_missing_lib.patch deleted file mode 100644 index f239053f1..000000000 --- a/multilib/nspluginwrapper/fix_missing_lib.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile 2012-01-15 13:25:28.922775770 +0100 -+++ Makefile.new 2012-01-15 13:25:09.185815643 +0100 -@@ -142,7 +142,7 @@ - npplayer_LDFLAGS = $(LDFLAGS) - npplayer_LDFLAGS += $(libpthread_LDFLAGS) - npplayer_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(CURL_LIBS) $(X_LIBS) --npplayer_LIBS += $(libpthread_LIBS) $(libsocket_LIBS) -+npplayer_LIBS += $(libpthread_LIBS) $(libsocket_LIBS) -ldl - - libnoxshm_LIBRARY = libnoxshm.so - libnoxshm_RAWSRCS = libnoxshm.c diff --git a/multilib/nspluginwrapper/install b/multilib/nspluginwrapper/install deleted file mode 100644 index 78e196fdb..000000000 --- a/multilib/nspluginwrapper/install +++ /dev/null @@ -1,5 +0,0 @@ -post_upgrade() { - for i in `nspluginwrapper -l | grep -v "^ "`; do - /usr/bin/nspluginwrapper -u "$i" - done -} diff --git a/multilib/q4wine/PKGBUILD b/multilib/q4wine/PKGBUILD deleted file mode 100644 index 0e1457979..000000000 --- a/multilib/q4wine/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 62212 2012-01-18 10:47:43Z heftig $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com> - -pkgname=q4wine -pkgver=0.121 -pkgrel=3 -pkgdesc="A Qt4 GUI for Wine" -arch=("i686" "x86_64") -url="http://sourceforge.net/projects/${pkgname}/" -license=("GPL3") -depends=("qt" "wine" "sqlite3" "which" "icoutils") -makedepends=("cmake") -optdepends=("winetricks" "fuseiso") -options=('!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver/_/-}.tar.bz2) -md5sums=('2de5de62f57ba6b26247198df339d81a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_WINETRIKS=ON \ - -DLIBS_ENTRY_PATH=/usr/lib/$pkgname . - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver/_/-} - make DESTDIR=${pkgdir} install -} diff --git a/multilib/q4wine/q4wine.desktop b/multilib/q4wine/q4wine.desktop deleted file mode 100644 index 2b1415848..000000000 --- a/multilib/q4wine/q4wine.desktop +++ /dev/null @@ -1,18 +0,0 @@ -[Desktop Entry] -Name=Q4Wine -GenericName=A Qt4 GUI for Wine -Comment=A Qt4 GUI for Wine -#Version=0.1 -Type=Application -Categories=KDE;Qt;Settings -Terminal=false -Encoding=UTF-8 -Icon=wine -Exec=q4wine -#ServiceTypes=inode/directory -#Actions=Create; -#X-KDE-Submenu= -#X-KDE-Priority=TopLevel -#X-KDE-Icon=tgz -X-KDE-StartupNotify=true -#X-DCOP-ServiceType=Unique diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD deleted file mode 100644 index b6c269b76..000000000 --- a/multilib/wine/PKGBUILD +++ /dev/null @@ -1,147 +0,0 @@ -# $Id: PKGBUILD 63493 2012-02-05 11:45:46Z ibiru $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Eduardo Romero <eduardo@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=wine -pkgver=1.4rc2 -pkgrel=2 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('41e1a9c293cfab5e8ada6e908eebf534') - -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 - libxi lib32-libxi - gettext lib32-gettext - 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 - libpng lib32-libpng - gnutls lib32-gnutls - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - oss -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - oss cups -) - -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 - - # These additional CFLAGS solve FS#27662 - export CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - export CXXFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/} -D_FORTIFY_SOURCE=0" - - 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[@]}" - - # These additional CFLAGS solve FS#27560 - make CFLAGS+="-mstackrealign" CXXFLAGS+="-mstackrealign" -} - -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: diff --git a/multilib/wine/wine.install b/multilib/wine/wine.install deleted file mode 100644 index 0548b7ffd..000000000 --- a/multilib/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - #echo "If you are on x86_64, the default WINEARCH will be win64." - #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - #echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} diff --git a/multilib/wine_gecko/PKGBUILD b/multilib/wine_gecko/PKGBUILD deleted file mode 100644 index b9572f7cd..000000000 --- a/multilib/wine_gecko/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 58906 2011-11-20 00:25:05Z heftig $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) -# Contributor: Allan McRae (allan <at> archlinux <dot> org) -# Contributor: Alexander 'bas' Brovikov (bas <at> it-core <dot> org) - -pkgname=wine_gecko -pkgver=1.4 -pkgrel=1 -pkgdesc="Wine's built-in replacement for Microsoft's Internet Explorer" -arch=(i686 x86_64) -url="http://wiki.winehq.org/Gecko" -license=(MPL) -depends=('wine>=1.3.33') -source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi) -md5sums=('700aaa08724be1992cffed7b87e79a44' - '7b4811f667fd01d300fdff68420a9c72') - -if [[ $CARCH == i686 ]]; then - # Strip x86_64 msi - source=(${source[0]}) - md5sums=(${md5sums[0]}) -fi - -package() { - cd "$srcdir" - _geckodir="$pkgdir/usr/share/wine/gecko" - install -Dm644 $pkgname-$pkgver-x86.msi "$_geckodir/$pkgname-$pkgver-x86.msi" - if [[ $CARCH == x86_64 ]]; then - install -m644 $pkgname-$pkgver-x86_64.msi "$_geckodir/" - fi -} |