Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 931098 - media-gfx/freecad-9999: add assembly to modules
Summary: media-gfx/freecad-9999: add assembly to modules
Status: CONFIRMED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Paul Zander
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-05-02 14:55 UTC by Fabio Rossi
Modified: 2024-10-22 19:14 UTC (History)
6 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
ondselsolver-9999.ebuild (ondselsolver-9999.ebuild,463 bytes, application/vnd.gentoo.ebuild)
2024-10-02 08:59 UTC, Fabio Rossi
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Fabio Rossi 2024-05-02 14:55:34 UTC
The master branch has new code for the future assembly, please enable it again 

--- /usr/portage/media-gfx/freecad/freecad-9999.ebuild  2024-05-02 14:40:03.952609706 +0200
+++ /usr/portage/media-gfx/freecad/freecad-9999.ebuild.new      2024-05-02 14:49:08.498558459 +0200
@@ -28,7 +28,7 @@
 SLOT="0"
 IUSE="debug designer +gui qt6 test"

-FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
+FREECAD_EXPERIMENTAL_MODULES="assembly cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
        openscad part-design path points raytracing robot show surface
        techdraw tux"
@@ -167,6 +167,7 @@
        "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch
        "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
        "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
+       "${FILESDIR}"/${PN}-mine.patch
 )

 DOCS=( CODE_OF_CONDUCT.md README.md )
@@ -197,7 +198,7 @@
        local mycmakeargs=(
                -DBUILD_ADDONMGR=$(usex addonmgr)
                -DBUILD_ARCH=ON
-               -DBUILD_ASSEMBLY=OFF                                    # deprecated
+               -DBUILD_ASSEMBLY=$(usex assembly)
                -DBUILD_CLOUD=$(usex cloud)
                -DBUILD_COMPLETE=OFF                                    # deprecated
                -DBUILD_DRAFT=ON
Comment 1 Fabio Rossi 2024-05-02 14:57:36 UTC
I am sorry, the previous patch was wrong, here are the required changes:

--- /usr/portage/media-gfx/freecad/freecad-9999.ebuild  2024-05-02 14:40:03.952609706 +0200
+++ /usr/portage/media-gfx/freecad/freecad-9999.ebuild.new      2024-05-02 14:49:08.498558459 +0200
@@ -28,7 +28,7 @@
 SLOT="0"
 IUSE="debug designer +gui qt6 test"

-FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
+FREECAD_EXPERIMENTAL_MODULES="assembly cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
        openscad part-design path points raytracing robot show surface
        techdraw tux"
@@ -197,7 +197,7 @@
        local mycmakeargs=(
                -DBUILD_ADDONMGR=$(usex addonmgr)
                -DBUILD_ARCH=ON
-               -DBUILD_ASSEMBLY=OFF                                    # deprecated
+               -DBUILD_ASSEMBLY=$(usex assembly)
                -DBUILD_CLOUD=$(usex cloud)
                -DBUILD_COMPLETE=OFF                                    # deprecated
                -DBUILD_DRAFT=ON
Comment 2 Nowa Ammerlaan gentoo-dev 2024-09-15 15:00:43 UTC
This requires https://github.com/Ondsel-Development/OndselSolver (currently not packaged)
Comment 3 Fabio Rossi 2024-10-02 08:58:36 UTC
a(In reply to Nowa Ammerlaan from comment #2)
> This requires https://github.com/Ondsel-Development/OndselSolver (currently
> not packaged)

as other 3rd party deps :-) Anyway I have packaged the OndselSolver too, here is attached the ebuild

Moreover, here is the updated patch to the freecad ebuild to use the external OndselSolver :

--- /usr/portage/media-gfx/freecad/freecad-9999.ebuild  2024-09-15 18:11:15.000000000 +0200
+++ /var/db/repos/__mine__/media-gfx/freecad/freecad-9999.ebuild        2024-10-01 18:49:56.738164299 +0200
@@ -28,7 +28,7 @@
 SLOT="0"
 IUSE="debug designer +gui +qt6 test"

-FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
+FREECAD_EXPERIMENTAL_MODULES="assembly cloud netgen pcl"
 FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
        openscad part-design path points raytracing robot show smesh
        surface techdraw tux"
@@ -70,6 +70,9 @@
        sci-libs/orocos_kdl:=
        sys-libs/zlib
        virtual/libusb:1
+       assembly? (
+               sci-libs/ondselsolver
+       )
        cloud? (
                dev-libs/openssl:=
                net-misc/curl
@@ -205,7 +208,7 @@
        local mycmakeargs=(
                -DBUILD_ADDONMGR=$(usex addonmgr)
                -DBUILD_ARCH=ON
-               -DBUILD_ASSEMBLY=OFF                    # Requires OndselSolver
+               -DBUILD_ASSEMBLY=$(usex assembly)
                -DBUILD_CLOUD=$(usex cloud)
                -DBUILD_COMPLETE=OFF                                    # deprecated
                -DBUILD_DRAFT=ON
@@ -253,6 +256,7 @@

                -DFREECAD_BUILD_DEBIAN=OFF

+               -DFREECAD_USE_EXTERNAL_ONDSELSOLVER=ON
                -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
Comment 4 Fabio Rossi 2024-10-02 08:59:22 UTC
Created attachment 904640 [details]
ondselsolver-9999.ebuild
Comment 5 Chris Mayo 2024-10-22 19:14:24 UTC
I should have checked Bugzilla first..

I've submitted (although this is a snapshot):
https://github.com/gentoo/gentoo/pull/39080

As with the attachment here there really isn't much to do for ondselsolver. I have added testing. It needs:

https://github.com/Ondsel-Development/OndselSolver/pull/82