From 65e06dd673aa7cdb38d703162a146f9c417ddea7 Mon Sep 17 00:00:00 2001 From: thomas Date: Tue, 19 Jul 2022 13:49:36 +0200 Subject: [PATCH] qt5: build Qt5 from the KDE fork This saves some patches, since they are already included. Preparing the source tree is described here: https://wiki.qt.io/Building_Qt_5_from_Git The helper script is located at: /project/admin/tools/qt_source_preparation --- qt5.be0 | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/qt5.be0 b/qt5.be0 index d26de8eae..5ad7c0b8d 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -1,9 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION qt5-5.15.2-1 +# BEE_VERSION qt5-5.15.5_20220705_ea4efc06-0 -# SRCURL[0]="https://download.qt.io/archive/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz" -SRCURL[0]="https://beehive.molgen.mpg.de/e1447db4f06c841d8947f0a6ce83a7b5/qt-everywhere-src-5.15.2.tar.xz" +# origin: https://invent.kde.org/qt/qt/qt5.git - branch kde/5.15 +SRCURL[0]="https://beehive.molgen.mpg.de/1566026e325525d550c60fee32ecc2b8/qt-everywhere-src-5.15.5_20220705_ea4efc06.tar.lz" PREFIX=/usr/local/qt5 @@ -13,27 +13,11 @@ BMF=$(beegetopt --option j: -- ${BEE_MAKEFLAGS}) # export for build and install export NINJAJOBS=${BMF/ -- */} -# build_in_sourcedir - -############################################################################### -# NOTE: -# webengine is the new webkit (sigh). To obtain a 'lean and mean' qt toolkit, -# this is the way to dump all web related stuff. -# mee_extract_post() { -# 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_patch() { - bee_patch "${@}" - sed -e '/webengine-system-libevent/ s/=true\s*$/=false/' -i ${S}/qtwebengine/src/core/config/linux.pri -} - mee_configure() { MAKEFLAGS=${BEE_MAKEFLAGS} \ - start_cmd ${S}/configure \ + ${S}/configure \ + -confirm-license \ + -opensource \ -prefix ${PREFIX} \ -bindir ${BINDIR} \ -libdir ${LIBDIR} \ @@ -41,21 +25,20 @@ mee_configure() { -headerdir ${INCLUDEDIR} \ -sysconfdir ${SYSCONFDIR} \ -nomake examples \ - -opensource \ - -confirm-license \ + -nomake tests \ -no-strip \ -no-pch \ -verbose \ -xcb \ - -qpa xcb \ + -qpa "xcb;wayland" \ -opengl } mee_build() { - start_cmd make ${BEE_MAKEFLAGS} + make ${BEE_MAKEFLAGS} } mee_install() { - start_cmd make INSTALL_ROOT=${D} install + make INSTALL_ROOT=${D} install }