pyrox.dev
Merge pull request #236764 from figsoda/cairo
cairo: update outdated patch link
authored by
Bobby Rong
and committed by
GitHub
c55fda05
a9fa8f84
+9
-9
pkgs/development/libraries/cairo/default.nix
+9
-9
pkgs/development/libraries/cairo/default.nix
···
32
32
# This patch is the merged commit from the above PR.
33
33
(fetchpatch {
34
34
name = "CVE-2018-19876.patch";
35
-
url = "https://gitlab.freedesktop.org/cairo/cairo/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
36
-
sha256 = "112hgrrsmcwxh1r52brhi5lksq4pvrz4xhkzcf2iqp55jl2pb7n1";
35
+
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/6edf572ebb27b00d3c371ba5ae267e39d27d5b6d.patch";
36
+
hash = "sha256-wZ51BZWlXByFY3/CTn7el2A9aYkwL1FygJ2zqnN+UIQ=";
37
37
})
38
38
39
39
# Fix PDF output.
40
40
# https://gitlab.freedesktop.org/cairo/cairo/issues/342
41
41
(fetchpatch {
42
-
url = "https://gitlab.freedesktop.org/cairo/cairo/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch";
43
-
sha256 = "yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o=";
42
+
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/5e34c5a9640e49dcc29e6b954c4187cfc838dbd1.patch";
43
+
hash = "sha256-yCwsDUY7efVvOZkA6a0bPS+RrVc8Yk9bfPwWHeOjq5o=";
44
44
})
45
45
46
46
# Fixes CVE-2020-35492; see https://github.com/NixOS/nixpkgs/issues/120364.
···
49
49
(fetchpatch {
50
50
name = "CVE-2020-35492.patch";
51
51
includes = [ "src/cairo-image-compositor.c" ];
52
-
url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch";
53
-
sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki";
52
+
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch";
53
+
hash = "sha256-cXKzLMENx4/BHXLZg3Kfkx3esCnaNaB7WvjNfL77FhE=";
54
54
})
55
55
56
56
# Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121
···
60
60
# Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420
61
61
(fetchpatch {
62
62
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff";
63
-
sha256 = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s=";
63
+
hash = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s=";
64
64
})
65
65
66
66
# Fix clang build failures on newer LLVM versions
···
68
68
(fetchpatch {
69
69
name = "fix-types.patch";
70
70
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/38e486b34d435130f2fb38c429e6016c3c82cd53.patch";
71
-
sha256 = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo=";
71
+
hash = "sha256-vmluOJSuTRiQHmbBBVCxOIkZ0O0ZEo0J4mgrUPn0SIo=";
72
72
})
73
73
74
74
# Fix unexpected color addition on grayscale images (usually text).
···
77
77
(fetchpatch {
78
78
name = "fix-grayscale-anialias.patch";
79
79
url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/4f4d89506f58a64b4829b1bb239bab9e46d63727.diff";
80
-
sha256 = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM=";
80
+
hash = "sha256-mbTg67e7APfdELsuMAgXdY3xokWbGtHF7VDD5UyYqKM=";
81
81
})
82
82
83
83
];