From 9f6ec164cd6f9898039d270f0c555034dfaa7ecd0eab4bdda808e5f2163250b2 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Wed, 14 Sep 2016 15:18:43 +0000 Subject: [PATCH] - 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/package/show/M17N/fonts-config?expand=0&rev=76 --- fonts-config | 4 +++- fonts-config.changes | 7 +++++++ fonts-config.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fonts-config b/fonts-config index a0c04f0..a8172e1 100644 --- a/fonts-config +++ b/fonts-config @@ -654,7 +654,7 @@ sub get_option_defaults_from_sysconfig { elsif (eval ("\$$i") =~ /^[0-9]+$/) { # Type integer 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"); } else { # this case also occurs when the variable is the empty string! @@ -1313,6 +1313,8 @@ sub family_preference_list { $cfg .= "\t\t$family\n"; $cfg .= "\t\t\n"; for my $f (@families) { + # remove comma and the rest of the family string [bsc#998300] + $f =~ s/,.*//; $f =~ s/&/&/g; $cfg .= " $f\n"; if ($VERBOSITY >= $VERBOSITY_DEBUG) { diff --git a/fonts-config.changes b/fonts-config.changes index 8cd55fb..decd75e 100644 --- a/fonts-config.changes +++ b/fonts-config.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 14 15:15:11 UTC 2016 - pgajdos@suse.com + +- 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 diff --git a/fonts-config.spec b/fonts-config.spec index 047afb6..7d96580 100644 --- a/fonts-config.spec +++ b/fonts-config.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed