public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #57696 from dtzWill/update/freetype2-2.10.0

Browse Source 
freetype2: 2.9.1 -> 2.10.0
This commit is contained in:
Will Dietz 2019-03-17 00:47:05 -05:00 committed by GitHub
commit ec918e56d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/freetype/default.nix
View File

@ -13,8 +13,8 @@ let
inherit (stdenv.lib) optional optionalString; inherit (stdenv.lib) optional optionalString;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "freetype-${version}"; pname = "freetype";
version = "2.9.1"; version = "2.10.0";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A font rendering engine"; description = "A font rendering engine";
@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
}; };
src = fetchurl { src = fetchurl {
url = "mirror://savannah/freetype/${name}.tar.bz2"; url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2";
sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv"; sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w";
}; };
propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype

17
pkgs/development/libraries/freetype/enable-subpixel-rendering.patch
View File

@ -1,13 +1,12 @@
Index: freetype-2.7.1/include/freetype/config/ftoption.h Index: freetype-2.10.0/include/freetype/config/ftoption.h
=================================================================== --- a/include/freetype/config/ftoption.h
--- freetype-2.7.1.orig/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h
+++ freetype-2.7.1/include/freetype/config/ftoption.h @@ -126,7 +126,7 @@ FT_BEGIN_HEADER
@@ -122,7 +122,7 @@ FT_BEGIN_HEADER * macro is not defined, FreeType offers alternative LCD rendering
/* This is done to allow FreeType clients to run unmodified, forcing */ * technology that produces excellent output without LCD filtering.
/* them to display normal gray-level anti-aliased glyphs. */ */
/* */
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING
/*************************************************************************/ /**************************************************************************

12
pkgs/development/libraries/freetype/enable-table-validation.patch
View File

@ -1,20 +1,18 @@
Index: freetype-2.7.1/modules.cfg Index: freetype-2.10.0/modules.cfg
=================================================================== ===================================================================
--- freetype-2.7.1.orig/modules.cfg --- freetype-2.10.0.orig/modules.cfg
+++ freetype-2.7.1/modules.cfg +++ freetype-2.10.0/modules.cfg
@@ -120,7 +120,7 @@ AUX_MODULES += cache @@ -120,6 +120,6 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs ftgxval.c below. # TrueType GX/AAT table validation. Needs ftgxval.c below.
# #
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid -# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid +AUX_MODULES += gxvalid
# Support for streams compressed with gzip (files with suffix .gz). # Support for streams compressed with gzip (files with suffix .gz).
# #
@@ -143,7 +143,7 @@ AUX_MODULES += bzip2 @@ -143,6 +143,6 @@ AUX_MODULES += bzip2
# OpenType table validation. Needs ftotval.c below. # OpenType table validation. Needs ftotval.c below.
# #
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid -# AUX_MODULES += otvalid
+AUX_MODULES += otvalid +AUX_MODULES += otvalid