From 52f707a3506cf8233129ed9e6e750f4288f32945 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 12 Nov 2024 15:47:07 -0600 Subject: [PATCH] [no ci] checkin a basic .rubocop.yml file for basic linting and new patch for hdf5 --- .rubocop.yml | 20 +++++++++++++++++++ .../freecad@0.21.2_py310-hdf5-cmake-fix.patch | 20 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 .rubocop.yml create mode 100644 patches/freecad@0.21.2_py310-hdf5-cmake-fix.patch diff --git a/.rubocop.yml b/.rubocop.yml new file mode 100644 index 00000000..d6767f7a --- /dev/null +++ b/.rubocop.yml @@ -0,0 +1,20 @@ +--- +AllCops: + TargetRubyVersion: 3.3 + NewCops: enable + +Layout/EndAlignment: + EnforcedStyleAlignWith: start_of_line +Layout/SpaceAroundOperators: + Enabled: false +Style/StringConcatenation: + Exclude: + - "**/{Formula,Casks}/**/*.rb" +Style/FetchEnvVar: + Exclude: + - "**/Formula/**/*.rb" +Style/StringLiterals: + EnforcedStyle: double_quotes +Style/StringLiteralsInInterpolation: + EnforcedStyle: double_quotes + diff --git a/patches/freecad@0.21.2_py310-hdf5-cmake-fix.patch b/patches/freecad@0.21.2_py310-hdf5-cmake-fix.patch new file mode 100644 index 00000000..b002b5eb --- /dev/null +++ b/patches/freecad@0.21.2_py310-hdf5-cmake-fix.patch @@ -0,0 +1,20 @@ +commit c0021f32f711e28328e16363f692ba8e41474577 +Author: chris +Date: Tue Nov 12 19:34:53 2024 +0000 + + freecad@0.21.2_py310: fix cmake HDF5 error ie. issue #583 + +diff --git a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake +index 513ec18..7744a21 100644 +--- a/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake ++++ b/cMake/FreeCAD_Helpers/SetupSalomeSMESH.cmake +@@ -91,7 +91,8 @@ macro(SetupSalomeSMESH) + endif() + pkg_search_module(HDF5 ${HDF5_VARIANT}) + if(HOMEBREW_PREFIX) +- set(HDF5_ROOT ${HOMEBREW_PREFIX}/opt/hdf5) ++ unset(HDF5_FOUND CACHE) ++ # set(HDF5_ROOT ${HOMEBREW_PREFIX}/opt/hdf5) + message("--------------------------------------------") + message("ipatch, manually set hdf5_root, cmake build of hdf5 breaks h5cc") + message("--------------------------------------------")