diff options
| -rw-r--r-- | sci-mathematics/proverif/Manifest | 2 | ||||
| -rw-r--r-- | sci-mathematics/proverif/files/proverif-2.05-lib_path.patch | 17 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sci-mathematics/proverif/Manifest b/sci-mathematics/proverif/Manifest index 9bd3079..8304fb9 100644 --- a/sci-mathematics/proverif/Manifest +++ b/sci-mathematics/proverif/Manifest @@ -1,5 +1,5 @@ AUX 50proverif-gentoo.el 650 BLAKE2B d31acd5c6aeeb2b938b0a475c896f0345149abc500bc98e889a89b2b241b8e59890544b64997eb7f029fe048de3fc696a2290bf1a707d9898b166458065f4d22 SHA512 44e6058ffc609a6475b21350148d677dfc0cd8846b7441541ed33b9f10bc789c4f1177ad517e684cc19f9e1ac34066a023cb003197be8c376f3c3cf99e7ff937 -AUX proverif-2.05-lib_path.patch 3376 BLAKE2B a249d7d5289df20e1112d9b88a13a808a494cd19a8cdf8d9c5dc95762a86ea806886b2ebb3d7a020d2940774ba98dc58c5a520a29207eb180b69d2e901db321c SHA512 7b4731929457ba1567b2226420b79d7d4ef966188034a5f8a7101eb8dc421f616ff70b370b9da116e3c5e262a80d13b088c40a2fa8d2bc502f33d611e685de36 +AUX proverif-2.05-lib_path.patch 3212 BLAKE2B 76ab8550447ee190484210e5b8bf0e5993871a50a4ad17605243b0e80a73e11d79e3a9a9e767835dab9790a81ed46721ef6b5edb47fb964e88292e81463834e9 SHA512 4194b065b24399df06c7095338b50a952a5313d9c81c3223e4a03034770adbdee45715264d849c54f56203692dc765e4bedef38b81df7996b7ca8ad46cb464d6 AUX proverif-2.05-use_gtk3.patch 5340 BLAKE2B c3b4f9bfaaf1d68bd726f9c52b74ebec1e383577913ffa150af8ac9f712e3bfa2210373bfea77cb2638e791bfb9299e14e1d1b886ecb2481020715719dd39396 SHA512 0b0544715ef7fcf499a002de8e3103782ac79100bfa0d28a6c38d86ec0a2cf838fe8450f6352bf1c868ea4641b9ec779348a7966601301345b3383507f6494a6 AUX proverif-2.05-usr_share_default.patch 300 BLAKE2B e4f3846a4bf7f8322dbd68aec9145a29e2c75db373f80e27ea5ec9d58885ecdf0b08e485d20e71b67dd71804306c3f9f8db46936213d8352aa626348747accf7 SHA512 2704defdc903f441b227e4b099f7efd8a2eaab6c56f580860076799d39db95ccc8e398f3b199660b530d1c3ea29eaedff86259b5636baa104e1f2b981c415798 DIST proverif2.05.tar.gz 980879 BLAKE2B 738531d34249f1837a93c6897d7249e326213940cc9a8fc378a25912a4de4c122a6ce536a429f17c1ef7fae5dd5e1673cdf439d7bad2dd0f44826b33363dbc8a SHA512 e20d6dc40b0e4957590b9ce019ef654361f3514f53e0a5c3240a40d296ff2a50093630982b7a230c2277eadf4ed22ba1b6d09b48764c2ad3ec0e102033d1c486 diff --git a/sci-mathematics/proverif/files/proverif-2.05-lib_path.patch b/sci-mathematics/proverif/files/proverif-2.05-lib_path.patch index 08fb3b8..e3b5621 100644 --- a/sci-mathematics/proverif/files/proverif-2.05-lib_path.patch +++ b/sci-mathematics/proverif/files/proverif-2.05-lib_path.patch @@ -42,7 +42,7 @@ val def_var_name : string --- A/src/pitsyntax.ml +++ B/src/pitsyntax.ml -@@ -1516,13 +1516,29 @@ +@@ -1516,13 +1516,32 @@ with Sys_error s -> user_error ("File error: " ^ s) @@ -69,19 +69,14 @@ + fun () -> None + +let parse_lib filename = -+ let do_parse filename = ++ let filename = match find_lib filename with ++ | Some v -> v ++ | None -> user_error ("Could not find library "^filename) ++ in try let ic = open_in filename in let lexbuf = Lexing.from_channel ic in -@@ -1538,6 +1554,7 @@ - ptree - with Sys_error s -> - user_error ("File error: " ^ s) -+ in Option.fold ~none:(user_error ("Could not find library "^filename)) ~some:do_parse @@ find_lib filename - - let parse_with_lib filename = - let rec parse_all_lib = function -@@ -1553,16 +1570,7 @@ +@@ -1553,16 +1572,7 @@ match !Param.lib_name with | [] -> (* Use default library when no library is mentioned and it exists *) |