diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/graphics.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar guix-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 1006bb3cb4..e0cade6359 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -826,8 +826,8 @@ exception-handling library.") (define-public lib2geom ;; Use the latest master commit, as the 1.0 release suffer build problems. - (let ((revision "3") - (commit "17e0d21f0afc8489656f9184bff7ad024a42394a")) + (let ((revision "4") + (commit "b29d60e49a58f4e8069544b44863b1a623e4ee59")) (package (name "lib2geom") (version (git-version "1.0" revision commit)) @@ -839,7 +839,7 @@ exception-handling library.") (file-name (git-file-name name version)) (sha256 (base32 - "0waskrmdrrdjw8pr5cvlkrxywgf376viggpc2jzdqxxpy2k78fpr")) + "0xd8f3cgfnipdav4w8j54r7hzy9f3m7xk42ppcfhdjz2hriggyk6")) (patches ;; Patch submitted to upstream (see: ;; https://gitlab.com/inkscape/lib2geom/-/merge_requests/32). @@ -1500,7 +1500,7 @@ exec -a \"$0\" ~a/.brdf-real~%" (native-inputs `(("qttools" ,qttools))) ;for 'qmake' (inputs - `(("qtbase" ,qtbase) + `(("qtbase" ,qtbase-5) ("mesa" ,mesa) ("glew" ,glew) ("freeglut" ,freeglut) @@ -1936,7 +1936,7 @@ Automated palette selection is supported.") ("libvpx" ,libvpx) ("libxi" ,libxi) ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg) |