From a1922d0ec660fdc1892f2783515f781c090df0a9 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 20 Jan 2012 23:14:48 +0000 Subject: Fri Jan 20 23:14:48 UTC 2012 --- multilib-staging/lib32-cairo/PKGBUILD | 36 +++++++++ .../lib32-cairo/cairo-1.10.0-buggy_gradients.patch | 13 ++++ multilib-staging/lib32-gdk-pixbuf2/PKGBUILD | 2 +- multilib-staging/lib32-libcups/PKGBUILD | 38 ++++++++++ multilib-staging/lib32-libtiff/PKGBUILD | 41 +++++++++++ .../lib32-libtiff/libtiff-CVE-2009-2285.patch | 22 ++++++ multilib-staging/lib32-qt/PKGBUILD | 86 ++++++++++++++++++++++ 7 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 multilib-staging/lib32-cairo/PKGBUILD create mode 100644 multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch create mode 100644 multilib-staging/lib32-libcups/PKGBUILD create mode 100644 multilib-staging/lib32-libtiff/PKGBUILD create mode 100644 multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch create mode 100644 multilib-staging/lib32-qt/PKGBUILD (limited to 'multilib-staging') diff --git a/multilib-staging/lib32-cairo/PKGBUILD b/multilib-staging/lib32-cairo/PKGBUILD new file mode 100644 index 000000000..394a26fbe --- /dev/null +++ b/multilib-staging/lib32-cairo/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 62413 2012-01-19 21:13:41Z bluewind $ +# Maintainer: Ionut Biru + +_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-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch b/multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch new file mode 100644 index 000000000..368e356d3 --- /dev/null +++ b/multilib-staging/lib32-cairo/cairo-1.10.0-buggy_gradients.patch @@ -0,0 +1,13 @@ +--- 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-staging/lib32-gdk-pixbuf2/PKGBUILD b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD index eef9aca26..28b102d55 100644 --- a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD +++ b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD @@ -3,7 +3,7 @@ _pkgbasename=gdk-pixbuf2 pkgname=lib32-$_pkgbasename pkgver=2.24.1 -pkgrel=1 +pkgrel=2 pkgdesc="An image loading library (32-bit)" arch=('x86_64') url="http://www.gtk.org/" diff --git a/multilib-staging/lib32-libcups/PKGBUILD b/multilib-staging/lib32-libcups/PKGBUILD new file mode 100644 index 000000000..010da0cf7 --- /dev/null +++ b/multilib-staging/lib32-libcups/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 62421 2012-01-19 21:25:14Z bluewind $ +# Maintainer: Andreas Radke + +_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-staging/lib32-libtiff/PKGBUILD b/multilib-staging/lib32-libtiff/PKGBUILD new file mode 100644 index 000000000..2d6eb6a8e --- /dev/null +++ b/multilib-staging/lib32-libtiff/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 62312 2012-01-19 07:50:29Z bluewind $ +# Maintainer: Eric Belanger +# Contributor: dorphell + +_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-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch b/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch new file mode 100644 index 000000000..435a84b53 --- /dev/null +++ b/multilib-staging/lib32-libtiff/libtiff-CVE-2009-2285.patch @@ -0,0 +1,22 @@ +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-staging/lib32-qt/PKGBUILD b/multilib-staging/lib32-qt/PKGBUILD new file mode 100644 index 000000000..205e21a76 --- /dev/null +++ b/multilib-staging/lib32-qt/PKGBUILD @@ -0,0 +1,86 @@ +# $Id: PKGBUILD 62425 2012-01-19 21:55:49Z bluewind $ +# Maintainer: Florian Pritz +# Contributor: Andrea Scarpino +# Contributor: Pierre Schmitz + +_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" +} -- cgit v1.2.3-54-g00ecf