Gha patch ko

shell/re-patch.sh

@@ -65,12 +65,12 @@ for package in $(cd patches ; find . -maxdepth 1 -mindepth 1 -type d | sed -e 's
       patch -p1 --set-time --no-backup-if-mismatch < ../$patch
       cd ..
       (TZ=UTC+0 diff -Naur a b || true) > $patch.new
-      if ! diff -q $patch $patch.new &>/dev/null ; then
+#      if ! diff -q $patch $patch.new &>/dev/null ; then
         mv $patch $patch.old
         mv $patch.new $patch
-      else
-        rm $patch.new
-      fi
+#      else
+#        rm $patch.new
+#      fi
       rm -rf a
       mv b a
     done

src_ext/patches/cmdliner.common/0001-Escape-default-values.patch

@@ -1,12 +1,13 @@
 diff -Naur a/src/cmdliner_docgen.ml b/src/cmdliner_docgen.ml
 --- a/src/cmdliner_docgen.ml	2019-06-14 09:55:03.000000000 +0000
 +++ b/src/cmdliner_docgen.ml	2019-11-21 14:29:33.000000000 +0000
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,8 @@
    | Cmdliner_info.Val v ->
        match Lazy.force v with
        | "" -> strf "%s" (or_env ~value:false a)
 -      | v -> strf "absent=%s%s" v (or_env ~value:true a)
 +      | v -> strf "absent=%s%s" (esc v) (or_env ~value:true a)
++
    in
    let optvopt = match Cmdliner_info.arg_opt_kind a with
    | Cmdliner_info.Opt_vopt v -> strf "default=%s" v

src_ext/patches/extlib/extlib-1.7.5.patch

@@ -1,14 +1,15 @@
 diff -Naur a/src/configure.ml b/src/configure.ml
 --- a/src/configure.ml	2021-01-19 23:51:04.000000000 +0000
 +++ b/src/configure.ml	2021-07-22 11:07:11.000000000 +0000
-@@ -1,15 +1,21 @@
+@@ -1,15 +1,22 @@
  open Printf
 
  let show_bytes s =
 -    let (_:int) = Sys.command (sprintf "ocamlfind query -format %s bytes" (Filename.quote s)) in ()
 +  if Sys.command (sprintf "ocamlfind query -format %s bytes" (Filename.quote s)) <> 0 then
 +    print_endline "WITH_DUMMY"
 +
++
 +let define v =
 +  print_endline "-D";
 +  print_endline v