openjfx17: 17.0.11-ga -> 17.0.11+3

So this is fun: the hash here is actually the hash we had previously
for 17.0.6+3. 614dc610fe bumped to
this version, with the correct hash, but then the conversion to use
the Gradle setup hook in e6f8a3baba
regressed it back, presumably due to a merge issue, and of course
nobody noticed until now.

Drop an upstreamed WebKit Ruby compatibility fix that should never have
been needed for the version we advertised this as being at the time.

Fixes: e6f8a3baba
This commit is contained in:
Emily 2024-10-24 19:17:45 +00:00
parent 7bc545f5a8
commit 09adc5dc96
3 changed files with 4 additions and 9 deletions

View File

@ -7,8 +7,8 @@
}
},
"https://github.com": {
"unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": {
"zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="
"unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": {
"zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="
}
},
"https://repo.maven.apache.org/maven2": {

View File

@ -1,6 +1,6 @@
{
"hash": "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE=",
"owner": "openjdk",
"repo": "jfx17u",
"rev": "17.0.11-ga",
"sha256": "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="
"rev": "refs/tags/17.0.11+3"
}

View File

@ -139,11 +139,6 @@ stdenv.mkDerivation {
-i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \
modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h
''
+ lib.optionalString (!atLeast21) ''
substituteInPlace modules/javafx.web/src/main/native/Source/JavaScriptCore/offlineasm/parser.rb \
--replace-fail "File.exists?" "File.exist?"
''
+ ''
ln -s $config gradle.properties