Skip to content
This repository was archived by the owner on Nov 19, 2025. It is now read-only.

exdlpro with ghactions#3

Merged
smanders merged 27 commits intodevfrom
ghact3
Jul 30, 2025
Merged

exdlpro with ghactions#3
smanders merged 27 commits intodevfrom
ghact3

Conversation

@smanders
Copy link
Copy Markdown

@smanders smanders commented Jul 23, 2025

@smanders
Copy link
Copy Markdown
Author

smanders commented Jul 23, 2025

the following projects fail to patch on Windows

Hunk #x FAILED at xx (different line endings).
  • apr
  • azmq
  • boostbeast
  • cares
  • ceres
  • cppzmq
  • curl
  • eigen
  • fecpp
  • ffmpeg_2.6.2
  • ffmpeg_2.6.2.1
  • ffmpeg_4.3.1
  • flatbuffers
  • geotrans
  • glew
  • jasper
  • jpegxp_jpeglossy8
  • libgit2
  • libssh2
  • libstrophe
  • libzmq
  • lua
  • openh264
  • protobuf
  • rapidjson
  • wirehair
  • wx
  • wxinclude
  • wxx_wxxplotctrl
  • yasm
  • zmqpp

succeeds

  • activemqcpp
  • bzip2
  • expat
  • geotiff
  • jxrlib
  • openssl
  • rapidxml
  • shapelib
  • sodium
  • wxx
$ file patches/*
patches/activemqcpp.patch:              unified diff output text, ASCII text
patches/apr.patch:                      unified diff output text, ASCII text
patches/azmq.patch:                     unified diff output text, ASCII text
patches/boost.beast.patch:              unified diff output text, ASCII text
patches/boost.dll.patch:                unified diff output text, ASCII text
patches/boost.gil.patch:                unified diff output text, ASCII text
patches/boost.graph.patch:              unified diff output text, ASCII text
patches/boost.install.patch:            unified diff output text, ASCII text
patches/boost.interprocess.patch:       unified diff output text, ASCII text
patches/boost.program_options.patch:    unified diff output text, ASCII text
patches/boost.program_optionshpp.patch: unified diff output text, ASCII text
patches/boost.regex.patch:              unified diff output text, ASCII text
patches/boost.units.patch:              unified diff output text, ASCII text
patches/bzip2.patch:                    unified diff output text, ASCII text
patches/cares.patch:                    unified diff output text, ASCII text
patches/ceres.patch:                    unified diff output text, ASCII text
patches/cppzmq.patch:                   unified diff output text, ASCII text
patches/curl.patch:                     unified diff output text, ASCII text
patches/eigen.patch:                    unified diff output text, ASCII text
patches/expat.patch:                    unified diff output text, ASCII text, with CRLF, LF line terminators
patches/fecpp.patch:                    unified diff output text, ASCII text
patches/ffmpeg_2.6.2.1.patch:           unified diff output text, ASCII text
patches/ffmpeg_2.6.2.patch:             unified diff output text, ASCII text
patches/ffmpeg_4.3.1.patch:             unified diff output text, ASCII text, with very long lines (325)
patches/flatbuffers.patch:              unified diff output text, ASCII text
patches/geotiff.patch:                  unified diff output text, ASCII text
patches/geotrans.patch:                 unified diff output text, ASCII text
patches/glew.patch:                     unified diff output text, ASCII text
patches/jasper.patch:                   unified diff output text, ASCII text
patches/jpegxp.lossless.patch:          unified diff output text, ASCII text
patches/jpegxp.lossy12.patch:           unified diff output text, ASCII text
patches/jpegxp.lossy8.patch:            unified diff output text, ASCII text
patches/jpegxp.patch:                   unified diff output text, ASCII text
patches/jxrlib.patch:                   unified diff output text, ASCII text, with CRLF, LF line terminators
patches/libgit2.patch:                  unified diff output text, ASCII text
patches/libssh2.patch:                  unified diff output text, ASCII text
patches/libstrophe.patch:               unified diff output text, ASCII text
patches/libzmq.patch:                   unified diff output text, ASCII text
patches/lua.patch:                      unified diff output text, ASCII text
patches/openh264.patch:                 unified diff output text, ASCII text
patches/openssl.patch:                  unified diff output text, ASCII text
patches/protobuf.patch:                 unified diff output text, ASCII text
patches/rapidjson.patch:                unified diff output text, ASCII text
patches/rapidxml.patch:                 unified diff output text, ASCII text, with CRLF, LF line terminators
patches/shapelib.patch:                 unified diff output text, ASCII text
patches/sodium.patch:                   unified diff output text, ASCII text
patches/wirehair.patch:                 unified diff output text, ASCII text
patches/wx.patch:                       unified diff output text, ASCII text
patches/wxcmake.patch:                  unified diff output text, ASCII text
patches/wxInclude.patch:                unified diff output text, ASCII text
patches/wxx.plotctrl.patch:             unified diff output text, ASCII text
patches/wxx.things.patch:               unified diff output text, ASCII text
patches/wxx.tlc.patch:                  unified diff output text, ASCII text, with CRLF, LF line terminators
patches/wxx.xpro.patch:                 unified diff output text, ASCII text
patches/yasm.patch:                     unified diff output text, ASCII text
patches/zmqpp.patch:                    unified diff output text, ASCII text

smanders added 5 commits July 23, 2025 14:59
actions/checkout#135 (comment)
Checkout as-is, commit Unix-style line endings
* Git will not perform any conversion when checking out text files. When
  committing text files, CRLF will be converted to LF. For cross-platform projects,
  this is the recommended setting on Unix ("core.autocrlf" is set to "input").
@smanders
Copy link
Copy Markdown
Author

smanders commented Jul 23, 2025

dirtyrepo

        modified:   patches/expat.patch
        modified:   patches/jxrlib.patch
        modified:   patches/rapidxml.patch
        modified:   patches/wxx.tlc.patch

which are the 4 files from above with

unified diff output text, ASCII text, with CRLF, LF line terminators

https://dev.to/kevinshu/git-and-normalization-of-line-endings-228j

$ git ls-files --eol patches/* | grep mixed
i/mixed w/mixed attr/text eol=lf        patches/expat.patch
i/mixed w/mixed attr/text eol=lf        patches/jxrlib.patch
i/mixed w/mixed attr/text eol=lf        patches/rapidxml.patch
i/mixed w/mixed attr/text eol=lf        patches/wxx.tlc.patch

@smanders smanders merged commit f52ac49 into dev Jul 30, 2025
7 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant