Skip to content

Commit 40e6fef

Browse files
kit-ty-katetjammer
authored andcommitted
Upgrade to patch 3.0.0
1 parent 39056dd commit 40e6fef

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

dune-project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
dune-configurator
2222
(ctypes (>= 0.14))
2323
(integers (>= 0.5))
24-
(patch (>= 2.0))))
24+
(patch (>= 3.0.0))))
2525

2626
(package
2727
(name raygui)
@@ -34,7 +34,7 @@
3434
dune-configurator
3535
(ctypes (>= 0.14))
3636
(raylib (>= 1.4.0))
37-
(patch (>= 2.0))))
37+
(patch (>= 3.0.0))))
3838

3939
(package
4040
(name raylib-gen)

raygui.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ depends: [
1414
"dune-configurator"
1515
"ctypes" {>= "0.14"}
1616
"raylib" {>= "1.4.0"}
17-
"patch" {>= "2.0"}
17+
"patch" {>= "3.0.0"}
1818
"odoc" {with-doc}
1919
]
2020
build: [

raylib.opam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ depends: [
1818
"conf-libxi" {os = "linux" | os-family = "bsd"}
1919
"conf-libxinerama" {os = "linux" | os-family = "bsd"}
2020
"conf-libxrandr" {os = "linux" | os-family = "bsd"}
21-
"patch" {>= "2.0"}
21+
"patch" {>= "3.0.0"}
2222
"odoc" {with-doc}
2323
]
2424
build: [

src/c/apply_patch.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ let patch file =
77
let s = really_input_string patch_ic (in_channel_length patch_ic) in
88
close_in patch_ic;
99

10-
let patch = Patch.parse s |> List.hd in
10+
let patch = Patch.parse ~p:1 s |> List.hd in
1111
let target =
1212
match patch.operation with
1313
| Edit (a, _) -> String.trim a
@@ -21,7 +21,7 @@ let patch file =
2121
print_endline ("patching " ^ target);
2222

2323
let output =
24-
match Patch.patch (Some input) patch with
24+
match Patch.patch ~cleanly:true (Some input) patch with
2525
| Some output -> output
2626
| None -> failwith "Patch does not apply"
2727
in

src/c/mingw64.patch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
diff --git a/vendor/raylib/src/Makefile /b/vendor/raylib/src/Makefile
2-
deleted file mode 100644
1+
diff --git a/vendor/raylib/src/Makefile b/vendor/raylib/src/Makefile
32
index 193e3eb5..11412e60 100644
43
--- a/vendor/raylib/src/Makefile
5-
+++ /b/vendor/raylib/src/Makefile
4+
+++ b/vendor/raylib/src/Makefile
65
@@ -240,8 +240,8 @@ endif
76

87
# Define default C compiler and archiver to pack library: CC, AR

0 commit comments

Comments
 (0)