From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alex Myczko <tar@debian.org>
Date: Jun, 01 2026 10:31:42 +0200
Subject: [PATCH] <short summary of the patch>

TODO: Put a short summary on the line above and replace this paragraph
with a longer explanation of this change. Complete the meta-information
with other relevant fields (see below for details). To make it easier, the
information below has been extracted from the changelog. Adjust it or drop
it.

---
The information above should follow the Patch Tagging Guidelines, please
checkout https://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: (upstream|backport|vendor|other), (<patch-url>|commit:<commit-id>)
Bug: <upstream-bugtracker-url>
Bug-<Vendor>: <vendor-bugtracker-url>
Forwarded: (no|not-needed|<patch-forwarded-url>)
Applied-Upstream: <version>, (<commit-url>|commit:<commid-id>)
Reviewed-By: <name and email of someone who approved/reviewed the patch>

--- fonts-0xproto-2.502+ds.orig/Makefile
+++ fonts-0xproto-2.502+ds/Makefile
@@ -4,45 +4,28 @@ SOURCE_DIR = sources
 ROMAN_GLYPHS_FILE = $(SOURCE_DIR)/$(FONT_NAME).glyphspackage
 ITALIC_GLYPHS_FILE = $(SOURCE_DIR)/$(FONT_NAME)-Italic.glyphspackage
 OUTPUT_DIR = fonts
-WOFF2_DIR = woff2
 SCRIPTS_DIR = scripts
 
+.PHONY: setup
 setup:
-	uv sync
-	if [ ! -e $(WOFF2_DIR) ]; then $(MAKE) setup-woff2; fi
-
-setup-woff2:
-	git clone --recursive https://github.com/google/woff2.git $(WOFF2_DIR)
-	cd $(WOFF2_DIR) && make clean all
+	@echo "Dependencies must be installed via pip (fontmake, fonttools, glyphsLib, ttfautohint-py)"
+	@echo "Run: pip install -r requirements.txt"
 
 .PHONY: build
 build:
 	$(MAKE) clean
 	$(MAKE) compile-all
-	uv run python $(SCRIPTS_DIR)/add_stat.py $(OUTPUT_DIR)/$(FONT_NAME)-Regular.ttf $(OUTPUT_DIR)/$(FONT_NAME)-Bold.ttf $(OUTPUT_DIR)/$(FONT_NAME)-Italic.ttf
-	uv run python $(SCRIPTS_DIR)/remove_calt.py $(OUTPUT_DIR) -o $(OUTPUT_DIR)/No-Ligatures
-	uv run python $(SCRIPTS_DIR)/build_zx_fonts.py
-
-compile-woff2-roman: $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).ttf $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).ttf
-	./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$(MAIN_WEIGHT).ttf
-	./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$(BOLD_WEIGHT).ttf
-
-compile-woff2-italic: $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).ttf
-	./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$(ITALIC).ttf
+	python3 $(SCRIPTS_DIR)/add_stat.py $(OUTPUT_DIR)/$(FONT_NAME)-Regular.ttf $(OUTPUT_DIR)/$(FONT_NAME)-Bold.ttf $(OUTPUT_DIR)/$(FONT_NAME)-Italic.ttf
+	python3 $(SCRIPTS_DIR)/remove_calt.py $(OUTPUT_DIR) -o $(OUTPUT_DIR)/No-Ligatures
+	python3 $(SCRIPTS_DIR)/build_zx_fonts.py
 
 compile-roman: $(ROMAN_GLYPHS_FILE)
-	uv run fontmake -a -g $(ROMAN_GLYPHS_FILE) -i --output-dir $(OUTPUT_DIR)
+	fontmake -a -g $(ROMAN_GLYPHS_FILE) -i --output-dir $(OUTPUT_DIR)
 
 compile-italic: $(ITALIC_GLYPHS_FILE)
-	uv run fontmake -a -g $(ITALIC_GLYPHS_FILE) --output-dir $(OUTPUT_DIR)
-
-compile-woff2: compile-roman compile-italic
-	@for family in $(FAMILIES); do \
-		./woff2/woff2_compress $(OUTPUT_DIR)/$(FONT_NAME)-$$family.ttf; \
-	done
+	fontmake -a -g $(ITALIC_GLYPHS_FILE) --output-dir $(OUTPUT_DIR)
 
-compile-all:
-	$(MAKE) compile-woff2
+compile-all: compile-roman compile-italic
 
 .PHONY: clean
 clean:
@@ -57,9 +40,8 @@ install-otf: $(OUTPUT_DIR)
 install:
 	$(MAKE) build && $(MAKE) install-otf
 
-
 .PHONY: test
 test:
-	uv run fontbakery check-universal $(OUTPUT_DIR)/$(FONT_NAME)-*.ttf
-	uv run fontbakery check-universal $(OUTPUT_DIR)/No-Ligatures/*.ttf
-	uv run fontbakery check-universal $(OUTPUT_DIR)/ZxProto/*.ttf
+	fontbakery check-universal $(OUTPUT_DIR)/$(FONT_NAME)-*.ttf
+	fontbakery check-universal $(OUTPUT_DIR)/No-Ligatures/*.ttf
+	fontbakery check-universal $(OUTPUT_DIR)/ZxProto/*.ttf
