diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-08-08 09:02:16 -0300 |
| commit | dec82423b45179c362a4727cc3d63fb2349af369 (patch) | |
| tree | 552f0832ffe5dab6305382ea0c0e4a42da17063a /extra/libwebkit/PKGBUILD | |
| parent | a0f85906119bcb8e7269dee701076946b3ec45ea (diff) | |
| parent | ef815a5d80eecd4ba0679a376386741c374e0d1b (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dzen2/PKGBUILD
community/qtcurve-kde4/PKGBUILD
core/openldap/PKGBUILD
extra/geeqie/PKGBUILD
extra/kactivities/PKGBUILD
extra/kdebase-runtime/PKGBUILD
extra/kdebase-workspace/PKGBUILD
extra/kdebindings-korundum/PKGBUILD
extra/kdebindings-kross/PKGBUILD
extra/kdebindings-perlkde/PKGBUILD
extra/kdebindings-perlqt/PKGBUILD
extra/kdebindings-python/PKGBUILD
extra/kdebindings-qtruby/PKGBUILD
extra/kdebindings-qyoto/PKGBUILD
extra/kdebindings-smokegen/PKGBUILD
extra/kdebindings-smokekde/PKGBUILD
extra/kdebindings-smokeqt/PKGBUILD
extra/kdeedu-analitza/PKGBUILD
extra/kdegraphics-ksaneplugin/PKGBUILD
extra/kdegraphics-mobipocket/PKGBUILD
extra/kdegraphics-strigi-analyzer/PKGBUILD
extra/kdegraphics-svgpart/PKGBUILD
extra/kdegraphics-thumbnailers/PKGBUILD
extra/kdepim-runtime/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdepimlibs/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
extra/kdeutils-sweeper/PKGBUILD
extra/libkdcraw/PKGBUILD
extra/libkdeedu/PKGBUILD
extra/libkexiv2/PKGBUILD
extra/libkipi/PKGBUILD
extra/libksane/PKGBUILD
extra/moc/PKGBUILD
extra/strigi/PKGBUILD
extra/vice/PKGBUILD
Diffstat (limited to 'extra/libwebkit/PKGBUILD')
| -rw-r--r-- | extra/libwebkit/PKGBUILD | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/extra/libwebkit/PKGBUILD b/extra/libwebkit/PKGBUILD index aa7574bec..1f7359d44 100644 --- a/extra/libwebkit/PKGBUILD +++ b/extra/libwebkit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157142 2012-04-24 22:33:15Z ibiru $ +# $Id: PKGBUILD 164820 2012-08-06 19:57:10Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=libwebkit pkgname=(libwebkit libwebkit3) -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 pkgdesc="An opensource web content engine" arch=('i686' 'x86_64' 'mips64el') @@ -13,11 +13,16 @@ depends=('libxt' 'libxslt' 'sqlite' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchan 'geoclue') makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa') options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz) -sha256sums=('9a126a76b40ca61adb1f1626e1567f976740af2332948cc5189489dbd01e3b28') +source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz + bison26.diff) +sha256sums=('0cd69b7c4bf4af3442a5e6777a1487cabf14db15baeeed96d0865419f69b81e6' + '2a9c0c1b9d5259fd1254ebea228fc83313267fbe8cfec1bb43356de1f355b93e') build() { cd "$srcdir/webkit-$pkgver" + # https://bugs.webkit.org/show_bug.cgi?id=92264 / http://trac.webkit.org/changeset/124099 + patch -Np1 -i ${srcdir}/bison26.diff + mkdir build-gtk{2,3} if [ "$CARCH" = "mips64el" ]; then @@ -31,7 +36,7 @@ build() { # clear makeflags: race during introspection. # WebKit*.gir should be created before WebKit*.typelib, but isn't - MAKEFLAGS= + #MAKEFLAGS= ( cd build-gtk2 && _build --with-gtk=2.0 ) ( cd build-gtk3 && _build --with-gtk=3.0 ) @@ -43,7 +48,20 @@ _build() { --with-font-backend=freetype \ --with-unicode-backend=icu \ --enable-spellcheck "$@" - make all stamp-po + #make all stamp-po + + # crazy smp build fix by LFS - http://www.linuxfromscratch.org/blfs/view/svn/x/webkitgtk.html + # !!! safes a lot of time but may cover other bugs you won't notice anymore !!! + error_count=0 + until make all stamp-po #-j$(getconf _NPROCESSORS_ONLN) + do + if (( $((error_count++)) > 4 )) + then + echo Too Many Errors + break + fi + done + unset error_count } package_libwebkit() { |