From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 654D7158074 for ; Sat, 05 Jul 2025 04:53:35 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 421343420F2 for ; Sat, 05 Jul 2025 04:53:35 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E9AE611055C; Sat, 05 Jul 2025 04:53:29 +0000 (UTC) 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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E1D8111055C for ; Sat, 05 Jul 2025 04:53:29 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93BE33420BF for ; Sat, 05 Jul 2025 04:53:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F236D2DE3 for ; Sat, 05 Jul 2025 04:53:27 +0000 (UTC) From: "Sam James" 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" Message-ID: <1751690967.4cc4e1d89d09f0f7510c13bc90cde39deeda1e27.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-libs/gtk/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-libs/gtk/gtk-4.18.6-r1.ebuild X-VCS-Directories: gui-libs/gtk/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4cc4e1d89d09f0f7510c13bc90cde39deeda1e27 X-VCS-Branch: master Date: Sat, 05 Jul 2025 04:53:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f779eba1-cb2e-4c56-80d2-3c49bafc9a79 X-Archives-Hash: db46f719bbdcd95285b60e1a68b0aa49 commit: 4cc4e1d89d09f0f7510c13bc90cde39deeda1e27 Author: Chris Mayo gmail com> AuthorDate: Tue Jul 1 18:47:47 2025 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 5 04:49:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc4e1d8 gui-libs/gtk: optionally build and install documentation Signed-off-by: Chris Mayo gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42304 Signed-off-by: Sam James gentoo.org> gui-libs/gtk/gtk-4.18.6-r1.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gui-libs/gtk/gtk-4.18.6-r1.ebuild b/gui-libs/gtk/gtk-4.18.6-r1.ebuild index a35e473428ef..d1ac9e0a2584 100644 --- a/gui-libs/gtk/gtk-4.18.6-r1.ebuild +++ b/gui-libs/gtk/gtk-4.18.6-r1.ebuild @@ -12,10 +12,11 @@ LICENSE="LGPL-2+" SLOT="4" REQUIRED_USE=" || ( aqua wayland X ) + gtk-doc? ( introspection ) test? ( introspection ) " KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="aqua broadway cloudproviders colord cups examples gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c" +IUSE="aqua broadway cloudproviders colord cups examples gstreamer gtk-doc +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c" # TODO: Optional gst build dep on >=gst-plugins-base-1.23.1, so depend on it once we can COMMON_DEPEND=" @@ -96,6 +97,7 @@ BDEPEND=" dev-util/glib-utils >=sys-devel/gettext-0.19.7 virtual/pkgconfig + gtk-doc? ( dev-util/gi-docgen ) vulkan? ( media-libs/shaderc ) wayland? ( dev-util/wayland-scanner @@ -175,7 +177,7 @@ src_configure() { $(meson_feature introspection) # Documentation - -Ddocumentation=false # we ship pregenerated API docs from tarball + $(meson_use gtk-doc documentation) -Dscreenshots=false -Dman-pages=true @@ -239,11 +241,10 @@ src_test() { src_install() { meson_src_install - # TODO: Seems that HTML docs are no longer in the tarball after - # upstream switched to CI-generated releases? bug #947514 - #insinto /usr/share/gtk-doc/html - # This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional - #doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}} + if use gtk-doc; then + mkdir -p "${ED}"/usr/share/gtk-doc/html/ || die + mv "${ED}"/usr/share/doc/{gtk4,gsk4,gdk4{,-wayland,-x11}} "${ED}"/usr/share/gtk-doc/html/ || die + fi } pkg_preinst() {