MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-11-05 04:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update servo to 0.7.0

Browse Source
This commit is contained in:
Wildan M 2026-10-07 11:40:09 +02:00
parent b23af373da
commit 27881074c3
No known key found for this signature in database
GPG Key ID: 01AC53185C679C79
3 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
recipes/wip/web/servo/recipe.toml
View File

@ -1,6 +1,6 @@
[source]
git = "https://gitlab.redox-os.org/redox-os/servo.git"
branch = "redox"
branch = "redox-0.7.0"
[build]
template = "custom"
@ -12,10 +12,6 @@ dependencies = [
"mesa",
"zlib",
]
dev-dependencies = [
"llvm21.dev",
"host:libarchive", # workaround for cmake error
]
script = """
DYNAMIC_INIT
@ -23,30 +19,40 @@ cp -v "${COOKBOOK_RECIPE}/.servobuild" "${COOKBOOK_SOURCE}/.servobuild"
# jemalloc specific configuration
export JEMALLOC_SYS_WITH_LG_PAGE=16
if [[ "$REDOXER_USE_CLANG" != "1" && "$REDOXER_USE_CLANG" != "true" ]]; then
export CC="${GNU_TARGET}-gcc"
export CXX="${GNU_TARGET}-g++"
export HOST_CC="gcc"
export HOST_CXX="g++"
else
export CC="${GNU_TARGET}-clang"
export CXX="${GNU_TARGET}-clang++ -stdlib=libstdc++"
export HOST_CC="clang"
export HOST_CXX="clang++"
fi
export TARGET_CC="$CC"
export TARGET_CXX="$CXX"
export TARGET_AR="$AR"
export MOZJS_FROM_SOURCE=1
# pkg-config crate can only recognize one path to pkgconfig
export PKG_CONFIG_PATH_x86_64_unknown_redox="${COOKBOOK_SYSROOT}/lib/pkgconfig"
export PKG_CONFIG_SYSROOT_DIR_x86_64_unknown_redox="${COOKBOOK_SYSROOT}/lib/pkgconfig"
# rsync -a -v ${COOKBOOK_SYSROOT}/usr/share/pkgconfig/*.pc ${COOKBOOK_SYSROOT}/lib/pkgconfig/
#TODO: mozjs-sys and mozangle uses clang, it won't know our prefix C libraries, so here's the workaround
PREFIX_INCLUDE="$COOKBOOK_HOST_SYSROOT/$TARGET/include"
export CLANGFLAGS="-I $PREFIX_INCLUDE/c++/13.2.0 -I $PREFIX_INCLUDE/c++/13.2.0/$TARGET -I $PREFIX_INCLUDE/c++/13.2.0/backward -I $PREFIX_INCLUDE"
#Mozjs specifics
export CCACHE="$CC_WRAPPER"
unset CC_WRAPPER
export CARGO_MAKEFLAGS="-j $COOKBOOK_MAKE_JOBS" CCACHE="sccache"
export CARGO_MAKEFLAGS="-j $COOKBOOK_MAKE_JOBS"
COOKBOOK_CARGO_PATH="ports/servoshell" cookbook_cargo
# resources packaging
mkdir -p ${COOKBOOK_STAGE}/usr/lib/servo/bin
mv ${COOKBOOK_STAGE}/usr/bin/servo ${COOKBOOK_STAGE}/usr/lib/servo/bin/
ln -s ../lib/servo/bin/servo ${COOKBOOK_STAGE}/usr/bin/servo
rsync -a -v ${COOKBOOK_SOURCE}/resources ${COOKBOOK_STAGE}/usr/lib/servo/
mkdir -p "${COOKBOOK_STAGE}/usr/lib/servo/bin" "${COOKBOOK_STAGE}/usr/share/applications"
mv "${COOKBOOK_STAGE}/usr/bin/servoshell" "${COOKBOOK_STAGE}/usr/lib/servo/bin/"
rsync -a -v "${COOKBOOK_SOURCE}/resources" "${COOKBOOK_STAGE}/usr/lib/servo/"
cp "${COOKBOOK_RECIPE}/servo.desktop" "${COOKBOOK_STAGE}/usr/share/applications/servo.desktop"
cp "${COOKBOOK_RECIPE}/servo.sh" "${COOKBOOK_STAGE}/usr/bin/servo"
"""
[package]

10
recipes/wip/web/servo/servo.desktop Normal file
View File

@ -0,0 +1,10 @@
[Desktop Entry]
Name=Servo
Comment=Servoshell
Exec=servo
Icon=/usr/lib/servo/resources/servo_64.png
Terminal=false
Type=Application
StartupNotify=true
Categories=Network;WebBrowser;
NoDisplay=true

6
recipes/wip/web/servo/servo.sh Executable file
View File

@ -0,0 +1,6 @@
#!/usr/bin/env bash
# bug within egui/llvm causing broken fonts
export GALLIUM_DRIVER=softpipe
exec /usr/lib/servo/bin/servoshell