diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-04 20:06:56 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-04 20:06:56 +0100 |
| commit | a88635c60af2b1f3bc2bf3be9d8004a1fb28408d (patch) | |
| tree | 4dc5680ea810d863e4381357bf0f7ef88e357ac2 | |
| parent | 0faf579c24046ce4256b76c0cedf751c3ef024a2 (diff) | |
Possibly fix qt build.
| -rw-r--r-- | extra/qt/PKGBUILD | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index d3faa457d..67a9d1fed 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -16,11 +16,9 @@ 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' @@ -29,12 +27,12 @@ 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 + # Qt's JavaScriptCore is too old or too stripped to support MIPS, so + # use QtWebKit's one. + export WEBDIRDIR="$(pwd)/src/3rdparty/webkit/Source" # Now fix its MIPS N32 support. - sed -i 's/defined(_ABIO32)/defined(_ABIO32) || defined(_ABIN32)/' \ - src/3rdparty/JavaScriptCore/wtf/Platform.h + sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ + src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} @@ -42,9 +40,9 @@ build() { if [ "${CARCH}" = "mips64el" ] ; then export CXXFLAGS="${CXXFLAGS} -fpermissive" # Raster renders incorrectly. - default_graphicssystem=native + graphicssystem="" else - default_graphicssystem=raster + graphicssystem="-graphicssystem raster" fi sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf @@ -66,7 +64,7 @@ build() { -no-phonon \ -no-phonon-backend \ -no-webkit \ - -graphicssystem $default_graphicssystem \ + $graphicssystem \ -openssl-linked \ -nomake demos \ -nomake examples \ |