diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-28 17:29:42 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-28 17:29:42 -0500 |
| commit | 9b049849bfc385604f240157e129f7a8e3530d7f (patch) | |
| tree | 95167a5adc36d5ef9516e43f02dca89f5f147407 /pkgs/development/libraries/fontconfig | |
| parent | 036f4b2f04b7f69e02096ed38980f989dcd25e62 (diff) | |
| download | nixpkgs-9b049849bfc385604f240157e129f7a8e3530d7f.tar nixpkgs-9b049849bfc385604f240157e129f7a8e3530d7f.tar.gz nixpkgs-9b049849bfc385604f240157e129f7a8e3530d7f.tar.bz2 nixpkgs-9b049849bfc385604f240157e129f7a8e3530d7f.tar.lz nixpkgs-9b049849bfc385604f240157e129f7a8e3530d7f.tar.xz nixpkgs-9b049849bfc385604f240157e129f7a8e3530d7f.tar.zst nixpkgs-9b049849bfc385604f240157e129f7a8e3530d7f.zip | |
freetype: disable PCF long family names
Backported several patches from upstream. The test suite patch for Fontconfig is no longer necessary.
Diffstat (limited to 'pkgs/development/libraries/fontconfig')
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch | 18 |
2 files changed, 0 insertions, 22 deletions
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index c44373625e0..14983b744df 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -33,10 +33,6 @@ stdenv.mkDerivation rec { url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c"; sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz"; }) - - # FreeType 2.7 prefixes PCF font family names with the foundry name. - # The output of fc-list and fc-query change which breaks the tests. - ./test-pcf-family-names-freetype-2.7.patch ]; # additionally required for the glibc-2.25 patch; avoid requiring gperf postPatch = '' diff --git a/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch b/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch deleted file mode 100644 index 24aa6e5aaa1..00000000000 --- a/pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nuar fontconfig-2.10.2-orig/test/out.expected fontconfig-2.10.2/test/out.expected ---- fontconfig-2.10.2-orig/test/out.expected 2017-03-06 06:45:50.876053093 -0600 -+++ fontconfig-2.10.2/test/out.expected 2017-03-06 06:48:18.012514337 -0600 -@@ -1,8 +1,8 @@ --Fixed:pixelsize=16 --Fixed:pixelsize=6 -+Misc Fixed:pixelsize=6 -+Sony Fixed:pixelsize=16 - = --Fixed:pixelsize=16 --Fixed:pixelsize=6 -+Misc Fixed:pixelsize=6 -+Sony Fixed:pixelsize=16 - = --Fixed:pixelsize=16 --Fixed:pixelsize=6 -+Misc Fixed:pixelsize=6 -+Sony Fixed:pixelsize=16 |