diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-15 10:59:36 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-15 10:59:36 +0100 |
| commit | 7545c059f8a1aadcf7dc1a15adb739ddbd8c61cc (patch) | |
| tree | ec53c4230cddd1602f9893574dd8a16c7c2d6747 /extra/qtwebkit | |
| parent | a81a0b6ad84173e4494421a1dfafa77415f479df (diff) | |
| parent | 3cc17982fa285effbc27ce867815e56bae56238d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gmp/PKGBUILD
extra/pidgin/PKGBUILD
extra/qtwebkit/PKGBUILD
Diffstat (limited to 'extra/qtwebkit')
| -rw-r--r-- | extra/qtwebkit/PKGBUILD | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index c7dcd715e..d41018102 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175761 2013-01-21 13:09:08Z andrea $ +# $Id: PKGBUILD 178044 2013-02-14 09:17:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.3.beta1 -_pkgver=2.3-beta1 +pkgver=2.3.beta2 +_pkgver=2.3-beta2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://trac.webkit.org/wiki/QtWebKit' @@ -18,7 +18,7 @@ source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/ 'use-python2.patch' 'qwebview.patch' 'LLIntCLoop32BigEndian.patch') -sha1sums=('e5a8ffe62fc57dbbea2110241077bebbcd605fd2' +sha1sums=('b1bfa9e3303ce9c95eec0a1e66b2b812b844bf08' 'f5880f11c139d7d8d01ecb8d874535f7d9553198' '315b6ff603f35e5492a036f7082f6aa075dfb607' 'fed0c1a90e3997b5575dbc83d6ea23bc46097a6f' @@ -41,11 +41,17 @@ build() { # Fix https://bugs.webkit.org/show_bug.cgi?id=103128, original patch with ChangeLog stripped. patch -p0 -i "${srcdir}/LLIntCLoop32BigEndian.patch" + OPTS="--no-webkit2" + if [ "${CARCH}" = "i686" ]; then + # FS#33418 + OPTS="${OPTS} --no-sse2" + fi + export QTDIR=/usr Tools/Scripts/build-webkit --qt \ --makeargs="${MAKEFLAGS}" \ --prefix=/usr \ - --no-webkit2 + ${OPTS} cd ../ |