fix: resolve PR conflicts with origin/main

- 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

.github/FUNDING.yml

@@ -1,11 +0,0 @@
-# These are supported funding model platforms
-
-github: FreeCAD
-open_collective: freecad
-patreon: # Replace with a single Patreon username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: ["https://wiki.freecad.org/Donate"]

.gitignore

@@ -10,6 +10,7 @@
 !/.pre-commit-config.yaml
 !/.pylintrc
 !/.github/
+!/.gitea/
 !/contrib/.vscode/
 !*.gitattributes
 !*.gitignore
@@ -70,3 +71,6 @@ files_to_translate.txt
 # pixi environments
 .pixi
 *.egg-info
+
+# mdBook build output
+docs/book/

.pre-commit-config.yaml

@@ -46,7 +46,6 @@ exclude: |
         src/App/ExpressionParser.tab.h|
         src/App/ExpressionParser.y|
         src/App/lex.ExpressionParser.c|
-        src/Doc/ThirdPartyLibraries.html.cmake|
         src/Gui/3Dconnexion/navlib|
         src/Gui/QSint|
         src/Gui/Quarter|

.pylintrc

@@ -398,7 +398,7 @@ indent-after-paren=4
 indent-string='    '
 
 # Maximum number of characters on a single line.
-max-line-length=120
+max-line-length=100
 
 # Maximum number of lines in a module.
 max-module-lines=1000

cMake/FindNETGEN.cmake

@@ -13,15 +13,19 @@
 # See also: http://git.salome-platform.org/gitweb/?p=NETGENPLUGIN_SRC.git;a=summary
 
 
-find_package(Netgen CONFIG QUIET)
+find_package(Netgen CONFIG)
 IF (Netgen_FOUND)
     set(NGLIB_INCLUDE_DIR ${NETGEN_INCLUDE_DIRS})
     set(NGLIB_LIBRARIES nglib)
+    set(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY)
     # for external smesh only the following two variables are needed:
     set(NETGEN_FOUND True)
     set(NETGEN_INCLUDE_DIRS ${NETGEN_INCLUDE_DIRS})
+
 ELSE ()
 
+    SET(NETGEN_DEFINITIONS -DNO_PARALLEL_THREADS -DOCCGEOMETRY)
+
     IF (WIN32)
         FIND_PATH(NGLIB_INCLUDE_DIR NAMES nglib.h PATHS ${NETGEN_INCLUDEDIR})
         SET(NETGEN_LIBS nglib mesh occ interface)
@@ -143,8 +147,3 @@ IF (Netgen_FOUND)
     MESSAGE(STATUS "Found NETGEN version ${NETGEN_VERSION_MAJOR}.${NETGEN_VERSION_MINOR}, calculated: ${NETGEN_VERSION_C}")
     LIST(APPEND NETGEN_DEFINITIONS -DNETGEN_VERSION=${NETGEN_VERSION_C})
 ENDIF ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(NETGEN
-    REQUIRED_VARS NGLIB_INCLUDE_DIR NGLIB_LIBRARIES NETGEN_INCLUDE_DIRS 
-    VERSION_VAR NETGEN_VERSION)

pixi.toml

@@ -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"