fix: resolve PR conflicts with origin/main
Some checks failed
Build and Test / build (pull_request) Failing after 4m45s
Some checks failed
Build and Test / build (pull_request) Failing after 4m45s
- Remove .github/FUNDING.yml (upstream FreeCAD only, not Kindred) - Sync .gitignore, .pre-commit-config.yaml, .pylintrc from origin/main - Sync README.md, cMake/FindNETGEN.cmake from origin/main - Sync pixi.lock, pixi.toml from origin/main - Reset mods/ztools submodule pointer to match origin/main
This commit is contained in:
@@ -25,6 +25,7 @@ freetype = "*"
|
||||
git = "*"
|
||||
graphviz = "*"
|
||||
hdf5 = "*"
|
||||
icu = ">=75,<76"
|
||||
ifcopenshell = "*"
|
||||
lark = "*"
|
||||
libboost-devel = "*"
|
||||
@@ -92,10 +93,9 @@ mesa-libgl-cos7-x86_64 = "*"
|
||||
mesa-libgl-devel-cos7-x86_64 = "*"
|
||||
mold = "*"
|
||||
pixman-cos7-x86_64 = "*"
|
||||
qt6-wayland = ">=6.8,<6.9"
|
||||
qt6-wayland = "*"
|
||||
sed = "*"
|
||||
sysroot_linux-64 = "*"
|
||||
xcb-util-cursor = "==0.1.5" ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
|
||||
xorg-x11-server-common-cos7-x86_64 = "*"
|
||||
xorg-x11-server-xvfb-cos7-x86_64 = "*"
|
||||
xorg-xproto = "*"
|
||||
@@ -132,10 +132,9 @@ mesa-libgl-devel-cos7-aarch64 = "*"
|
||||
mesa-libglapi-cos7-aarch64 = "*"
|
||||
mold = "*"
|
||||
pixman-cos7-aarch64 = "*"
|
||||
qt6-wayland = ">=6.8,<6.9"
|
||||
qt6-wayland = "*"
|
||||
sed = "*"
|
||||
sysroot_linux-aarch64 = "*"
|
||||
xcb-util-cursor = "==0.1.5" ## hack to address https://github.com/FreeCAD/FreeCAD/issues/26726
|
||||
xorg-x11-server-common-cos7-aarch64 = "*"
|
||||
xorg-x11-server-xvfb-cos7-aarch64 = "*"
|
||||
xorg-xproto = "*"
|
||||
@@ -192,5 +191,6 @@ install-debug = { cmd = ["cmake", "--install", "build/debug"]}
|
||||
install-release = { cmd = ["cmake", "--install", "build/release"]}
|
||||
test-debug = { cmd = ["ctest", "--test-dir", "build/debug"]}
|
||||
test-release = { cmd = ["ctest", "--test-dir", "build/release"]}
|
||||
test-kindred = { cmd = ["python3", "tests/run_kindred_tests.py"]}
|
||||
freecad-debug = "build/debug/bin/FreeCAD"
|
||||
freecad-release = "build/release/bin/FreeCAD"
|
||||
|
||||
Reference in New Issue
Block a user