From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 62467@debbugs.gnu.org
Cc: rg@raghavgururajan.name, Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style.
Date: Mon, 10 Apr 2023 09:08:38 +0200 [thread overview]
Message-ID: <17d1e460476b5c72d75e4224661720557b7de2b2.camel@gmail.com> (raw)
In-Reply-To: <716b57a44002b5d866aff0d2abe0190c90a39556.camel@gmail.com>
* gnu/packages/inkscape.scm (inkscape)[arguments]: Convert to list of
G-Expressions.
[inputs]: Drop labels.
---
gnu/packages/inkscape.scm | 150 +++++++++++++++++++-------------------
1 file changed, 76 insertions(+), 74 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index b8e78c2b11..7762271299 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -26,6 +26,7 @@
(define-module (gnu packages inkscape)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
@@ -153,87 +154,88 @@ (define-public inkscape/stable
((".*find_package\\(DoubleConversion.*") ""))))))
(build-system cmake-build-system)
(arguments
- `(#:test-target "check" ;otherwise some test binaries are missing
- #:imported-modules (,@%cmake-build-system-modules
+ (list
+ #:test-target "check" ; otherwise some test binaries are missing
+ #:imported-modules `(,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system))
- #:modules ((guix build cmake-build-system)
+ #:modules '((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
- (assoc-ref glib-or-gtk:%standard-phases
- 'generate-gdk-pixbuf-loaders-cache-file))
- (add-after 'unpack 'patch-icon-cache-generator
- (lambda _
- (substitute* "share/icons/application/CMakeLists.txt"
- (("gtk-update-icon-cache") "true"))))
- (add-after 'unpack 'disable-latex-export-tests
- ;; FIXME: For some reason the test.pdf_tex file generated by the
- ;; "--export-latex" lacks "some text" in its content when run in
- ;; the build environment. Skip the related tests.
- (lambda _
- (substitute* "testfiles/cli_tests/CMakeLists.txt"
- (("add_cli_test\\(export-latex")
- "message(TEST_DISABLED: export-latex"))))
- (add-after 'unpack 'set-home
- ;; Mute Inkscape warnings during tests.
- (lambda _
- (setenv "HOME" (getcwd))))
- ;; Move the check phase after the install phase, as when run in the
- ;; tests, Inkscape relies on files that are not yet installed, such
- ;; as the "share/inkscape/ui/units.xml" file.
- (delete 'check)
- (add-after 'install 'check
- (assoc-ref %standard-phases 'check))
- (add-after 'install 'glib-or-gtk-compile-schemas
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
- (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
- (add-after 'install '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
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'generate-gdk-pixbuf-loaders-cache-file))
+ (add-after 'unpack 'patch-icon-cache-generator
+ (lambda _
+ (substitute* "share/icons/application/CMakeLists.txt"
+ (("gtk-update-icon-cache") "true"))))
+ (add-after 'unpack 'disable-latex-export-tests
+ ;; FIXME: For some reason the test.pdf_tex file generated by the
+ ;; "--export-latex" lacks "some text" in its content when run in
+ ;; the build environment. Skip the related tests.
+ (lambda _
+ (substitute* "testfiles/cli_tests/CMakeLists.txt"
+ (("add_cli_test\\(export-latex")
+ "message(TEST_DISABLED: export-latex"))))
+ (add-after 'unpack 'set-home
+ ;; Mute Inkscape warnings during tests.
+ (lambda _
+ (setenv "HOME" (getcwd))))
+ ;; Move the check phase after the install phase, as when run in the
+ ;; tests, Inkscape relies on files that are not yet installed, such
+ ;; as the "share/inkscape/ui/units.xml" file.
+ (delete 'check)
+ (add-after 'install 'check
+ (assoc-ref %standard-phases 'check))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
+ (add-after 'install '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
- `(("aspell" ,aspell)
- ("bash-minimal" ,bash-minimal)
- ("autotrace" ,autotrace)
- ("gdl" ,gdl-minimal)
- ("gtkmm" ,gtkmm-3)
- ("gtk" ,gtk+)
- ("gtkspell3" ,gtkspell3)
- ("gsl" ,gsl)
- ("poppler" ,poppler)
- ("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)
- ("libwpd" ,libwpd)
- ("libwpg" ,libwpg)
- ("freetype" ,freetype)
- ("popt" ,popt)
- ("potrace" ,potrace)
- ("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)
- ("python-lxml" ,python-lxml)))
+ (list aspell
+ bash-minimal
+ autotrace
+ gdl-minimal
+ gtkmm-3
+ gtk+
+ gtkspell3
+ gsl
+ poppler
+ lib2geom-1.2
+ libjpeg-turbo
+ libpng
+ libxml2
+ libxslt
+ libgc
+ librsvg ; for the pixbuf loader
+ libsoup-minimal-2
+ libcdr
+ libvisio
+ libwpd
+ libwpg
+ freetype
+ popt
+ potrace
+ lcms
+ boost
+ python-wrapper
+ python-cssselect ; to render qrcode
+ python-scour
+ python-pyserial
+ python-numpy
+ python-lxml))
(native-inputs
(list imagemagick ;for tests
intltool
--
2.39.2
next prev parent reply other threads:[~2023-04-11 7:12 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1 Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v3 02/15] " Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v2 01/12] " Liliana Marie Prikler
2023-04-08 19:37 ` Maxim Cournoyer
2023-04-08 19:54 ` Liliana Marie Prikler
2023-04-09 5:03 ` Maxim Cournoyer
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team 2/5] gnu: Make pango-next the new pango Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v3 03/15] " Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v2 02/12] " Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v2 03/12] gnu: pango: Update to 1.50.14 Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team 3/5] " Liliana Marie Prikler
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v3 04/15] " Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v3 05/15] " Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v2 04/12] " Liliana Marie Prikler
2023-04-08 19:41 ` Maxim Cournoyer
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team 5/5] gnu: gobject-introspection: Update to 1.76.1 Liliana Marie Prikler
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v2 05/12] " Liliana Marie Prikler
2023-04-08 19:40 ` Maxim Cournoyer
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v3 06/15] " Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v3 07/15] gnu: libsoup-minimal@2: Update to 2.74.3 Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v2 06/12] " Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-04-08 19:56 ` Liliana Marie Prikler
2023-04-09 5:04 ` Maxim Cournoyer
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v3 08/15] gnu: python-pygobject: Set upstream-name Liliana Marie Prikler
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v2 07/12] " Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v2 08/12] gnu: python-pygobject: Update to 3.44.1 Liliana Marie Prikler
2023-04-08 19:43 ` Maxim Cournoyer
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v3 09/15] " Liliana Marie Prikler
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build Liliana Marie Prikler
2023-04-08 19:49 ` Maxim Cournoyer
2023-04-08 20:03 ` Liliana Marie Prikler
2023-04-09 5:07 ` Maxim Cournoyer
2023-04-10 12:51 ` Liliana Marie Prikler
2023-04-11 1:49 ` Maxim Cournoyer
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v3 12/15] " Liliana Marie Prikler
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37 Liliana Marie Prikler
2023-04-08 19:34 ` Maxim Cournoyer
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v3 11/15] " Liliana Marie Prikler
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v3 10/15] gnu: gtk+-2: Fix build by hardening list store Liliana Marie Prikler
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v2 09/12] " Liliana Marie Prikler
2023-04-08 19:47 ` Maxim Cournoyer
2023-04-08 20:00 ` Liliana Marie Prikler
2023-04-09 5:06 ` Maxim Cournoyer
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1 Liliana Marie Prikler
2023-04-08 19:51 ` Maxim Cournoyer
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v3 13/15] " Liliana Marie Prikler
2023-03-31 21:43 ` [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages Liliana Marie Prikler
2023-04-02 17:27 ` Raghav Gururajan via Guix-patches via
2023-04-02 18:20 ` Liliana Marie Prikler
2023-04-03 16:37 ` [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50 Kaelyn Takata
2023-04-11 20:52 ` Maxim Cournoyer
2023-04-10 7:08 ` Liliana Marie Prikler [this message]
2023-04-10 16:12 ` [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1 Liliana Marie Prikler
2023-04-11 20:57 ` Maxim Cournoyer
2023-04-12 5:33 ` Liliana Marie Prikler
2023-04-13 2:33 ` Maxim Cournoyer
2023-04-13 5:12 ` bug#62467: " Liliana Marie Prikler
2023-04-11 7:06 ` [bug#62467] [PATCH gnome-team v3 00/15] Update glib to 2.76.1 Liliana Marie Prikler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17d1e460476b5c72d75e4224661720557b7de2b2.camel@gmail.com \
--to=liliana.prikler@gmail.com \
--cc=62467@debbugs.gnu.org \
--cc=maxim.cournoyer@gmail.com \
--cc=rg@raghavgururajan.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.