This commit is contained in:
committed by
Git OBS Bridge
parent
7a3732e32c
commit
56b19ade54
38
fonts-config
38
fonts-config
@@ -205,8 +205,8 @@ use strict;
|
|||||||
|
|
||||||
my $script_start_time = time();
|
my $script_start_time = time();
|
||||||
|
|
||||||
my $cvs_id = '$Id: fonts-config,v 1.72 2008/06/03 13:12:19 mfabian Exp $';
|
my $cvs_id = '$Id: fonts-config,v 1.73 2009/01/28 16:23:08 mfabian Exp $';
|
||||||
my $cvs_date = '$Date: 2008/06/03 13:12:19 $';
|
my $cvs_date = '$Date: 2009/01/28 16:23:08 $';
|
||||||
$cvs_date =~ /^\$[[:alpha:]]+: (.*) \$$/;
|
$cvs_date =~ /^\$[[:alpha:]]+: (.*) \$$/;
|
||||||
my $version = $1;
|
my $version = $1;
|
||||||
|
|
||||||
@@ -400,7 +400,7 @@ my $command = "";
|
|||||||
# available to X11 as well:
|
# available to X11 as well:
|
||||||
if ($cidfont_x11_config_bin) {
|
if ($cidfont_x11_config_bin) {
|
||||||
$command = $cidfont_x11_config_bin;
|
$command = $cidfont_x11_config_bin;
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "Configure X11 to use available CID-keyed fonts ...\n";
|
print "Configure X11 to use available CID-keyed fonts ...\n";
|
||||||
}
|
}
|
||||||
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||||
@@ -415,16 +415,16 @@ if ($cidfont_x11_config_bin) {
|
|||||||
my @x11_font_dirs = x11_font_dirs();
|
my @x11_font_dirs = x11_font_dirs();
|
||||||
my $gs_fontmap_needs_update = 0;
|
my $gs_fontmap_needs_update = 0;
|
||||||
|
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "Creating fonts.{scale,dir} files ";
|
print "Creating fonts.{scale,dir} files ";
|
||||||
}
|
}
|
||||||
for my $dir (@x11_font_dirs) {
|
for my $dir (@x11_font_dirs) {
|
||||||
make_fonts_scale_and_fonts_dir ($dir);
|
make_fonts_scale_and_fonts_dir ($dir);
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "."; # "progress bar"
|
print "."; # "progress bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "\n";
|
print "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -440,7 +440,7 @@ my $fc_cache_exit_status = 256;
|
|||||||
|
|
||||||
if ($fc_cache_bin) {
|
if ($fc_cache_bin) {
|
||||||
$command = "$fc_cache_bin";
|
$command = "$fc_cache_bin";
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "Creating cache files for fontconfig ";
|
print "Creating cache files for fontconfig ";
|
||||||
}
|
}
|
||||||
if ($OPT_FORCE) {
|
if ($OPT_FORCE) {
|
||||||
@@ -449,7 +449,7 @@ if ($fc_cache_bin) {
|
|||||||
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
$command .= " --verbose ";
|
$command .= " --verbose ";
|
||||||
}
|
}
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) { # with "progress bar"
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) { # with "progress bar"
|
||||||
open (FC_CACHE, "$command |");
|
open (FC_CACHE, "$command |");
|
||||||
select (STDOUT);
|
select (STDOUT);
|
||||||
$OUTPUT_AUTOFLUSH = 1;
|
$OUTPUT_AUTOFLUSH = 1;
|
||||||
@@ -464,7 +464,7 @@ if ($fc_cache_bin) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$fc_cache_exit_status = $CHILD_ERROR;
|
$fc_cache_exit_status = $CHILD_ERROR;
|
||||||
if ($VERBOSITY == $VERBOSITY_DEBUG) {
|
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||||
print "exit status of fc-cache: $fc_cache_exit_status\n";
|
print "exit status of fc-cache: $fc_cache_exit_status\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -472,13 +472,13 @@ my $fc_cache32_exit_status = 256;
|
|||||||
|
|
||||||
if ($fc_cache32_bin) {
|
if ($fc_cache32_bin) {
|
||||||
$command = "$fc_cache32_bin";
|
$command = "$fc_cache32_bin";
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "Creating 32bit cache files for fontconfig ";
|
print "Creating 32bit cache files for fontconfig ";
|
||||||
}
|
}
|
||||||
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
$command .= " --verbose ";
|
$command .= " --verbose ";
|
||||||
}
|
}
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) { # with "progress bar"
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) { # with "progress bar"
|
||||||
open (FC_CACHE, "$command |");
|
open (FC_CACHE, "$command |");
|
||||||
select (STDOUT);
|
select (STDOUT);
|
||||||
$OUTPUT_AUTOFLUSH = 1;
|
$OUTPUT_AUTOFLUSH = 1;
|
||||||
@@ -493,7 +493,7 @@ if ($fc_cache32_bin) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$fc_cache32_exit_status = $CHILD_ERROR;
|
$fc_cache32_exit_status = $CHILD_ERROR;
|
||||||
if ($VERBOSITY == $VERBOSITY_DEBUG) {
|
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||||
print "exit status of fc-cache: $fc_cache32_exit_status\n";
|
print "exit status of fc-cache: $fc_cache32_exit_status\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -501,13 +501,13 @@ my $fc_cache64_exit_status = 256;
|
|||||||
|
|
||||||
if ($fc_cache64_bin) {
|
if ($fc_cache64_bin) {
|
||||||
$command = "$fc_cache64_bin";
|
$command = "$fc_cache64_bin";
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "Creating 64bit cache files for fontconfig ";
|
print "Creating 64bit cache files for fontconfig ";
|
||||||
}
|
}
|
||||||
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
$command .= " --verbose ";
|
$command .= " --verbose ";
|
||||||
}
|
}
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) { # with "progress bar"
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) { # with "progress bar"
|
||||||
open (FC_CACHE, "$command |");
|
open (FC_CACHE, "$command |");
|
||||||
select (STDOUT);
|
select (STDOUT);
|
||||||
$OUTPUT_AUTOFLUSH = 1;
|
$OUTPUT_AUTOFLUSH = 1;
|
||||||
@@ -522,7 +522,7 @@ if ($fc_cache64_bin) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
$fc_cache64_exit_status = $CHILD_ERROR;
|
$fc_cache64_exit_status = $CHILD_ERROR;
|
||||||
if ($VERBOSITY == $VERBOSITY_DEBUG) {
|
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||||
print "exit status of fc-cache: $fc_cache64_exit_status\n";
|
print "exit status of fc-cache: $fc_cache64_exit_status\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -645,13 +645,13 @@ sub xfree86_version {
|
|||||||
sub freetype_module_supports_ttcap {
|
sub freetype_module_supports_ttcap {
|
||||||
my ($v1, $v2, $v3, $v4) = xfree86_version();
|
my ($v1, $v2, $v3, $v4) = xfree86_version();
|
||||||
if (version_compare(xfree86_version(), "4.3.99") >= 0) {
|
if (version_compare(xfree86_version(), "4.3.99") >= 0) {
|
||||||
if ($VERBOSITY == $VERBOSITY_DEBUG) {
|
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||||
print "freetype module supports TTCap.\n";
|
print "freetype module supports TTCap.\n";
|
||||||
}
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if ($VERBOSITY == $VERBOSITY_DEBUG) {
|
if ($VERBOSITY >= $VERBOSITY_DEBUG) {
|
||||||
print "freetype module does not support TTCap.\n";
|
print "freetype module does not support TTCap.\n";
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1532,14 +1532,14 @@ sub make_gs_fontmap {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "."; # "progress bar"
|
print "."; # "progress bar"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
close (FONTMAP);
|
close (FONTMAP);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($VERBOSITY == $VERBOSITY_VERBOSE) {
|
if ($VERBOSITY >= $VERBOSITY_VERBOSE) {
|
||||||
print "\n";
|
print "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 28 17:17:26 CET 2009 - mfabian@suse.de
|
||||||
|
|
||||||
|
- apply patch by Egbert Eich to make handling of verbosity levels
|
||||||
|
consistent.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 03 15:12:56 CEST 2008 - mfabian@suse.de
|
Tue Jun 03 15:12:56 CEST 2008 - mfabian@suse.de
|
||||||
|
|
||||||
|
@@ -1,10 +1,17 @@
|
|||||||
#
|
#
|
||||||
# spec file for package fonts-config (Version 20080121)
|
# spec file for package fonts-config (Version 20080121)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
|
||||||
# package are under the same license as the package itself.
|
|
||||||
#
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
@@ -22,7 +29,7 @@ Recommends: ft2demos
|
|||||||
%endif
|
%endif
|
||||||
PreReq: %fillup_prereq
|
PreReq: %fillup_prereq
|
||||||
Version: 20080121
|
Version: 20080121
|
||||||
Release: 25
|
Release: 52
|
||||||
Summary: Configures Fonts for X Windows and other applications
|
Summary: Configures Fonts for X Windows and other applications
|
||||||
Source: fonts-config
|
Source: fonts-config
|
||||||
Source1: SuSEconfig.fonts
|
Source1: SuSEconfig.fonts
|
||||||
@@ -82,6 +89,9 @@ exit 0
|
|||||||
/var/adm/fillup-templates/sysconfig.fonts-config
|
/var/adm/fillup-templates/sysconfig.fonts-config
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 28 2009 mfabian@suse.de
|
||||||
|
- apply patch by Egbert Eich to make handling of verbosity levels
|
||||||
|
consistent.
|
||||||
* Tue Jun 03 2008 mfabian@suse.de
|
* Tue Jun 03 2008 mfabian@suse.de
|
||||||
- bnc#396611: prefer "AR PL ShanHeiSun Uni" (uming.ttf) over
|
- bnc#396611: prefer "AR PL ShanHeiSun Uni" (uming.ttf) over
|
||||||
FZMingTiB (/usr/share/fonts/truetype/FZMingTiB.ttf) for
|
FZMingTiB (/usr/share/fonts/truetype/FZMingTiB.ttf) for
|
||||||
@@ -246,7 +256,7 @@ exit 0
|
|||||||
files.
|
files.
|
||||||
* Fri Mar 04 2005 mfabian@suse.de
|
* Fri Mar 04 2005 mfabian@suse.de
|
||||||
- add missing %%prep section to .spec file.
|
- add missing %%prep section to .spec file.
|
||||||
* Tue Dec 07 2004 mfabian@suse.de
|
* Mon Dec 06 2004 mfabian@suse.de
|
||||||
- Bugzilla #48603: don't try to write OpenOffice font-setup if
|
- Bugzilla #48603: don't try to write OpenOffice font-setup if
|
||||||
OpenOffice is not installed.
|
OpenOffice is not installed.
|
||||||
* Fri Oct 01 2004 mfabian@suse.de
|
* Fri Oct 01 2004 mfabian@suse.de
|
||||||
@@ -257,5 +267,5 @@ exit 0
|
|||||||
- make fonts which have spaces in the filename usable with
|
- make fonts which have spaces in the filename usable with
|
||||||
the X11 core font system by generating symbolic links.
|
the X11 core font system by generating symbolic links.
|
||||||
- checkproc was still used without absolute path in one place.
|
- checkproc was still used without absolute path in one place.
|
||||||
* Thu May 06 2004 sndirsch@suse.de
|
* Wed May 05 2004 sndirsch@suse.de
|
||||||
- created package
|
- created package
|
||||||
|
Reference in New Issue
Block a user