commit: 1aed7f583f69549248ac6fb8f5a87aa765908dfe Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu May 30 18:05:06 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu May 30 18:09:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aed7f58
app-office/libreoffice: Unmask 24.2.3.2 without IUSE=qt6,qt5 Fixes build with poppler-24.05.0. libreoffice-24.2.3.2 -> libreoffice-24.2.3.2-r10 Closes: https://bugs.gentoo.org/933199 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...2.3.2.ebuild => libreoffice-24.2.3.2-r1.ebuild} | 48 +++++++--------------- ....3.2.ebuild => libreoffice-24.2.3.2-r10.ebuild} | 0 profiles/package.mask | 3 +- 3 files changed, 15 insertions(+), 36 deletions(-) diff --git a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild b/app-office/libreoffice/libreoffice-24.2.3.2-r1.ebuild similarity index 96% copy from app-office/libreoffice/libreoffice-24.2.3.2.ebuild copy to app-office/libreoffice/libreoffice-24.2.3.2-r1.ebuild index b97b9926a7b0..d49c614f096b 100644 --- a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.3.2-r1.ebuild @@ -92,13 +92,12 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} base? ( java ) bluetooth? ( dbus ) - kde? ( || ( qt5 qt6 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -210,20 +209,15 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/pango ) kde? ( - qt5? ( - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - qt6? ( - kde-frameworks/kconfig:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/ki18n:6 - kde-frameworks/kio:6 - kde-frameworks/kwindowsystem:6 - ) + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) @@ -232,13 +226,6 @@ COMMON_DEPEND="${PYTHON_DEPS} !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - ) - qt6? ( dev-qt/qtbase:6[gui,widgets] ) " # FIXME: cppunit should be moved to test conditional # after everything upstream is under gbuild @@ -482,12 +469,7 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt5; then - export QT5DIR="$(qt5_get_bindir)/.." - fi - if use qt6; then - export QT6DIR="$(qt6_get_bindir)/.." - fi + use kde && export QT5DIR="$(qt5_get_bindir)/.." local gentoo_buildid="Gentoo official package" if [[ -n ${LOCOREGIT_VERSION} ]]; then @@ -528,6 +510,7 @@ src_configure() { --disable-online-update --disable-openssl --disable-pdfium + --disable-qt6 --with-extra-buildid="${gentoo_buildid}" --enable-extension-integration --with-external-dict-dir="${EPREFIX}/usr/share/myspell" @@ -562,12 +545,12 @@ src_configure() { $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) + $(use_enable kde kf5) + $(use_enable kde qt5) $(use_enable ldap) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt5) - $(use_enable qt6) $(use_enable vulkan skia) $(use_with accessibility lxml) $(use_with coinmp system-coinmp) @@ -578,9 +561,6 @@ src_configure() { $(use_with valgrind) ) - use qt5 && myeconfargs+=( $(use_enable kde kf5) ) - use qt6 && myeconfargs+=( $(use_enable kde kf6) ) - if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else diff --git a/app-office/libreoffice/libreoffice-24.2.3.2.ebuild b/app-office/libreoffice/libreoffice-24.2.3.2-r10.ebuild similarity index 100% rename from app-office/libreoffice/libreoffice-24.2.3.2.ebuild rename to app-office/libreoffice/libreoffice-24.2.3.2-r10.ebuild diff --git a/profiles/package.mask b/profiles/package.mask index b1256dc7ca2b..cdc64cd6b9b6 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -780,8 +780,7 @@ sec-keys/openpgp-keys-jiatan ~sys-auth/polkit-qt-0.200.0 ~x11-misc/sddm-0.21.0_p20240302 ~app-office/libreoffice-24.2.4.1 -~app-office/libreoffice-24.2.3.2 -~app-office/libreoffice-l10n-24.2.3.2 +=app-office/libreoffice-24.2.3.2-r10 # Ulrich Müller <[email protected]> (2024-02-08) # Masked for testing.
