From 8a5cb5830c975bc265c5ce1523f045ac08652138 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 6 Apr 2018 13:48:59 +0200 Subject: [PATCH 1/3] qtwebkit: Disable warning `expansion-to-defined` If desired, adjust the build settings to avoid literally thousands of unneeded warning messages: sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \ -i Tools/qmake/mkspecs/features/unix/default_pre.prf --- qtwebkit.be0 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qtwebkit.be0 b/qtwebkit.be0 index f0bc8ec7d..4d45e602e 100755 --- a/qtwebkit.be0 +++ b/qtwebkit.be0 @@ -17,9 +17,11 @@ SRCURL[0]="https://download.qt.io/community_releases/${PKGVERSION[2]}/${PKGVERSI # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +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_configure() { qmake ${S}/WebKit.pro From 3c70cc58f923e3378bba474955f6d4b6f8259b5f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 6 Apr 2018 14:31:57 +0200 Subject: [PATCH 2/3] 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}"' From 4b8b829469a467b938f049e2dfaa34cf01986133 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sun, 8 Apr 2018 13:13:42 +0200 Subject: [PATCH 3/3] qtwebkit: Disable libhyphen The library is not installed in MarIuX, so disable it. ``` CMake Error at /usr/share/cmake-3.8/Modules/FindPackageHandleStandardArgs.cmake:137 (message): Could NOT find Hyphen (missing: HYPHEN_INCLUDE_DIR HYPHEN_LIBRARIES) Call Stack (most recent call first): /usr/share/cmake-3.8/Modules/FindPackageHandleStandardArgs.cmake:377 (_FPHSA_FAILURE_MESSAGE) Source/cmake/FindHyphen.cmake:37 (find_package_handle_standard_args) Source/cmake/OptionsQt.cmake:790 (find_package) Source/cmake/WebKitCommon.cmake:50 (include) CMakeLists.txt:137 (include) ``` --- qtwebkit.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qtwebkit.be0 b/qtwebkit.be0 index 619014386..01bdd3480 100755 --- a/qtwebkit.be0 +++ b/qtwebkit.be0 @@ -24,7 +24,8 @@ SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodu mee_configure() { bee_configure \ -DPORT=Qt \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DUSE_LIBHYPHEN=no } #mee_build() {