Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bc92dd657b79
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ec918e56d4d9
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Mar 15, 2019

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    callahad Dan Callahan
    Copy the full SHA
    dd48bd5 View commit details

Commits on Mar 17, 2019

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

    freetype2: 2.9.1 -> 2.10.0
    dtzWill authored Mar 17, 2019
    Copy the full SHA
    ec918e5 View commit details
8 changes: 4 additions & 4 deletions pkgs/development/libraries/freetype/default.nix
Original file line number Diff line number Diff line change
@@ -13,8 +13,8 @@ let
inherit (stdenv.lib) optional optionalString;

in stdenv.mkDerivation rec {
name = "freetype-${version}";
version = "2.9.1";
pname = "freetype";
version = "2.10.0";

meta = with stdenv.lib; {
description = "A font rendering engine";
@@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
};

src = fetchurl {
url = "mirror://savannah/freetype/${name}.tar.bz2";
sha256 = "0kg8w6qyiizlyzh4a8lpzslipcbv96hcg3rqqpnxba8ffbm8g3fv";
url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2";
sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w";
};

propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
Index: freetype-2.7.1/include/freetype/config/ftoption.h
===================================================================
--- freetype-2.7.1.orig/include/freetype/config/ftoption.h
+++ freetype-2.7.1/include/freetype/config/ftoption.h
@@ -122,7 +122,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
Index: freetype-2.10.0/include/freetype/config/ftoption.h
--- a/include/freetype/config/ftoption.h
+++ b/include/freetype/config/ftoption.h
@@ -126,7 +126,7 @@ FT_BEGIN_HEADER
* macro is not defined, FreeType offers alternative LCD rendering
* technology that produces excellent output without LCD filtering.
*/
-/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */
+#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING


/*************************************************************************/
/**************************************************************************
Original file line number Diff line number Diff line change
@@ -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.7.1/modules.cfg
@@ -120,7 +120,7 @@ AUX_MODULES += cache
--- freetype-2.10.0.orig/modules.cfg
+++ freetype-2.10.0/modules.cfg
@@ -120,6 +120,6 @@ AUX_MODULES += cache
# TrueType GX/AAT table validation. Needs ftgxval.c below.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += gxvalid
+AUX_MODULES += gxvalid

# 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.
#
# No FT_CONFIG_OPTION_PIC support.
-# AUX_MODULES += otvalid
+AUX_MODULES += otvalid