Merge pull request #1466 from mariux64/bugfix-update-qt5-to-5.12.5

Bugfix update qt5 to 5.12.5
mariux64 · Nov 19, 2019 · 0242706 · 0242706
2 parents 16a86d7 + 4dffdb1
commit 0242706
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git 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"
 
@@ -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} \

diff --git 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() {
 

diff --git 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 \