From c3bafa553e13cb6c502d0aa20dbd013145cb07a0 Mon Sep 17 00:00:00 2001
From: Hugo Buddelmeijer <hugo@buddelmeijer.nl>
Date: Sun, 5 Oct 2025 23:59:39 +0200
Subject: [PATCH] gnu: python-glyphslib: Update to 6.6.1.

python-glyphslib 6.6.1 is the last version that works properly with
python-ufo2ft 2.x, see guix/guix#3335.

* gnu/packages/fontutils.scm (python-glyphslib): Update to 6.6.1.
[source] Switch to git-fetch.
[arguments] <#:test-flags>: Enable tests.
<#:phases>: Add 'pretend-version phase.
[native-inputs]: Remove python-wheel.

Change-Id: Ia68015f415cbe6e4bb11b32411b3a5cba0c7a52a
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
---
 gnu/packages/fontutils.scm | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 31c35bedfb9..b2cccdebf30 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -805,26 +805,29 @@ high-level API is bound.")
 (define-public python-glyphslib
   (package
     (name "python-glyphslib")
-    (version "6.0.7")
+    (version "6.6.1")  ;6.6.1 is the last version that works with ufo2ft 2.x
     (source (origin
-              (method url-fetch)
-              (uri (pypi-uri "glyphsLib" version))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/googlefonts/glyphsLib")
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0mkkwd09g76hvif603ij5aqicxh47zvhgyyd0pjcjmpdy6dr70yw"))))
+                "193h5ixq9p9m2kwz8srfw61rzgqg6gishlndqm759cymwax0cibi"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      #:test-flags #~'(;; These fail because the test data has not yet been
-                       ;; updated for newer FontTools:
-                       ;;   https://github.com/googlefonts/glyphsLib/issues/787
-                       ;; Re-enable for versions > 6.0.7.
-                       "--ignore=tests/builder/designspace_gen_test.py"
-                       "--ignore=tests/builder/interpolation_test.py")))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'pretend-version
+            ;; The version string is usually derived via setuptools-scm, but
+            ;; without the git metadata available this fails.
+            (lambda _
+              (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version))))))
     (native-inputs
      (list python-setuptools-scm
            python-setuptools
-           python-wheel
            ;; For tests.
            python-pytest
            python-xmldiff))