[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable ver
From: |
Liliana Marie Prikler |
Subject: |
[bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1. |
Date: |
Fri, 31 Mar 2023 20:54:00 +0200 |
* gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1.
[inputs]: Add bash-minimal, librsvg and python-cssselect.
Use lib2geom-1.2 rather than lib2geom.
(inkscape): Inherit build-system, arguments and inputs.
---
gnu/packages/inkscape.scm | 36 +++++++++++-------------------------
1 file changed, 11 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index d1ac5e7312..b8e78c2b11 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -61,7 +61,7 @@ (define-public inkscape/stable
(hidden-package
(package
(name "inkscape")
- (version "1.1.1")
+ (version "1.2.1")
(source
(origin
(method url-fetch)
@@ -69,7 +69,7 @@ (define-public inkscape/stable
"resources/file/"
"inkscape-" version ".tar.xz"))
(sha256
- (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf"))
+ (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))
(modules '((guix build utils)
(ice-9 format)))
(snippet
@@ -196,9 +196,14 @@ (define-public inkscape/stable
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape")
`("GUIX_PYTHONPATH" ":" prefix
- (,(getenv "GUIX_PYTHONPATH"))))))))))
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
+ ;; its own icons in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
(inputs
`(("aspell" ,aspell)
+ ("bash-minimal" ,bash-minimal)
("autotrace" ,autotrace)
("gdl" ,gdl-minimal)
("gtkmm" ,gtkmm-3)
@@ -206,12 +211,13 @@ (define-public inkscape/stable
("gtkspell3" ,gtkspell3)
("gsl" ,gsl)
("poppler" ,poppler)
- ("lib2geom" ,lib2geom)
+ ("lib2geom" ,lib2geom-1.2)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("libgc" ,libgc)
+ ("librsvg" ,librsvg) ; for the pixbuf loader
("libsoup" ,libsoup-minimal-2)
("libcdr" ,libcdr)
("libvisio" ,libvisio)
@@ -223,6 +229,7 @@ (define-public inkscape/stable
("lcms" ,lcms)
("boost" ,boost)
("python" ,python-wrapper)
+ ("python-cssselect" ,python-cssselect) ; to render qrcode
("python-scour" ,python-scour)
("python-pyserial" ,python-pyserial)
("python-numpy" ,python-numpy)
@@ -255,25 +262,4 @@ (define-public inkscape
"inkscape-" version ".tar.xz"))
(sha256
(base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
- (build-system cmake-build-system)
- (arguments
- (substitute-keyword-arguments (package-arguments inkscape/stable)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'wrap-program
- ;; Ensure Python is available at runtime.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/inkscape")
- `("GUIX_PYTHONPATH" prefix
- (,(getenv "GUIX_PYTHONPATH")))
- ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
- ;; its own icons in pure environments.
- `("GDK_PIXBUF_MODULE_FILE" =
- (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
- (inputs (modify-inputs (package-inputs inkscape/stable)
- (replace "lib2geom" lib2geom-1.2)
- (append bash-minimal
- librsvg ;for the pixbuf loader
- python-cssselect))) ;to render qrcode
(properties (alist-delete 'hidden? (package-properties inkscape/stable)))))
--
2.39.2
- [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection., (continued)
- [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection., Liliana Marie Prikler, 2023/03/26
- [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages, Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 02/12] gnu: Make pango-next the new pango., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 03/12] gnu: pango: Update to 1.50.14., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 05/12] gnu: gobject-introspection: Update to 1.76.1., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 04/12] gnu: Make gobject-introspection-next the new gobject-introspection., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 07/12] gnu: python-pygobject: Set upstream-name., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1.,
Liliana Marie Prikler <=
- [bug#62467] [PATCH gnome-team v2 08/12] gnu: python-pygobject: Update to 3.44.1., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store., Liliana Marie Prikler, 2023/03/31
- [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build., Liliana Marie Prikler, 2023/03/31