Untested fixes for QtWebKit's bus error.

2 files changed, 22 insertions, 3 deletions

diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD
index b2fd9eac9..d3faa457d 100644
--- a/extra/qt/PKGBUILD
+++ b/extra/qt/PKGBUILD
@@ -5,7 +5,7 @@
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.8.0
-pkgrel=2
+pkgrel=2.1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -16,9 +16,11 @@ makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'db
 options=('!libtool')
 _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
 source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
+        "http://mirrors.kernel.org/archlinux/other/qtwebkit/QtWebKit-2.2.1.tar.gz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop'
         'qtconfig.desktop')
 md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
+         '1a77037379369ba151bb8a2d6bc6122a'
          'fc211414130ab2764132e7370f8e5caa'
          '85179f5e0437514f8639957e1d8baf62'
          'f11852b97583610f3dbb669ebc3e21bc'
@@ -27,10 +29,23 @@ md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
 build() {
   cd "${srcdir}"/${_pkgfqn}
 
+  # Qt's JavaScriptCore is too old or too stripped to support MIPS.
+  rm -rf src/3rdparty/JavaScriptCore
+  cp -R ../QtWebKit-2.2.1/Source/JavaScriptCore src/3rdparty
+  # Now fix its MIPS N32 support.
+  sed -i 's/defined(_ABIO32)/defined(_ABIO32) || defined(_ABIN32)/' \
+      src/3rdparty/JavaScriptCore/wtf/Platform.h
+
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-  [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive"
+  if [ "${CARCH}" = "mips64el" ] ; then
+      export CXXFLAGS="${CXXFLAGS} -fpermissive"
+      # Raster renders incorrectly.
+      default_graphicssystem=native
+  else
+      default_graphicssystem=raster
+  fi
 
   sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
   sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
@@ -51,7 +66,7 @@ build() {
     -no-phonon \
     -no-phonon-backend \
     -no-webkit \
-    -graphicssystem raster \
+    -graphicssystem $default_graphicssystem \
     -openssl-linked \
     -nomake demos \
     -nomake examples \
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index d9a10d3f3..a53298973 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -22,6 +22,10 @@ sha1sums=('283fc116882157df0474af496be73bb9b34cb001'
 build() {
   cd "${srcdir}"/QtWebKit-${pkgver}
 
+  # Fix MIPS N32 support.
+  sed -i 's/defined(_ABIO32)/defined(_ABIO32) || defined(_ABIN32)/' \
+      Source/JavaScriptCore/wtf/Platform.h
+
   patch -p1 -i "${srcdir}"/python2-path.patch
 
   cd Tools/Scripts