From b147e7331fd710111c1310dadbd4735444b0f007 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 2 Dec 2020 15:17:40 +0100 Subject: [PATCH 1/4] qt5: Raise version to 5.15.2, use beehive Moved plugins from PREFIX to LIBDIR, otherwise formerly built Qt5 applications fail to find 'platforms/libqxcb.so'. Make building of xcb, opengl bindings mandatory, otherwise Qt would silently build w/o supporting them (...). --- qt5.be0 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/qt5.be0 b/qt5.be0 index 82d768393..273117892 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -1,8 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION qt5-5.12.7-0 +# BEE_VERSION qt5-5.15.2-0 -SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz" +# 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" PREFIX=/usr/local/qt5 @@ -23,17 +24,23 @@ mee_configure_pre() { } mee_configure() { + start_cmd ${S}/configure \ -prefix ${PREFIX} \ -bindir ${BINDIR} \ -libdir ${LIBDIR} \ + -plugindir ${LIBDIR}/plugins \ -headerdir ${INCLUDEDIR} \ -sysconfdir ${SYSCONFDIR} \ -nomake examples \ -opensource \ -confirm-license \ -no-strip \ - -no-pch + -no-pch \ + -verbose \ + -xcb \ + -qpa xcb \ + -opengl } From 3aa05afceebc7d3fb78c24c21374929e4fe47400 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 2 Dec 2020 15:37:44 +0100 Subject: [PATCH 2/4] qwt: Raise version to 6.1.5 --- qwt.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qwt.be0 b/qwt.be0 index 6450567ab..9e30a0cc4 100755 --- a/qwt.be0 +++ b/qwt.be0 @@ -1,10 +1,10 @@ #!/usr/bin/env beesh -# BEE_VERSION qwt-6.1.4-1 +# BEE_VERSION qwt-6.1.5-0 #SRCURL[0]="https://downloads.sourceforge.net/project/qwt/qwt/${PKGVERSION}/qwt-${PKGVERSION}.tar.bz2" -SRCURL[0]="https://beehive.molgen.mpg.de/4fb1852f694420e3ab9c583526edecc5/qwt-6.1.4.tar.bz2" +SRCURL[0]="https://beehive.molgen.mpg.de/d65582f99312796ed42c3be3208ed3db/qwt-6.1.5.tar.bz2" # PATCHURL[0]="" From d45ac6412caa18abaac40872a77a6f75892ef607 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 2 Dec 2020 15:38:53 +0100 Subject: [PATCH 3/4] QScintilla: Raise version to 2.11.6, use beehive --- QScintilla.be0 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) mode change 100644 => 100755 QScintilla.be0 diff --git a/QScintilla.be0 b/QScintilla.be0 old mode 100644 new mode 100755 index e7ec4cf0a..6b83247a4 --- a/QScintilla.be0 +++ b/QScintilla.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION QScintilla-2.11.2-0 +# BEE_VERSION QScintilla-2.11.6-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -9,7 +9,8 @@ ## The source URL(s) define the location of the sources that will be ## downloaded. Version variables may be used to simplify reuse of this bee-file. -SRCURL[0]="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION}/QScintilla_gpl-${PKGVERSION}.tar.gz" +#SRCURL[0]="https://www.riverbankcomputing.com/static/Downloads/QScintilla/${PKGVERSION}/QScintilla_gpl-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/343cd0c2c8b425518df2e51eb994fbc6/QScintilla-2.11.6.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 2ab4f2303a77e0c5f51050ceba9da345351a8712 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 2 Dec 2020 15:40:15 +0100 Subject: [PATCH 4/4] qtlinks: Rebuild and symlink for Qt5-plugins --- qtlinks.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qtlinks.be0 b/qtlinks.be0 index 8af3f631b..d1392cc9a 100755 --- a/qtlinks.be0 +++ b/qtlinks.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION qtlinks-1.0.1-4 +# BEE_VERSION qtlinks-1.0.1-5 mee_install() { mkdir -p $D/usr/local/bin @@ -30,6 +30,8 @@ mee_install() { ln -s $f $D/usr/local/lib/ done + ln -s /usr/local/qt5/lib/plugins $D/usr/local/lib/ + for f in /usr/local/qt5/lib/pkgconfig/*.pc;do ln -s $f $D/usr/local/lib/pkgconfig/ done