Subject: [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1.

From: Liliana Marie Prikler <[email-masked]>
Date: Mon, 10 Apr 2023 18:12:19 +0200

* gnu/packages/graphics.scm (lib2geom): Update to 1.2.
(lib2geom-1.2): Remove variable.
* gnu/packages/inkscape.scm (inkscape)[inputs]: Use libgeom.
---
 gnu/packages/graphics.scm | 22 ++++------------------
 gnu/packages/inkscape.scm |  2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index bcc27cc3bf..336f1dd19d 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -872,16 +872,16 @@ (define-public ilmbase
 (define-public lib2geom
   (package
     (name "lib2geom")
-    (version "1.1")
+    (version "1.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://gitlab.com/inkscape/lib2geom.git")
+                    (url "https://gitlab.com/inkscape/lib2geom")
                     (commit version)))
-              (file-name (git-file-name name version))
+              (file-name (git-file-name "lib2geom" version))
               (sha256
                (base32
-                "03bx9k1m4bfhmx0ldsg0bks6i8h7fmvl5vbg6gmpq0bk0nkmpnmv"))))
+                "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))
     (build-system cmake-build-system)
     (arguments
      `(#:imported-modules ((guix build python-build-system)
@@ -938,20 +938,6 @@ (define-public lib2geom
     ;; https://gitlab.com/inkscape/inkscape/issues/784).
     (license license:gpl3+)))
 
-(define-public lib2geom-1.2
-  (package
-    (inherit lib2geom)
-    (version "1.2")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://gitlab.com/inkscape/lib2geom")
-                    (commit version)))
-              (file-name (git-file-name "lib2geom" version))
-              (sha256
-               (base32
-                "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))))
-
 (define-public python-booleanoperations
   (package
     (name "python-booleanoperations")
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 7762271299..5c1689fcc7 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -213,7 +213,7 @@ (define-public inkscape/stable
             gtkspell3
             gsl
             poppler
-            lib2geom-1.2
+            lib2geom
             libjpeg-turbo
             libpng
             libxml2
-- 
2.39.2