diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2024-03-01 20:06:49 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2024-03-31 20:47:13 -0400 |
| commit | 51ae492e8bde8c5465ac1b7bab72944aaf798e3f (patch) | |
| tree | c3ca9319adedc2e09c42c8ea0dc97611f3dc27ab /gnu/local.mk | |
| parent | adecd321c33bcade6467b75ceb8b377f25588e55 (diff) | |
| download | guix-51ae492e8bde8c5465ac1b7bab72944aaf798e3f.tar guix-51ae492e8bde8c5465ac1b7bab72944aaf798e3f.tar.gz | |
gnu: cairo: Update to 1.18.0.
With this new release of cairo many old configure options were removed and now
meson is used to build it. The defaults include the tee backend which we had
previously enabled while the xml backend has been dropped from cairo
completely. Old configure options where were commented out to be enabled have
been removed as they no longer apply to version 1.18.0.
The variable 'cairo' is now a hidden package to work around a dependency cycle
where gtk-doc is needed to build the documentation (which itself depends on
cairo). The new variable 'cairo-with-documentation' is now the public package
and the module exports 'cairo' for use in other packages. This follows what
was done for glib.
* gnu/packages/gtk.scm: Export 'cairo'.
(cairo): Update to 1.18.0.
[source]: Remove 'patches' field.
[properties]: Hide package.
[outputs]: Remove (doc output is now in cairo-with-documentation).
[build-system]: Change to meson-build-system.
[arguments]: Add #:glib-or-gtk?. Remove old flags from #:configure-flags and
add '-Dtests=disabled' to match #:tests?.
[propagated-inputs]: Remove commented out packages.
(cairo-with-documentation): New variable.
(cairo-sans-poppler)[properties]: No longer set hidden as it is now inherited
from cairo.
(cairo-xcb)[properties]: Unhide (inherited from cairo).
[arguments]: Remove obsolete #:configure-flags and properly inherit from cairo.
* gnu/packages/patches/cairo-CVE-2018-19876.patch: Remove.
* gnu/packages/patches/cairo-CVE-2020-35492.patch: Remove.
* gnu/local.mk (dist_patch_DATA): Remove them.
Change-Id: I2f4c953b23c6b32b1fafaf03db89d7a475fc6956
Diffstat (limited to 'gnu/local.mk')
| -rw-r--r-- | gnu/local.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f2b480bded..cf6b07995d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1009,8 +1009,6 @@ dist_patch_DATA = \ %D%/packages/patches/breezy-fix-gio.patch \ %D%/packages/patches/byobu-writable-status.patch \ %D%/packages/patches/bubblewrap-fix-locale-in-tests.patch \ - %D%/packages/patches/cairo-CVE-2018-19876.patch \ - %D%/packages/patches/cairo-CVE-2020-35492.patch \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ |