From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3E2E5158089 for ; Tue, 5 Sep 2023 13:05:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B86602BC06F; Tue, 5 Sep 2023 13:05:53 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 445282BC06D for ; Tue, 5 Sep 2023 13:05:53 +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 248A3335CAF for ; Tue, 5 Sep 2023 13:05:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E1BC1143 for ; Tue, 5 Sep 2023 13:05:48 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1693918873.c2d1b889127af2b11559f0ac3c41313058a4969a.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/qt6-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c2d1b889127af2b11559f0ac3c41313058a4969a X-VCS-Branch: master Date: Tue, 5 Sep 2023 13:05:48 +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: 4f99503f-8edb-4a83-afe4-cc492d2bd949 X-Archives-Hash: 704337dfa628b3f5aed468f99cf67c79 commit: c2d1b889127af2b11559f0ac3c41313058a4969a Author: Ionen Wolkens gentoo org> AuthorDate: Mon Sep 4 00:45:10 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Sep 5 13:01:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d1b889 qt6-build.eclass: switch examples dir to /usr/lib*/qt6/examples This is used to install compiled test executables (not source examples or similar), meant to be executed from qtcreator (not that I've tried it). We do not install examples (yet), so no need to worry about files or qtbase remembering a bad path. Looking at other distros (at least those that do not set this to a docdir like we were and there are many), putting this under lib/*qt6/ alongside qt6/bin seems to be the typical choice. For actual source code examples, Qt has opted to not support installing these anymore (QTBUG-86302) so we'd have to doins -r ourselves either way, likely like normal docs unless something expects to find these in the Qt examples dir. Bug: https://bugs.gentoo.org/881433 Signed-off-by: Ionen Wolkens gentoo.org> eclass/qt6-build.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 0fa3091f8106..7978a25f8eac 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -283,7 +283,7 @@ _qt6-build_prepare_env() { readonly QT6_BINDIR=${QT6_ARCHDATADIR}/bin readonly QT6_DOCDIR=${QT6_PREFIX}/share/qt6-doc - readonly QT6_EXAMPLESDIR=${QT6_DATADIR}/examples + readonly QT6_EXAMPLESDIR=${QT6_ARCHDATADIR}/examples readonly QT6_HEADERDIR=${QT6_PREFIX}/include/qt6 readonly QT6_IMPORTDIR=${QT6_ARCHDATADIR}/imports readonly QT6_LIBEXECDIR=${QT6_ARCHDATADIR}/libexec