gnu: freetype: Update to 2.10.4 and remove replacement.
* gnu/packages/fontutils.scm (freetype): Update to 2.10.4. [replacement]: Remove. (freetype/fixed): Remove.
This commit is contained in:
		
							parent
							
								
									52ef5b3847
								
							
						
					
					
						commit
						79b31767d0
					
				
					 1 changed files with 9 additions and 22 deletions
				
			
		|  | @ -8,7 +8,7 @@ | ||||||
| ;;; Copyright © 2017 Nikita <nikita@n0.is> | ;;; Copyright © 2017 Nikita <nikita@n0.is> | ||||||
| ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> | ;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr> | ||||||
| ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> | ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> | ||||||
| ;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org> | ;;; Copyright © 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> | ||||||
| ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> | ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> | ||||||
| ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> | ;;; Copyright © 2020 Roel Janssen <roel@gnu.org> | ||||||
| ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> | ;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> | ||||||
|  | @ -73,14 +73,14 @@ | ||||||
| (define-public freetype | (define-public freetype | ||||||
|   (package |   (package | ||||||
|    (name "freetype") |    (name "freetype") | ||||||
|    (version "2.10.1") |    (version "2.10.4") | ||||||
|    (replacement freetype/fixed) |    (source | ||||||
|    (source (origin |     (origin | ||||||
|       (method url-fetch) |       (method url-fetch) | ||||||
|       (uri (string-append "mirror://savannah/freetype/freetype-" |       (uri (string-append "mirror://savannah/freetype/freetype-" | ||||||
|                           version ".tar.xz")) |                           version ".tar.xz")) | ||||||
|             (sha256 (base32 |       (sha256 | ||||||
|                      "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn")))) |        (base32 "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46")))) | ||||||
|    (build-system gnu-build-system) |    (build-system gnu-build-system) | ||||||
|    (arguments |    (arguments | ||||||
|     ;; The use of "freetype-config" is deprecated, but other packages still |     ;; The use of "freetype-config" is deprecated, but other packages still | ||||||
|  | @ -103,19 +103,6 @@ anti-aliased glyph bitmap generation with 256 gray levels.") | ||||||
|    (license license:freetype)           ; some files have other licenses |    (license license:freetype)           ; some files have other licenses | ||||||
|    (home-page "https://www.freetype.org/"))) |    (home-page "https://www.freetype.org/"))) | ||||||
| 
 | 
 | ||||||
| (define freetype/fixed |  | ||||||
|   ;; Security fix for CVE-2020-15999. |  | ||||||
|   (package |  | ||||||
|     (inherit freetype) |  | ||||||
|     (version "2.10.4") |  | ||||||
|     (source |  | ||||||
|      (origin |  | ||||||
|        (method url-fetch) |  | ||||||
|        (uri (string-append "mirror://savannah/freetype/freetype-" |  | ||||||
|                            version ".tar.xz")) |  | ||||||
|        (sha256 |  | ||||||
|         (base32 "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46")))))) |  | ||||||
| 
 |  | ||||||
| (define-public ttfautohint | (define-public ttfautohint | ||||||
|   (package |   (package | ||||||
|     (name "ttfautohint") |     (name "ttfautohint") | ||||||
|  |  | ||||||
		Reference in a new issue