diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gtk.scm | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 16efb072a3f..24fd48d971f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm | |||
| @@ -125,11 +125,12 @@ tools have full access to view and control running applications.") | |||
| 125 | (package | 125 | (package |
| 126 | (name "cairo") | 126 | (name "cairo") |
| 127 | (version "1.16.0") | 127 | (version "1.16.0") |
| 128 | (replacement cairo/fixed) | ||
| 129 | (source (origin | 128 | (source (origin |
| 130 | (method url-fetch) | 129 | (method url-fetch) |
| 131 | (uri (string-append "https://cairographics.org/releases/cairo-" | 130 | (uri (string-append "https://cairographics.org/releases/cairo-" |
| 132 | version ".tar.xz")) | 131 | version ".tar.xz")) |
| 132 | (patches (search-patches "cairo-CVE-2018-19876.patch" | ||
| 133 | "cairo-CVE-2020-35492.patch")) | ||
| 133 | (sha256 | 134 | (sha256 |
| 134 | (base32 | 135 | (base32 |
| 135 | "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) | 136 | "0c930mk5xr2bshbdljv005j3j8zr47gqmkry3q6qgvqky6rjjysy")))) |
| @@ -176,15 +177,6 @@ affine transformation (scale, rotation, shear, etc.).") | |||
| 176 | (license license:lgpl2.1) ; or Mozilla Public License 1.1 | 177 | (license license:lgpl2.1) ; or Mozilla Public License 1.1 |
| 177 | (home-page "https://cairographics.org/"))) | 178 | (home-page "https://cairographics.org/"))) |
| 178 | 179 | ||
| 179 | (define cairo/fixed | ||
| 180 | (package | ||
| 181 | (inherit cairo) | ||
| 182 | (source (origin | ||
| 183 | (inherit (package-source cairo)) | ||
| 184 | (patches (append (search-patches "cairo-CVE-2018-19876.patch" | ||
| 185 | "cairo-CVE-2020-35492.patch") | ||
| 186 | (origin-patches (package-source cairo)))))))) | ||
| 187 | |||
| 188 | (define-public cairo-sans-poppler | 180 | (define-public cairo-sans-poppler |
| 189 | ;; Variant used to break the dependency cycle between Poppler and Cairo. | 181 | ;; Variant used to break the dependency cycle between Poppler and Cairo. |
| 190 | (package/inherit cairo | 182 | (package/inherit cairo |
