diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-22 23:20:29 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2020-11-22 23:42:07 +0100 |
| commit | 782f2fad3e4d17b00e76a6412a73f304b709c227 (patch) | |
| tree | 52ac6c023ef80fb1937cc30bcff15520a8f642c3 /app-office | |
| parent | games-strategy/wargus: Bump to 2.4.3 (diff) | |
| download | gentoo-782f2fad3e4d17b00e76a6412a73f304b709c227.tar.gz gentoo-782f2fad3e4d17b00e76a6412a73f304b709c227.tar.bz2 gentoo-782f2fad3e4d17b00e76a6412a73f304b709c227.zip | |
app-office/libreoffice: 6.4.7.2: Fix Qt5 moc path detect, drop QT_SELECT
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild index e632c848c589..15b973e2b41f 100644 --- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild @@ -267,6 +267,7 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" "${FILESDIR}/${PN}-6.1-nomancompress.patch" + "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch" # 6.4 branch (fixed in 6.4.8) "${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch" @@ -377,11 +378,7 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use kde; then - export QT_SELECT=5 # bug 639620 needs proper fix though - export QT5DIR="$(qt5_get_bindir)/../" - export MOC5="$(qt5_get_bindir)/moc" - fi + use kde && export QT5DIR="$(qt5_get_bindir)/.." local gentoo_buildid="Gentoo official package" if [[ -n ${LOCOREGIT_VERSION} ]]; then |