Adjuts font directory to /usr/share/fonts in all recipes

This commit is contained in:
Jeremy Soller 2026-01-25 15:20:20 -07:00
parent f5e797e12a
commit ef59f95988
No known key found for this signature in database
GPG Key ID: 670FDFB5428E05CA
8 changed files with 9 additions and 9 deletions

View File

@ -8,7 +8,7 @@ script = """
#TODO: Mono style included in Sans directory #TODO: Mono style included in Sans directory
for style in Sans Serif for style in Sans Serif
do do
DEST="${COOKBOOK_STAGE}/ui/fonts/${style}/DejaVu" DEST="${COOKBOOK_STAGE}/usr/share/fonts/${style}/DejaVu"
mkdir -pv "${DEST}" mkdir -pv "${DEST}"
cp -v "${COOKBOOK_SOURCE}/ttf/DejaVu${style}"*".ttf" "${DEST}" cp -v "${COOKBOOK_SOURCE}/ttf/DejaVu${style}"*".ttf" "${DEST}"
done done

View File

@ -7,7 +7,7 @@ template = "custom"
script = """ script = """
for style in Mono Sans Serif for style in Mono Sans Serif
do do
DEST="${COOKBOOK_STAGE}/ui/fonts/${style}/FreeFont" DEST="${COOKBOOK_STAGE}/usr/share/fonts/${style}/FreeFont"
mkdir -pv "${DEST}" mkdir -pv "${DEST}"
cp -v "${COOKBOOK_SOURCE}/Free${style}"*".otf" "${DEST}" cp -v "${COOKBOOK_SOURCE}/Free${style}"*".otf" "${DEST}"
done done

View File

@ -7,7 +7,7 @@ template = "custom"
script = """ script = """
for style in Mono Sans Serif for style in Mono Sans Serif
do do
DEST="${COOKBOOK_STAGE}/ui/fonts/${style}/IBM-Plex" DEST="${COOKBOOK_STAGE}/usr/share/fonts/${style}/IBM-Plex"
mkdir -pv "${DEST}" mkdir -pv "${DEST}"
cp -v "${COOKBOOK_SOURCE}/IBM-Plex-${style}/fonts/complete/ttf/"*".ttf" "${DEST}" cp -v "${COOKBOOK_SOURCE}/IBM-Plex-${style}/fonts/complete/ttf/"*".ttf" "${DEST}"
done done

View File

@ -5,7 +5,7 @@ blake3="9caff71b0a9fe8627253c55889964612ea4ae144584a283cd2fe88b7a14a4140"
[build] [build]
template = "custom" template = "custom"
script = """ script = """
DEST="${COOKBOOK_STAGE}/ui/fonts/Mono/Intel-One" DEST="${COOKBOOK_STAGE}/usr/share/fonts/Mono/Intel-One"
mkdir -pv "${DEST}" mkdir -pv "${DEST}"
cp -v "${COOKBOOK_SOURCE}/fonts/ttf/"*".ttf" "${DEST}" cp -v "${COOKBOOK_SOURCE}/fonts/ttf/"*".ttf" "${DEST}"
""" """

View File

@ -4,7 +4,7 @@ rev = "e8073ab740292f8d5f19b5de144087ac58044d06"
[build] [build]
template = "custom" template = "custom"
script = """ script = """
DEST="${COOKBOOK_STAGE}/ui/fonts/Emoji/Noto" DEST="${COOKBOOK_STAGE}/usr/share/fonts/Emoji/Noto"
mkdir -pv "${DEST}" mkdir -pv "${DEST}"
cp -v "${COOKBOOK_SOURCE}/fonts/NotoColorEmoji.ttf" "${DEST}" cp -v "${COOKBOOK_SOURCE}/fonts/NotoColorEmoji.ttf" "${DEST}"
""" """

View File

@ -6,6 +6,6 @@ blake3 = "acd40f61f6f512b0808d4bf530ab4aeb5a8ec3aa1f65bf5a1d08964d1bc3d044"
template = "custom" template = "custom"
script = """ script = """
for file in "${COOKBOOK_SOURCE}"/*.ttf; do for file in "${COOKBOOK_SOURCE}"/*.ttf; do
install -D -m 644 "$file" "${COOKBOOK_STAGE}/ui/fonts/Mono/Hack/$(basename "$file")" install -D -m 644 "$file" "${COOKBOOK_STAGE}/usr/share/fonts/Mono/Hack/$(basename "$file")"
done done
""" """

View File

@ -84,7 +84,7 @@ diff -ruwN source/netsurf/Makefile.config source-new/netsurf/Makefile.config
+override NETSURF_USE_VIDEO := NO +override NETSURF_USE_VIDEO := NO
+ +
+override NETSURF_FB_FONTLIB := freetype +override NETSURF_FB_FONTLIB := freetype
+override NETSURF_FB_FONTPATH := /ui/fonts/ +override NETSURF_FB_FONTPATH := /usr/share/fonts/
+override NETSURF_FB_FONT_SANS_SERIF := Sans/Fira/Regular.ttf +override NETSURF_FB_FONT_SANS_SERIF := Sans/Fira/Regular.ttf
+override NETSURF_FB_FONT_SANS_SERIF_BOLD := Sans/Fira/Bold.ttf +override NETSURF_FB_FONT_SANS_SERIF_BOLD := Sans/Fira/Bold.ttf
+override NETSURF_FB_FONT_SANS_SERIF_ITALIC := Sans/Fira/Regular.ttf +override NETSURF_FB_FONT_SANS_SERIF_ITALIC := Sans/Fira/Regular.ttf

View File

@ -5,6 +5,6 @@ rev = "7b41c66a1ef0c4ac5884a4203cb53c0901217e32"
[build] [build]
template = "custom" template = "custom"
script = """ script = """
mkdir -pv "${COOKBOOK_STAGE}"/ui/fonts mkdir -pv "${COOKBOOK_STAGE}"/usr/share/fonts
cp -rv "${COOKBOOK_SOURCE}"/patched-fonts/* "${COOKBOOK_STAGE}"/ui/fonts cp -rv "${COOKBOOK_SOURCE}"/patched-fonts/* "${COOKBOOK_STAGE}"/usr/share/fonts
""" """