diff options
author | root <root@rshg054.dnsready.net> | 2013-08-29 03:06:29 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-08-29 03:06:29 -0700 |
commit | 0a2b1eeb31400e539041c83cc1a5952f1c880917 (patch) | |
tree | e957f8274799baeebffbefd8182fa1e7f106979f /extra | |
parent | d4e7f77644a42f66c76c525abf0bd5d47c6431eb (diff) |
Thu Aug 29 03:04:08 PDT 2013
Diffstat (limited to 'extra')
-rw-r--r-- | extra/cairo/PKGBUILD | 35 | ||||
-rw-r--r-- | extra/cairo/libpng16.patch | 40 | ||||
-rw-r--r-- | extra/gimp/PKGBUILD | 4 | ||||
-rw-r--r-- | extra/gnumeric/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/goffice/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/libmng/PKGBUILD | 28 | ||||
-rw-r--r-- | extra/libmng/libmng-stdio.patch | 10 | ||||
-rw-r--r-- | extra/llvm-amdgpu-snapshot/PKGBUILD | 88 | ||||
-rw-r--r-- | extra/mesa/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/poppler/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/qt3/PKGBUILD | 26 | ||||
-rw-r--r-- | extra/qt4/PKGBUILD | 18 | ||||
-rw-r--r-- | extra/qt4/qtbug-31579.patch | 146 | ||||
-rw-r--r-- | extra/qt4/qtbug-32534.patch | 40 | ||||
-rw-r--r-- | extra/qt5/PKGBUILD | 16 | ||||
-rw-r--r-- | extra/qt5/bison3.patch | 38 | ||||
-rw-r--r-- | extra/qt5/gcc48.patch | 63 | ||||
-rw-r--r-- | extra/wayland/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/xine-lib/PKGBUILD | 4 |
19 files changed, 336 insertions, 270 deletions
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 94b113a82..ea88e9d60 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,32 +1,28 @@ -# $Id: PKGBUILD 184362 2013-05-06 19:36:38Z foutrelis $ +# $Id: PKGBUILD 193704 2013-08-28 15:19:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.12.14 -pkgrel=4 +pkgver=1.12.16 +pkgrel=1 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') url="http://cairographics.org/" -# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') -makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' +depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' 'libgl' 'sh' 'lzo2') +makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind' # for the test suite: 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm') #optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz - libpng16.patch) -sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15' - 'c9911f185637d266ce1d2985bd6fb7d0df3d75b2') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) +sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec') build() { cd $pkgname-$pkgver - patch -Np1 -i ../libpng16.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -47,15 +43,18 @@ build() { make } -#check() { -# cd "$srcdir/$pkgname-$pkgver" - #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped -# make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped -#} +check() { + cd $pkgname-$pkgver + make -k test || /bin/true + + # results: + # 1.12.8-1 # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped + # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped + # 1.12.16-1: 144 Passed, 364 Failed [6 crashed, 12 expected], 27 Skipped -package() { - depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh' 'lzo2') +} +package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cairo/libpng16.patch b/extra/cairo/libpng16.patch deleted file mode 100644 index c16317811..000000000 --- a/extra/cairo/libpng16.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Tue, 16 Apr 2013 09:58:56 +0000 -Subject: png: Avoid marking the surface as in error after a png warning - -It turns out that libpng will continue to load an image after throwing a -warning, and that libpng16 now throws warnings for images that libpng15 -and earlier loaded without error. As we were happily loading those -images into cairo surfaces before, we are therefore being overzealous -in throwing an error now - so just squelch the warning. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-png.c b/src/cairo-png.c -index e74a4a8..068617d 100644 ---- a/src/cairo-png.c -+++ b/src/cairo-png.c -@@ -149,13 +149,13 @@ static void - png_simple_warning_callback (png_structp png, - png_const_charp error_msg) - { -- cairo_status_t *error = png_get_error_ptr (png); -- -- /* default to the most likely error */ -- if (*error == CAIRO_STATUS_SUCCESS) -- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- /* png does not expect to abort and will try to tidy up after a warning */ -+ /* png does not expect to abort and will try to tidy up and continue -+ * loading the image after a warning. So we also want to return the -+ * (incorrect?) surface. -+ * -+ * We use our own warning callback to squelch any attempts by libpng -+ * to write to stderr as we may not be in control of that output. -+ */ - } - - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index c35a97223..31ca4a7c8 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188883 2013-06-23 21:29:32Z daniel $ +# $Id: PKGBUILD 193684 2013-08-28 00:06:02Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gimp pkgver=2.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64') url="http://www.gimp.org/" diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 92ab12ad1..70c8ab6c2 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193620 2013-08-26 07:59:33Z jgc $ +# $Id: PKGBUILD 193698 2013-08-28 08:52:31Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.5 +pkgver=1.12.6 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('7ff36dff134157ce6919c4cebc1a419192e529b00e42c52d9cebbd15e8dd5871' +sha256sums=('73cce1979eac10bd248a46d0a702eeba57673c3e9a990356d246e687d0c7ce25' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 06edd5313..188b9d663 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193438 2013-08-20 07:25:28Z jgc $ +# $Id: PKGBUILD 193696 2013-08-28 08:37:59Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.5 +pkgver=0.10.6 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('63a7a7dd55fbe91991a66dbc78ab27d2ac55bd722d42d4dd3087e3ae33832570') +sha256sums=('a72e65018c0670ed2c52d00361ea874625575cdde7cf091e89914cfd8128cf07') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD index c95d7ca3d..87f3b2438 100644 --- a/extra/libmng/PKGBUILD +++ b/extra/libmng/PKGBUILD @@ -1,30 +1,34 @@ -# $Id: PKGBUILD 178306 2013-02-19 21:06:05Z eric $ +# $Id: PKGBUILD 193685 2013-08-28 00:06:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libmng -pkgver=1.0.10 -pkgrel=4 +pkgver=2.0.2 +pkgrel=2 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" arch=('i686' 'x86_64') url="http://www.libmng.com/" license=('custom') -depends=('zlib' 'libjpeg') +depends=('lcms2') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('eaf1476a3bb29f6190bca660e6abef16') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc} + libmng-stdio.patch) +sha1sums=('7dd35369ff5916e1823cbacef984ab1b87714b69' + 'SKIP' + '2f8b472d53791ba3a44dab9b18fb215e8b19dd77') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p5 -i "${srcdir}/libmng-stdio.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/AM_C_PROTOTYPES//' makefiles/configure.in - ln -s makefiles/configure.in . - ln -s makefiles/Makefile.am . - autoreconf --force --install + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libmng/libmng-stdio.patch b/extra/libmng/libmng-stdio.patch new file mode 100644 index 000000000..42414f152 --- /dev/null +++ b/extra/libmng/libmng-stdio.patch @@ -0,0 +1,10 @@ +--- /mnt/chrootstaging32/usr/include/libmng_types.h 2013-08-15 16:26:03.000000000 -0400 ++++ /mnt/chrootstaging64/usr/include/libmng_types.h 2013-08-16 19:53:39.165878412 -0400 +@@ -204,6 +204,7 @@ + #define HAVE_BOOLEAN + typedef int boolean; + #endif ++#include <stdio.h> + #include <jpeglib.h> + #endif /* MNG_INCLUDE_IJG6B */ + diff --git a/extra/llvm-amdgpu-snapshot/PKGBUILD b/extra/llvm-amdgpu-snapshot/PKGBUILD deleted file mode 100644 index cdac9521c..000000000 --- a/extra/llvm-amdgpu-snapshot/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 186322 2013-05-24 18:14:34Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Anders Bergh <anders@archlinuxppc.org> -# Contributor: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com> - -pkgbase=llvm-amdgpu-snapshot -pkgname=('llvm-amdgpu-snapshot' 'llvm-amdgpu-lib-snapshot') -pkgver=20130403 -pkgrel=3 -pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support' -arch=('i686' 'x86_64') -url="http://llvm.org" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('libffi' 'python2' 'ocaml') -source=(ftp://ftp.archlinux.org/other/packages/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) -md5sums=('4baa7b8da9eff4811952b6f855c141ca') - -prepare() { - cd "$srcdir"/llvm-c* - - sed -i 's/python$/python2/' utils/llvm-build/llvm-build -} - -build() { - cd "$srcdir"/llvm-c* - - # 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)" - - # Force the use of GCC instead of clang - PYTHON=python2 CC=gcc CXX=g++ \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --enable-experimental-targets=R600 \ - --disable-expensive-checks \ - --with-binutils-include=/usr/include \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package_llvm-amdgpu-snapshot() { - depends=("llvm-amdgpu-lib-snapshot=${pkgver}" 'python2') - conflicts=('llvm') - - cd "$srcdir"/llvm-c* - - make DESTDIR="$pkgdir" install - - # Remove useless files - rm -r "$pkgdir"/usr/{docs,lib/ocaml} - # moved to llvm-amdgpu-lib-snapshot - rm "$pkgdir"/usr/lib/libLLVM-3.2svn.so - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/lib*.a - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm-amdgpu-lib-snapshot() { - depends=('libffi' 'gcc-libs') - - cd "$srcdir"/llvm-c* - - make DESTDIR="$pkgdir" install - - mv -v "$pkgdir"/usr/lib/libLLVM-3.2svn.so "$pkgdir"/ - - # Remove useless files - rm -r "$pkgdir"/usr/{bin,include,docs,lib/*} - - mv "$pkgdir"/libLLVM-3.2svn.so "$pkgdir"/usr/lib/ - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 75dc33e40..b64894f08 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 191957 2013-08-01 23:15:05Z lcarlier $ +# $Id: PKGBUILD 193703 2013-08-28 15:19:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=9.1.6 +pkgver=9.2.0 pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' - 'libvdpau' 'wayland' 'llvm-amdgpu-snapshot' 'systemd') + 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd') url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 +source=(ftp://ftp.freedesktop.org/pub/mesa/9.2/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('443a2a352667294b53d56cb1a74114e9' +md5sums=('4185b6aae890bc62a964f4b24cc1aca8' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -27,11 +27,11 @@ build() { --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-egl-platforms=x11,drm,wayland \ --with-llvm-shared-libs \ --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ - --with-egl-platforms=x11,drm,wayland \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -46,9 +46,10 @@ build() { # --help make + # fake installation - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install } package_ati-dri() { @@ -87,10 +88,8 @@ package_nouveau-dri() { optdepends=('libtxc_dxtn: S3 Texture Compressed support') depends=("mesa-libgl=${pkgver}") - # vdpau driver is problematic, so remove it (FS#36004) install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ - rm -rf ${pkgdir}/usr/lib/vdpau/ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -104,7 +103,7 @@ package_nouveau-dri() { package_svga-dri() { pkgdesc="Gallium3D VMware guest GL driver" - depends=('libdrm' 'expat' 'llvm-amdgpu-lib-snapshot') + depends=('libdrm' 'expat' 'llvm-libs') install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -118,7 +117,7 @@ package_svga-dri() { package_mesa() { pkgdesc="an open-source implementation of the OpenGL specification" - depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'llvm-amdgpu-lib-snapshot') + depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs') optdepends=('opengl-man-pages: for the OpenGL API man pages') provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 046d092d9..f5997ff4c 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192058 2013-08-05 14:17:25Z andyrtr $ +# $Id: PKGBUILD 193705 2013-08-28 15:19:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.24.0 +pkgver=0.24.1 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('891000481f639e996d000d767d953a7f' +md5sums=('b11cc0408b4ad3809fa455d7b3d5ade9' '9dc64c254a31e570507bdd4ad4ba629a') prepare() { @@ -23,6 +23,7 @@ prepare() { sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac } + build() { cd ${pkgbase}-${pkgver} autoreconf -fi diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index c92af9f04..942959ad4 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184426 2013-05-06 19:39:25Z foutrelis $ +# $Id: PKGBUILD 193687 2013-08-28 00:06:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=5 +pkgrel=6 epoch=1 pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64') @@ -12,7 +12,8 @@ license=('GPL') depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' 'libxrandr' 'libmng') makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('libmariadbclient: MariaDB driver' +optdepends=('qtchooser: set the default Qt toolkit' + 'libmariadbclient: MariaDB driver' 'postgresql-libs: PostgreSQL driver' 'unixodbc: ODBC driver') options=('!libtool' '!docs') @@ -30,13 +31,8 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo -build() { - export QTDIR="${srcdir}"/qt-x11-free-${pkgver} - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - - cd "${srcdir}"/qt-x11-free-${pkgver} +prepare() { + cd qt-x11-free-${pkgver} # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do patch -p0 -i $i @@ -56,12 +52,20 @@ build() { sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix sed -i "s|read acceptance|acceptance=yes|" configure +} + +build() { + export QTDIR="${srcdir}"/qt-x11-free-${pkgver} + export PATH=${QTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ if [ "$CARCH" = "x86_64" ]; then export ARCH="-64" else unset ARCH fi + cd qt-x11-free-${pkgver} ./configure \ -prefix /usr \ -bindir /usr/lib/qt3/bin \ @@ -87,7 +91,7 @@ build() { } package() { - cd "${srcdir}"/qt-x11-free-${pkgver} + cd qt-x11-free-${pkgver} make INSTALL_ROOT="${pkgdir}" install sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations} diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 03c78f6df..fa69e4728 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 189290 2013-07-02 11:12:21Z andrea $ +# $Id: PKGBUILD 193688 2013-08-28 00:06:07Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' @@ -31,14 +31,17 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz" 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' - 'improve-cups-support.patch') + 'improve-cups-support.patch' + 'qtbug-31579.patch' 'qtbug-32534.patch') md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' '9727c406c240990870c905696a8c5bd1' '0e384663d3dd32abe35f5331c4147569' 'b859c5673e5098c39f72b2252947049e' - 'c439c7731c25387352d8453ca7574971') + 'c439c7731c25387352d8453ca7574971' + '6ed8d26a8e4a9bba1f6c08fb99cc8357' + 'bb0e0fa6ba953fa590d81ac612374e11') prepare() { cd ${_pkgfqn} @@ -46,6 +49,11 @@ prepare() { # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch + # (FS#36028) (QTBUG#31579) + patch -p1 -i "${srcdir}"/qtbug-31579.patch + # (FS#36394) (QTBUG#32534) + patch -p1 -i "${srcdir}"/qtbug-32534.patch + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,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}|g" mkspecs/common/gcc-base.conf diff --git a/extra/qt4/qtbug-31579.patch b/extra/qt4/qtbug-31579.patch new file mode 100644 index 000000000..b4e1e7387 --- /dev/null +++ b/extra/qt4/qtbug-31579.patch @@ -0,0 +1,146 @@ +From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001 +From: Gunnar Sletta <gunnar.sletta@digia.com> +Date: Thu, 4 Jul 2013 16:20:40 +1000 +Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect. + +This was broken by a previous fix which aimed to fix gaps in +polylines with tiny line segments. The result was that we +skipped updating the origin point when stroke() didn't produce +pixels which accidentally included the case of the line +being completely outside the deviceRect. I fixed this +by returning the value of clipLine in drawLine to the caller +so we could still update the origin for this case. + +Task-number: QTBUG-31579 +Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 +(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) +Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> +--- + src/gui/painting/qcosmeticstroker.cpp | 42 ++++++++++++++++++++------------ + src/gui/painting/qcosmeticstroker_p.h | 2 +- + 2 files changed, 27 insertions(+), 17 deletions(-) + +diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp +index 0061ecb..4413170 100644 +--- a/src/gui/painting/qcosmeticstroker.cpp ++++ b/src/gui/painting/qcosmeticstroker.cpp +@@ -133,10 +133,15 @@ struct NoDasher { + + }; + ++/* ++ * The return value is the result of the clipLine() call performed at the start ++ * of each of the two functions, aka "false" means completely outside the devices ++ * rect. ++ */ + template<DrawPixel drawPixel, class Dasher> +-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + template<DrawPixel drawPixel, class Dasher> +-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + + inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage) + { +@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + caps |= CapEnd; + + QCosmeticStroker::Point last = this->lastPixel; +- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); ++ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); + + /* fix for gaps in polylines with fastpen and aliased in a sequence + of points with small distances: if current point p2 has been dropped +- out, keep last non dropped point p. */ +- if (fastPenAliased) { +- if (last.x != lastPixel.x || last.y != lastPixel.y || +- points == begin + 2 || points == end - 2 ) { +- { +- p = p2; +- } ++ out, keep last non dropped point p. ++ ++ However, if the line was completely outside the devicerect, we ++ still need to update p to avoid drawing the line after this one from ++ a bad starting position. ++ */ ++ if (fastPenAliased && unclipped) { ++ if (last.x != lastPixel.x || last.y != lastPixel.y ++ || points == begin + 2 || points == end - 2) { ++ p = p2; + } + } else { + p = p2; +@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x2, int &y, int yinc) + the drawing shifts from horizontal to vertical or back. + */ + template<DrawPixel drawPixel, class Dasher> +-static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) ++static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) + { + if (stroker->clipLine(rx1, ry1, rx2, ry2)) +- return; ++ return false; + + static const int half = 31; + int x1 = toF26Dot6(rx1) + half; +@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, + } else { + // horizontal + if (!dx) +- return; ++ return true; + + QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight; + +@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, + } + } + stroker->lastPixel = last; ++ return true; + } + + + template<DrawPixel drawPixel, class Dasher> +-static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) ++static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) + { + if (stroker->clipLine(rx1, ry1, rx2, ry2)) +- return; ++ return false; + + int x1 = toF26Dot6(rx1); + int y1 = toF26Dot6(ry1); +@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx + } else { + // horizontal + if (!dx) +- return; ++ return true; + + int yinc = F16Dot16FixedDiv(dy, dx); + +@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx + drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6); + } + } ++ return true; + } + + QT_END_NAMESPACE +diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h +index 870738b..3216856 100644 +--- a/src/gui/painting/qcosmeticstroker_p.h ++++ b/src/gui/painting/qcosmeticstroker_p.h +@@ -56,7 +56,7 @@ QT_MODULE(Gui) + class QCosmeticStroker; + + +-typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + + class QCosmeticStroker + { +-- +1.7.1 + diff --git a/extra/qt4/qtbug-32534.patch b/extra/qt4/qtbug-32534.patch new file mode 100644 index 000000000..c49f18842 --- /dev/null +++ b/extra/qt4/qtbug-32534.patch @@ -0,0 +1,40 @@ +From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001 +From: Peter Hartmann <phartmann@blackberry.com> +Date: Thu, 25 Jul 2013 12:05:29 -0400 +Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method + +When readData() is called repeatedly, we need to keep track which +part of the multipart message we are currently reading from. +Hereby we also need to take the boundary size into account, and not +only the size of the multipart; otherwise we would skip a not +completely read part. This would then later lead to advancing the +read pointer by negative indexes and data loss. + +Task-number: QTBUG-32534 +Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 +Reviewed-by: Jonathan Liu <net147@gmail.com> +Reviewed-by: Shane Kearns <shane.kearns@accenture.com> +(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529) +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- + src/network/access/qhttpmultipart.cpp | 3 +- + tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++++ + 2 files changed, 46 insertions(+), 1 deletions(-) + +diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp +index 635129a..b25e917 100644 +--- a/src/network/access/qhttpmultipart.cpp ++++ b/src/network/access/qhttpmultipart.cpp +@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize) + + // skip the parts we have already read + while (index < multiPart->parts.count() && +- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) ++ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() ++ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart + index++; + + // read the data +-- +1.7.1 + diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 2e123b391..703664ac4 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189742 2013-07-06 18:49:32Z andrea $ +# $Id: PKGBUILD 193689 2013-08-28 00:06:10Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -20,10 +20,10 @@ pkgname=('qt5-base' 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.1.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL' 'FDL' 'custom') makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' @@ -35,13 +35,15 @@ options=('!libtool') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' - 'use-python2.patch') + 'use-python2.patch' + 'bison3.patch') md5sums=('44a507beebef73eb364b5a2ec7bbe090' 'b2897dd6a2967bccf8f10e397aafee55' '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' - '92831f79144d5cb8121915423ba47575') + '92831f79144d5cb8121915423ba47575' + '6b162cd2bc104f0ae83ca039401be7bf') prepare() { cd ${_pkgfqn} @@ -55,6 +57,10 @@ prepare() { sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') + + # Fix build with bison 3.x + cd qtwebkit + patch -p1 -i "${srcdir}"/bison3.patch } build() { diff --git a/extra/qt5/bison3.patch b/extra/qt5/bison3.patch new file mode 100644 index 000000000..4070c88e8 --- /dev/null +++ b/extra/qt5/bison3.patch @@ -0,0 +1,38 @@ +From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Fri, 16 Aug 2013 18:27:07 +0200 +Subject: [PATCH] ANGLE doesn't build with bison 3.0 + +https://bugs.webkit.org/show_bug.cgi?id=119798 + +Reviewed by Antti Koivisto. + +Make glslang.y compatible with bison 3.0 +by using %lex-param to set YYLEX_PARAM. + +* src/compiler/glslang.y: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +Task-number: QTBUG-32913 +Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3 +Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +--- + Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +index 3cad335..b41e95a 100644 +--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y ++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). + %expect 1 /* One shift reduce conflict because of if | else */ + %pure-parser + %parse-param {TParseContext* context} ++%lex-param {YYLEX_PARAM} + + %union { + struct { +-- +1.7.1 + diff --git a/extra/qt5/gcc48.patch b/extra/qt5/gcc48.patch deleted file mode 100644 index 03b205b68..000000000 --- a/extra/qt5/gcc48.patch +++ /dev/null @@ -1,63 +0,0 @@ -# Author: David E. Narváez <david.narvaez@computer.org> -# AuthorDate: 2013-02-23 23:14:50 -0500 -# Commit: David E. Narváez <david.narvaez@computer.org> -# CommitDate: 2013-02-23 23:14:50 -0500 -# -# Rename qAbs Function for timeval -# -# This decouples it from qAbs which is declared as a constexpr under -# certain compilation flags and enables for qtbase to be compiled with -# GCC 4.8 -# -# Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 -diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp -index 0eee425..7a29247 100644 ---- a/src/corelib/kernel/qtimerinfo_unix.cpp -+++ b/src/corelib/kernel/qtimerinfo_unix.cpp -@@ -87,22 +87,21 @@ - firstTimerInfo = 0; - } - - timeval QTimerInfoList::updateCurrentTime() - { - return (currentTime = qt_gettime()); - } - - #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) - --template <> --timeval qAbs(const timeval &t) -+timeval qAbsTimeval(const timeval &t) - { - timeval tmp = t; - if (tmp.tv_sec < 0) { - tmp.tv_sec = -tmp.tv_sec - 1; - tmp.tv_usec -= 1000000; - } - if (tmp.tv_sec == 0 && tmp.tv_usec < 0) { - tmp.tv_usec = -tmp.tv_usec; - } - return normalizedTimeval(tmp); -@@ -137,21 +136,21 @@ - *delta = elapsedTime - elapsedTimeTicks; - - previousTicks = currentTicks; - previousTime = currentTime; - - // If tick drift is more than 10% off compared to realtime, we assume that the clock has - // been set. Of course, we have to allow for the tick granularity as well. - timeval tickGranularity; - tickGranularity.tv_sec = 0; - tickGranularity.tv_usec = msPerTick * 1000; -- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); -+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); - } - - /* - repair broken timer - */ - void QTimerInfoList::timerRepair(const timeval &diff) - { - // repair all timers - for (int i = 0; i < size(); ++i) { - register QTimerInfo *t = at(i); diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index f08d82fc0..05ae4ae53 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190120 2013-07-15 21:53:45Z tomegun $ +# $Id: PKGBUILD 193712 2013-08-28 20:08:20Z lcarlier $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64') @@ -14,9 +14,11 @@ depends=('libffi' 'expat') makedepends=('doxygen') options=(!libtool) source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") +sha1sums=('2214b690cb5a4f9695d287f27730c4368e6ef829') build() { cd $pkgname-$pkgver + ./configure --prefix=/usr \ --disable-static make @@ -24,7 +26,7 @@ build() { package() { cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('48d375afb15f3e68a72cf7b4fd8f4a63') diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 672d34a2e..8d6809fee 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192482 2013-08-12 20:25:49Z eric $ +# $Id: PKGBUILD 193690 2013-08-28 00:06:11Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" |