commit: 7d57f10e7b8934b402ec3d43b8daae95e21e6999 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 4 19:38:40 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 4 19:40:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d57f10e
app-office/libreoffice-bin: always install GTK VCL In fbd7f2ebe12742578db020bc93a32e3ed78b31f7, when I fixed a typo, I made a problem far worse (as reported at https://forums.gentoo.org/viewtopic-t-1172908.html). The GNOME integration also contains the GTK(3) VCL, which means that deleting it (with USE=-gnome, which became far more common than USE=-java as before w/ the typo) leaves us with only the ugly fallback backend. Now, in looking into this, I realised that the KDE integration also installs a Qt 5 VCL, but let's continue to remove that for now at least given adding new Qt 5 at this point isn't desirable. Bug: https://bugs.gentoo.org/950393 Signed-off-by: Sam James <sam <AT> gentoo.org> .../libreoffice-bin-24.8.4-r1.ebuild | 21 ++++++++++----------- .../libreoffice-bin-25.2.0-r1.ebuild | 21 ++++++++++----------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild index 61903e5b025c..181eb17076b0 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-24.8.4-r1.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}" LICENSE="LGPL-3" SLOT="0" KEYWORDS="-* amd64" -IUSE="java gnome python" +IUSE="java python" RDEPEND=" acct-group/libreoffice @@ -62,11 +62,6 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender x11-libs/pango - gnome? ( - dev-libs/glib:2 - >=gnome-base/dconf-0.40.0 - gnome-extra/evolution-data-server - ) || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) " @@ -84,11 +79,15 @@ src_unpack() { # We don't package Firebird anymore rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-firebird*_amd64.deb || die - if ! use gnome ; then - rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-gnome-integration*_amd64.deb || die - fi - - # Requires KF5 as of 25.2.0, so we choose not to use it. + # The GNOME and KDE integration .debs are a mix of both: + # 1) VCLs (GUI backends), and + # 2) Actual DE integration (which needs KF5 and so on) + # + # For now, we always install the GTK one, and don't install the Qt + # one (as it's Qt5-based). + # + # KDE integration itself also requires KF5 as of 25.2.0, so we choose not to use it. + # Can revisit when it's KF6-based. rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-kde-integration*_amd64.deb || die # Bundled Python is used (3.10 as of 25.2.0), so no need for system dependency. diff --git a/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild b/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild index 9a415e0207c1..4386adf62c12 100644 --- a/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild +++ b/app-office/libreoffice-bin/libreoffice-bin-25.2.0-r1.ebuild @@ -20,7 +20,7 @@ S="${WORKDIR}" LICENSE="LGPL-3" SLOT="0" KEYWORDS="-* ~amd64" -IUSE="java gnome python" +IUSE="java python" RDEPEND=" acct-group/libreoffice @@ -62,11 +62,6 @@ RDEPEND=" x11-libs/libXrandr x11-libs/libXrender x11-libs/pango - gnome? ( - dev-libs/glib:2 - >=gnome-base/dconf-0.40.0 - gnome-extra/evolution-data-server - ) || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( virtual/jre:11 ) " @@ -84,11 +79,15 @@ src_unpack() { # We don't package Firebird anymore rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-firebird*_amd64.deb || die - if ! use gnome ; then - rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-gnome-integration*_amd64.deb || die - fi - - # Requires KF5 as of 25.2.0, so we choose not to use it. + # The GNOME and KDE integration .debs are a mix of both: + # 1) VCLs (GUI backends), and + # 2) Actual DE integration (which needs KF5 and so on) + # + # For now, we always install the GTK one, and don't install the Qt + # one (as it's Qt5-based). + # + # KDE integration itself also requires KF5 as of 25.2.0, so we choose not to use it. + # Can revisit when it's KF6-based. rm "${WORKDIR}"/${BINPKG_BASE}/DEBS/libobasis${PV%*.*}-kde-integration*_amd64.deb || die # Bundled Python is used (3.10 as of 25.2.0), so no need for system dependency.
