From 2bc88940e88cf223ca8bfef02aebfeffa0cc5a76 Mon Sep 17 00:00:00 2001
From: Marius Bakke <marius@gnu.org>
Date: Thu, 11 Aug 2022 23:46:36 +0200
Subject: gnu: lib2geom: Remove 1.1.

* gnu/packages/graphics.scm (lib2geom): Update to 1.2.
(lib2geom-1.2): Remove variable.
* gnu/packages/inkscape.scm (inkscape/stable)[inputs]: Change from
LIB2GEOM-1.2 to LIB2GEOM.
---
 gnu/packages/graphics.scm | 18 ++----------------
 gnu/packages/inkscape.scm |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

(limited to 'gnu/packages')

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index a777d19d65..26c6a27113 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -771,7 +771,7 @@ exception-handling library.")
 (define-public lib2geom
   (package
     (name "lib2geom")
-    (version "1.1")
+    (version "1.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -780,7 +780,7 @@ exception-handling library.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "03bx9k1m4bfhmx0ldsg0bks6i8h7fmvl5vbg6gmpq0bk0nkmpnmv"))))
+                "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))
     (build-system cmake-build-system)
     (arguments
      `(#:imported-modules ((guix build python-build-system)
@@ -837,20 +837,6 @@ basic geometries.")
     ;; 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 b2b54d71e4..0342d4c56d 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -225,7 +225,7 @@ endif()~%~%"
             gtkspell3
             gsl
             poppler
-            lib2geom-1.2
+            lib2geom
             libjpeg-turbo
             libpng
             libxml2
-- 
cgit 1.4.1