-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
22 changed files
with
72,264 additions
and
68,033 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| From 35a6a872e780b48b482517619d7b47431bc9f827 Mon Sep 17 00:00:00 2001 | ||
| From: Tobiasz Laskowski <[email protected]> | ||
| Date: Wed, 4 Sep 2024 21:21:10 +0100 | ||
| Subject: [PATCH] Update to luv 0.5.13 | ||
|
|
||
| --- | ||
| haxe.opam | 2 +- | ||
| src/macro/eval/evalLuv.ml | 8 ++++---- | ||
| std/eval/luv/FsEvent.hx | 2 +- | ||
| std/eval/luv/Resource.hx | 6 ++++-- | ||
| 4 files changed, 10 insertions(+), 8 deletions(-) | ||
|
|
||
| diff --git a/haxe.opam b/haxe.opam | ||
| index 54bb8e31f..90cd909d4 100644 | ||
| --- a/haxe.opam | ||
| +++ b/haxe.opam | ||
| @@ -32,5 +32,5 @@ depends: [ | ||
| "conf-libpcre2-8" | ||
| "conf-zlib" | ||
| "conf-neko" | ||
| - "luv" {= "0.5.12"} | ||
| + "luv" {>= "0.5.13"} | ||
| ] | ||
|
|
||
| diff --git a/src/macro/eval/evalLuv.ml b/src/macro/eval/evalLuv.ml | ||
| index 12099b5f6b9..07aee9a3999 100644 | ||
| --- a/src/macro/eval/evalLuv.ml | ||
| +++ b/src/macro/eval/evalLuv.ml | ||
| @@ -1942,7 +1942,7 @@ let fs_event_fields = [ | ||
| ) events | ||
| in | ||
| encode_obj [ | ||
| - key_file,vnative_string file; | ||
| + key_file,encode_nullable vnative_string file; | ||
| key_events,encode_array vevents; | ||
| ] | ||
| ) v4 | ||
| @@ -2175,7 +2175,7 @@ let env_fields = [ | ||
| let time_fields = [ | ||
| "getTimeOfDay", vfun0 (fun() -> | ||
| encode_result (fun (t:Time.t) -> | ||
| - encode_obj [key_sec,VInt64 t.tv_sec; key_usec,vint32 t.tv_usec] | ||
| + encode_obj [key_sec,VInt64 t.sec; key_usec,vint32 t.usec] | ||
| ) (Time.gettimeofday()) | ||
| ); | ||
| "hrTime", vfun0 (fun() -> | ||
| @@ -2292,10 +2292,10 @@ let resource_fields = [ | ||
| encode_array_a [|vfloat m1; vfloat m5; vfloat m15|]; | ||
| ); | ||
| "freeMemory", vfun0 (fun() -> | ||
| - VUInt64 (Resource.free_memory()) | ||
| + encode_nullable (fun u -> VUInt64 u) (Resource.free_memory()) | ||
| ); | ||
| "totalMemory", vfun0 (fun() -> | ||
| - VUInt64 (Resource.total_memory()) | ||
| + encode_nullable (fun u -> VUInt64 u) (Resource.total_memory()) | ||
| ); | ||
| "constrainedMemory", vfun0 (fun() -> | ||
| encode_nullable (fun u -> VUInt64 u) (Resource.constrained_memory()) | ||
| diff --git a/std/eval/luv/FsEvent.hx b/std/eval/luv/FsEvent.hx | ||
| index 5571138197f..5df6c3bf151 100644 | ||
| --- a/std/eval/luv/FsEvent.hx | ||
| +++ b/std/eval/luv/FsEvent.hx | ||
| @@ -26,7 +26,7 @@ enum abstract FsEventFlag(Int) { | ||
| /** | ||
| Starts the handle and watches the given path for changes. | ||
| **/ | ||
| - public function start(path:NativeString, ?flags:Array<FsEventFlag>, callback:(result:Result<{file:NativeString,events:Array<FsEventType>}>)->Void):Void; | ||
| + public function start(path:NativeString, ?flags:Array<FsEventFlag>, callback:(result:Result<{file:Null<NativeString>,events:Array<FsEventType>}>)->Void):Void; | ||
|
|
||
| /** | ||
| Stops the handle. | ||
| diff --git a/std/eval/luv/Resource.hx b/std/eval/luv/Resource.hx | ||
| index 5457e74f6ea..de70d5d1b78 100644 | ||
| --- a/std/eval/luv/Resource.hx | ||
| +++ b/std/eval/luv/Resource.hx | ||
| @@ -40,13 +40,15 @@ extern class Resource { | ||
|
|
||
| /** | ||
| Evaluates to the amount of free memory, in bytes. | ||
| + Returns `null` when unknown. | ||
| **/ | ||
| - static function freeMemory():UInt64; | ||
| + static function freeMemory():Null<UInt64>; | ||
|
|
||
| /** | ||
| Evaluates to the total amount of memory, in bytes. | ||
| + Returns `null` when unknown. | ||
| **/ | ||
| - static function totalMemory():UInt64; | ||
| + static function totalMemory():Null<UInt64>; | ||
|
|
||
| /** | ||
| Gets the amount of memory available to the process (in bytes) based on | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -893,6 +893,7 @@ | |
| <Path fileType="data">/usr/share/haxe/std/haxe/crypto/Sha1.hx</Path> | ||
| <Path fileType="data">/usr/share/haxe/std/haxe/crypto/Sha224.hx</Path> | ||
| <Path fileType="data">/usr/share/haxe/std/haxe/crypto/Sha256.hx</Path> | ||
| <Path fileType="data">/usr/share/haxe/std/haxe/display/Diagnostic.hx</Path> | ||
| <Path fileType="data">/usr/share/haxe/std/haxe/display/Display.hx</Path> | ||
| <Path fileType="data">/usr/share/haxe/std/haxe/display/FsPath.hx</Path> | ||
| <Path fileType="data">/usr/share/haxe/std/haxe/display/JsonModuleTypes.hx</Path> | ||
|
|
@@ -2672,9 +2673,9 @@ | |
| </Files> | ||
| </Package> | ||
| <History> | ||
| <Update release="6"> | ||
| <Date>2024-02-09</Date> | ||
| <Version>4.3.3</Version> | ||
| <Update release="7"> | ||
| <Date>2024-10-23</Date> | ||
| <Version>4.3.6</Version> | ||
| <Comment>Packaging update</Comment> | ||
| <Name>Thomas Staudinger</Name> | ||
| <Email>[email protected]</Email> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.