pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ladybird: some patches were merged
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Thu Jun 6 22:41:03 2024 +0200
Changeset: 2d2bf943cf5f5fcccec1a3c3dac4609827eed016
Modified Files:
ladybird-git/TODO
ladybird-git/distinfo
Removed Files:
ladybird-git/patches/patch-Meta_Lagom_CMakeLists.txt
ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp
ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h
ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
ladybird-git/patches/patch-Userland_Libraries_LibJS_Heap_BlockAllocator.cpp
Log Message:
ladybird: some patches were merged
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2d2bf943cf5f5fcccec1a3c3dac4609827eed016
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ladybird-git/TODO | 16 ++++++++++
ladybird-git/distinfo | 5 ---
.../patches/patch-Meta_Lagom_CMakeLists.txt | 16 ----------
...atch-Userland_Libraries_LibCore_Environment.cpp | 37 ----------------------
.../patch-Userland_Libraries_LibCore_System.h | 16 ----------
...rland_Libraries_LibGfx_EdgeFlagPathRasterizer.h | 16 ----------
...serland_Libraries_LibJS_Heap_BlockAllocator.cpp | 28 ----------------
7 files changed, 16 insertions(+), 118 deletions(-)
diffs:
diff --git a/ladybird-git/TODO b/ladybird-git/TODO
index c38811708b..81b6cb66a6 100644
--- a/ladybird-git/TODO
+++ b/ladybird-git/TODO
@@ -12,4 +12,20 @@ Downloads files during build:
-- Downloading file public_suffix_list.dat from https://raw.githubusercontent.com/publicsuffix/list/master/public_suffix_list.dat
-- Downloading file commonmark.spec.json from https://spec.commonmark.org/0.30/spec.json
+Currently doesn't build with:
+
+In file included from /scratch/wip/ladybird-git/work/serenity/Userland/Libraries/LibGfx/SystemTheme.h:17,
+ from /scratch/wip/ladybird-git/work/serenity/Userland/Libraries/LibGfx/Palette.h:15,
+ from /scratch/wip/ladybird-git/work/serenity/Userland/Libraries/LibSyntax/Highlighter.h:11,
+ from /scratch/wip/ladybird-git/work/serenity/Userland/Libraries/LibSyntax/Language.cpp:9:
+/scratch/wip/ladybird-git/work/serenity/Userland/Libraries/LibGfx/Color.h: In member function 'constexpr u8 Gfx::Color::luminosity() const':
+/scratch/wip/ladybird-git/work/serenity/Userland/Libraries/LibGfx/Color.h:321:28: error: call to non-'constexpr' function 'I AK::Rounding::round_to(float) [with I = unsigned char]'
+ 321 | return round_to<u8>(red() * 0.2126f + green() * 0.7152f + blue() * 0.0722f);
+ | ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Reported here:
+https://github.com/SerenityOS/serenity/issues/23375
+
Core dumps when visiting any websites.
+Reported at
+https://github.com/SerenityOS/serenity/issues/23375
diff --git a/ladybird-git/distinfo b/ladybird-git/distinfo
index b8b7ac7be5..afc76512f4 100644
--- a/ladybird-git/distinfo
+++ b/ladybird-git/distinfo
@@ -1,7 +1,2 @@
$NetBSD$
-SHA1 (patch-Meta_Lagom_CMakeLists.txt) = 2860c0f2e25c6353467ab1ec44b329de6a3365b1
-SHA1 (patch-Userland_Libraries_LibCore_Environment.cpp) = 0a3eedeaf1badb0de422ed679f406db2f6448f6f
-SHA1 (patch-Userland_Libraries_LibCore_System.h) = f8bc69e4f4032f945d2db08d38ceaf21ffe0beca
-SHA1 (patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h) = 2c3e46cdd49aaea673a99d7a72b8b0ae2fd2380e
-SHA1 (patch-Userland_Libraries_LibJS_Heap_BlockAllocator.cpp) = 1bc0777d64c240d838ce6c504b433602d60bd3a1
diff --git a/ladybird-git/patches/patch-Meta_Lagom_CMakeLists.txt b/ladybird-git/patches/patch-Meta_Lagom_CMakeLists.txt
deleted file mode 100644
index 220d0cb64f..0000000000
--- a/ladybird-git/patches/patch-Meta_Lagom_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix linking on NetBSD.
-https://github.com/SerenityOS/serenity/issues/23375
-
---- Meta/Lagom/CMakeLists.txt.orig 2024-05-09 21:15:08.421089885 +0000
-+++ Meta/Lagom/CMakeLists.txt
-@@ -360,7 +360,7 @@ add_serenity_subdirectory(Userland/Libra
- target_link_libraries(LibCore PRIVATE Threads::Threads)
- if (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
- # NetBSD has its shm_open and shm_unlink functions in librt so we need to link that
-- target_link_libraries(LibCore PRIVATE librt.so)
-+ target_link_libraries(LibCoreMinimal PRIVATE rt)
- endif()
- if (${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
- # Solaris has socket and networking related functions in two extra libraries
diff --git a/ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp b/ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp
deleted file mode 100644
index eb67f4de2a..0000000000
--- a/ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD$
-
-Fix NetBSD & FreeBSD compatibility.
-https://github.com/SerenityOS/serenity/pull/24273
-
---- Userland/Libraries/LibCore/Environment.cpp.orig 2024-05-09 18:56:01.000000000 +0000
-+++ 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,8 @@ Optional<StringView> get(StringView name
- builder.append('\0');
- // Note the explicit null terminators above.
-
--#if defined(AK_OS_MACOS) || defined(AK_OS_ANDROID)
-+ // FIXME: FreeBSD >= 14 has secure_getenv(3)
-+#if defined(AK_OS_BSD_GENERIC) || defined(AK_OS_ANDROID)
- char* result = ::getenv(builder.string_view().characters_without_null_termination());
- #else
- char* result;
-@@ -153,7 +154,9 @@ ErrorOr<void> put(StringView env)
-
- ErrorOr<void> clear()
- {
--#if defined(AK_OS_MACOS)
-+#if defined(__FreeBSD__) && __FreeBSD__ < 14
-+ environ = nullptr;
-+#elif defined(AK_OS_BSD_GENERIC)
- auto environment = raw_environ();
- for (size_t environ_size = 0; environment[environ_size]; ++environ_size) {
- environment[environ_size] = NULL;
diff --git a/ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h b/ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h
deleted file mode 100644
index b0a0dd7ea6..0000000000
--- a/ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix coredump on NetBSD.
-https://github.com/SerenityOS/serenity/issues/23375
-
---- Userland/Libraries/LibCore/System.h.orig 2024-05-09 21:15:38.476631953 +0000
-+++ Userland/Libraries/LibCore/System.h
-@@ -263,7 +263,7 @@ private:
- }
-
- struct AddrInfoDeleter {
-- void operator()(struct addrinfo* ptr) { ::freeaddrinfo(ptr); }
-+ void operator()(struct addrinfo* ptr) { if (ptr) ::freeaddrinfo(ptr); }
- };
-
- Vector<struct addrinfo> m_addresses {};
diff --git a/ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h b/ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
deleted file mode 100644
index d3592953d0..0000000000
--- a/ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix compilation on NetBSD.
-https://github.com/SerenityOS/serenity/issues/23375
-
---- Userland/Libraries/LibGfx/EdgeFlagPathRasterizer.h.orig 2024-02-27 18:16:47.107269492 +0000
-+++ Userland/Libraries/LibGfx/EdgeFlagPathRasterizer.h
-@@ -18,7 +18,7 @@ namespace Gfx {
-
- namespace Detail {
-
--static auto constexpr coverage_lut = [] {
-+static auto coverage_lut = [] {
- Array<u8, 256> coverage_lut {};
- for (u32 sample = 0; sample <= 255; sample++)
- coverage_lut[sample] = popcount(sample);
diff --git a/ladybird-git/patches/patch-Userland_Libraries_LibJS_Heap_BlockAllocator.cpp b/ladybird-git/patches/patch-Userland_Libraries_LibJS_Heap_BlockAllocator.cpp
deleted file mode 100644
index 59b8790511..0000000000
--- a/ladybird-git/patches/patch-Userland_Libraries_LibJS_Heap_BlockAllocator.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD$
-
-Fix NetBSD & FreeBSD compatibility.
-https://github.com/SerenityOS/serenity/pull/24273
-
---- Userland/Libraries/LibJS/Heap/BlockAllocator.cpp.orig 2024-05-09 18:56:01.000000000 +0000
-+++ Userland/Libraries/LibJS/Heap/BlockAllocator.cpp
-@@ -55,9 +55,9 @@ void* BlockAllocator::allocate_block([[m
- }
-
- #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);
-+ auto* block = (HeapBlock*)serenity_mmap(nullptr, HeapBlock::block_size, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_RANDOMIZED | MAP_PRIVATE, -1, 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(vo
- 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();
- }
Home |
Main Index |
Thread Index |
Old Index