From 8f6c12396a95695b00cd0ca7cfb879799ab00386 Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 8 Nov 2019 16:11:58 +0100 Subject: [PATCH 1/4] qt5: build updated release This fixes a subtle bug qt5-5.12.4 where window-close events aren't handled the default way. --- qt5.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5.be0 b/qt5.be0 index c6581ee2e..83e0988e6 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION qt5-5.12.4-0 +# BEE_VERSION qt5-5.12.5-0 SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz" From 99d7608604485a97a96d7e58a8a76056daa3cebb Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 8 Nov 2019 16:14:08 +0100 Subject: [PATCH 2/4] qt5: Build webengine with bundled libevent --- qt5.be0 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qt5.be0 b/qt5.be0 index 83e0988e6..d9f4ef814 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -16,6 +16,12 @@ PREFIX=/usr/local/qt5 # start_cmd rm -rf ${S}/qtweb* # } +# At the time of building the system libevent is a complete mess. But it also makes +# sense to keep this in future builds. +mee_configure_pre() { + start_cmd sed -e '/webengine-system-libevent/ s/=true\s*$/=false/' -i ${S}/qtwebengine/src/core/config/linux.pri +} + mee_configure() { start_cmd ${S}/configure \ -prefix ${PREFIX} \ From b3d7221ff5e2075a241faa492eb40053d8f6d409 Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 8 Nov 2019 16:17:21 +0100 Subject: [PATCH 3/4] qtlinks: rebuild against updated qt5 --- qtlinks.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtlinks.be0 b/qtlinks.be0 index 5bdcafc5f..c9563fb7d 100755 --- a/qtlinks.be0 +++ b/qtlinks.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION qtlinks-1.0.1-2 +# BEE_VERSION qtlinks-1.0.1-3 mee_install() { From 4dffdb18c7e3676d2133fd9ec4b57edb139ad754 Mon Sep 17 00:00:00 2001 From: thomas Date: Fri, 8 Nov 2019 16:27:52 +0100 Subject: [PATCH 4/4] xpdf: rebuild w/o window-close hack Some digging into the topic showed that the addition of hide(); event->ignore(); simply enforces the default behaviour for a window close event. This seems to be special at least for Qt version 5.12.4, since it is neither needed for older Qt versions like 5.9, 5.10 nor for 5.12.5 . Note: This is not related to libev/libevent issues. The fault was present before libev was updated --- xpdf.be0 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/xpdf.be0 b/xpdf.be0 index 80e553008..7a263459d 100755 --- a/xpdf.be0 +++ b/xpdf.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION xpdf-4.02-1 +# BEE_VERSION xpdf-4.02-2 # BEE_CONFIGURE=compat @@ -22,10 +22,6 @@ SRCURL[0]="https://xpdfreader-dl.s3.amazonaws.com/xpdf-${PKGVERSION}.tar.gz" # bee_patch "${@}" #} -mee_patch_post() { - sed -i -e '/\slastSize = size();/ a \ hide();\n event->ignore();' ${S}/xpdf-qt/XpdfViewer.cc -} - mee_configure() { bee_configure \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \