diff --git a/Makefile b/Makefile index e4882350e..7237d832e 100644 --- a/Makefile +++ b/Makefile @@ -2426,13 +2426,13 @@ $(SNAP_TARGET): Makefile packaging/snap/snap/snapcraft.yaml | $(SNAP_BUILD_DIR) mv "$$created" $(SNAP_TARGET) test -f $@ -$(FLATPAK_TARGET): Makefile $(FLATPAK_MANIFEST) | $(FLATPAK_BUILD_DIR) $(FLATPAK_DIST_DIR) podman-check +$(FLATPAK_TARGET): Makefile $(FLATPAK_MANIFEST) scripts/install-build-fonttools.sh | $(FLATPAK_BUILD_DIR) $(FLATPAK_DIST_DIR) podman-check rm -f $(FLATPAK_DIST_DIR)/*.flatpak $(PODMAN) run $(PODMAN_RUN_PLATFORM) $(PODMAN_RUN_NETWORK) --rm --privileged \ -v "$(abspath .):/work" \ -w /work \ $(FLATPAK_IMAGE) \ - sh -lc 'set -eu; sh scripts/install-build-node.sh /tmp/inbe-build-node; export PATH=/tmp/inbe-build-node/bin:$$PATH; rm -rf .flatpak-builder $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir; flatpak-builder --disable-rofiles-fuse --force-clean --repo=$(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir $(FLATPAK_MANIFEST) || { rm -rf $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir vendor-builds/linux build/bin/linux; make vendor-prebuilds-native; make native; flatpak build-init $(FLATPAK_BUILD_DIR)/build-dir $(APP_ID) org.gnome.Sdk org.gnome.Platform 46; install -D -m755 "$$(find build/bin/linux -maxdepth 1 -type f -name '\''inbe-linux-*'\'' | head -n 1)" $(FLATPAK_BUILD_DIR)/build-dir/files/bin/inbe; install -D -m644 packaging/linux/appimage/inbe.desktop $(FLATPAK_BUILD_DIR)/build-dir/files/share/applications/$(APP_ID).desktop; sed -i '\''s/^Icon=.*/Icon=$(APP_ID)/'\'' $(FLATPAK_BUILD_DIR)/build-dir/files/share/applications/$(APP_ID).desktop; install -D -m644 packaging/linux/appimage/inbe.png $(FLATPAK_BUILD_DIR)/build-dir/files/share/icons/hicolor/512x512/apps/$(APP_ID).png; install -D -m644 packaging/linux/appimage/inbe.appdata.xml $(FLATPAK_BUILD_DIR)/build-dir/files/share/metainfo/$(APP_ID).metainfo.xml; flatpak build-finish --share=ipc --share=network --socket=fallback-x11 --socket=wayland --socket=pulseaudio --device=dri --filesystem=home $(FLATPAK_BUILD_DIR)/build-dir; flatpak build-export $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir; }; flatpak build-bundle $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_TARGET) $(APP_ID)' + sh -lc 'set -eu; sh scripts/install-build-node.sh /tmp/inbe-build-node; export PATH=/tmp/inbe-build-node/bin:$$PATH; sh scripts/install-build-fonttools.sh /tmp/inbe-build-fonttools; export PYTHONPATH=/tmp/inbe-build-fonttools; rm -rf .flatpak-builder $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir; flatpak-builder --disable-rofiles-fuse --force-clean --repo=$(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir $(FLATPAK_MANIFEST) || { rm -rf $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir vendor-builds/linux build/bin/linux; make vendor-prebuilds-native; make native; flatpak build-init $(FLATPAK_BUILD_DIR)/build-dir $(APP_ID) org.gnome.Sdk org.gnome.Platform 46; install -D -m755 "$$(find build/bin/linux -maxdepth 1 -type f -name '\''inbe-linux-*'\'' | head -n 1)" $(FLATPAK_BUILD_DIR)/build-dir/files/bin/inbe; install -D -m644 packaging/linux/appimage/inbe.desktop $(FLATPAK_BUILD_DIR)/build-dir/files/share/applications/$(APP_ID).desktop; sed -i '\''s/^Icon=.*/Icon=$(APP_ID)/'\'' $(FLATPAK_BUILD_DIR)/build-dir/files/share/applications/$(APP_ID).desktop; install -D -m644 packaging/linux/appimage/inbe.png $(FLATPAK_BUILD_DIR)/build-dir/files/share/icons/hicolor/512x512/apps/$(APP_ID).png; install -D -m644 packaging/linux/appimage/inbe.appdata.xml $(FLATPAK_BUILD_DIR)/build-dir/files/share/metainfo/$(APP_ID).metainfo.xml; flatpak build-finish --share=ipc --share=network --socket=fallback-x11 --socket=wayland --socket=pulseaudio --device=dri --filesystem=home $(FLATPAK_BUILD_DIR)/build-dir; flatpak build-export $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_BUILD_DIR)/build-dir; }; flatpak build-bundle $(FLATPAK_BUILD_DIR)/repo $(FLATPAK_TARGET) $(APP_ID)' test -f $@ $(WEB_JS_TARGET): Makefile $(WEB_SRC) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_FILES) $(EMBEDDED_ASSETS_C) $(WEB_GEN_STAMP) $(WEB_LIBOQS_A) $(WEB_HOST_JS) web-tools-check | $(WEB_DIST_DIR) diff --git a/packaging/flatpak/xyz.waozi.inbe.yml b/packaging/flatpak/xyz.waozi.inbe.yml index c371881ef..439ca9ca8 100644 --- a/packaging/flatpak/xyz.waozi.inbe.yml +++ b/packaging/flatpak/xyz.waozi.inbe.yml @@ -15,6 +15,7 @@ modules: - name: inbe buildsystem: simple build-commands: + - sh scripts/install-build-fonttools.sh /run/build/inbe/fonttools-build - make vendor-prebuilds-native - make native - install -D -m755 "$(find build/bin/linux -maxdepth 1 -type f -name 'inbe-linux-*' | head -n 1)" /app/bin/inbe @@ -31,6 +32,7 @@ modules: # packages in the build directory so the links stay valid. env: XDG_CACHE_HOME: /run/build/inbe/.cache + PYTHONPATH: /run/build/inbe/fonttools-build sources: - type: dir path: ../.. diff --git a/packaging/snap/snap/snapcraft.yaml b/packaging/snap/snap/snapcraft.yaml index 88651aa79..f6e93737d 100644 --- a/packaging/snap/snap/snapcraft.yaml +++ b/packaging/snap/snap/snapcraft.yaml @@ -84,6 +84,7 @@ parts: - curl - xz-utils - python3 + - python3-fonttools # Fetches the Ziran packages pinned in ziran.lock. - git override-build: | diff --git a/scripts/install-build-fonttools.sh b/scripts/install-build-fonttools.sh new file mode 100644 index 000000000..829c304ec --- /dev/null +++ b/scripts/install-build-fonttools.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# Isolated package builders need fontTools for the required shipped-font gate. +set -eu + +destination=${1:?Usage: install-build-fonttools.sh destination} +python3 - "$destination" <<'PY' +import hashlib +import io +from pathlib import Path +import sys +import urllib.request +import zipfile + +url = "https://files.pythonhosted.org/packages/c7/93/0dd45cd283c32dea1545151d8c3637b4b8c53cdb3a625aeb2885b184d74d/fonttools-4.60.1-py3-none-any.whl" +expected = "906306ac7afe2156fcf0042173d6ebbb05416af70f6b370967b47f8f00103bbb" +with urllib.request.urlopen(url, timeout=60) as response: + wheel = response.read() +if hashlib.sha256(wheel).hexdigest() != expected: + raise SystemExit("fontTools build dependency checksum mismatch") +destination = Path(sys.argv[1]) +destination.mkdir(parents=True, exist_ok=True) +with zipfile.ZipFile(io.BytesIO(wheel)) as archive: + archive.extractall(destination) +PY