mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-14 07:43:06 +00:00
www/ladybird: update to g20240505
This commit is contained in:
parent
d660953221
commit
81c15ce208
@ -1,5 +1,5 @@
|
||||
PORTNAME= ladybird
|
||||
PORTVERSION= g20240226
|
||||
PORTVERSION= g20240505
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://github.com/unicode-org/cldr-json/releases/download/${CLDRVERSION}/:cldr \
|
||||
https://www.unicode.org/Public/${UCDVERSION}/ucd/:ucd \
|
||||
@ -34,7 +34,7 @@ USES= cmake:testing compiler:c++20-lang gl localbase:ldflags python:build qt:6
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= SerenityOS
|
||||
GH_PROJECT= serenity
|
||||
GH_TAGNAME= a8a1d8746e28e743a7d86e6e660140fc28949e4f
|
||||
GH_TAGNAME= 3a7bea7402e879f731c9f4802cec84921f496942
|
||||
USE_GL= egl
|
||||
USE_LDCONFIG= yes
|
||||
USE_QT= base tools:build wayland multimedia
|
||||
|
@ -1,13 +1,13 @@
|
||||
TIMESTAMP = 1708984390
|
||||
SHA256 (ladybird-g20240226/cldr-44.0.1-json-modern.zip) = 6daf783158fb3b09aa026a048e1f5ed5773148387b1edadfad33f303371f332a
|
||||
SIZE (ladybird-g20240226/cldr-44.0.1-json-modern.zip) = 47935704
|
||||
SHA256 (ladybird-g20240226/UCD.zip) = cb1c663d053926500cd501229736045752713a066bd75802098598b7a7056177
|
||||
SIZE (ladybird-g20240226/UCD.zip) = 8248819
|
||||
SHA256 (ladybird-g20240226/emoji-test.txt) = d876ee249aa28eaa76cfa6dfaa702847a8d13b062aa488d465d0395ee8137ed9
|
||||
SIZE (ladybird-g20240226/emoji-test.txt) = 639405
|
||||
SHA256 (ladybird-g20240226/IdnaMappingTable.txt) = 402cbd285f1f952fcd0834b63541d54f69d3d8f1b8f8599bf71a1a14935f82c4
|
||||
SIZE (ladybird-g20240226/IdnaMappingTable.txt) = 874566
|
||||
SHA256 (ladybird-g20240226/cacert-2023-08-22.pem) = 23c2469e2a568362a62eecf1b49ed90a15621e6fa30e29947ded3436422de9b9
|
||||
SIZE (ladybird-g20240226/cacert-2023-08-22.pem) = 221470
|
||||
SHA256 (ladybird-g20240226/SerenityOS-serenity-g20240226-a8a1d8746e28e743a7d86e6e660140fc28949e4f_GH0.tar.gz) = 72fc9689259489600d117cb5bd7463b7635b11e4e7ff795dfea15f0be68686d5
|
||||
SIZE (ladybird-g20240226/SerenityOS-serenity-g20240226-a8a1d8746e28e743a7d86e6e660140fc28949e4f_GH0.tar.gz) = 69356886
|
||||
TIMESTAMP = 1714913472
|
||||
SHA256 (ladybird-g20240505/cldr-44.0.1-json-modern.zip) = 6daf783158fb3b09aa026a048e1f5ed5773148387b1edadfad33f303371f332a
|
||||
SIZE (ladybird-g20240505/cldr-44.0.1-json-modern.zip) = 47935704
|
||||
SHA256 (ladybird-g20240505/UCD.zip) = cb1c663d053926500cd501229736045752713a066bd75802098598b7a7056177
|
||||
SIZE (ladybird-g20240505/UCD.zip) = 8248819
|
||||
SHA256 (ladybird-g20240505/emoji-test.txt) = d876ee249aa28eaa76cfa6dfaa702847a8d13b062aa488d465d0395ee8137ed9
|
||||
SIZE (ladybird-g20240505/emoji-test.txt) = 639405
|
||||
SHA256 (ladybird-g20240505/IdnaMappingTable.txt) = 402cbd285f1f952fcd0834b63541d54f69d3d8f1b8f8599bf71a1a14935f82c4
|
||||
SIZE (ladybird-g20240505/IdnaMappingTable.txt) = 874566
|
||||
SHA256 (ladybird-g20240505/cacert-2023-08-22.pem) = 23c2469e2a568362a62eecf1b49ed90a15621e6fa30e29947ded3436422de9b9
|
||||
SIZE (ladybird-g20240505/cacert-2023-08-22.pem) = 221470
|
||||
SHA256 (ladybird-g20240505/SerenityOS-serenity-g20240505-3a7bea7402e879f731c9f4802cec84921f496942_GH0.tar.gz) = 167bccf09e4d3325e5dd292559f6b6179922d410b8aec481ab8853d816592d31
|
||||
SIZE (ladybird-g20240505/SerenityOS-serenity-g20240505-3a7bea7402e879f731c9f4802cec84921f496942_GH0.tar.gz) = 69958563
|
||||
|
@ -1,10 +0,0 @@
|
||||
--- Meta/Lagom/CMakeLists.txt.orig 2024-02-26 22:01:50 UTC
|
||||
+++ Meta/Lagom/CMakeLists.txt
|
||||
@@ -350,6 +350,7 @@ lagom_lib(AK ak SOURCES ${AK_SOURCES})
|
||||
# AK
|
||||
add_serenity_subdirectory(AK)
|
||||
lagom_lib(AK ak SOURCES ${AK_SOURCES})
|
||||
+target_link_libraries(AK PRIVATE execinfo)
|
||||
|
||||
# LibCore
|
||||
add_serenity_subdirectory(Userland/Libraries/LibCore)
|
@ -0,0 +1,34 @@
|
||||
--- Userland/Libraries/LibCore/Environment.cpp.orig 2024-05-05 05:45:42 UTC
|
||||
+++ Userland/Libraries/LibCore/Environment.cpp
|
||||
@@ -13,7 +13,7 @@
|
||||
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
|
||||
# include <crt_externs.h>
|
||||
#else
|
||||
-extern char** environ;
|
||||
+extern "C" char** environ;
|
||||
#endif
|
||||
|
||||
namespace Core::Environment {
|
||||
@@ -93,7 +93,7 @@ Optional<StringView> get(StringView name, [[maybe_unus
|
||||
builder.append('\0');
|
||||
// Note the explicit null terminators above.
|
||||
|
||||
-#if defined(AK_OS_MACOS) || defined(AK_OS_ANDROID)
|
||||
+#if defined(AK_OS_MACOS) || defined(AK_OS_ANDROID) || defined(__FreeBSD__) && __FreeBSD__ < 14
|
||||
char* result = ::getenv(builder.string_view().characters_without_null_termination());
|
||||
#else
|
||||
char* result;
|
||||
@@ -158,10 +158,12 @@ ErrorOr<void> clear()
|
||||
for (size_t environ_size = 0; environment[environ_size]; ++environ_size) {
|
||||
environment[environ_size] = NULL;
|
||||
}
|
||||
-#else
|
||||
+#elif __FreeBSD__ >= 14
|
||||
auto rc = ::clearenv();
|
||||
if (rc < 0)
|
||||
return Error::from_errno(errno);
|
||||
+#else
|
||||
+ environ = NULL;
|
||||
#endif
|
||||
return {};
|
||||
}
|
@ -0,0 +1,23 @@
|
||||
mmap() with MAP_ANONYMOUS requires that -1 be passed for the fd argument.
|
||||
See https://github.com/SerenityOS/serenity/issues/23375.
|
||||
|
||||
--- Userland/Libraries/LibJS/Heap/BlockAllocator.cpp.orig 2024-05-05 13:48:53 UTC
|
||||
+++ Userland/Libraries/LibJS/Heap/BlockAllocator.cpp
|
||||
@@ -57,7 +57,7 @@ void* BlockAllocator::allocate_block([[maybe_unused]]
|
||||
#ifdef AK_OS_SERENITY
|
||||
auto* block = (HeapBlock*)serenity_mmap(nullptr, HeapBlock::block_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_RANDOMIZED | MAP_PRIVATE, 0, 0, HeapBlock::block_size, name);
|
||||
#else
|
||||
- auto* block = (HeapBlock*)mmap(nullptr, HeapBlock::block_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, 0, 0);
|
||||
+ auto* block = (HeapBlock*)mmap(nullptr, HeapBlock::block_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
|
||||
#endif
|
||||
VERIFY(block != MAP_FAILED);
|
||||
LSAN_REGISTER_ROOT_REGION(block, HeapBlock::block_size);
|
||||
@@ -74,7 +74,7 @@ void BlockAllocator::deallocate_block(void* block)
|
||||
perror("munmap");
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
- if (mmap(block, HeapBlock::block_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, 0, 0) != block) {
|
||||
+ if (mmap(block, HeapBlock::block_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE | MAP_FIXED, -1, 0) != block) {
|
||||
perror("mmap");
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user