- updated to 20150421:
* use mkpath instead of make_path [bnc#927968] * behave better when /usr/share/fontconfig/conf.avail/30-metric-aliases.conf not found * added --user option OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=65
This commit is contained in:
parent
ce3ee03fe1
commit
5ebc5e6578
14
fonts-config
14
fonts-config
@ -322,7 +322,7 @@ use utf8;
|
||||
use English;
|
||||
use Getopt::Long;
|
||||
use File::Basename;
|
||||
use File::Path qw(make_path);
|
||||
use File::Path qw(mkpath);
|
||||
use Env;
|
||||
use strict;
|
||||
|
||||
@ -1344,13 +1344,13 @@ sub family_metric_compatibility {
|
||||
$suse_metric .= "\n";
|
||||
}
|
||||
}
|
||||
close (CONF);
|
||||
} else {
|
||||
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||
print "--- WARNING: $fontconfig_metric_conf doesn't exist!\n";
|
||||
}
|
||||
}
|
||||
|
||||
close (CONF);
|
||||
return $suse_metric;
|
||||
}
|
||||
|
||||
@ -1378,6 +1378,7 @@ sub family_preference_config {
|
||||
|
||||
if (!$user)
|
||||
{
|
||||
if (-e $metric_avail) {
|
||||
# replace fontconfig's /etc/fonts/conf.d/30-metric-aliases.conf
|
||||
# by fonts-config's one
|
||||
|
||||
@ -1396,6 +1397,13 @@ sub family_preference_config {
|
||||
print CONF $suse_metric;
|
||||
close (CONF);
|
||||
}
|
||||
else {
|
||||
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||
print "--- WARNING: $metric_avail not found, not writing $suse_metric_file ---\n";
|
||||
print "---\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$suse_pref .= "<?xml version=\"1.0\"?>\n";
|
||||
$suse_pref .= "<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">\n";
|
||||
@ -1922,7 +1930,7 @@ sub my_make_path {
|
||||
}
|
||||
return;
|
||||
}
|
||||
make_path($dir);
|
||||
mkpath($dir);
|
||||
if (! -d $dir) {
|
||||
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||
print "can not create\n";
|
||||
|
@ -1,8 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 21 13:34:43 UTC 2015 - pgajdos@suse.com
|
||||
|
||||
- updated to 20150421:
|
||||
* use mkpath instead of make_path [bnc#927968]
|
||||
* behave better when
|
||||
/usr/share/fontconfig/conf.avail/30-metric-aliases.conf
|
||||
not found
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 17 11:55:10 UTC 2015 - pgajdos@suse.com
|
||||
|
||||
- updated to 20150417:
|
||||
added --user option
|
||||
* added --user option
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 12 13:55:20 UTC 2015 - pgajdos@suse.com
|
||||
|
Loading…
x
Reference in New Issue
Block a user