From 1c7114da69a257b01f6ca7827ae58e788844c114 Mon Sep 17 00:00:00 2001
From: cmfwyp <cmfwyp@riseup.net>
Date: Tue, 16 Aug 2016 02:38:07 -0400
Subject: 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.
---
 nixos/modules/config/fonts/fontconfig-ultimate.nix |  2 +-
 pkgs/development/compilers/openjdk/8.nix           |  2 +-
 pkgs/development/libraries/freetype/default.nix    | 38 +++++++++++-----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index a3f52fbd9199..56fec5684412 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -104,7 +104,7 @@ in
         ultimate = {
           enable = mkOption {
             type = types.bool;
-            default = true;
+            default = false;
             description = ''
               Enable fontconfig-ultimate settings (formerly known as
               Infinality). Besides the customizable settings in this NixOS
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index c42b39ce91f8..3653e75856db 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -2,7 +2,7 @@
 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
 , setJavaClassPath
 , minimal ? false
-, enableInfinality ? true # font rendering patch
+, enableInfinality ? false # font rendering patch
 }:
 
 let
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 6c4586a24833..316d8b5db231 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -8,33 +8,33 @@
 }:
 
 let
-  version = "2.6.2";
-
-  # Don't use fetchpatch. It mangles them. That's an hour I'll never get back.
-  fetchbohoomil = name: sha256: fetchurl {
-    url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/254b688f96d4a37f78fb594303a43160fc15c7cd/freetype/ + name;
-    inherit sha256;
-  };
+  version = "2.6.5";
 in
 with { inherit (stdenv.lib) optional optionals optionalString; };
 stdenv.mkDerivation rec {
   name = "freetype-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/freetype/${name}.tar.bz2";
-    sha256 = "14mqrfgl18q2by1yzv6vcxi97zjy4kppcgsqf312mhfwgkpvvxms";
+    url = "mirror://savannah/freetype/${name}.tar.bz2";
+    sha256 = "1w5c87s4rpx9af5b3mk5cjd1yny3c4dq5p9iv3ixb3vr00a6w2p2";
   };
 
-  patches = []
-    # mingw: these patches use `strcasestr` which isn't available on windows
-    ++ optionals (useEncumberedCode && stdenv.cross.libc or null != "msvcrt" ) [
-      (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch"
-        "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08")
-      (fetchbohoomil "02-upstream-2015.12.05.patch"
-        "0781r9n35kpn8db8nma0l47cpkzh0hbp84ziii5sald90dnrqdj4")
-      (fetchbohoomil "03-infinality-2.6.2-2015.12.05.patch"
-        "0wcjf9hiymplgqm3szla633i417pb57vpzzs2dyl1dnmcxgqa2y8")
-    ];
+  patches = [
+    # Patch for validation of OpenType and GX/AAT tables.
+    (fetchurl {
+      name = "freetype-2.2.1-enable-valid.patch";
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.2.1-enable-valid.patch?id=9a81147af83b1166a5f301e379f85927cc610990";
+      sha256 = "0zkgqhws2s0j8ywksclf391iijhidb1a406zszd7xbdjn28kmj2l";
+    })
+  ] ++ optionals (useEncumberedCode) [
+    # Patch to enable subpixel rendering.
+    # See https://www.freetype.org/freetype2/docs/reference/ft2-lcd_filtering.html.
+    (fetchurl {
+      name = "freetype-2.3.0-enable-spr.patch";
+      url = http://pkgs.fedoraproject.org/cgit/rpms/freetype.git/plain/freetype-2.3.0-enable-spr.patch?id=9a81147af83b1166a5f301e379f85927cc610990;
+      sha256 = "13ni9n5q3nla38wjmxd4f8cy29gp62kjx2l6y6nqhdyiqp8fz8nd";
+    })
+  ];
 
   outputs = [ "dev" "out" ];
 
-- 
cgit 1.4.1