diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-23 14:50:53 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-23 14:50:53 +0100 |
| commit | 674b648c65d37f018cecade7f66ab3162ed94a8e (patch) | |
| tree | ad4083997dcc3bf2cb623233a0326090748441bd /eclass | |
| parent | 34efeba333bb7b35b450c57f2045c933b84bd252 (diff) | |
gentoo auto-resync : 23:07:2022 - 14:50:52
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 36779 -> 36782 bytes | |||
| -rw-r--r-- | eclass/qt5-build.eclass | 13 |
2 files changed, 6 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 876b28ff00ea..646af105c81b 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 86082a07f4bc..c6cb5dd3682e 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -107,11 +107,15 @@ if [[ ${PN} != qtwebengine ]]; then *9999 ) inherit kde.org # kde/5.15 branch ;; - 5.15.[3-9]* | 5.15.??* ) + 5.15.[5-9]* | 5.15.??* ) # official stable release _QT5_P=${QT5_MODULE}-everywhere-opensource-src-${PV} HOMEPAGE="https://www.qt.io/" SRC_URI="https://download.qt.io/official_releases/qt/${PV%.*}/${PV}/submodules/${_QT5_P}.tar.xz" + if [[ ${QT5_MODULE} == qtbase ]]; then + _QT5_GENTOOPATCHSET_REV=1 + SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz" + fi # KDE Qt5PatchCollection on top of tag v${PV}-lts-lgpl if [[ -n ${QT5_KDEPATCHSET_REV} ]]; then HOMEPAGE+=" https://invent.kde.org/qt/qt/${QT5_MODULE} https://community.kde.org/Qt5PatchCollection" @@ -122,11 +126,6 @@ if [[ ${PN} != qtwebengine ]]; then esac fi -if [[ ${QT5_MODULE} == qtbase ]] && [[ ${PV} == 5.15.[5-9]* ]]; then - _QT5_GENTOOPATCHSET_REV=1 - SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-5.15-gentoo-patchset-${_QT5_GENTOOPATCHSET_REV}.tar.xz" -fi - # @ECLASS_VARIABLE: QT5_BUILD_DIR # @OUTPUT_VARIABLE # @DESCRIPTION: @@ -187,7 +186,7 @@ qt5-build_src_prepare() { -e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake - sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \ + sed -i -e "/outpath\/qmake\".*\"*\$MAKE\"*)/ s|)| \ ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \ -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \ |