diff options
| author |   Larry Hajali <larryhaja@gmail.com> | 2014-05-31 22:26:21 +0700 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2014-06-01 01:07:35 +0700 |
| commit | 89c4a26b3b1b2d82d6dfa3301d9eda675b0b4dc3 (patch) | |
| tree | 99df33dfd3574cb327fd28e4f15643ed329aea1e /libraries/qt5/qt5.SlackBuild | |
| parent | 032ca8d0f59f16e1d76e3727798427486091f102 (diff) | |
| download | slackbuilds-89c4a26b3b1b2d82d6dfa3301d9eda675b0b4dc3.tar.gz slackbuilds-89c4a26b3b1b2d82d6dfa3301d9eda675b0b4dc3.tar.xz | |
libraries/qt5: Updated for version 5.3.0.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/qt5/qt5.SlackBuild')
| -rw-r--r-- | libraries/qt5/qt5.SlackBuild | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libraries/qt5/qt5.SlackBuild b/libraries/qt5/qt5.SlackBuild index 14f7cc7f77..1449b0bf5d 100644 --- a/libraries/qt5/qt5.SlackBuild +++ b/libraries/qt5/qt5.SlackBuild @@ -46,7 +46,7 @@ # tailored to Qt 5. Modified by Larry Hajali. PRGNAM=qt5 -VERSION=${VERSION:-5.2.1} +VERSION=${VERSION:-5.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -105,6 +105,17 @@ patch -p1 < $CWD/patches/qt5.mysql.h.diff # https://bugs.webkit.org/show_bug.cgi?id=117077 patch -p1 < $CWD/patches/platformplugin-install-path-fix.patch +# Fix QTBUG-39047. https://bugreports.qt-project.org/browse/QTBUG-39047 +patch -p1 -d qtdeclarative < $CWD/patches/QTBUG-39047.patch + +# Limit -reduce-relocations to ix86 and x86_64. +# https://bugreports.qt-project.org/browse/QTBUG-36129 +if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then + RELOCATIONS="-reduce-relocations" +else + RELOCATIONS="" +fi + if echo "$ARCH" | grep -q "i.86" 2>/dev/null; then sed -i "/^QMAKE_CFLAGS_RELEASE/ s|+=.*|+= $SLKCFLAGS|" qtbase/mkspecs/common/gcc-base.conf fi @@ -129,19 +140,18 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -verbose \ -optimized-qmake \ -dbus-linked \ - -reduce-relocations \ -qpa xcb \ -xcb \ -glib \ -accessibility \ - -javascript-jit \ -system-harfbuzz \ -nomake examples \ -no-separate-debug-info \ -no-pch \ -no-rpath \ -no-strip \ - -release + -release \ + $RELOCATIONS make make install INSTALL_ROOT=$PKG @@ -208,6 +218,7 @@ sed -i \ -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \ -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \ -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \ + -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \ $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/lib/pkgconfig/Qt5WebKit.pc # While we are at it, there isn't any reason to keep references to $PKG in the *.prl files. |