Browse Packages - Diff freecad-1.0.2-r2 with a freecad-9999

Diff freecad-1.0.2-r2 with a freecad-9999

     # The added asserts break on mem leaks, so tests fail.
     # PYTHON_REQ_USE="-debug"
     inherit check-reqs cmake cuda edo flag-o-matic optfeature python-single-r1 qt-utils toolchain-funcs xdg virtualx
     # pyNastran missing
     inherit branding check-reqs cmake cuda edo flag-o-matic optfeature python-single-r1 toolchain-funcs xdg virtualx
     DESCRIPTION="Qt based Computer Aided Design application"
     HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
-...
     if [[ ${PV} == *9999* ]]; then
     	inherit git-r3
     	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
     	EGIT_SUBMODULES=( 'src/Mod/AddonManager' )
     	S="${WORKDIR}/freecad-${PV}"
     	EGIT_SUBMODULES=( '-*' )
     else
     	SRC_URI="
     		https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
     		https://github.com/FreeCAD/FreeCAD/commit/d91b3e051789623f0bc1eff65947c361e7a661d0.patch -> ${PN}-20710.patch
     		https://github.com/FreeCAD/FreeCAD/commit/9ea0f32692e13eee85b1e74bd42514942d357906.patch -> ${PN}-21433.patch
     		https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/freecad_source_${PV}.tar.gz
+    	"
     	KEYWORDS="amd64"
     	S="${WORKDIR}/FreeCAD-${PV}"
     	KEYWORDS="~amd64"
     fi
     # code is licensed LGPL-2
     # examples are licensed CC-BY-SA (without note of specific version)
     LICENSE="LGPL-2 CC-BY-SA-4.0"
     SLOT="0"
     IUSE="debug designer +gui netgen pcl +smesh spacenav test X"
     IUSE="debug designer +gui netgen pcl +smesh spacenav tbb test X"
     # Modules are found in src/Mod/ and their options defined in:
     # cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
     # To get their dependencies:
     # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
     IUSE+=" addonmgr assembly +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw"
     IUSE+=" addonmgr assembly +bim cam fem idf inspection +mesh openscad points reverse robot surface +techdraw"
     REQUIRED_USE="
     	${PYTHON_REQUIRED_USE}
     	bim? ( mesh )
     	cam? ( mesh )
     	gui? ( bim )
     	designer? ( gui )
     	fem? ( smesh )
     	inspection? ( points )
-...
     	reverse? ( mesh points )
     	test? ( techdraw )
+    "
     # Draft Workbench needs BIM
     RESTRICT="!test? ( test )"
-...
     # if vtk[cuda], we use cuda
     RDEPEND="
     	${PYTHON_DEPS}
     	dev-cpp/tbb:=
     	dev-cpp/yaml-cpp:=
     	dev-libs/boost:=
     	dev-libs/libfmt:=
     	dev-libs/xerces-c:=[icu]
     	dev-qt/qtbase:6[concurrent,network,xml]
     	media-libs/freetype
     	sci-libs/opencascade:=[json]
     	sci-libs/opencascade:=[json,tbb?]
     	tbb? (
     		dev-cpp/tbb:=
+    	)
     	virtual/zlib:=
     	$(python_gen_cond_dep '
     		dev-python/lark[${PYTHON_USEDEP}]
     		dev-python/numpy[${PYTHON_USEDEP}]
     		dev-python/pybind11[${PYTHON_USEDEP}]
     		>=dev-python/pybind11-3.0.1[${PYTHON_USEDEP}]
     		dev-python/pycxx[${PYTHON_USEDEP}]
     		dev-python/pyyaml[${PYTHON_USEDEP}]
     	')
     	assembly? ( sci-libs/ondselsolver )
     	cloud? (
     		dev-libs/openssl:=
     		net-misc/curl
+    	)
     	assembly? ( >=sci-libs/ondselsolver-1.0.1_p20260211 )
     	fem? (
     		sci-libs/vtk:=
     		$(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]')
-...
     		$(python_gen_cond_dep '
     			dev-python/matplotlib[${PYTHON_USEDEP}]
     			>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
     			>=dev-python/pyside-6.10.1-r5:6=[uitools(-),gui,svg,${PYTHON_USEDEP}]
     			dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}]
     		' )
     		virtual/opengl
     		spacenav? ( dev-libs/libspnav[X?] )
+    	)
     	netgen? ( media-gfx/netgen[opencascade] )
     	netgen? ( <media-gfx/netgen-6.2.2605[opencascade] )
     	openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') )
     	pcl? ( sci-libs/pcl:= )
     	smesh? (
-...
     		sci-libs/vtk:=
+    	)
+    "
     # TODO why?
     RDEPEND+="
     	dev-libs/icu:=
