From fcd54de282060b6548d94d968ced1bd68586a1ba Mon Sep 17 00:00:00 2001 From: Mauro Toffanin Date: Thu, 28 Jan 2021 16:04:18 +0100 Subject: [PATCH 1/3] [media-gfx/freecad] Make the Web Workbench optional - Add the Start/Web Workbench; - Add the Material Module as a dependency for the FEM Module; --- media-gfx/freecad/freecad-0.18.5-r2.ebuild | 6 ++--- .../freecad/freecad-0.19_pre20201231.ebuild | 6 ++--- media-gfx/freecad/metadata.xml | 26 +++++++++++-------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/media-gfx/freecad/freecad-0.18.5-r2.ebuild b/media-gfx/freecad/freecad-0.18.5-r2.ebuild index dc915ce1..a5f06658 100644 --- a/media-gfx/freecad/freecad-0.18.5-r2.ebuild +++ b/media-gfx/freecad/freecad-0.18.5-r2.ebuild @@ -38,7 +38,7 @@ FREECAD_EXPERIMENTAL_MODULES="assembly plot ship" #FREECAD_DEBUG_MODULES="sandbox template" FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image inspection material mesh openscad part-design path points raytracing robot - show spreadsheet surface techdraw tux" + show spreadsheet surface techdraw tux start" FREECAD_DISABLED_MODULES="vr" FREECAD_ALL_MODULES="${FREECAD_STABLE_MODULES} ${FREECAD_EXPERIMENTAL_MODULES} ${FREECAD_DISABLED_MODULES}" @@ -67,10 +67,10 @@ RDEPEND=" dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 + start? ( dev-qt/qtwebkit:5 ) >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull @@ -119,7 +119,7 @@ REQUIRED_USE=" arch? ( mesh ) debug? ( mesh ) drawing? ( spreadsheet ) - fem? ( mesh ) + fem? ( material mesh ) inspection? ( mesh points ) netgen? ( fem ) openscad? ( mesh ) diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild index a8d8e5bc..acc2fa73 100644 --- a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild +++ b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild @@ -30,7 +30,7 @@ FREECAD_EXPERIMENTAL_MODULES="cloud plot ship" FREECAD_DEBUG_MODULES="sandbox template" FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image inspection material mesh openscad part-design path points - raytracing robot show spreadsheet surface techdraw tux" + raytracing robot show spreadsheet surface techdraw tux start" FREECAD_DISABLED_MODULES="vr" FREECAD_ALL_MODULES="${FREECAD_STABLE_MODULES} ${FREECAD_EXPERIMENTAL_MODULES} ${FREECAD_DISABLED_MODULES}" @@ -57,10 +57,10 @@ RDEPEND=" dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 + start? ( dev-qt/qtwebengine:5[widgets] ) >=media-libs/coin-4.0.0 media-libs/freetype media-libs/qhull @@ -113,7 +113,7 @@ REQUIRED_USE=" arch? ( mesh ) debug? ( mesh ) drawing? ( spreadsheet ) - fem? ( mesh ) + fem? ( material mesh ) inspection? ( mesh points ) openscad? ( mesh ) path? ( mesh robot ) diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index df4be696..42614453 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -6,12 +6,16 @@ Bernd Waibel + + Build the Start workbench, that is presented when you open FreeCAD + with no document loaded. + - Build the addon manager module for automatic handling of 3rd + Build the addon manager module for automatic handling of 3rd party addons - Build the architecture workbench for working with architectural + Build the architecture workbench for working with architectural elements @@ -25,11 +29,11 @@ Amazon S3). - Build the drawing module and workbench to display 3D work on a + Build the drawing module and workbench to display 3D work on a 2D sheet - Build the FEM module and workbench which provides Finite Element + Build the FEM module and workbench which provides Finite Element Analysis (FEA) workflows @@ -52,7 +56,7 @@ Build the material module and workbench to work with materials - Build the mesh module and workbench to work with triangulated + Build the mesh module and workbench to work with triangulated meshes @@ -64,7 +68,7 @@ the official version sci-libs/opencascade. - Build the OpenSCAD module for interoperability with OpenSCAD + Build the OpenSCAD module for interoperability with OpenSCAD and repairing Constructive Solid Geometry (CSG) history @@ -72,7 +76,7 @@ from sketches - Build the path module and workbench to procude G-Code instructions + Build the path module and workbench to procude G-Code instructions for CNC @@ -92,7 +96,7 @@ Build the robot module and workbench for studying robot movements - Build the ship module and workbench which works over ship entities, + Build the ship module and workbench which works over ship entities, that must be created on top of provided geometry. NOTE: This conflicts with the external ship workbench, which you can add via the Addon Manager! @@ -100,7 +104,7 @@ Build the show module, a helper module for visibility automation - Build the spreadsheet module and workbench to create and manipulate + Build the spreadsheet module and workbench to create and manipulate spreadsheet data @@ -112,7 +116,7 @@ --> - Build the techdraw module and workbench, a more advanced and + Build the techdraw module and workbench, a more advanced and feature-rich successor of the drawing workbench @@ -149,7 +153,7 @@ sandbox - Build the sanbox module (only for testing / debugging) template - Build the template module (only for testing / debugging) test - Build the test framework module and workbench used for debugging -disabled: The Occulus SDK development for linux seems to be stalled. +disabled: The Occulus SDK development for linux seems to be stalled. As long as there is no stable means to add a package for it, we disable the use of vr. vr - Build the VR module and workbench which provides Occulus Rift support (needs Occulus SDK 4.x or higher) --> From a1f2a837c88bcbf82a8f2b287ba3fc8a936c09d4 Mon Sep 17 00:00:00 2001 From: Mauro Toffanin Date: Thu, 28 Jan 2021 22:18:43 +0100 Subject: [PATCH 2/3] [media-gfx/freecad] Fix svg icons --- media-gfx/freecad/freecad-0.18.5-r2.ebuild | 4 ++-- media-gfx/freecad/freecad-0.19_pre20201231.ebuild | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/media-gfx/freecad/freecad-0.18.5-r2.ebuild b/media-gfx/freecad/freecad-0.18.5-r2.ebuild index a5f06658..7cb6edae 100644 --- a/media-gfx/freecad/freecad-0.18.5-r2.ebuild +++ b/media-gfx/freecad/freecad-0.18.5-r2.ebuild @@ -205,12 +205,12 @@ src_configure() { -DBUILD_SKETCHER=ON # needed by draft workspace -DBUILD_SMESH=$(usex mesh) -DBUILD_SPREADSHEET=$(usex spreadsheet) - -DBUILD_START=ON # basic workspace, enable it by default + -DBUILD_START=$(usex start) -DBUILD_SURFACE=$(usex surface) -DBUILD_TECHDRAW=$(usex techdraw) -DBUILD_TUX=$(usex tux) -DBUILD_VR=OFF - -DBUILD_WEB=ON # needed by start workspace + -DBUILD_WEB=$(usex start) -DBUILD_WITH_CONDA=OFF -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild index acc2fa73..7e425489 100644 --- a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild +++ b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild @@ -124,6 +124,7 @@ REQUIRED_USE=" PATCHES=( "${FILESDIR}"/${P}-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch "${FILESDIR}"/${P}-0002-CMakeLists.txt-add-option-for-ccache.patch + "${FILESDIR}"/${P}-0003-fix-svg-icons.patch ) DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md ) @@ -195,12 +196,12 @@ src_configure() { -DBUILD_SKETCHER=ON # needed by draft workspace -DBUILD_SMESH=$(usex mesh) -DBUILD_SPREADSHEET=$(usex spreadsheet) - -DBUILD_START=ON # basic workspace, enable it by default + -DBUILD_START=$(usex start) -DBUILD_SURFACE=$(usex surface) -DBUILD_TECHDRAW=$(usex techdraw) -DBUILD_TUX=$(usex tux) -DBUILD_VR=OFF - -DBUILD_WEB=ON # needed by start workspace + -DBUILD_WEB=$(usex start) -DBUILD_WITH_CONDA=OFF -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data From 7a66394a6fee0f655882c189ceba3f9b52f0ab34 Mon Sep 17 00:00:00 2001 From: Mauro Toffanin Date: Thu, 28 Jan 2021 22:58:24 +0100 Subject: [PATCH 3/3] Add missing patchset from the previous commit --- ...-0.19_pre20201231-0003-fix-svg-icons.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 media-gfx/freecad/files/freecad-0.19_pre20201231-0003-fix-svg-icons.patch diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-fix-svg-icons.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-fix-svg-icons.patch new file mode 100644 index 00000000..58bd99de --- /dev/null +++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-fix-svg-icons.patch @@ -0,0 +1,26 @@ +From f9bcfada1a8c93277ac3118350baa5926ab3f48c Mon Sep 17 00:00:00 2001 +From: wmayer +Date: Thu, 31 Dec 2020 12:52:06 +0100 +Subject: [PATCH] Gui: [skip ci] re-add removed SVG icon, remove duplicate + entry + +--- + src/Gui/Icons/resource.qrc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc +index fc24826e9c1..23baacf3036 100644 +--- a/src/Gui/Icons/resource.qrc ++++ b/src/Gui/Icons/resource.qrc +@@ -177,10 +177,10 @@ + Std_Tool12.svg + Std_ViewIvStereoInterleavedColumns.svg + Std_ViewIvStereoInterleavedRows.svg +- Std_ViewIvStereoInterleavedRows.svg + Std_ViewIvStereoOff.svg + Std_ViewIvStereoQuadBuff.svg + Std_ViewIvStereoRedGreen.svg ++ Std_WindowCascade.svg + Std_WindowNext.svg + Std_WindowPrev.svg + Std_WindowTileVer.svg