From 746c8fffd3044fc5f9fb2a879e6d6a80ce69ad16 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 08:44:15 +0200 Subject: [PATCH 01/15] qt5: Raise version to 5.12.4 Version 5.13 is already available, but might cause initial troubles with accompanying tools/packages. --- qt5.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5.be0 b/qt5.be0 index 09a326cf5..1d5c72a42 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION qt5-5.10.1-2 +# BEE_VERSION qt5-5.12.4-0 SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz" From 8bf7ae370ce7d997db8701a44d49cc9cb1f75f3f Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 08:47:06 +0200 Subject: [PATCH 02/15] qt5: Cleanup 'preamble' part --- qt5.be0 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qt5.be0 b/qt5.be0 index 1d5c72a42..901ad0c31 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -6,10 +6,7 @@ SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/sing PREFIX=/usr/local/qt5 -# https://bugreports.qt.io/browse/QTBUG-37417 -build_in_sourcedir - -# BEE_MAKEFLAGS=-j1 +# build_in_sourcedir mee_configure() { start_cmd ${S}/configure \ From 72b305156d8364574969a1475985ce6afa46aaff Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 08:54:06 +0200 Subject: [PATCH 03/15] qt5: Note on how to build a slim toolkit This might be helpful if the unfortunate webkit history starts to repeat. --- qt5.be0 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qt5.be0 b/qt5.be0 index 901ad0c31..e47155d6f 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -8,6 +8,14 @@ PREFIX=/usr/local/qt5 # 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* +# } + mee_configure() { start_cmd ${S}/configure \ -prefix ${PREFIX} \ From 2e97ada7512d933d0261fb5340985efe2ef67d65 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 09:01:29 +0200 Subject: [PATCH 04/15] qt5: Do not build unused precomp. headers Since they aren't installed, there is no need to build them. (As a side effect the size of the build archive is halved :) --- qt5.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qt5.be0 b/qt5.be0 index e47155d6f..c6581ee2e 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -26,7 +26,9 @@ mee_configure() { -nomake examples \ -opensource \ -confirm-license \ - -no-strip + -no-strip \ + -no-pch + } mee_build() { From 875d6bb1e78088f4ceea81942b8f62e91fdfa87f Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 09:44:33 +0200 Subject: [PATCH 05/15] qtwebkit: Set new release and adjust URL The 'latest' part in the former download URL is way bogus, since it seems that the webkit version won't increase any more and only the timestamps relate to the current patchlevel. --- qtwebkit.be0 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/qtwebkit.be0 b/qtwebkit.be0 index 01bdd3480..a5c7ad52c 100755 --- a/qtwebkit.be0 +++ b/qtwebkit.be0 @@ -1,8 +1,9 @@ #!/usr/bin/env beesh -# BEE_VERSION qtwebkit-5.212-0 +# BEE_VERSION qtwebkit-5.212-1 -SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/latest/src/submodules/qtwebkit-everywhere-src-5.212.tar.xz" +# mind the timestamp! | here | +SRCURL[0]="https://download.qt.io/snapshots/ci/qtwebkit/5.212/1563413169/src/submodules/qtwebkit-everywhere-src-5.212.tar.xz" # PATCHURL+=() From 1588e091ee504f3b16eda5b29bdf91652295de22 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 09:47:29 +0200 Subject: [PATCH 06/15] qtwebkit: Quieten cmake warning about ld-gold Nerve ... --- qtwebkit.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/qtwebkit.be0 b/qtwebkit.be0 index a5c7ad52c..93b848c8f 100755 --- a/qtwebkit.be0 +++ b/qtwebkit.be0 @@ -26,6 +26,7 @@ mee_configure() { bee_configure \ -DPORT=Qt \ -DCMAKE_BUILD_TYPE=Release \ + -DUSE_LD_GOLD=no \ -DUSE_LIBHYPHEN=no } From 7a5899578ac52ef1db9a6c42851ae5d493421c7c Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 09:50:30 +0200 Subject: [PATCH 07/15] qtwebkit: Enable parallel build For some reason the bee magic doesn't work here, so call make by hand. --- qtwebkit.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qtwebkit.be0 b/qtwebkit.be0 index 93b848c8f..47000674d 100755 --- a/qtwebkit.be0 +++ b/qtwebkit.be0 @@ -30,9 +30,9 @@ mee_configure() { -DUSE_LIBHYPHEN=no } -#mee_build() { -# make ${BEE_MAKEFLAGS} -#} +mee_build() { + make ${BEE_MAKEFLAGS} +} #mee_install() { # make INSTALL_ROOT=${D} install From 4cd642de999e7e98d635181d385910c5d71b6c4e Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 10:04:35 +0200 Subject: [PATCH 08/15] qwt: git mv and version directive --- qwt-6.0.1-0.bee => qwt.be0 | 2 ++ 1 file changed, 2 insertions(+) rename qwt-6.0.1-0.bee => qwt.be0 (95%) diff --git a/qwt-6.0.1-0.bee b/qwt.be0 similarity index 95% rename from qwt-6.0.1-0.bee rename to qwt.be0 index b13077cee..c09c7c213 100755 --- a/qwt-6.0.1-0.bee +++ b/qwt.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION qwt-6.1.4-0 + SRCURL[0]="http://downloads.sourceforge.net/project/qwt/qwt/${PKGVERSION}/qwt-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From ccb3933396155197514f5cbff544c97e09eacf4b Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 10:08:27 +0200 Subject: [PATCH 09/15] qwt: Use https for download --- qwt.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qwt.be0 b/qwt.be0 index c09c7c213..d2ea29aca 100755 --- a/qwt.be0 +++ b/qwt.be0 @@ -2,7 +2,7 @@ # BEE_VERSION qwt-6.1.4-0 -SRCURL[0]="http://downloads.sourceforge.net/project/qwt/qwt/${PKGVERSION}/qwt-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://downloads.sourceforge.net/project/qwt/qwt/${PKGVERSION}/qwt-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From 1930f99f4d6d29faad5862b52999e2033a213809 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 10:29:13 +0200 Subject: [PATCH 10/15] qwt: Adjust exclusion of docs Note: QWT is nowadays an extension for QT5. The old libs 'libqwt' and 'libqwtmathml' will be removed since they are unused in the system. IMHO packages (if any) still using the former qwt should be fixed inplace. --- qwt.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qwt.be0 b/qwt.be0 index d2ea29aca..3e76df3f4 100755 --- a/qwt.be0 +++ b/qwt.be0 @@ -10,7 +10,7 @@ PATCHURL[0]="" # BEE_BUILDTYPE= -EXCLUDE=( $(pkg-config QtCore --variable=prefix)/doc ) +EXCLUDE=( $(pkg-config Qt5Core --variable=prefix)/doc ) build_in_sourcedir From 6678aca858a9711d59084ddbcc79484920ac4f39 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 10:34:09 +0200 Subject: [PATCH 11/15] qwt: Fix the qmake config in a less brutal manner --- qwt.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qwt.be0 b/qwt.be0 index 3e76df3f4..db14313ac 100755 --- a/qwt.be0 +++ b/qwt.be0 @@ -23,8 +23,7 @@ build_in_sourcedir #} mee_patch_post() { - sed -i ${S}/qwtconfig.pri \ - -e 's,QWT_INSTALL_PREFIX.*=.*$,QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX],' + sed -i ${S}/qwtconfig.pri -e '/^\s\s*QWT_INSTALL_PREFIX/ s,QWT,# QWT,' } mee_configure() { From 675353870db1162e29fb23cec7b205d7f2d4fb9e Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 10:36:20 +0200 Subject: [PATCH 12/15] qwt: Honor BEE_MAKEFLAGS in manual make --- qwt.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qwt.be0 b/qwt.be0 index db14313ac..0e0608e75 100755 --- a/qwt.be0 +++ b/qwt.be0 @@ -31,7 +31,7 @@ mee_configure() { } mee_build() { - make + make ${BEE_MAKEFLAGS} } mee_install() { From 84fa3d1f599f563566a64bacfc23d2ae7348ef28 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 12:32:21 +0200 Subject: [PATCH 13/15] QScintilla: Create a new bee file based on dflt templ. --- QScintilla.be0 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 QScintilla.be0 diff --git a/QScintilla.be0 b/QScintilla.be0 new file mode 100644 index 000000000..e7ec4cf0a --- /dev/null +++ b/QScintilla.be0 @@ -0,0 +1,78 @@ +#!/usr/bin/env beesh + +# BEE_VERSION QScintilla-2.11.2-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.) + +############################################################################### +## 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" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +sourcesubdir_append Qt4Qt5 + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +mee_configure() { + qmake +} + +mee_build() { + make ${BEE_MAKEFLAGS} +} + +mee_install() { + make install INSTALL_ROOT=${D} +} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 4428689b1d4bfd4313bfeec0f4744dc90a149859 Mon Sep 17 00:00:00 2001 From: thomas Date: Wed, 7 Aug 2019 13:32:44 +0200 Subject: [PATCH 14/15] qtlinks: Increase revision Resulting changes summarized: +/usr/local/bin/qdistancefieldgenerator -/usr/local/bin/qhelpconverter +/usr/local/bin/qmlpreview +/usr/local/lib/pkgconfig/Qt5PositioningQuick.pc +/usr/local/lib/pkgconfig/Qt5QuickTemplates2.pc +/usr/local/lib/pkgconfig/Qt5VirtualKeyboard.pc -/usr/local/lib/libqwt.so -/usr/local/lib/libqwtmathml.so +/usr/local/lib/libQt5PositioningQuick.so +/usr/local/lib/libQt5QuickShapes.so +/usr/local/lib/libQt5VirtualKeyboard.so +/usr/local/lib/libqscintilla2_qt5.so +/usr/local/lib/libqwt.so --- qtlinks.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtlinks.be0 b/qtlinks.be0 index 7e224d3c2..e801570c4 100755 --- a/qtlinks.be0 +++ b/qtlinks.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION qtlinks-1.0.1-0 +# BEE_VERSION qtlinks-1.0.1-1 mee_install() { From 2ce53540d24b9c3820306cf18782357b2a1dd8fa Mon Sep 17 00:00:00 2001 From: thomas Date: Mon, 12 Aug 2019 13:01:55 +0200 Subject: [PATCH 15/15] qtlinks: Add Qt4 compat. link for qmake It looks like distros start installing old Qt4 stuff with fours attached. This one works like charme with cmake. Another note on cmake: Since the *.cmake files from Qt5 can't be moved into the cmake context it is usually helpful to define CMAKE_PREFIX_PATH=/usr/local/qt5/lib/cmake --- qtlinks.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qtlinks.be0 b/qtlinks.be0 index e801570c4..533e9c71a 100755 --- a/qtlinks.be0 +++ b/qtlinks.be0 @@ -13,6 +13,8 @@ mee_install() { # qt4 + ln -s /usr/local/qt4/bin/qmake $D/usr/local/bin/qmake4 + for f in /usr/local/qt4/lib/pkgconfig/*.pc;do ln -s $f $D/usr/local/lib/pkgconfig/ done