Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[media-gfx/freecad] Make the Web Workbench optional #297

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[media-gfx/freecad] Make the Web Workbench optional #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcd54de
[media-gfx/freecad] Make the Web Workbench optional
Dr-Terrible Jan 28, 2021
a1f2a83
[media-gfx/freecad] Fix svg icons
Dr-Terrible Jan 28, 2021
7a66394
Add missing patchset from the previous commit
Dr-Terrible Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions media-gfx/freecad/files/freecad-0.19_pre20201231-0003-fix-svg-icons.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From f9bcfada1a8c93277ac3118350baa5926ab3f48c Mon Sep 17 00:00:00 2001
From: wmayer <[email protected]>
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 @@
<file>Std_Tool12.svg</file>
<file>Std_ViewIvStereoInterleavedColumns.svg</file>
<file>Std_ViewIvStereoInterleavedRows.svg</file>
- <file>Std_ViewIvStereoInterleavedRows.svg</file>
<file>Std_ViewIvStereoOff.svg</file>
<file>Std_ViewIvStereoQuadBuff.svg</file>
<file>Std_ViewIvStereoRedGreen.svg</file>
+ <file>Std_WindowCascade.svg</file>
<file>Std_WindowNext.svg</file>
<file>Std_WindowPrev.svg</file>
<file>Std_WindowTileVer.svg</file>
10 changes: 5 additions & 5 deletions media-gfx/freecad/freecad-0.18.5-r2.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep the alphabetical ordering, which is common for ebuilds.

FREECAD_DISABLED_MODULES="vr"
FREECAD_ALL_MODULES="${FREECAD_STABLE_MODULES}
${FREECAD_EXPERIMENTAL_MODULES} ${FREECAD_DISABLED_MODULES}"
Expand Down Expand Up @@ -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 )
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here, please move the line to correct location.
At the top, alphabetical order of dependencies required without USE flags, after those are dependencies required by a USE flag, also in alphabetical order.

>=media-libs/coin-4.0.0
media-libs/freetype
media-libs/qhull
Expand Down Expand Up @@ -119,7 +119,7 @@ REQUIRED_USE="
arch? ( mesh )
debug? ( mesh )
drawing? ( spreadsheet )
fem? ( mesh )
fem? ( material mesh )
inspection? ( mesh points )
netgen? ( fem )
openscad? ( mesh )
Expand Down Expand Up @@ -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}
Expand Down
11 changes: 6 additions & 5 deletions media-gfx/freecad/freecad-0.19_pre20201231.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alphabetical ordering, like above

FREECAD_DISABLED_MODULES="vr"
FREECAD_ALL_MODULES="${FREECAD_STABLE_MODULES}
${FREECAD_EXPERIMENTAL_MODULES} ${FREECAD_DISABLED_MODULES}"
Expand All @@ -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] )
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like above, please keep alphabetical ordering

>=media-libs/coin-4.0.0
media-libs/freetype
media-libs/qhull
Expand Down Expand Up @@ -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 )
Expand All @@ -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 )
Expand Down Expand Up @@ -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
Expand Down
26 changes: 15 additions & 11 deletions media-gfx/freecad/metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@
<name>Bernd Waibel</name>
</maintainer>
<use>
<flag name="start">
Build the Start workbench, that is presented when you open FreeCAD
with no document loaded.
</flag>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The USE flags are also ordered alphabetical. Please move the new flag down to the correct location.

<flag name="addonmgr">
Build the addon manager module for automatic handling of 3rd
Build the addon manager module for automatic handling of 3rd
party addons
</flag>
<flag name="arch">
Build the architecture workbench for working with architectural
Build the architecture workbench for working with architectural
elements
</flag>
<flag name="assembly">
Expand All @@ -25,11 +29,11 @@
Amazon S3).
</flag>
<flag name="drawing">
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
</flag>
<flag name="fem">
Build the FEM module and workbench which provides Finite Element
Build the FEM module and workbench which provides Finite Element
Analysis (FEA) workflows
</flag>
<flag name="headless">
Expand All @@ -52,7 +56,7 @@
Build the material module and workbench to work with materials
</flag>
<flag name="mesh">
Build the mesh module and workbench to work with triangulated
Build the mesh module and workbench to work with triangulated
meshes
</flag>
<flag name="netgen">
Expand All @@ -64,15 +68,15 @@
the official version <pkg>sci-libs/opencascade</pkg>.
</flag>
<flag name="openscad">
Build the OpenSCAD module for interoperability with OpenSCAD
Build the OpenSCAD module for interoperability with OpenSCAD
and repairing Constructive Solid Geometry (CSG) history
</flag>
<flag name="part-design">
Build the part design module and workbench for build part shapes
from sketches
</flag>
<flag name="path"><!-- FIXME: auto-enable throught robot? -->
Build the path module and workbench to procude G-Code instructions
Build the path module and workbench to procude G-Code instructions
for CNC
</flag>
<flag name="pcl">
Expand All @@ -92,15 +96,15 @@
Build the robot module and workbench for studying robot movements
</flag>
<flag name="ship">
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!
</flag>
<flag name="show">
Build the show module, a helper module for visibility automation
</flag>
<flag name="spreadsheet">
Build the spreadsheet module and workbench to create and manipulate
Build the spreadsheet module and workbench to create and manipulate
spreadsheet data
</flag>
<flag name="surface">
Expand All @@ -112,7 +116,7 @@
</flag>
-->
<flag name="techdraw">
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
</flag>
<flag name="tux">
Expand Down Expand Up @@ -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)
-->