freetype: 2.6.2 -> 2.6.5

The fontconfig-ultimate patches are unmaintained. Since they were
not updated for newer FreeType versions, this removes them and
disables fontconfig-ultimate by default.

authored by

cmfwyp and committed by
Nikolay Amiantov
1c7114da 50c00112

+21 -21
+1 -1
nixos/modules/config/fonts/fontconfig-ultimate.nix
··· 104 104 ultimate = { 105 105 enable = mkOption { 106 106 type = types.bool; 107 - default = true; 107 + default = false; 108 108 description = '' 109 109 Enable fontconfig-ultimate settings (formerly known as 110 110 Infinality). Besides the customizable settings in this NixOS
+1 -1
pkgs/development/compilers/openjdk/8.nix
··· 2 2 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib 3 3 , setJavaClassPath 4 4 , minimal ? false 5 - , enableInfinality ? true # font rendering patch 5 + , enableInfinality ? false # font rendering patch 6 6 }: 7 7 8 8 let
+19 -19
pkgs/development/libraries/freetype/default.nix
··· 8 8 }: 9 9 10 10 let 11 - version = "2.6.2"; 12 - 13 - # Don't use fetchpatch. It mangles them. That's an hour I'll never get back. 14 - fetchbohoomil = name: sha256: fetchurl { 15 - url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/254b688f96d4a37f78fb594303a43160fc15c7cd/freetype/ + name; 16 - inherit sha256; 17 - }; 11 + version = "2.6.5"; 18 12 in 19 13 with { inherit (stdenv.lib) optional optionals optionalString; }; 20 14 stdenv.mkDerivation rec { 21 15 name = "freetype-${version}"; 22 16 23 17 src = fetchurl { 24 - url = "mirror://sourceforge/freetype/${name}.tar.bz2"; 25 - sha256 = "14mqrfgl18q2by1yzv6vcxi97zjy4kppcgsqf312mhfwgkpvvxms"; 18 + url = "mirror://savannah/freetype/${name}.tar.bz2"; 19 + sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2"; 26 20 }; 27 21 28 - patches = [] 29 - # mingw: these patches use `strcasestr` which isn't available on windows 30 - ++ optionals (useEncumberedCode && stdenv.cross.libc or null != "msvcrt" ) [ 31 - (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch" 32 - "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08") 33 - (fetchbohoomil "02-upstream-2015.12.05.patch" 34 - "0781r9n35kpn8db8nma0l47cpkzh0hbp84ziii5sald90dnrqdj4") 35 - (fetchbohoomil "03-infinality-2.6.2-2015.12.05.patch" 36 - "0wcjf9hiymplgqm3szla633i417pb57vpzzs2dyl1dnmcxgqa2y8") 37 - ]; 22 + patches = [ 23 + # Patch for validation of OpenType and GX/AAT tables. 24 + (fetchurl { 25 + name = "freetype-2.2.1-enable-valid.patch"; 26 + url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990"; 27 + sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l"; 28 + }) 29 + ] ++ optionals (useEncumberedCode) [ 30 + # Patch to enable subpixel rendering. 31 + # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html. 32 + (fetchurl { 33 + name = "freetype-2.3.0-enable-spr.patch"; 34 + url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990; 35 + sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd"; 36 + }) 37 + ]; 38 38 39 39 outputs = [ "dev" "out" ]; 40 40