diff options
| author |   Eric Hameleers <alien@slackware.com> | 2019-10-19 19:32:13 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2019-10-19 19:32:13 +0000 |
| commit | a849adafa91a7f3bcd0df8582dc9b79fdab37cd2 (patch) | |
| tree | 947f4ae746337a22c01b256b0db3ae51961843dd /qt5-webkit/build/qt5-webkit.SlackBuild | |
| parent | 4faaa68c131819d052f6b82273aeada166934200 (diff) | |
| download | asb-a849adafa91a7f3bcd0df8582dc9b79fdab37cd2.tar.gz asb-a849adafa91a7f3bcd0df8582dc9b79fdab37cd2.tar.xz | |
qt5-webkit: updated to 5.212.0-alpha3
Diffstat (limited to 'qt5-webkit/build/qt5-webkit.SlackBuild')
| -rwxr-xr-x | qt5-webkit/build/qt5-webkit.SlackBuild | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/qt5-webkit/build/qt5-webkit.SlackBuild b/qt5-webkit/build/qt5-webkit.SlackBuild index 31e6608b..5bad3385 100755 --- a/qt5-webkit/build/qt5-webkit.SlackBuild +++ b/qt5-webkit/build/qt5-webkit.SlackBuild @@ -25,9 +25,9 @@ # Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1, 5.212 2016, 2017, 2018, 2019 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5-webkit -SRCVER=${SRCVER:-"5.212.0-alpha2"} +SRCVER=${SRCVER:-"5.212.0-alpha3"} VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-5} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} @@ -82,8 +82,8 @@ echo "Extracting qtwebkit-$SRCVER.tar.xz" tar xf $CWD/qtwebkit-$SRCVER.tar.xz || exit 1 cd qtwebkit-$SRCVER || exit 1 -# Prevent crashes when compiled with gcc7: -cat $CWD/patches/qt5-webkit.gcc7.patch | patch -p1 --verbose || exit 1 +# Fix compilation against icu4c 65.1: +cat $CWD/patches/qt5-webkit.icu65.patch | patch -p0 --verbose || exit 1 chown -R root:root . find . \ @@ -101,8 +101,8 @@ else fi export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS -fpermissive" -export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive" +export CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" +export OPENSOURCE_CXXFLAGS="$SLKCFLAGS -fpermissive -fno-strict-aliasing" export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5" export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" @@ -111,7 +111,7 @@ cd build cmake .. \ -DPORT=Qt \ -DQt5_DIR=$QTDIR \ - -DCMAKE_BUILD_TYPE=Release + || exit 1 make ${NUMJOBS} || make || exit 1 make install DESTDIR=$PKG || exit 1 cd .. @@ -124,16 +124,6 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; -# Fix pkgconfig files: -sed \ - -e 's|qt5/Qt5WebKit|qt5/QtWebKit|' \ - -e '/Name/a Description: Qt WebKit module' \ - -i $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc -sed \ - -e 's|qt5/Qt5WebKitWidgets|qt5/QtWebKitWidgets|' \ - -e '/Name/a Description: Qt WebKitWidgets module' \ - -i $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKitWidgets.pc - # Add a documentation directory: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ |