git: c2216387ee48 - main - www/ladybird: update to g20240109

From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Tue, 16 Jan 2024 16:18:57 UTC 
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c2216387ee48a80e4aaffe994baf9e5dad8f3227

commit c2216387ee48a80e4aaffe994baf9e5dad8f3227
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2024-01-09 19:33:53 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2024-01-16 16:18:22 +0000

    www/ladybird: update to g20240109
    
     - add PULSEAUDIO option to disable use of Pulseaudio
     - remove upstreamed distribution patches
    
    PR:             276222
---
 www/ladybird/Makefile                              | 10 ++++++---
 www/ladybird/distinfo                              | 26 +++++++++++-----------
 www/ladybird/files/patch-AK_Format.cpp             | 20 -----------------
 ...ch-Userland_Libraries_LibCore_StandardPaths.cpp | 21 -----------------
 4 files changed, 20 insertions(+), 57 deletions(-)

diff --git a/www/ladybird/Makefile b/www/ladybird/Makefile
index d486369b303e..88344eceb7c5 100644
--- a/www/ladybird/Makefile
+++ b/www/ladybird/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	ladybird
-PORTVERSION=	g20231216
+PORTVERSION=	g20240109
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/unicode-org/cldr-json/releases/download/${CLDRVERSION}/:cldr \
 		https://www.unicode.org/Public/${UCDVERSION}/ucd/:ucd \
