Skip to content

Commit c64c8a8

Browse files
Up JSC Linux (#107)
1 parent 27f17e5 commit c64c8a8

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/jobs/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
steps:
99
- script: |
1010
sudo apt-get update
11-
sudo apt-get install libjavascriptcoregtk-4.0-dev libcurl4-openssl-dev ninja-build
11+
sudo apt-get install libjavascriptcoregtk-4.1-dev libcurl4-openssl-dev ninja-build
1212
displayName: 'Install packages'
1313
1414
- script: cmake -B Build/ubuntu -GNinja -D CMAKE_BUILD_TYPE=RelWithDebInfo

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ FetchContent_Declare(llhttp
3030
URL "https://github.com/nodejs/llhttp/archive/refs/tags/release/v8.1.0.tar.gz")
3131
FetchContent_Declare(UrlLib
3232
GIT_REPOSITORY https://github.com/BabylonJS/UrlLib.git
33-
GIT_TAG 2f12534f242ab15aa761c3b273538f44787cf5e3)
33+
GIT_TAG e0eb7d4c36c2cca5bbe82b94fd141734420ba84e)
3434
# --------------------------------------------------
3535

3636
FetchContent_MakeAvailable(CMakeExtensions)

Core/Node-API/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ elseif(ANDROID)
77
set(NAPI_JAVASCRIPT_ENGINE "V8" CACHE STRING "JavaScript engine for Node-API")
88
elseif(UNIX)
99
set(NAPI_JAVASCRIPT_ENGINE "JavaScriptCore" CACHE STRING "JavaScript engine for Node-API")
10-
set(JAVASCRIPTCORE_LIBRARY "/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.0.so" CACHE STRING "Path to the JavaScriptCore shared library")
10+
set(JAVASCRIPTCORE_LIBRARY "/usr/lib/x86_64-linux-gnu/libjavascriptcoregtk-4.1.so" CACHE STRING "Path to the JavaScriptCore shared library")
1111
else()
1212
message(FATAL_ERROR "Unable to select Node-API JavaScript engine for platform")
1313
endif()
@@ -76,7 +76,7 @@ if(NAPI_BUILD_ABI)
7676
set(LINK_LIBRARIES ${LINK_LIBRARIES}
7777
PUBLIC ${JAVASCRIPTCORE_LIBRARY})
7878
set(INCLUDE_DIRECTORIES ${INCLUDE_DIRECTORIES}
79-
PUBLIC "/usr/include/webkitgtk-4.0/")
79+
PUBLIC "/usr/include/webkitgtk-4.1/")
8080
else()
8181
message(FATAL_ERROR "Unsupported JavaScript engine: ${NAPI_JAVASCRIPT_ENGINE}")
8282
endif()

Polyfills/XMLHttpRequest/Source/XMLHttpRequest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ namespace Babylon::Polyfills::Internal
117117
gsl::span<const std::byte> responseBuffer{m_request.ResponseBuffer()};
118118
auto arrayBuffer{Napi::ArrayBuffer::New(Env(), responseBuffer.size())};
119119
std::memcpy(arrayBuffer.Data(), responseBuffer.data(), arrayBuffer.ByteLength());
120-
return std::move(arrayBuffer);
120+
return arrayBuffer;
121121
}
122122
}
123123

@@ -165,7 +165,7 @@ namespace Babylon::Polyfills::Internal
165165
responseHeadersObject.Set(key, value);
166166
}
167167

168-
return std::move(responseHeadersObject);
168+
return responseHeadersObject;
169169
}
170170

171171
void XMLHttpRequest::SetRequestHeader(const Napi::CallbackInfo& info)

0 commit comments

Comments
 (0)