media-gfx/freecad-0.21.2-r2: useless rebuild for USE=qt5

Message

CaptainBlood · Post by **CaptainBlood** » Sat Mar 09, 2024 4:17 pm

New media-gfx/freecad-0.21.2-r2 is dedicated to qt6 integration.
However many not qt6 ready packages share with media-gfx/freecad-0.21.2 many dependencies e.g sci-libs/vtk.
Currently sci-libs/vtk doesn't seems to support USE="qt5 qt6"
So jumping to media-gfx/freecad[qt6] isn't an option here yet.

media-gfx/freecad-0.21.2-r1 has been updated less that a day ago, then finally ghostly (commitless) removed from gitweb.gentoo.org.

For installed with USE=-qt6 the current situation to avoid costly useless rebuild is to

Code: Select all

emerge --exclude media-gfx/freecad

Sounds overly complicated when media-gfx/freecad-0.21.2-r1 could have been kept in tree for the time being.

There may be a way to trick emerge installed references to believe current install is from media-gfx/freecad-0.21.2-r1 in local overlay.
That would make things simpler here, i.e. cpu & power usage friendly,

No idea how to achieve this... Any experience to share?

Thks 4 ur attention, interest & support.

Post by Hu » Sat Mar 09, 2024 4:31 pm

Packages cannot be removed without a git commit. According to git history, 0.21.2-r1 was removed by media-gfx/freecad: fix build with qt6 for [bug]920579[/bug]. I don't see why that was done as a rename to -r2 instead of fixing -r1 in place, since it is documented as a build fix, and the diff seems to agree with it being only a build fix. However, as I do not use this package, I cannot be sure there was not a reason for this rename.

Assuming that the rename was the wrong solution, it seems like the right solution would be to ask the developer to restore -r1, possibly with the fixes that prevent the build failure, or possibly with a REQUIRED_USE to prohibit requesting a known-broken configuration. That would save everyone from the rebuild, rather than only helping your system.

CaptainBlood · Post by **CaptainBlood** » Sat Mar 09, 2024 4:50 pm

There is not ghostly deletion commit indeed, overlooked, sorry.
This thread has been started because bugzilla.

Thus I doubt ebuild will be restored and would like to avoid --exclude freecad on my emerge command line on a daily basis.

Thks 4 ur attention, interest & support.

Post by Hu » Sat Mar 09, 2024 5:37 pm

Your bug report was closed by a different maintainer than the one who deleted the ebuild. Your report did not explain well why a restoration is justified. I am not surprised that a report with so little explanation was closed.

CaptainBlood · Post by **CaptainBlood** » Sat Mar 09, 2024 5:51 pm

Hu wrote:Your bug report was closed by a different maintainer than the one who deleted the ebuild. Your report did not explain well why a restoration is justified. I am not surprised that a report with so little explanation was closed.

Well I only discovered recently user can add to email list, now updated.
Since that I counted on bug wanglers to the job.

Post by Hu » Sat Mar 09, 2024 6:57 pm

