-
Notifications
You must be signed in to change notification settings - Fork 0
Update qt5 5.15.2 to 5.15.5 incl support #2716
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
65e06dd
qt5: build Qt5 from the KDE fork
thomas 752f10a
qwt: update to version 6.2.0
thomas 346a683
QScintilla: update to 2.13.3
thomas e1d89f0
QScintilla_designer_plugin: create from QScintilla.be0
thomas 8f0fc8d
QScintilla_designer_plugin: adjust name and source directory
thomas d83cd3d
qt4_compat: keep the few referenced Qt4 libs found in the system
thomas f35b4cc
qtlinks: almost dump Qt4, unify creation of config & plugin links
thomas File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
#!/usr/bin/env beesh | ||
|
||
# BEE_VERSION QScintilla_designer_plugin-2.13.3-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_src-${PKGVERSION}.tar.gz" | ||
SRCURL[0]="https://beehive.molgen.mpg.de/af0dab4ff9908e0d41934aff6ce2348d/QScintilla_src-2.13.3.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 designer | ||
|
||
############################################################################### | ||
## 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/ | ||
## |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#!/usr/bin/env beesh | ||
|
||
# BEE_VERSION qt4_compat-4.7.4-0 | ||
|
||
mee_install() { | ||
cd ${D} | ||
tar xvpf /src/mariux/beeroot/packages/qt4-4.7.4-0.x86_64.bee.tar.bz2 \ | ||
/usr/local/qt4/lib/libQtCore.so.4.7.4 \ | ||
/usr/local/qt4/lib/libQtCore.so.4.7 \ | ||
/usr/local/qt4/lib/libQtCore.so.4 \ | ||
/usr/local/qt4/lib/libQtGui.so.4.7.4 \ | ||
/usr/local/qt4/lib/libQtGui.so.4.7 \ | ||
/usr/local/qt4/lib/libQtGui.so.4 \ | ||
/usr/local/qt4/lib/libQtXml.so.4.7.4 \ | ||
/usr/local/qt4/lib/libQtXml.so.4.7 \ | ||
/usr/local/qt4/lib/libQtXml.so.4 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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,49 +13,32 @@ 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} \ | ||
-plugindir ${LIBDIR}/plugins \ | ||
-headerdir ${INCLUDEDIR} \ | ||
-sysconfdir ${SYSCONFDIR} \ | ||
-nomake examples \ | ||
-opensource \ | ||
-confirm-license \ | ||
-nomake tests \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Do they fail to be disabled, or were they never used/run in the first place? |
||
-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 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I’d keep the start_cmd to be in line with
bee_configure()
and friends.