+    "
     DEPEND="${RDEPEND}
     	<dev-cpp/eigen-5:=
     	dev-cpp/eigen:=
     	dev-cpp/ms-gsl
     	test? (
     		$(python_gen_impl_dep '-debug')
     		$(python_gen_cond_dep '
     			sci-libs/vtk[python,${PYTHON_SINGLE_USEDEP}]
     		' )
     		fem? (
     			sci-libs/calculix-ccx
     			$(python_gen_cond_dep '
     				sci-libs/gmsh[${PYTHON_USEDEP}]
     			' )
+    		)
     		gui? (
     			$(python_gen_cond_dep '
     				dev-python/pyside:6[tools(-),${PYTHON_USEDEP}]
-...
+    "
     PATCHES=(
     	"${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch
     	"${FILESDIR}"/${PN}-1.0.1-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
     	"${FILESDIR}/${PN}-1.0.2-pybind11-latent-slots-macro-conflicts-with-Qt.patch" # fixed in pybind-3.0.1
     	"${DISTDIR}/${PN}-20710.patch" # DESTDIR in env
     	"${DISTDIR}/${PN}-21433.patch" # FindHDF5 fails to find HDF5 after a failing pkg_search_module
     	"${FILESDIR}"/${P}-boost-1.89.patch # bug 969041
     	"${FILESDIR}/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch"
     	"${FILESDIR}/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch"
     	"${FILESDIR}/${PN}-1.1.0-boost_system.patch"
     	"${FILESDIR}/${PN}-1.1.3-gcc-17-fstream.patch"
     	"${FILESDIR}/${PN}-1.1.3-skip-unicode-test.patch"
+    )
     DOCS=( CODE_OF_CONDUCT.md README.md )
-...
     	python-single-r1_pkg_setup
+    }
     src_unpack() {
     	if [[ ${PV} == *9999* ]]; then
     		# only fetch/unpack if used
     		if use addonmgr; then
     			EGIT_SUBMODULES+=( 'src/Mod/AddonManager' )
     		fi
     		git-r3_src_unpack
     	else
     		# release archive does not contain a top-level directory...
     		mkdir -p "${S}" || die
     		cd "${S}" || die
     		unpack ${A}
     	fi
+    }
     src_prepare() {
     	# deprecated in python-3.11 removed in python-3.13
     	sed -e '/import imghdr/d' -i src/Mod/CAM/CAMTests/TestCAMSanity.py || die
     	sed \
     		-e '/include( ccache )/s/^/# /g' \
     		-e '/include( ClangFormat )/s/^/# /g' \
     		-i src/3rdParty/libE57Format/CMakeLists.txt || die
     	# The PCL point_traits.h header was renamed (and deprecated) since 1.11.0 and removed in 1.15.0.
     	# d9e731ca94abc14808ebeed208617116f6d5ea4a
     	sed -e 's#pcl/point_traits.h#pcl/type_traits.h#g' -i src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp || die
     	# TODO
     	sed -e '/TestExternalFacePreselection/d' -i src/Mod/Sketcher/TestSketcherGui.py || die
     	# removed bundled pycxx
     	if [[ ${PV} != *9999* ]]; then
     		rm -r src/CXX || die "remove bundled pycxx"
     		rm -r src/3rdParty/PyCXX || die "remove bundled pycxx"
     	fi
     	cmake_src_prepare
-...
     	fi
     	local mycmakeargs=(
     		-DFREECAD_USE_CCACHE="no" # Do not use CCache
     		-DCMAKE_POLICY_DEFAULT_CMP0144="OLD" # FLANN_ROOT
     		-DCMAKE_POLICY_DEFAULT_CMP0167="OLD" # FindBoost
     		-DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command
     		-DCMAKE_POLICY_DEFAULT_CMP0153="OLD" # exec_program
     		"$(cmake_use_find_package "spacenav" "Spnav")"
     		-DPYCXX_INCLUDE_DIR="${ESYSROOT}/usr/include/${PYTHON_SINGLE_TARGET/_/.}"
     		-DPYCXX_INCLUDE_DIRS="${ESYSROOT}/usr/include/${PYTHON_SINGLE_TARGET/_/.}"
     		-DPYCXX_SOURCE_DIR="${ESYSROOT}/usr/share/${PYTHON_SINGLE_TARGET/_/.}/CXX"
     		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
-...
     		-DBUILD_ASSEMBLY=$(usex assembly)
     		-DBUILD_BIM=$(usex bim)
     		-DBUILD_CAM=$(usex cam)
     		-DBUILD_CLOUD=$(usex cloud)
     		-DBUILD_DRAFT=ON
     		# see below for DRAWING
     		-DBUILD_FEM=$(usex fem)
-...
     		-DFREECAD_BUILD_DEBIAN=OFF
     		-DE57_ENABLE_DIAGNOSTIC_OUTPUT="no"
     		-DE57_VALIDATION_LEVEL=0
     		# -DFREECAD_PARALLEL_COMPILE_JOBS=""
     		# -DFREECAD_PARALLEL_LINK_JOBS=""
     		-DFREECAD_USE_3DCONNEXION_LEGACY="no"
     		-DFREECAD_USE_CCACHE="no" # Do not use CCache
     		-DFREECAD_USE_EXTERNAL_CLIPPER2="yes"
     		-DFREECAD_USE_EXTERNAL_COIN_PIVY="yes"
     		-DFREECAD_USE_EXTERNAL_E57FORMAT="no"
     		-DFREECAD_USE_EXTERNAL_GTEST="$(usex test)"
     		-DFREECAD_USE_EXTERNAL_JSON="yes"
     		-DFREECAD_USE_EXTERNAL_KDL=OFF # https://github.com/FreeCAD/FreeCAD/commit/9f98866
     		-DFREECAD_USE_EXTERNAL_KDTREE=OFF
     		-DFREECAD_USE_EXTERNAL_ONDSELSOLVER=$(usex assembly)
     		-DFREECAD_USE_EXTERNAL_PYCXX="no"
     		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
     		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
     		-DFREECAD_USE_EXTERNAL_FMT="yes"
     		-DFREECAD_USE_EXTERNAL_KDL=OFF # https://github.com/FreeCAD/FreeCAD/commit/9f98866
     		-DFREECAD_USE_FREETYPE=ON
     		-Dfreetype_DIR="${ESYSROOT}/usr"
     		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
     		-DFREECAD_USE_PCL=$(usex pcl)
     		-DFREECAD_USE_PYBIND11=ON
     		-DFREECAD_USE_QT_FILEDIALOG=ON
     		# -DFREECAD_USE_PYBIND11=ON
     		-DFREECAD_USE_PYSIDE="yes"
     		-DFREECAD_USE_QT_DIALOGS="yes"
     		# -DFREECAD_USE_QT_FILEDIALOG=ON
     		-DFREECAD_USE_SHIBOKEN="yes"
     		# install python modules to site-packages' dir. True only for the main package,
     		# sub-packages will still be installed inside /usr/lib64/freecad
-...
     		mycmakeargs+=(
     			-DENABLE_DEVELOPER_TESTS=OFF
     			-DPACKAGE_WCREF="${PVR} (gentoo)"
     			-DPACKAGE_WCREF="${PVR} (${BRANDING_OS_NAME})"
     			-DPACKAGE_WCURL="git://github.com/FreeCAD/FreeCAD.git ${PV}"
+    		)
     	fi
-...
     			-DFREECAD_QT_MAJOR_VERSION=6
     			-DFREECAD_QT_VERSION=6
     			-DQT_DEFAULT_MAJOR_VERSION=6
     			-DQt6Core_MOC_EXECUTABLE="$(qt_get_broot_binary 6 moc)"
     			-DQt6Core_RCC_EXECUTABLE="$(qt_get_broot_binary 6 rcc)"
     			-DBUILD_QT5=OFF
     			# Drawing module unmaintained and not ported to qt6
     			-DBUILD_DRAWING=OFF
-...
     # for two reasons:
     # 1. It works out of the box with USE=-gui as well, not needing a guard
     # 2. We don't need virtualx.eclass and its dependencies
     # The environment variables are needed, so that FreeCAD knows
     # where to save its temporary files, and where to look and write its
     # configuration. Without those, there is a sandbox violation, when it
     # tries to create /var/lib/portage/home/.FreeCAD directory.
     src_test() {
     	cd "${BUILD_DIR}" || die
     	# Fails because translated names are used otherwise
     	local -x LANG="en_US.UTF-8"
     	# The environment variables are needed, so that FreeCAD knows
     	# where to save its temporary files, and where to look and write its
     	# configuration. Without those, there is a sandbox violation, when it
     	# tries to create /var/lib/portage/home/.FreeCAD directory.
     	local -x FREECAD_USER_HOME="${T}/home"
     	local -x FREECAD_USER_DATA="${T}/data"
     	local -x FREECAD_USER_TEMP="${T}/temp"
     	[[ -c "/dev/udmabuf" ]] && addwrite "/dev/udmabuf"
     	mkdir -p "${FREECAD_USER_HOME}" "${FREECAD_USER_DATA}" "${FREECAD_USER_TEMP}" || die
     	cd "${BUILD_DIR}" || die
     	if use bim; then
     		# No module named 'ifcopenshell' #940465
     		rm "${BUILD_DIR}/Mod/BIM/nativeifc/ifc_performance_test.py" || die
     		rm "Mod/BIM/nativeifc/ifc_performance_test.py" || die
     	fi
     	if use cam; then
-...
     		sed -e '/test47/a \        return' -i "Mod/CAM/CAMTests/TestPathOpUtil.py" || die
     	fi
     	local -x EPYTEST_IGNORE=(
     		"Mod/BIM/nativeifc/ifc_performance_test.py"
+    	)
     	if ! use openscad ; then
     		EPYTEST_IGNORE+=(
     			"Mod/OpenSCAD/OpenSCADTest/app/test_importCSG.py"
-...
+    		)
     	fi
     	local -x CMAKE_SKIP_TESTS=(
     		"^ConstraintPointsAccess."
+    	)
     	# # TODO coin? pivy?
     	# sed \
     	# 	-e '/self.assertTrue(pc.getTriangleCount/i \        print(pc.getTriangleCount())' \
     	# 	-e '/self.assertTrue(pc.getTriangleCount/s/self/# /' \
     	# 	-i Mod/Mesh/MeshTestsApp.py || die
     	local -x FREECAD_USER_HOME="${HOME}"
     	local -x FREECAD_USER_DATA="${T}/data"
     	local -x FREECAD_USER_TEMP="${T}/temp"
     	local -x EPYTEST_IGNORE=(
     		"Mod/BIM/nativeifc/ifc_performance_test.py"
+    	)
     	mkdir -p "${FREECAD_USER_DATA}" "${FREECAD_USER_TEMP}" || die
     	local CMAKE_SKIP_TESTS=(
     		"^AttachExtensionTest.testEmptyLegacySupportDoesNotClearAttachmentSupport$"
     		"^AttachExtensionTest.testNonEmptyLegacySupportReplacesAttachmentSupport$"
     		"^LinkArrayPolarTest.expandedElementsFollowPatternPlacementChanges$"
     		"^LinkArrayPolarTest.suppressedExpandedElementIsOmittedFromSubObjects$"
     		"^TestLineFormat.setQColorKeepsOpaqueColorsOpaque$"
     		"^TestLineFormat.setQColorPreservesAlphaValue$"
+    	)
     	local failed=()
     	local run
     	if \
     		! nonfatal \
     		edo \
     		"${BUILD_DIR}/bin/FreeCADCmd" \
     			--run-test 0 \
     			--set-config AppHomePath="${BUILD_DIR}/" \
     			--log-file "${T}/FreeCADCmd.log"; then
     		ret=$?
     		eerror "FreeCADCmd failed $ret"
     		failed+=( "FreeCADCmd" )
     	fi
     	if use gui; then
     		addpredict "/dev/char/"
     		addwrite "/dev/dri/renderD128"
     		addwrite "/dev/dri/card0"
     	run_freecad() {
     		if [[ $# -ne 1 && $# -ne 2  ]]; then
     			eerror "$0: usage <cmd> [<runner>]"
     			die "$0: usage <cmd> <runner>"
     		fi
     		[[ -c "/dev/nvidiactl" ]] && addwrite "/dev/nvidiactl"
     		[[ -c "/dev/nvidia-uvm" ]] && addwrite "/dev/nvidia-uvm"
     		[[ -c "/dev/nvidia-uvm-tools" ]] && addwrite "/dev/nvidia-uvm-tools"
     		[[ -c "/dev/nvidia0" ]] && addwrite "/dev/nvidia0"
     		local cmd="${1}"
     		local run="${2}"
     		[[ -c "/dev/udmabuf" ]] && addwrite "/dev/udmabuf"
     		if use debug; then
     			nonfatal \
     			${run} \
     			edo \
     			"${BUILD_DIR}/bin/${cmd}" \
     				--set-config AppHomePath="${BUILD_DIR}/" \
     				--dump-config &> "${T}/${cmd}_config.log"
     		fi
     		if \
     			! nonfatal \
     			virtx \
     			${run} \
     			edo \
     			"${BUILD_DIR}/bin/FreeCAD" \
     			"${BUILD_DIR}/bin/${cmd}" \
     				--run-test 0 \
     				--set-config AppHomePath="${BUILD_DIR}/" \
     				--log-file "${T}/FreeCAD.log" ; then
     				--log-file "${T}/${cmd}.log"
     		then
     			ret=$?
     			eerror "FreeCAD failed $ret"
     			failed+=( "FreeCAD" )
     			eerror "${cmd} failed ${ret}"
     			die "${cmd} failed ${ret}"
     			failed+=( "${cmd}" )
     		fi
+    	}
     	if ! use gui; then
     		run_freecad "FreeCADCmd"
     	else
     		run="virtx"
     		addwrite "/dev/dri/renderD128"
     		addwrite "/dev/dri/card0"
     		[[ -c "/dev/udmabuf" ]] && addwrite "/dev/udmabuf"
     		if [[ -c "/dev/nvidiactl" ]]; then
     			addwrite "/dev/nvidiactl"
     			addpredict "/dev/char/"
     			[[ -c "/dev/nvidia-uvm" ]] && addwrite "/dev/nvidia-uvm"
     			[[ -c "/dev/nvidia-uvm-tools" ]] && addwrite "/dev/nvidia-uvm-tools"
     			[[ -c "/dev/nvidia0" ]] && addwrite "/dev/nvidia0"
     		fi
     		# run_freecad "FreeCAD" virtx
     		# this runs only the gui tests
     		if \
     			! nonfatal \
     				virtx \
     				${PYTHON} "${S}/.github/scripts/run_gui_tests.py" "${BUILD_DIR}"
     		then
     			ret=$?
     			eerror "$run_gui_tests.py failed ${ret}"
     			die "run_gui_tests.py failed ${ret}"
     			failed+=( "run_gui_tests.py" )
     		fi
     	fi
     	if [[ ${PV} == *9999* ]]; then
     		local myctestargs=(
     			# for YamlParameterSourceTest
     			-j1
+    		)
     		if ! nonfatal \
     			"${run}" \
     			cmake_src_test; then
     			eerror "cmake failed $?"
     			failed+=( "cmake" )
     			${run} \
     			cmake_src_test
     		then
     			ret=$?
     			eerror "cmake_src_test failed ${ret}"
     			die "cmake_src_test failed ${ret}"
     			failed+=( "cmake_src_test" )
     		fi
     	fi
     	if [[ "${#failed[@]}" -gt 0 ]]; then
     		eerror "Tests ${failed[*]} failed"
     		if ! use debug && [[ ${PV} != *9999* ]]; then
     		# Tests _will_ fail with USE=debug as the reference values change
     		# We want test failures to be fatal for keyworded versions
     		if ! use debug || [[ ${PV} != *9999* ]]; then
     			die "${failed[@]}"
     		fi
     	fi
-...
     	if use gui; then
     		newbin - FreeCAD <<- _EOF_
     			#!/bin/sh
     			#!/usr/bin/env sh
     			# https://github.com/coin3d/coin/issues/451
     			: "\${QT_QPA_PLATFORM:=xcb}"
     			export QT_QPA_PLATFORM
-...
     	if [[ -f src/Tools/freecad-thumbnailer ]]; then
     		dobin src/Tools/freecad-thumbnailer
     	else
     		dosym -r "/usr/$(get_libdir)/${PN}/bin/freecad-thumbnailer" "/usr/bin/freecad-thumbnailer"
     	fi
     	for dir in share/{applications,icons,metainfo,mime,pixmaps,thumbnailers}; do
-...
     pkg_postinst() {
     	xdg_pkg_postinst
     	einfo "You can load a lot of additional workbenches using the integrated"
     	einfo "AddonManager."
     	einfo ""
     	einfo "You can load a lot of additional workbenches using the integrated AddonManager."
     	einfo ""
     	einfo "There are a lot of additional tools, for which FreeCAD has builtin support."
     	einfo "Some of them are available in Gentoo."
     	einfo "Take a look at:"
     	einfo "  https://wiki.freecad.org/Installing_additional_components"
     	einfo ""
     	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
     	einfo "support. Some of them are available in Gentoo. Take a look at"
     	einfo "https://wiki.freecad.org/Installing_additional_components"
     	optfeature_header "External programs used by FreeCAD"
     	optfeature "dependency graphs" media-gfx/graphviz
     	optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
     	optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad
     	use bim && optfeature "working with COLLADA documents" dev-python/pycollada
     	if use bim; then
     		optfeature "working with COLLADA documents" dev-python/pycollada
     	fi
     	if use fem || use mesh; then
     		optfeature "mesh generation" sci-libs/gmsh
     		optfeature "mesh solver" sci-libs/calculix-ccx
     	fi
     	if use python_single_target_python3_13; then