fontconfig: 2.12.6 -> 2.13.92

This commit is contained in:
worldofpeace 2019-11-19 20:45:30 -05:00 committed by Jan Tojnar
parent dc80d7bc4a
commit 27b14ee82a
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 47 additions and 32 deletions

View File

@ -1,5 +1,14 @@
{ stdenv, substituteAll, fetchurl { stdenv
, pkgconfig, freetype, expat, libxslt, gperf, dejavu_fonts , fetchpatch
, substituteAll
, fetchurl
, pkg-config
, freetype
, expat
, libxslt
, gperf
, dejavu_fonts
, autoreconfHook
}: }:
/** Font configuration scheme /** Font configuration scheme
@ -18,11 +27,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fontconfig"; pname = "fontconfig";
version = "2.12.6"; version = "2.13.92";
src = fetchurl { src = fetchurl {
url = "http://fontconfig.org/release/${pname}-${version}.tar.bz2"; url = "http://fontconfig.org/release/${pname}-${version}.tar.xz";
sha256 = "05zh65zni11kgnhg726gjbrd55swspdvhqbcnj5a5xh8gn03036g"; sha256 = "0kkfsvxcvcphm9zcgsh646gix3qn4spz555wa1jp5hbq70l62vjh";
}; };
patches = [ patches = [
@ -31,15 +40,44 @@ stdenv.mkDerivation rec {
inherit configVersion; inherit configVersion;
}) })
# Fix fonts not being loaded when missing included configs that have ignore_missing="yes".
# https://bugzilla.redhat.com/show_bug.cgi?id=1744377
(fetchpatch {
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/fcada522913e5e07efa6367eff87ace9f06d24c8.patch";
sha256 = "1jbm3vw45b3qjnqrh2545v1k8vmb29c09v2wj07jnrq3lnchbvmn";
})
# Register JoyPixels as an emoji font.
# https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67 # https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/67
./fix-joypixels.patch (fetchpatch {
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/65087ac7ce4cc5f2109967c1380b474955dcb590.patch";
sha256 = "1dkrbqx1c1d8yfnx0igvv516wanw2ksrpm3fbpm2h9nw0hccwqvm";
})
# Fix invalid DTD in reset-dirs.
# https://gitlab.freedesktop.org/fontconfig/fontconfig/merge_requests/78
(fetchpatch {
url = "https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/a4aa66a858f1ecd375c5efe5916398281f73f794.patch";
sha256 = "1j4ky8jhpllfm1lh2if34xglh2hl79nsa0xxgzxpj9sx6h4v99j5";
})
]; ];
outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
propagatedBuildInputs = [ freetype ]; nativeBuildInputs = [
nativeBuildInputs = [ pkgconfig gperf libxslt ]; gperf
buildInputs = [ expat ]; libxslt
pkg-config
autoreconfHook
];
buildInputs = [
expat
];
propagatedBuildInputs = [
freetype
];
configureFlags = [ configureFlags = [
"--with-arch=${stdenv.hostPlatform.parsed.cpu.name}" "--with-arch=${stdenv.hostPlatform.parsed.cpu.name}"

View File

@ -1,23 +0,0 @@
--- a/conf.d/45-generic.conf
+++ b/conf.d/45-generic.conf
@@ -5,6 +5,10 @@
<!-- Emoji -->
+ <alias binding="same">
+ <family>JoyPixels</family>
+ <default><family>emoji</family></default>
+ </alias>
<alias binding="same">
<family>Emoji Two</family>
<default><family>emoji</family></default>
--- a/conf.d/60-generic.conf
+++ b/conf.d/60-generic.conf
@@ -29,6 +29,7 @@
<alias binding="same">
<family>emoji</family>
<prefer>
+ <family>JoyPixels</family>
<family>Emoji Two</family>
<family>Emoji One</family>
<!-- System fonts -->