pool/fonts-config
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 427717 from M17N

Browse Source 
- version 20160914:
  * comma and the rest of family string is ignored while translating
    preference lists from sysconfig to fontconfig snippets 
    [bsc#998300]

OBS-URL: https://build.opensuse.org/request/show/427717
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fonts-config?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2016-09-17 12:37:53 +00:00 committed by Git OBS Bridge
commit be2f9d1c7d
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fonts-config
View File

@ -654,7 +654,7 @@ sub get_option_defaults_from_sysconfig {
elsif (eval ("\$$i") =~ /^[0-9]+$/) { # Type integer elsif (eval ("\$$i") =~ /^[0-9]+$/) { # Type integer
eval("\$$sysconfig_options{$i}=\$$i"); eval("\$$sysconfig_options{$i}=\$$i");
} }
elsif (eval ("\$$i") =~ /^[-:a-zA-Z0-9 &]+$/) { # Type string elsif (eval ("\$$i") =~ /^[-:a-zA-Z0-9 &,]+$/) { # Type string
eval("\$$sysconfig_options{$i}=\$$i"); eval("\$$sysconfig_options{$i}=\$$i");
} }
else { # this case also occurs when the variable is the empty string! else { # this case also occurs when the variable is the empty string!
@ -1313,6 +1313,8 @@ sub family_preference_list {
$cfg .= "\t\t<family>$family</family>\n"; $cfg .= "\t\t<family>$family</family>\n";
$cfg .= "\t\t<prefer>\n"; $cfg .= "\t\t<prefer>\n";
for my $f (@families) { for my $f (@families) {
# remove comma and the rest of the family string [bsc#998300]
$f =~ s/,.*//;
$f =~ s/&/&amp;/g; $f =~ s/&/&amp;/g;
$cfg .= " <family>$f</family>\n"; $cfg .= " <family>$f</family>\n";
if ($VERBOSITY >= $VERBOSITY_DEBUG) { if ($VERBOSITY >= $VERBOSITY_DEBUG) {

8
fonts-config.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 14 15:15:11 UTC 2016 - pgajdos@suse.com
- version 20160914:
* comma and the rest of family string is ignored while translating
preference lists from sysconfig to fontconfig snippets
[bsc#998300]
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 9 08:04:29 UTC 2015 - pgajdos@suse.com Mon Nov 9 08:04:29 UTC 2015 - pgajdos@suse.com

4
fonts-config.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package fonts-config # spec file for package fonts-config
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
%define infinality_srcver 1-20130104_1 %define infinality_srcver 1-20130104_1
%define infinality_name fontconfig-infinality %define infinality_name fontconfig-infinality
Name: fonts-config Name: fonts-config
Version: 20150424 Version: 20160914
Release: 0 Release: 0
Summary: Configures Fonts for X Windows and other applications Summary: Configures Fonts for X Windows and other applications
License: GPL-2.0+ and MIT License: GPL-2.0+ and MIT