Per [bug=926603#c3]comment #3[/bug], there are changes in the -r1 -> r2 bump that justify a revision bump. Even knowing this, I cannot identify specific hunks that justify a bump, but I defer to the maintainer who knows how to build this package, as I neither use it nor try to build it. It looks like this may be one of those cases where running unstable exposes you to greater churn.

CaptainBlood · Post by **CaptainBlood** » Sat Mar 09, 2024 8:07 pm

Well, I've compared original r1 from not updated portage tree with final r2.
All changes are qt6 related.
Indirectly new python12+USE=qui requires qt6.

As far as qt5 is concerned, there seems 2 be no changes.

I'm about to rebuild with r2.

Will report whether binary are the same (which is expected) or not.

Thks 4 ur attention, interest & support.

CaptainBlood · Post by **CaptainBlood** » Sun Mar 10, 2024 12:02 am

Hu wrote:Per [bug=926603#c3]comment #3[/bug], there are changes in the -r1 -> r2 bump that justify a revision bump. Even knowing this, I cannot identify specific hunks that justify a bump, but I defer to the maintainer who knows how to build this package, as I neither use it nor try to build it. It looks like this may be one of those cases where running unstable exposes you to greater churn.

Bisecting:

Code: Select all

amd64 ~ # diff -C 2 freecad-0.21.2-r1-installed.ebuild freecad-0.21.2-r1-latest.ebuild
*** freecad-0.21.2-r1-installed.ebuild	2024-03-09 22:06:45.671916250 +0300
--- freecad-0.21.2-r1-latest.ebuild	2024-03-09 18:46:13.722379023 +0300
***************
*** 60,63 ****
--- 60,64 ----
  	qt6? (
  		dev-qt/qtbase:6[concurrent,network,xml]
+ 		dev-qt/qt5compat:6
  	)
  	media-libs/freetype
amd64 ~ # diff -C 8 freecad-0.21.2-r1-latest.ebuild /var/db/repos/gentoo/media-gfx/freecad/freecad-0.21.2-r2.ebuild 
*** freecad-0.21.2-r1-latest.ebuild	2024-03-09 18:46:13.722379023 +0300
--- /var/db/repos/gentoo/media-gfx/freecad/freecad-0.21.2-r2.ebuild	2024-03-09 13:41:22.000000000 +0300
***************
*** 1,14 ****
  # Copyright 1999-2024 Gentoo Authors
  # Distributed under the terms of the GNU General Public License v2
  
  EAPI=8
  
! PYTHON_COMPAT=( python3_{10..12} )
  
  inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg
  
  DESCRIPTION="QT based Computer Aided Design application"
  HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
  
  MY_PN=FreeCAD
  
--- 1,14 ----
  # Copyright 1999-2024 Gentoo Authors
  # Distributed under the terms of the GNU General Public License v2
  
  EAPI=8
  
! PYTHON_COMPAT=( python3_{10..11} )
  
  inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg
  
  DESCRIPTION="QT based Computer Aided Design application"
  HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
  
  MY_PN=FreeCAD
  
***************
*** 54,70 ****
  		dev-qt/qtconcurrent:5
  		dev-qt/qtcore:5
  		dev-qt/qtnetwork:5
  		dev-qt/qtxml:5
  		dev-qt/qtxmlpatterns:5
  	)
  	qt6? (
  		dev-qt/qtbase:6[concurrent,network,xml]
- 		dev-qt/qt5compat:6
  	)
  	media-libs/freetype
  	media-libs/qhull:=
  	sci-libs/hdf5:=[fortran,zlib]
  	>=sci-libs/med-4.0.0-r1
  	sci-libs/opencascade:=[json,vtk]
  	sci-libs/orocos_kdl:=
  	sys-libs/zlib
--- 54,69 ----
***************
*** 95,110 ****
--- 94,110 ----
  				dev-python/matplotlib[${PYTHON_USEDEP}]
  				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
  				dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
  				dev-python/shiboken2[${PYTHON_USEDEP}]
  			' python3_{10..11} )
  		)
  		qt6? (
  			designer? ( dev-qt/qttools:6[designer] )
+ 			dev-qt/qt5compat:6
  			dev-qt/qttools:6[widgets]
  			dev-qt/qtbase:6[gui,opengl,widgets]
  			dev-qt/qtsvg:6
  			dev-qt/qtwebengine:6[widgets]
  			pcl? ( sci-libs/pcl[-qt5,qt6(-)] )
  			$(python_gen_cond_dep '
  				dev-python/matplotlib[${PYTHON_USEDEP}]
  				>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
***************
*** 153,171 ****
  #
  # The increase in auto-enabled workbenches is due to their need in parts of the
  # test suite when compiled with a minimal set of USE flags.
  REQUIRED_USE="
  	${PYTHON_REQUIRED_USE}
  	designer? ( gui )
  	inspection? ( points )
  	path? ( robot )
- 	python_single_target_python3_12? ( gui? ( qt6 ) )
  "
- # There is no py3.12 support planned for pyside2
  
  PATCHES=(
  	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
  	"${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch
  )
  
  DOCS=( CODE_OF_CONDUCT.md README.md )
  
--- 153,169 ----
***************
*** 190,206 ****
  	local mycmakeargs=(
  		-DBUILD_ADDONMGR=$(usex addonmgr)
  		-DBUILD_ARCH=ON
  		-DBUILD_ASSEMBLY=OFF					# deprecated
  		-DBUILD_CLOUD=$(usex cloud)
  		-DBUILD_COMPLETE=OFF					# deprecated
  		-DBUILD_DRAFT=ON
  		-DBUILD_DESIGNER_PLUGIN=$(usex designer)
- 		-DBUILD_DRAWING=ON
  		-DBUILD_ENABLE_CXX_STD:STRING="C++17"	# needed for >=boost-1.77.0
  		-DBUILD_FEM=$(usex fem)
  		-DBUILD_FEM_NETGEN=$(usex netgen)
  		-DBUILD_FLAT_MESH=ON
  		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
  		-DBUILD_FREETYPE=ON						# automagic dep
  		-DBUILD_GUI=$(usex gui)
  		-DBUILD_IDF=$(usex idf)
--- 188,203 ----
***************
*** 275,299 ****
--- 272,300 ----
  	if use qt6; then
  		mycmakeargs+=(
  			-DFREECAD_QT_MAJOR_VERSION=6
  			-DFREECAD_QT_VERSION=6
  			-DQT_DEFAULT_MAJOR_VERSION=6
  			-DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
  			-DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
  			-DBUILD_QT5=OFF
+ 			# Drawing module unmaintained and not ported to qt6
+ 			-DBUILD_DRAWING=OFF
  		)
  	else
  		mycmakeargs+=(
  			-DFREECAD_QT_MAJOR_VERSION=5
  			-DFREECAD_QT_VERSION=5
  			-DQT_DEFAULT_MAJOR_VERSION=5
  			-DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
  			-DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc"
  			-DBUILD_QT5=ON
+ 			# Drawing module unmaintained and not ported to qt6
+ 			-DBUILD_DRAWING=ON
  		)
  	fi
  
  	cmake_src_configure
  }
  
  # We use the FreeCADCmd binary instead of the FreeCAD binary here
  # for two reasons:

Nothing but qt6 related.
Any foppleganger around?

Thks 4 ur attention, interest & support.

CaptainBlood · Post by **CaptainBlood** » Sun Mar 10, 2024 12:13 am

My 2 cts qt6 integration is going to be the next new gentoo adventure.

Thks 4 ur attention, interest & support.