pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ladybird-git: some progress
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By: wiz
Date: Tue Feb 27 19:44:24 2024 +0100
Changeset: da557c3eb0f4c52de29d67f1b15395e72742d5b3
Modified Files:
ladybird-git/Makefile
ladybird-git/PLIST
ladybird-git/TODO
Added Files:
ladybird-git/distinfo
ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp
ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
Log Message:
ladybird-git: some progress
builds, but doesn't show any web pages
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=da557c3eb0f4c52de29d67f1b15395e72742d5b3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ladybird-git/Makefile | 13 +-
ladybird-git/PLIST | 176 +++++++++++++++++++++
ladybird-git/TODO | 3 -
ladybird-git/distinfo | 4 +
...atch-Userland_Libraries_LibCore_Environment.cpp | 25 +++
...rland_Libraries_LibGfx_EdgeFlagPathRasterizer.h | 16 ++
6 files changed, 230 insertions(+), 7 deletions(-)
diffs:
diff --git a/ladybird-git/Makefile b/ladybird-git/Makefile
index 10bdc005c6..b6902818e7 100644
--- a/ladybird-git/Makefile
+++ b/ladybird-git/Makefile
@@ -15,12 +15,17 @@ USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++20
GCC_REQD+= 12
-#WRKSRC= ${WRKDIR}/serenity/Ladybird
+CMAKE_ARGS+= -S Ladybird
+# build broken with make
+CMAKE_GENERATOR= ninja
-CMAKE_ARGS+= -S Ladybird
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/cmake-pkgsrc-build/lib
-# assumes directories exist before they do
-MAKE_JOBS_SAFE= no
+SUBST_CLASSES+= fontpath
+SUBST_FILES.fontpath+= Userland/Libraries/LibCore/StandardPaths.cpp
+SUBST_SED.fontpath+= -e "s,/usr/local/share/fonts,${PREFIX}/share/fonts,"
+SUBST_MESSAGE.fontpath= Fixing path to fonts.
+SUBST_STAGE.fontpath= pre-build
.include "../../devel/cmake/build.mk"
.include "../../x11/qt6-qtbase/buildlink3.mk"
diff --git a/ladybird-git/PLIST b/ladybird-git/PLIST
index 48d96a5493..49d5cbd272 100644
--- a/ladybird-git/PLIST
+++ b/ladybird-git/PLIST
@@ -1 +1,177 @@
@comment $NetBSD$
+bin/Ladybird
+include/Ladybird/HelperProcess.h
+include/Ladybird/Types.h
+include/Ladybird/Utilities.h
+lib/liblagom-ak.so
+lib/liblagom-ak.so.0
+lib/liblagom-ak.so.${PKGVERSION}
+lib/liblagom-audio.so
+lib/liblagom-audio.so.0
+lib/liblagom-audio.so.${PKGVERSION}
+lib/liblagom-compress.so
+lib/liblagom-compress.so.0
+lib/liblagom-compress.so.${PKGVERSION}
+lib/liblagom-core.so
+lib/liblagom-core.so.0
+lib/liblagom-core.so.${PKGVERSION}
+lib/liblagom-crypto.so
+lib/liblagom-crypto.so.0
+lib/liblagom-crypto.so.${PKGVERSION}
+lib/liblagom-diff.so
+lib/liblagom-diff.so.0
+lib/liblagom-diff.so.${PKGVERSION}
+lib/liblagom-filesystem.so
+lib/liblagom-filesystem.so.0
+lib/liblagom-filesystem.so.${PKGVERSION}
+lib/liblagom-gemini.so
+lib/liblagom-gemini.so.0
+lib/liblagom-gemini.so.${PKGVERSION}
+lib/liblagom-gfx.so
+lib/liblagom-gfx.so.0
+lib/liblagom-gfx.so.${PKGVERSION}
+lib/liblagom-gui.so
+lib/liblagom-gui.so.0
+lib/liblagom-gui.so.${PKGVERSION}
+lib/liblagom-http.so
+lib/liblagom-http.so.0
+lib/liblagom-http.so.${PKGVERSION}
+lib/liblagom-idl.so
+lib/liblagom-idl.so.0
+lib/liblagom-idl.so.${PKGVERSION}
+lib/liblagom-imagedecoderclient.so
+lib/liblagom-imagedecoderclient.so.0
+lib/liblagom-imagedecoderclient.so.${PKGVERSION}
+lib/liblagom-ipc.so
+lib/liblagom-ipc.so.0
+lib/liblagom-ipc.so.${PKGVERSION}
+lib/liblagom-js.so
+lib/liblagom-js.so.0
+lib/liblagom-js.so.${PKGVERSION}
+lib/liblagom-locale.so
+lib/liblagom-locale.so.0
+lib/liblagom-locale.so.${PKGVERSION}
+lib/liblagom-markdown.so
+lib/liblagom-markdown.so.0
+lib/liblagom-markdown.so.${PKGVERSION}
+lib/liblagom-protocol.so
+lib/liblagom-protocol.so.0
+lib/liblagom-protocol.so.${PKGVERSION}
+lib/liblagom-regex.so
+lib/liblagom-regex.so.0
+lib/liblagom-regex.so.${PKGVERSION}
+lib/liblagom-riff.so
+lib/liblagom-riff.so.0
+lib/liblagom-riff.so.${PKGVERSION}
+lib/liblagom-softgpu.so
+lib/liblagom-softgpu.so.0
+lib/liblagom-softgpu.so.${PKGVERSION}
+lib/liblagom-sql.so
+lib/liblagom-sql.so.0
+lib/liblagom-sql.so.${PKGVERSION}
+lib/liblagom-syntax.so
+lib/liblagom-syntax.so.0
+lib/liblagom-syntax.so.${PKGVERSION}
+lib/liblagom-textcodec.so
+lib/liblagom-textcodec.so.0
+lib/liblagom-textcodec.so.${PKGVERSION}
+lib/liblagom-threading.so
+lib/liblagom-threading.so.0
+lib/liblagom-threading.so.${PKGVERSION}
+lib/liblagom-tls.so
+lib/liblagom-tls.so.0
+lib/liblagom-tls.so.${PKGVERSION}
+lib/liblagom-unicode.so
+lib/liblagom-unicode.so.0
+lib/liblagom-unicode.so.${PKGVERSION}
+lib/liblagom-video.so
+lib/liblagom-video.so.0
+lib/liblagom-video.so.${PKGVERSION}
+lib/liblagom-wasm.so
+lib/liblagom-wasm.so.0
+lib/liblagom-wasm.so.${PKGVERSION}
+lib/liblagom-web.so
+lib/liblagom-web.so.0
+lib/liblagom-web.so.${PKGVERSION}
+lib/liblagom-websocket.so
+lib/liblagom-websocket.so.0
+lib/liblagom-websocket.so.${PKGVERSION}
+lib/liblagom-webview.so
+lib/liblagom-webview.so.0
+lib/liblagom-webview.so.${PKGVERSION}
+lib/liblagom-x86.so
+lib/liblagom-x86.so.0
+lib/liblagom-x86.so.${PKGVERSION}
+lib/liblagom-xml.so
+lib/liblagom-xml.so.0
+lib/liblagom-xml.so.${PKGVERSION}
+libexec/ImageDecoder
+libexec/RequestServer
+libexec/SQLServer
+libexec/WebContent
+libexec/WebDriver
+libexec/WebSocket
+libexec/WebWorker
+libexec/headless-browser
+share/Ladybird/LadybirdConfig.cmake
+share/Ladybird/LadybirdConfigVersion.cmake
+share/Ladybird/ladybirdTargets-noconfig.cmake
+share/Ladybird/ladybirdTargets.cmake
+share/Lagom/fonts/CsillaBold10.font
+share/Lagom/fonts/CsillaBold12.font
+share/Lagom/fonts/CsillaRegular10.font
+share/Lagom/fonts/CsillaRegular12.font
+share/Lagom/fonts/KaticaBold10.font
+share/Lagom/fonts/KaticaBold12.font
+share/Lagom/fonts/KaticaBoldOblique10.font
+share/Lagom/fonts/KaticaItalic10.font
+share/Lagom/fonts/KaticaRegular10.font
+share/Lagom/fonts/KaticaRegular12.font
+share/Lagom/fonts/SerenitySans-Regular.ttf
+share/Lagom/icons/16x16/app-browser.png
+share/Lagom/icons/16x16/audio-volume-high.png
+share/Lagom/icons/16x16/audio-volume-muted.png
+share/Lagom/icons/16x16/close-tab.png
+share/Lagom/icons/16x16/edit-copy.png
+share/Lagom/icons/16x16/filetype-css.png
+share/Lagom/icons/16x16/filetype-folder-open.png
+share/Lagom/icons/16x16/filetype-html.png
+share/Lagom/icons/16x16/filetype-image.png
+share/Lagom/icons/16x16/filetype-sound.png
+share/Lagom/icons/16x16/filetype-video.png
+share/Lagom/icons/16x16/find.png
+share/Lagom/icons/16x16/go-forward.png
+share/Lagom/icons/16x16/history.png
+share/Lagom/icons/16x16/layers.png
+share/Lagom/icons/16x16/layout.png
+share/Lagom/icons/16x16/new-tab.png
+share/Lagom/icons/16x16/open-parent-directory.png
+share/Lagom/icons/16x16/pause.png
+share/Lagom/icons/16x16/play.png
+share/Lagom/icons/16x16/select-all.png
+share/Lagom/icons/16x16/settings.png
+share/Lagom/icons/16x16/spoof.png
+share/Lagom/icons/16x16/trash-can.png
+share/Lagom/icons/16x16/zoom-in.png
+share/Lagom/icons/16x16/zoom-out.png
+share/Lagom/icons/16x16/zoom-reset.png
+share/Lagom/icons/32x32/app-browser.png
+share/Lagom/icons/32x32/filetype-folder.png
+share/Lagom/icons/32x32/filetype-unknown.png
+share/Lagom/icons/32x32/msgbox-warning.png
+share/Lagom/icons/browser/clear-cache.png
+share/Lagom/icons/browser/cookie.png
+share/Lagom/icons/browser/dom-tree.png
+share/Lagom/icons/browser/local-storage.png
+share/Lagom/ladybird/BrowserAutoplayAllowlist.txt
+share/Lagom/ladybird/BrowserContentFilters.txt
+share/Lagom/ladybird/about.html
+share/Lagom/ladybird/cacert.pem
+share/Lagom/ladybird/inspector.css
+share/Lagom/ladybird/inspector.js
+share/Lagom/ladybird/newtab.html
+share/Lagom/ladybird/templates/directory.html
+share/Lagom/ladybird/templates/error.html
+share/Lagom/ladybird/templates/version.html
+share/Lagom/themes/Dark.ini
+share/Lagom/themes/Default.ini
diff --git a/ladybird-git/TODO b/ladybird-git/TODO
index cb3edcc377..838f0e1d0d 100644
--- a/ladybird-git/TODO
+++ b/ladybird-git/TODO
@@ -11,6 +11,3 @@ Downloads files during build:
-- Downloading file IdnaMappingTable.txt from https://www.unicode.org/Public/idna/15.1.0/IdnaMappingTable.txt
-- 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
-
-Build fails early, see
-https://github.com/SerenityOS/serenity/issues/23375
diff --git a/ladybird-git/distinfo b/ladybird-git/distinfo
new file mode 100644
index 0000000000..131f607f39
--- /dev/null
+++ b/ladybird-git/distinfo
@@ -0,0 +1,4 @@
+$NetBSD$
+
+SHA1 (patch-Userland_Libraries_LibCore_Environment.cpp) = e73bbb399803231f36f2bdf43d7c49810a3cdb2b
+SHA1 (patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h) = 2c3e46cdd49aaea673a99d7a72b8b0ae2fd2380e
diff --git a/ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp b/ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp
new file mode 100644
index 0000000000..c7a2c7f73e
--- /dev/null
+++ b/ladybird-git/patches/patch-Userland_Libraries_LibCore_Environment.cpp
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Fix compilation on NetBSD.
+https://github.com/SerenityOS/serenity/issues/23375
+
+--- Userland/Libraries/LibCore/Environment.cpp.orig 2024-02-27 18:09:19.633132086 +0000
++++ Userland/Libraries/LibCore/Environment.cpp
+@@ -93,7 +93,7 @@ Optional<StringView> get(StringView name
+ builder.append('\0');
+ // Note the explicit null terminators above.
+
+-#if defined(AK_OS_MACOS)
++#if defined(AK_OS_MACOS) || defined(AK_OS_NETBSD)
+ char* result = ::getenv(builder.string_view().characters_without_null_termination());
+ #else
+ char* result;
+@@ -153,7 +153,7 @@ ErrorOr<void> put(StringView env)
+
+ ErrorOr<void> clear()
+ {
+-#if defined(AK_OS_MACOS)
++#if defined(AK_OS_MACOS) || defined(AK_OS_NETBSD)
+ 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_LibGfx_EdgeFlagPathRasterizer.h b/ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
new file mode 100644
index 0000000000..d3592953d0
--- /dev/null
+++ b/ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
@@ -0,0 +1,16 @@
+$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);
Home |
Main Index |
Thread Index |
Old Index