From ecac2e0d4be9ad1d5dde65bc8c321e2d254d2f89 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb <matthieu@cvs.openbsd.org>
Date: Sat, 9 Mar 2013 14:14:35 +0000
Subject: MFC: Bug 60748 - broken conf.d/10-autohint.conf and
 conf.d/10-unhinted.conf

Move the target of recipes to the "pattern" from the "font". This is
to ensure the targeted objects is updated by them prior to
FcDefaultSubstitute() so that it can adds the default values properly.
---
 dist/fontconfig/conf.d/10-autohint.conf          | 2 +-
 dist/fontconfig/conf.d/10-no-sub-pixel.conf      | 2 +-
 dist/fontconfig/conf.d/10-sub-pixel-bgr.conf     | 2 +-
 dist/fontconfig/conf.d/10-sub-pixel-rgb.conf     | 2 +-
 dist/fontconfig/conf.d/10-sub-pixel-vbgr.conf    | 2 +-
 dist/fontconfig/conf.d/10-sub-pixel-vrgb.conf    | 2 +-
 dist/fontconfig/conf.d/10-unhinted.conf          | 2 +-
 dist/fontconfig/conf.d/11-lcdfilter-default.conf | 2 +-
 dist/fontconfig/conf.d/11-lcdfilter-legacy.conf  | 2 +-
 dist/fontconfig/conf.d/11-lcdfilter-light.conf   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'dist')

diff --git a/dist/fontconfig/conf.d/10-autohint.conf b/dist/fontconfig/conf.d/10-autohint.conf
index bf08de83e..f9032ba31 100644
--- a/dist/fontconfig/conf.d/10-autohint.conf
+++ b/dist/fontconfig/conf.d/10-autohint.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use the Autohinter --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/10-no-sub-pixel.conf b/dist/fontconfig/conf.d/10-no-sub-pixel.conf
index e650160a5..cf1246561 100644
--- a/dist/fontconfig/conf.d/10-no-sub-pixel.conf
+++ b/dist/fontconfig/conf.d/10-no-sub-pixel.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/10-sub-pixel-bgr.conf b/dist/fontconfig/conf.d/10-sub-pixel-bgr.conf
index 74574ad3f..1378195dd 100644
--- a/dist/fontconfig/conf.d/10-sub-pixel-bgr.conf
+++ b/dist/fontconfig/conf.d/10-sub-pixel-bgr.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/10-sub-pixel-rgb.conf b/dist/fontconfig/conf.d/10-sub-pixel-rgb.conf
index 3c558e5df..757c3b6a7 100644
--- a/dist/fontconfig/conf.d/10-sub-pixel-rgb.conf
+++ b/dist/fontconfig/conf.d/10-sub-pixel-rgb.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/10-sub-pixel-vbgr.conf b/dist/fontconfig/conf.d/10-sub-pixel-vbgr.conf
index 392634d53..c807e5c05 100644
--- a/dist/fontconfig/conf.d/10-sub-pixel-vbgr.conf
+++ b/dist/fontconfig/conf.d/10-sub-pixel-vbgr.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/10-sub-pixel-vrgb.conf b/dist/fontconfig/conf.d/10-sub-pixel-vrgb.conf
index 1b7b5f6d5..b5985e03c 100644
--- a/dist/fontconfig/conf.d/10-sub-pixel-vrgb.conf
+++ b/dist/fontconfig/conf.d/10-sub-pixel-vrgb.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Enable sub-pixel rendering --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/10-unhinted.conf b/dist/fontconfig/conf.d/10-unhinted.conf
index 67037b435..a25e3b1dc 100644
--- a/dist/fontconfig/conf.d/10-unhinted.conf
+++ b/dist/fontconfig/conf.d/10-unhinted.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Disable hinting --> 
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/11-lcdfilter-default.conf b/dist/fontconfig/conf.d/11-lcdfilter-default.conf
index e251edd4d..9d7d11f90 100644
--- a/dist/fontconfig/conf.d/11-lcdfilter-default.conf
+++ b/dist/fontconfig/conf.d/11-lcdfilter-default.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use lcddefault as default for LCD filter -->
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/11-lcdfilter-legacy.conf b/dist/fontconfig/conf.d/11-lcdfilter-legacy.conf
index 63a4116e2..7e2b25675 100644
--- a/dist/fontconfig/conf.d/11-lcdfilter-legacy.conf
+++ b/dist/fontconfig/conf.d/11-lcdfilter-legacy.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use lcdlegacy as default for LCD filter -->
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
diff --git a/dist/fontconfig/conf.d/11-lcdfilter-light.conf b/dist/fontconfig/conf.d/11-lcdfilter-light.conf
index af50b2c2e..0dd0a9007 100644
--- a/dist/fontconfig/conf.d/11-lcdfilter-light.conf
+++ b/dist/fontconfig/conf.d/11-lcdfilter-light.conf
@@ -2,7 +2,7 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 <!--  Use lcdlight as default for LCD filter -->
-  <match target="font">
+  <match target="pattern">
     <!--
       This configuration is available on the major desktop environments.
       We shouldn't overwrite it with "assign" unconditionally.
-- 
cgit v1.2.3