pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
ladybird-git: switch to new upstream location
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Sat Jul 6 07:45:57 2024 +0200
Changeset: 0708fba68ac96796d54a7a8b546cba5dcadaa800
Modified Files:
ladybird-git/Makefile
ladybird-git/PLIST
ladybird-git/TODO
Removed Files:
ladybird-git/distinfo
ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
Log Message:
ladybird-git: switch to new upstream location
TODO: Needs skia package now.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0708fba68ac96796d54a7a8b546cba5dcadaa800
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
ladybird-git/Makefile | 14 +++++++++++---
ladybird-git/PLIST | 6 +++---
ladybird-git/TODO | 2 ++
ladybird-git/distinfo | 3 ---
...ch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h | 16 ----------------
5 files changed, 16 insertions(+), 25 deletions(-)
diffs:
diff --git a/ladybird-git/Makefile b/ladybird-git/Makefile
index 288d7fa397..92a3acd888 100644
--- a/ladybird-git/Makefile
+++ b/ladybird-git/Makefile
@@ -2,7 +2,7 @@
DISTNAME= ladybird-0.0.0
CATEGORIES= www
-GIT_REPO= https://github.com/SerenityOS/serenity.git
+GIT_REPO= https://github.com/LadybirdBrowser/ladybird.git
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://ladybird.dev/
@@ -14,13 +14,18 @@ TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
USE_LANGUAGES= c c++
USE_CXX_FEATURES+= c++20
GCC_REQD+= 13
+USE_TOOLS+= pkg-config
-CMAKE_ARGS+= -S Ladybird
+#CMAKE_ARGS+= -S Ladybird
# build broken with make
-CMAKE_GENERATOR= ninja
+#CMAKE_GENERATOR= ninja
# TODO: this needs fixing
ALLOW_NETWORK_ACCESS= 1
+# Ladybird dumps core with full RELRO
+# http://gnats.netbsd.org/57792
+RELRO_SUPPORTED= partial
+
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/cmake-pkgsrc-build/lib
SUBST_CLASSES+= fontpath
@@ -30,7 +35,10 @@ SUBST_MESSAGE.fontpath= Fixing path to fonts.
SUBST_STAGE.fontpath= pre-build
.include "../../devel/cmake/build.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/woff2/buildlink3.mk"
.include "../../x11/qt6-qtbase/buildlink3.mk"
.include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
+.include "../../multimedia/ffmpeg7/buildlink3.mk"
.include "../../wip/mk/git-package.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ladybird-git/PLIST b/ladybird-git/PLIST
index 9b621cee3e..79f1dd5e15 100644
--- a/ladybird-git/PLIST
+++ b/ladybird-git/PLIST
@@ -51,6 +51,9 @@ lib/liblagom-locale.so.${PKGVERSION}
lib/liblagom-markdown.so
lib/liblagom-markdown.so.0
lib/liblagom-markdown.so.${PKGVERSION}
+lib/liblagom-media.so
+lib/liblagom-media.so.0
+lib/liblagom-media.so.${PKGVERSION}
lib/liblagom-protocol.so
lib/liblagom-protocol.so.0
lib/liblagom-protocol.so.${PKGVERSION}
@@ -84,9 +87,6 @@ lib/liblagom-unicode.so.${PKGVERSION}
lib/liblagom-url.so
lib/liblagom-url.so.0
lib/liblagom-url.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}
diff --git a/ladybird-git/TODO b/ladybird-git/TODO
index 14c4de5a70..94ccddc591 100644
--- a/ladybird-git/TODO
+++ b/ladybird-git/TODO
@@ -1,3 +1,5 @@
+Needs skia package to build.
+
Downloads files during build:
-- Found Python3: /usr/pkg/bin/python3.11 (found version "3.11.8") found components: Interpreter
-- Removing outdated /scratch/wip/ladybird-git/work/serenity/Ladybird/cmake-pkgsrc-build/Lagom/../caches/CLDR for version 44.1.0
diff --git a/ladybird-git/distinfo b/ladybird-git/distinfo
deleted file mode 100644
index 1777dd4682..0000000000
--- a/ladybird-git/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-$NetBSD$
-
-SHA1 (patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h) = f7ed5a136558d68cd853c10f5b69fc14ebc852ec
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 c36a7b157e..0000000000
--- a/ladybird-git/patches/patch-Userland_Libraries_LibGfx_EdgeFlagPathRasterizer.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-popcount conflict on NetBSD.
-https://github.com/SerenityOS/serenity/issues/23375
-
---- Userland/Libraries/LibGfx/EdgeFlagPathRasterizer.h.orig 2024-06-06 21:18:50.814506936 +0000
-+++ Userland/Libraries/LibGfx/EdgeFlagPathRasterizer.h
-@@ -21,7 +21,7 @@ namespace Detail {
- static auto constexpr coverage_lut = [] {
- Array<u8, 256> coverage_lut {};
- for (u32 sample = 0; sample <= 255; sample++)
-- coverage_lut[sample] = popcount(sample);
-+ coverage_lut[sample] = AK::popcount(sample);
- return coverage_lut;
- }();
-
Home |
Main Index |
Thread Index |
Old Index