@@ -27,14 +27,13 @@ ONLY_FOR_ARCHS_REASON=	other architectures not recognised by build system
 BROKEN_i386=	Userland/Libraries/LibJIT/GDBElf.cpp:29:24: bit cast source size does not equal destination size
 
 BUILD_DEPENDS=	${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat:dns/public_suffix_list
-LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 RUN_DEPENDS=	${LOCALBASE}/share/fonts/Liberation/LiberationMono-Bold.ttf:x11-fonts/liberation-fonts-ttf
 
 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=	36f0499cc84ccfcb2d1867b683ec732d247a6827
+GH_TAGNAME=	343d6b001fa94d9707d443f00d295fdfcc4f1511
 USE_GL=		egl
 USE_LDCONFIG=	yes
 USE_QT=		base tools:build wayland multimedia
@@ -61,6 +60,11 @@ PLIST_FILES_amd64=	lib/liblagom-x86.so \
 			lib/liblagom-x86.so.0 \
 			lib/liblagom-x86.so.0.0.0
 
+OPTIONS_DEFINE=	PULSEAUDIO
+OPTIONS_DEFAULT=	PULSEAUDIO
+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL=	HAVE_PULSEAUDIO
+
 post-extract:
 	${MKDIR} ${CONFIGURE_WRKSRC}/caches/PublicSuffix
 	${LN} -s ${LOCALBASE}/share/public_suffix_list/public_suffix_list.dat \
diff --git a/www/ladybird/distinfo b/www/ladybird/distinfo
index 401b7001fd93..9a0cedc7a556 100644
--- a/www/ladybird/distinfo
+++ b/www/ladybird/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1702819284
-SHA256 (ladybird-g20231216/cldr-44.0.1-json-modern.zip) = 6daf783158fb3b09aa026a048e1f5ed5773148387b1edadfad33f303371f332a
-SIZE (ladybird-g20231216/cldr-44.0.1-json-modern.zip) = 47935704
-SHA256 (ladybird-g20231216/UCD.zip) = cb1c663d053926500cd501229736045752713a066bd75802098598b7a7056177
-SIZE (ladybird-g20231216/UCD.zip) = 8248819
-SHA256 (ladybird-g20231216/emoji-test.txt) = d876ee249aa28eaa76cfa6dfaa702847a8d13b062aa488d465d0395ee8137ed9
-SIZE (ladybird-g20231216/emoji-test.txt) = 639405
-SHA256 (ladybird-g20231216/IdnaMappingTable.txt) = 402cbd285f1f952fcd0834b63541d54f69d3d8f1b8f8599bf71a1a14935f82c4
-SIZE (ladybird-g20231216/IdnaMappingTable.txt) = 874566
-SHA256 (ladybird-g20231216/cacert-2023-08-22.pem) = 23c2469e2a568362a62eecf1b49ed90a15621e6fa30e29947ded3436422de9b9
-SIZE (ladybird-g20231216/cacert-2023-08-22.pem) = 221470
-SHA256 (ladybird-g20231216/SerenityOS-serenity-g20231216-36f0499cc84ccfcb2d1867b683ec732d247a6827_GH0.tar.gz) = dee275b33d72c8ae050368074c0c3b717b12914640d070700f5ec26ca8fda192
-SIZE (ladybird-g20231216/SerenityOS-serenity-g20231216-36f0499cc84ccfcb2d1867b683ec732d247a6827_GH0.tar.gz) = 65961975
+TIMESTAMP = 1704823039
+SHA256 (ladybird-g20240109/cldr-44.0.1-json-modern.zip) = 6daf783158fb3b09aa026a048e1f5ed5773148387b1edadfad33f303371f332a
+SIZE (ladybird-g20240109/cldr-44.0.1-json-modern.zip) = 47935704
+SHA256 (ladybird-g20240109/UCD.zip) = cb1c663d053926500cd501229736045752713a066bd75802098598b7a7056177
+SIZE (ladybird-g20240109/UCD.zip) = 8248819
+SHA256 (ladybird-g20240109/emoji-test.txt) = d876ee249aa28eaa76cfa6dfaa702847a8d13b062aa488d465d0395ee8137ed9
+SIZE (ladybird-g20240109/emoji-test.txt) = 639405
+SHA256 (ladybird-g20240109/IdnaMappingTable.txt) = 402cbd285f1f952fcd0834b63541d54f69d3d8f1b8f8599bf71a1a14935f82c4
+SIZE (ladybird-g20240109/IdnaMappingTable.txt) = 874566
+SHA256 (ladybird-g20240109/cacert-2023-08-22.pem) = 23c2469e2a568362a62eecf1b49ed90a15621e6fa30e29947ded3436422de9b9
+SIZE (ladybird-g20240109/cacert-2023-08-22.pem) = 221470
+SHA256 (ladybird-g20240109/SerenityOS-serenity-g20240109-343d6b001fa94d9707d443f00d295fdfcc4f1511_GH0.tar.gz) = 7d625f681d56ec27fc3344c732518c2afdfcf67257d8094af855bf974d3c99c3
+SIZE (ladybird-g20240109/SerenityOS-serenity-g20240109-343d6b001fa94d9707d443f00d295fdfcc4f1511_GH0.tar.gz) = 68262140
diff --git a/www/ladybird/files/patch-AK_Format.cpp b/www/ladybird/files/patch-AK_Format.cpp
deleted file mode 100644
index c7e127f6daf2..000000000000
--- a/www/ladybird/files/patch-AK_Format.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- AK/Format.cpp.orig	2023-12-17 13:03:11 UTC
-+++ AK/Format.cpp
-@@ -1215,7 +1215,7 @@ void vdbg(StringView fmtstr, TypeErasedFormatParams& p
-             struct timespec ts = {};
-             clock_gettime(CLOCK_MONOTONIC_COARSE, &ts);
-             auto pid = getpid();
--#    ifndef AK_OS_MACOS
-+#    if !defined(AK_OS_MACOS) && !defined(AK_OS_FREEBSD)
-             // Darwin doesn't handle thread IDs the same way other Unixes do
-             auto tid = gettid();
-             if (pid == tid)
-@@ -1223,7 +1223,7 @@ void vdbg(StringView fmtstr, TypeErasedFormatParams& p
-             {
-                 builder.appendff("{}.{:03} \033[33;1m{}({})\033[0m: ", ts.tv_sec, ts.tv_nsec / 1000000, process_name, pid);
-             }
--#    ifndef AK_OS_MACOS
-+#    if !defined(AK_OS_MACOS) && !defined(AK_OS_FREEBSD)
-             else {
-                 builder.appendff("{}.{:03} \033[33;1m{}({}:{})\033[0m: ", ts.tv_sec, ts.tv_nsec / 1000000, process_name, pid, tid);
-             }
diff --git a/www/ladybird/files/patch-Userland_Libraries_LibCore_StandardPaths.cpp b/www/ladybird/files/patch-Userland_Libraries_LibCore_StandardPaths.cpp
deleted file mode 100644
index 659b4c70c4a7..000000000000
--- a/www/ladybird/files/patch-Userland_Libraries_LibCore_StandardPaths.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- Userland/Libraries/LibCore/StandardPaths.cpp.orig	2023-12-17 14:07:18 UTC
-+++ Userland/Libraries/LibCore/StandardPaths.cpp
-@@ -12,6 +12,7 @@
- #include <AK/StringBuilder.h>
- #include <LibCore/SessionManagement.h>
- #include <LibCore/StandardPaths.h>
-+#include <LibCore/System.h>
- #include <pwd.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -107,6 +108,10 @@ ErrorOr<DeprecatedString> StandardPaths::runtime_direc
- #elif defined(AK_OS_MACOS)
-     builder.append(home_directory());
-     builder.append("/Library/Application Support"sv);
-+#elif defined(AK_OS_FREEBSD)
-+    auto uid = getuid();
-+    builder.appendff("/tmp/{}", uid);
-+    (void)Core::System::mkdir(builder.string_view(), 0700);
- #elif defined(AK_OS_HAIKU)
-     builder.append("/boot/system/var/shared_memory"sv);
- #else