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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2BDCC158020 for ; Tue, 22 Nov 2022 15:03:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61C84E0C4A; Tue, 22 Nov 2022 15:03:23 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 48B33E0C4A for ; Tue, 22 Nov 2022 15:03:23 +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 207DF340836 for ; Tue, 22 Nov 2022 15:03:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 770293A5 for ; Tue, 22 Nov 2022 15:03:20 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1669129398.f85e159cd80a8d61e89a64cd4ec9e9abcbf88fcc.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/freecad-9999.ebuild media-gfx/freecad/metadata.xml X-VCS-Directories: media-gfx/freecad/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: f85e159cd80a8d61e89a64cd4ec9e9abcbf88fcc X-VCS-Branch: master Date: Tue, 22 Nov 2022 15:03:20 +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: 998ae4ad-80b2-47fd-a290-9ca7310f4d66 X-Archives-Hash: 0f466024d07ec595fff1bd67b3e547e6 commit: f85e159cd80a8d61e89a64cd4ec9e9abcbf88fcc Author: Bernd Waibel posteo net> AuthorDate: Tue Nov 1 09:08:08 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Nov 22 15:03:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f85e159c media-gfx/freecad: adapt for Qt6 related changes Upstream has introduced cmake changes for handling both Qt5 and Qt6. No code changes have been made so far, so we don't yet implement the qt6 USE flag. This patch reflects the upstream changes and prepares for implementing the qt6 USE flag, by renaming the "headless" USE flag to "gui" and passing the new cmake variable FREECAD_QT_VERSION. Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28069 Signed-off-by: Joonas Niilola gentoo.org> media-gfx/freecad/freecad-9999.ebuild | 10 ++++++---- media-gfx/freecad/metadata.xml | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 95e48c37bdac..7a29fc5538d5 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -26,7 +26,7 @@ fi # examples are licensed CC-BY-SA (without note of specific version) LICENSE="LGPL-2 CC-BY-SA-4.0" SLOT="0" -IUSE="debug designer headless test" +IUSE="debug designer +gui test" FREECAD_EXPERIMENTAL_MODULES="cloud pcl" FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material @@ -159,7 +159,7 @@ src_configure() { -DBUILD_FLAT_MESH=ON -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex !headless) + -DBUILD_GUI=$(usex gui) -DBUILD_IDF=$(usex idf) -DBUILD_IMAGE=$(usex image) -DBUILD_IMPORT=ON # import module for various file formats @@ -197,6 +197,8 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF + -DFREECAD_QT_VERSION="5" + -DFREECAD_USE_EXTERNAL_KDL=ON -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree @@ -235,7 +237,7 @@ src_configure() { # We use the FreeCADCmd binary instead of the FreeCAD binary here # for two reasons: -# 1. It works out of the box with USE=headless as well, not needing a guard +# 1. It works out of the box with USE=-gui as well, not needing a guard # 2. We don't need virtualx.eclass and it's dependencies # The exported environment variables are needed, so freecad does know # where to save it's temporary files, and where to look and write it's @@ -255,7 +257,7 @@ src_install() { dobin src/Tools/freecad-thumbnailer - if ! use headless; then + if use gui; then dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" fi diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index d55000ab3501..6e0770f45ea8 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -26,6 +26,13 @@ Build the FEM module and workbench which provides Finite Element Analysis (FEA) workflows + + Build FreeCAD with a Qt based GUI. If built without setting this + USE flag, FreeCAD can be used in a headless mode, for server-side + instances. + The Python modules are available, without their GUI parts though, + if this is unset. + Build FreeCAD without a GUI, usable for server-side instances. The Python modules are still available, without their GUI parts though.