Merge branch 'master' into core-updates

2026-05-25 18:41:54 +02:00 · 2016-10-26 18:59:28 -04:00
parent a19da40630 5d73e30000
commit 02c73adcdf
44 changed files with 2442 additions and 1045 deletions
@@ -489,7 +489,8 @@ extracting content or merging files.")
          "1k64pdapyj8a336jw3j61fhn0rp4q6az7d0dqp9r5n3d9rgwa5c0"))
        (patches (search-patches "mupdf-build-with-openjpeg-2.1.patch"
                                 "mupdf-CVE-2016-6265.patch"
-                                 "mupdf-CVE-2016-6525.patch"))
+                                 "mupdf-CVE-2016-6525.patch"
+                                 "mupdf-CVE-2016-8674.patch"))
        (modules '((guix build utils)))
        (snippet
            ;; Delete all the bundled libraries except for mujs, which is