ladybird: some progress with patches from upstream

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Thu May 9 23:26:45 2024 +0200
Changeset:	696d6ad1162e5a4720abf84cc844ab46cdfa919a

Modified Files:
	ladybird-git/distinfo
Added Files:
	ladybird-git/patches/patch-Meta_Lagom_CMakeLists.txt
	ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h
Removed Files:
	ladybird-git/patches/patch-Userland_Libraries_LibCore_CMakeLists.txt

Log Message:
ladybird: some progress with patches from upstream

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=696d6ad1162e5a4720abf84cc844ab46cdfa919a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ladybird-git/distinfo                                    |  3 ++-
 ladybird-git/patches/patch-Meta_Lagom_CMakeLists.txt     | 16 ++++++++++++++++
 .../patch-Userland_Libraries_LibCore_CMakeLists.txt      | 16 ----------------
 .../patches/patch-Userland_Libraries_LibCore_System.h    | 16 ++++++++++++++++
 4 files changed, 34 insertions(+), 17 deletions(-)

diffs:
diff --git a/ladybird-git/distinfo b/ladybird-git/distinfo
index eec01a3dc2..b8b7ac7be5 100644
--- a/ladybird-git/distinfo
+++ b/ladybird-git/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
-SHA1 (patch-Userland_Libraries_LibCore_CMakeLists.txt) = 9565b8c9ac7656fa7bf4e2f4809ded38ae76ae4e
+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
new file mode 100644
index 0000000000..220d0cb64f
--- /dev/null
+++ b/ladybird-git/patches/patch-Meta_Lagom_CMakeLists.txt
@@ -0,0 +1,16 @@
+$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_CMakeLists.txt b/ladybird-git/patches/patch-Userland_Libraries_LibCore_CMakeLists.txt
deleted file mode 100644
index 90d24d08fb..0000000000
--- a/ladybird-git/patches/patch-Userland_Libraries_LibCore_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Fix build on NetBSD.
-https://github.com/SerenityOS/serenity/issues/23375
-
---- Userland/Libraries/LibCore/CMakeLists.txt.orig	2024-05-09 19:06:10.996535513 +0000
-+++ Userland/Libraries/LibCore/CMakeLists.txt
-@@ -15,7 +15,7 @@ set(SOURCES
- )
- 
- serenity_lib(LibCoreMinimal coreminimal)
--target_link_libraries(LibCoreMinimal PRIVATE LibSystem)
-+target_link_libraries(LibCoreMinimal PRIVATE LibSystem -lrt)
- 
- set(SOURCES
-     AnonymousBuffer.cpp
diff --git a/ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h b/ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h
new file mode 100644
index 0000000000..b0a0dd7ea6
--- /dev/null
+++ b/ladybird-git/patches/patch-Userland_Libraries_LibCore_System.h
@@ -0,0 +1,16 @@
+$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 {};