diff options
author | Will Dietz <w@wdtz.org> | 2019-03-18 20:14:39 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2019-03-18 22:57:50 -0500 |
commit | 0e44d14dff3232bc102278f248f5f9a1efab6151 (patch) | |
tree | 282b6629f4598740ff5e819bff8c1368f6ce6a63 /pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | |
parent | 542908cc354f7e8c68bb83083471182ad259cf4c (diff) |
xorg.mkfontdir: replace with mkfontscale, which now includes mkfontdir
See:
https://lists.x.org/archives/xorg-announce/2019-March/002960.html
Diffstat (limited to 'pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl')
-rwxr-xr-x | pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 938b0b7b2f96..0d39cb98b6ee 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -26,7 +26,7 @@ my %pcMap; my %extraAttrs; -my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "mkfontdir", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); +my @missingPCs = ("fontconfig", "libdrm", "libXaw", "zlib", "perl", "python", "mkfontscale", "bdftopcf", "libxslt", "openssl", "gperf", "m4"); $pcMap{$_} = $_ foreach @missingPCs; $pcMap{"freetype2"} = "freetype"; $pcMap{"libpng12"} = "libpng"; @@ -157,7 +157,7 @@ while (<>) { } if ($file =~ /AC_PATH_PROG\(MKFONTDIR/) { - push @requires, "mkfontdir"; + push @requires, "mkfontscale"; } if ($file =~ /AM_PATH_PYTHON/) { @@ -173,12 +173,12 @@ while (<>) { my $isFont; if ($file =~ /XORG_FONT_BDF_UTILS/) { - push @requires, "bdftopcf", "mkfontdir"; + push @requires, "bdftopcf", "mkfontscale"; $isFont = 1; } if ($file =~ /XORG_FONT_SCALED_UTILS/) { - push @requires, "mkfontscale", "mkfontdir"; + push @requires, "mkfontscale"; $isFont = 1; } |