boost patch file missing CRs

Description:

  1. Wrong b2sum reported for boost-1.86.patch.
  2. After updpkgsums, prepare fails with patch hint (different line endings).

I guess that the original patch file contains some CRs which have been converted by git.

My workaround was to keep the LF-only patch file and remove CRs from some source files to get it applied:

--- a/PKGBUILD
+++ b/PKGBUILD
@@ -50,7 +50,7 @@ b2sums=('SKIP'
         '96298a048569e6c4d5864504eeb908cdcbe1e22d7485969a7858bd08e66d1d9c050b5d4393e42801afdf3e31e48f56ec21bf1f1f2b1e19c02f54cc4d32d115f3'
         '8af23999e48d3ac4c80a259e12ba9e25f750c3ee1da047131ddc60228ad9c73434405949acbee89e82981be55ebfac4aec8c7d00e421bbee864cde199a07267f'
         '9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722'
-        '6aa942c0977d5e1eb0c30c7da892faabcdd0973519bdee59037eaf08db02126802cfe951b943ff04a7ba57ad082f6c3a71db6f2c879888056042adbcc6b89764')
+        '21e03ab03414598cc1b2d6c1f49f162e52b6fce6d1719fa75e3e4eaf7c244f2e18602c060aee39e7ddd6c2d4abe54866ec5029b0c7744d89fad60c1442a99abb')
 
 prepare() {
   patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
@@ -66,6 +66,7 @@ prepare() {
     -i freecad/src/Gui/PythonWrapper.cpp # Fix build with PySide 6.7
   cd freecad
   git cherry-pick -n f555a25f9e67e628e8075fc8599d7c11807eaddd # Fix build with boost 1.85
+  sed -i -e 's,\r$,,' src/Mod/{Part/App/Geometry,Sketcher/App/Constraint}.cpp
   patch -p1 -i ../boost-1.86.patch
 }

Instead, you might want to re-add the patch file as binary.

Additional info:

  • package version(s): freecad-0.21.2-25
  • config and/or log files:
  • link to upstream bug report, if any:

Steps to reproduce:

  1. Backup your (CR-augmented) version of boost-1.86.patch.
  2. Have git recreate the file from the repo (not the staging buffer) e.g. by switching to some previous checkout and switching back.
  3. Run extra-x86_64-build.
  4. After checksum failure, run updpkgsums.
  5. Run extra-x86_64-build again to witness the patch application failure.
Edited by Christian Cornelssen