Update qt5 5.15.2 to 5.15.5 incl support #2716
Merged
Conversation
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 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
Also account for the changed location of the plugins directory, which is under lib.
Rationale: building the plugin requires QScintilla to be installed.
QT4 is supposed to be history. Well, very old packages might need help from .compatlibs, but that is how the cookie crumbles :) The only dependencies in the system belong to /usr/lib/liblastfm.so.1 and /usr/lib/libpoppler-qt4.so.4.0.0. Better make this a task on its own to check if they are needed.
Note, bee throws a warning ...
WARNING: system and image files named '/usr/local/lib/plugins' differ
image : directory
system: symbolic link to /usr/local/qt5/lib/plugins
What is correct, so instead of update it is:
#> bee remove qtlinks-1.0.1-5.x86_64
#> bee install qtlinks-1.0.2
pmenzel
reviewed
Jul 21, 2022
| mee_configure() { | ||
| MAKEFLAGS=${BEE_MAKEFLAGS} \ | ||
| start_cmd ${S}/configure \ | ||
| ${S}/configure \ |
There was a problem hiding this comment.
I’d keep the start_cmd to be in line with bee_configure() and friends.
| -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.
Do they fail to be disabled, or were they never used/run in the first place?
|
As for the comment on start_cmd -- I hardly see any point inhere (better continue it here: mariux64/bee#54) 'nomake tests' -- why build something that isn't used? |
|
I will merge the updated Qt on Monday, accounting for the small risk that the Qt4 removal may yield trouble. |
Merged
Sign in
to join this conversation on GitHub.
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.
Most notably:
Test/install HowTo: