Accepting request 452790 from home:MargueriteSu:branches:M17N

OBS-URL: https://build.opensuse.org/request/show/452790
OBS-URL: https://build.opensuse.org/package/show/M17N/fonts-config?expand=0&rev=81

11-base-rendering.conf

@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
 <fontconfig>
 	<!-- hinting -->
-	<match target="font">
+	<match target="pattern">
                 <!-- hinting is on unconditionally, but that -->
                 <!-- can be controlled via hintstyle (hintnone) -->
 		<edit name="hinting" mode="assign">
@@ -11,12 +11,12 @@
 	</match>
 
         <!-- hint type: autohinter or BCI -->
-	<match target="font">
+	<match target="pattern">
 		<edit name="autohint" mode="assign">
 			<bool>true</bool>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
                 <test name="font_type">
                         <string>TT Instructed Font</string>
                 </test>
@@ -24,7 +24,7 @@
 			<bool>false</bool>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
                 <test name="font_type">
                         <string>NON TT Instructed Font</string>
                 </test>
@@ -32,7 +32,7 @@
 			<bool>true</bool>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
 		<test name="fontformat">
 			<string>CFF</string>
 		</test>
@@ -40,7 +40,7 @@
 			<bool>false</bool>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
                 <test name="force_autohint">
                         <bool>true</bool>
                 </test>
@@ -50,12 +50,12 @@
 	</match>
 
 	<!-- hint style -->
-	<match target="font">
+	<match target="pattern">
 		<edit name="hintstyle">
 			<const>hintslight</const>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
 		<test name="autohint">
 			<bool>false</bool>
 		</test>
@@ -66,7 +66,7 @@
 			<const>hintfull</const>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
 		<test name="force_hintstyle">
 			<string>hintnone</string>
 		</test>
@@ -74,7 +74,7 @@
 			<const>hintnone</const>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
 		<test name="force_hintstyle">
 			<string>hintslight</string>
 		</test>
@@ -82,7 +82,7 @@
 			<const>hintslight</const>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
 		<test name="force_hintstyle">
 			<string>hintmedium</string>
 		</test>
@@ -90,7 +90,7 @@
 			<const>hintmedium</const>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
 		<test name="force_hintstyle">
 			<string>hintfull</string>
 		</test>
@@ -100,7 +100,7 @@
 	</match>
 
         <!-- font smooth or don't font smooth -->
-	<match target="font">
+	<match target="pattern">
                 <!-- this test should not be needed, 
                      as antialiasing is done only for outlines,
                      but workarounds Qt5 issue, see bug 866705 -->
@@ -111,7 +111,7 @@
 			<bool>true</bool>
 		</edit>
 	</match>
-	<match target="font">
+	<match target="pattern">
                 <test name="force_bw">
                         <bool>true</bool>
                 </test>

12-tt-monospace-rendering.conf

@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
 <fontconfig>
 
-	<match target="font">
+	<match target="pattern">
 		<test name="force_bw_monospace">
 			<bool>true</bool>
 		</test>

fonts-config.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Jan 26 18:52:28 UTC 2017 - i@marguerite.su
+
+- fixed boo#904015: outlined fonts didn't get their antialias
+  enabled by fontconfig in openSUSE 13.2 and above
+  * 11-base-rendering.conf and 12-tt-monospace-rendering.conf:
+    fixed misused match target 'font' to 'pattern'. if 'font'
+    target is used, there should be a test matched only one font,
+    and all other tests/edits go to this font. any match that
+    wishes to have multiple possible results should use 'pattern'
+    target.
+
 -------------------------------------------------------------------
 Wed Sep 21 13:35:53 UTC 2016 - ftake@geeko.jp
 

fonts-config.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package fonts-config
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,9 +22,9 @@ Name:           fonts-config
 Version:        20160921
 Release:        0
 Summary:        Configures Fonts for X Windows and other applications
+# MIT for infinality
 License:        GPL-2.0+ and MIT
 Group:          System/X11/Fonts
-# MIT for infinality
 Source0:        fonts-config
 Source1:        sysconfig.fonts-config
 Source2:        fontconfig.SUSE.properties.template