From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1720617-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id EABC51582EF
for <garchives@archives.gentoo.org>; Sat, 22 Feb 2025 22:26:36 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id D3CB534325C
for <garchives@archives.gentoo.org>; Sat, 22 Feb 2025 22:26:36 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 307E4110474;
Sat, 22 Feb 2025 22:26:28 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id 2B87D110474
for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 22:26:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D4CCB3430B8
for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 22:26:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 03E80272B
for <gentoo-commits@lists.gentoo.org>; Sat, 22 Feb 2025 22:26:25 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1740263092.9c7f26240f9eae60febdf11f58b8915f1bc9aa13.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-office/libreoffice/libreoffice-9999.ebuild
X-VCS-Directories: app-office/libreoffice/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 9c7f26240f9eae60febdf11f58b8915f1bc9aa13
X-VCS-Branch: master
Date: Sat, 22 Feb 2025 22:26:25 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 697b9a59-5e0e-4e97-aece-5c9714dc83f6
X-Archives-Hash: 7df82515b23b7ca4f7d280b2e0cfee74
commit: 9c7f26240f9eae60febdf11f58b8915f1bc9aa13
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 22:24:52 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 22:24:52 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c7f2624
app-office/libreoffice: USE="gtk3 gtk4" => USE="gtk"
We don't want to support older toolkits where unnecessary and the UX
isn't ideal for it anyway with how you express user preference (similar
to USE=gui vs USE=X etc).
Bug: https://bugs.gentoo.org/902031
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-office/libreoffice/libreoffice-9999.ebuild | 30 ++++++++++----------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 7ebc8b86b5ef..f2a1bdc64ac8 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -93,7 +93,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds
-googledrive gstreamer gtk3 gtk4 kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
+googledrive gstreamer gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan
$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -194,16 +194,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/gstreamer:1.0
media-libs/gst-plugins-base:1.0
)
- gtk3? (
- app-accessibility/at-spi2-core:2
- dev-libs/glib:2
- dev-libs/gobject-introspection
- gnome-base/dconf
- media-libs/mesa[egl(+)]
- x11-libs/gtk+:3[X]
- x11-libs/pango
- )
- gtk4? (
+ gtk? (
app-accessibility/at-spi2-core:2
dev-libs/glib:2
gnome-base/dconf
@@ -507,6 +498,7 @@ src_configure() {
--disable-epm
--disable-fetch-external
--disable-firebird-sdbc
+ --disable-gtk3
--disable-gtk3-kde5
# Coveered by our own toolchain defaults
--disable-hardening-flags
@@ -549,8 +541,7 @@ src_configure() {
$(use_enable debug)
$(use_enable eds evolution2)
$(use_enable gstreamer gstreamer-1-0)
- $(use_enable gtk3 gtk3)
- $(use_enable gtk4 gtk4)
+ $(use_enable gtk4 gtk)
$(use_enable kde kf6)
$(use_enable ldap)
$(use_enable odk)
@@ -567,7 +558,7 @@ src_configure() {
$(use_with valgrind)
)
- if use eds || use gtk3 || use gtk4; then
+ if use eds || use gtk ; then
myeconfargs+=( --enable-dconf --enable-gio )
else
myeconfargs+=( --disable-dconf --disable-gio )
@@ -619,11 +610,12 @@ src_test() {
src_install() {
emake DESTDIR="${D}" distro-pack-install -o build -o check
- # bug 593514
- if use gtk3; then
- dosym libreoffice/program/liblibreofficekitgtk.so \
- /usr/$(get_libdir)/liblibreofficekitgtk.so
- fi
+ # TODO: still relevant for gtk4?
+ # bug #593514
+ #if use gtk3; then
+ # dosym libreoffice/program/liblibreofficekitgtk.so \
+ # /usr/$(get_libdir)/liblibreofficekitgtk.so
+ #fi
# bash completion aliases
bashcomp_alias \