Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
freetype: disable PCF long family names
Backported several patches from upstream. The test suite patch for Fontconfig is no longer necessary.
- Loading branch information
Showing
6 changed files
with
643 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 0 additions & 18 deletions
18
pkgs/development/libraries/fontconfig/test-pcf-family-names-freetype-2.7.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
pkgs/development/libraries/freetype/disable-pcf-long-family-names.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h | ||
index 5676074..37a0d00 100644 | ||
--- a/include/freetype/config/ftoption.h | ||
+++ b/include/freetype/config/ftoption.h | ||
@@ -856,7 +856,7 @@ FT_BEGIN_HEADER | ||
/* If this option is activated, it can be controlled with the */ | ||
/* `no-long-family-names' property of the pcf driver module. */ | ||
/* */ | ||
-#define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES | ||
+/* #define PCF_CONFIG_OPTION_LONG_FAMILY_NAMES */ | ||
|
||
|
||
/*************************************************************************/ | ||
-- | ||
cgit v1.0-41-gc330 |
Oops, something went wrong.
9b04984
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ttuegel argh, I just merged master into staging and somehow the magic merger decided it should remove the .patch file but re-add the reference in the .nix file 😦 just to confirm: I should remove that again, right? I have no idea what any of this stuff is 😄
9b04984
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh actually, I was wrong, the issue is just in 2.10.nix, https://github.com/NixOS/nixpkgs/blob/staging/pkgs/development/libraries/fontconfig/2.10.nix#L14
9b04984
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the error I'm getting in Hydra: http://hydra.nixos.org/jobset/nixpkgs/copumpkin-wip#tabs-errors
9b04984
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like
staging
has also been blocked for the past few days on this: http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-errors