From 3c70cc58f923e3378bba474955f6d4b6f8259b5f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 6 Apr 2018 14:31:57 +0200 Subject: [PATCH] qtwebkit: Update version from 5.9.0 to 5.212 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt WebKit 5.9.0 has problems with GCC 7.3.0, and [it’s recommended to use 5.212][1]. Update the build instructions according to the Wiki page [Building QtWebKit on Windows][2]. [1]: https://bugreports.qt.io/browse/QTBUG-61609?page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel&showAll=true [2]: https://github.com/annulen/webkit/wiki/Building-QtWebKit-on-Linux --- qtwebkit.be0 | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/qtwebkit.be0 b/qtwebkit.be0 index 4d45e602e..619014386 100755 --- a/qtwebkit.be0 +++ b/qtwebkit.be0 @@ -1,8 +1,8 @@ #!/usr/bin/env beesh -# BEE_VERSION qtwebkit-5.9.0-0 +# BEE_VERSION qtwebkit-5.212-0 -SRCURL[0]="https://download.qt.io/community_releases/${PKGVERSION[2]}/${PKGVERSION}-final/qtwebkit-opensource-src-${PKGVERSION}.tar.xz" +SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodules/qtwebkit-everywhere-src-5.212.tar.xz" # PATCHURL+=() @@ -17,21 +17,21 @@ SRCURL[0]="https://download.qt.io/community_releases/${PKGVERSION[2]}/${PKGVERSI # bee_extract "${@}" #} -mee_patch() { - bee_patch "${@}" - start_cmd sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \ - -i ${S}/Tools/qmake/mkspecs/features/unix/default_pre.prf -} +#mee_patch() { +# bee_patch "${@}" +#} mee_configure() { - qmake ${S}/WebKit.pro + bee_configure \ + -DPORT=Qt \ + -DCMAKE_BUILD_TYPE=Release } -mee_build() { - make ${BEE_MAKEFLAGS} -} +#mee_build() { +# make ${BEE_MAKEFLAGS} +#} -mee_install() { - make INSTALL_ROOT=${D} install -} +#mee_install() { +# make INSTALL_ROOT=${D} install +#} ## by default this may be 'make install DESTDIR="${D}"'