From 1b029929705627db816a2c8e5cad8f549d35f02f Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 29 Oct 2024 12:51:31 -0300 Subject: [PATCH] freecad@0.21.2_py310: remove ref to broken shiboken2 formula --- Formula/freecad@0.21.2_py310.rb | 52 ++++++++++++++++----------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/Formula/freecad@0.21.2_py310.rb b/Formula/freecad@0.21.2_py310.rb index 610a7a3b..d17fd9bd 100644 --- a/Formula/freecad@0.21.2_py310.rb +++ b/Formula/freecad@0.21.2_py310.rb @@ -90,7 +90,6 @@ class FreecadAT0212Py310 < Formula depends_on "freecad/freecad/opencascade@7.7.2" depends_on "freecad/freecad/pybind11_py310" depends_on "freecad/freecad/pyside2@5.15.11_py310" - depends_on "freecad/freecad/shiboken2@5.15.11_py310" depends_on "freetype" depends_on "glew" depends_on "icu4c" @@ -152,40 +151,40 @@ def install ENV.remove "PATH", Formula["qt"].opt_prefix/"bin" ENV.remove "PATH", Formula["pyqt"].opt_prefix/"bin" + # TODO: put each path entry on a separate line puts "PATH=#{ENV["PATH"]}" cmake_prefix_paths = [] - cmake_prefix_paths << Formula["pybind11_py310"].prefix + # cmake_prefix_paths << Formula["open-mpi"].prefix + # cmake_prefix_paths << Formula["llvm"].prefix + cmake_prefix_paths << Formula["boost"].prefix + cmake_prefix_paths << Formula["coin3d_py310"].prefix + cmake_prefix_paths << Formula["double-conversion"].prefix cmake_prefix_paths << Formula["doxygen"].prefix - cmake_prefix_paths << Formula["xerces-c"].prefix - cmake_prefix_paths << Formula["zlib"].prefix - cmake_prefix_paths << Formula["opencascade@7.7.2"].prefix - cmake_prefix_paths << Formula["vtk"].prefix - cmake_prefix_paths << Formula["utf8cpp"].prefix - cmake_prefix_paths << Formula["glew"].prefix - cmake_prefix_paths << Formula["hdf5"].prefix - cmake_prefix_paths << Formula["libpng"].prefix - cmake_prefix_paths << Formula["pugixml"].prefix cmake_prefix_paths << Formula["eigen"].prefix cmake_prefix_paths << Formula["expat"].prefix - cmake_prefix_paths << Formula["double-conversion"].prefix - cmake_prefix_paths << Formula["lz4"].prefix - cmake_prefix_paths << Formula["xz"].prefix + cmake_prefix_paths << Formula["freetype"].prefix + cmake_prefix_paths << Formula["glew"].prefix + cmake_prefix_paths << Formula["hdf5"].prefix + cmake_prefix_paths << Formula["icu4c"].prefix cmake_prefix_paths << Formula["libjpeg-turbo"].prefix + cmake_prefix_paths << Formula["libpng"].prefix cmake_prefix_paths << Formula["libtiff"].prefix + cmake_prefix_paths << Formula["lz4"].prefix cmake_prefix_paths << Formula["medfile"].prefix + cmake_prefix_paths << Formula["opencascade@7.7.2"].prefix cmake_prefix_paths << Formula["pkg-config"].prefix - cmake_prefix_paths << Formula["boost"].prefix - cmake_prefix_paths << Formula["swig@4.1.1"].prefix - cmake_prefix_paths << Formula["freetype"].prefix - cmake_prefix_paths << Formula["coin3d_py310"].prefix - cmake_prefix_paths << Formula["qt@5"].prefix - # cmake_prefix_paths << Formula["open-mpi"].prefix - cmake_prefix_paths << Formula["shiboken2@5.15.11_py310"].prefix + cmake_prefix_paths << Formula["pugixml"].prefix + cmake_prefix_paths << Formula["pybind11_py310"].prefix cmake_prefix_paths << Formula["pyside2@5.15.11_py310"].prefix - # cmake_prefix_paths << Formula["llvm"].prefix + cmake_prefix_paths << Formula["qt@5"].prefix + cmake_prefix_paths << Formula["swig@4.1.1"].prefix cmake_prefix_paths << Formula["tbb"].prefix - cmake_prefix_paths << Formula["icu4c"].prefix + cmake_prefix_paths << Formula["utf8cpp"].prefix + cmake_prefix_paths << Formula["vtk"].prefix + cmake_prefix_paths << Formula["xerces-c"].prefix + cmake_prefix_paths << Formula["xz"].prefix + cmake_prefix_paths << Formula["zlib"].prefix if OS.linux? cmake_prefix_paths << Formula["mesa-glu"].prefix @@ -353,10 +352,9 @@ def caveats is built for CLI by default now. 2. if freecad launches with runtime errors a common fix - i use is to force link pyside2@5.15.X and - shiboken2@5.15.X so workbenches such Draft and Arch - have the necessary runtime deps, see brew documenation - about force linking the above packages + i use is to force link pyside2@5.15.X so workbenches + such Draft and Arch have the necessary runtime deps, + see brew documenation about force linking the above packages 4. upstream homebrew/core has begun to introduce python 3.11 with that said, testing the formula manually on my local