[Fontconfig] Development snapshot release 2.11.93

[LRN]

On 09.03.2015 6:58, Akira TAGOH wrote:
> Since we've made an snapshot about 2 months ago, some changes
> including bug fixes and improvements has been made in git, that would
> be a time to make another snapshot to call for testers to make it stable.
> 
> If no further issues we want to fix during snapshots, I'm planning to
> make a release of 2.12 with it.
> Please let me know if any.

There seems to be a kind of mishap with the ~/.fonts.conf*: fontconfig now
spews messages about "deprecated" attribute in conf files being unknown here on
W32.

I've attached two patches, either one will do. One removes "deprecated=yes"
from 50-user.conf, the other adds back the code that handles the "deprecated"
attribute (including the ifdefed-out part of FcParseInclude() - now code just
assumes that rename&symlink dance fails on W32 (not really true on newer W32,
but i'm too lazy to hack in a symlinking function just for this, a warning is
enough)).

-- 
O< ascii ribbon - stop html email! - www.asciiribbon.org
-------------- next part --------------
--- fontconfig-2.11.93/src/fcxml.c.orig	2015-03-09 02:54:03.000000000 +0000
+++ fontconfig-2.11.93/src/fcxml.c	2015-03-24 13:30:24.825741200 +0000
@@ -2249,9 +2249,7 @@
     FcChar8	    *s;
     const FcChar8   *attr;
     FcBool	    ignore_missing = FcFalse;
-#ifndef _WIN32
     FcBool	    deprecated = FcFalse;
-#endif
     FcChar8	    *prefix = NULL, *p;
     static FcChar8  *userdir = NULL;
     static FcChar8  *userconf = NULL;
@@ -2265,11 +2263,9 @@
     attr = FcConfigGetAttribute (parse, "ignore_missing");
     if (attr && FcConfigLexBool (parse, (FcChar8 *) attr) == FcTrue)
 	ignore_missing = FcTrue;
-#ifndef _WIN32
     attr = FcConfigGetAttribute (parse, "deprecated");
     if (attr && FcConfigLexBool (parse, (FcChar8 *) attr) == FcTrue)
         deprecated = FcTrue;
-#endif
     attr = FcConfigGetAttribute (parse, "prefix");
     if (attr && FcStrCmp (attr, (const FcChar8 *)"xdg") == 0)
     {
@@ -2321,7 +2317,6 @@
     }
     if (!FcConfigParseAndLoad (parse->config, s, !ignore_missing))
 	parse->error = FcTrue;
-#ifndef _WIN32
     else
     {
         FcChar8 *filename;
@@ -2335,8 +2335,13 @@
 		    FcMakeDirectory (parent);
 		FcStrFree (parent);
 		if (FcFileIsDir (userdir) ||
+#ifndef _WIN32
 		    rename ((const char *)filename, (const char *)userdir) != 0 ||
-		    symlink ((const char *)userdir, (const char *)filename) != 0)
+		    symlink ((const char *)userdir, (const char *)filename) != 0
+#else
+		    1
+#endif
+		   )
 		{
 		    if (!warn_confd)
 		    {
@@ -2353,8 +2358,13 @@
 		    FcMakeDirectory (parent);
 		FcStrFree (parent);
 		if (FcFileIsFile (userconf) ||
+#ifndef _WIN32
 		    rename ((const char *)filename, (const char *)userconf) != 0 ||
-		    symlink ((const char *)userconf, (const char *)filename) != 0)
+		    symlink ((const char *)userconf, (const char *)filename) != 0
+#else
+		    1
+#endif
+		   )
 		{
 		    if (!warn_conf)
 		    {
@@ -2372,7 +2367,6 @@
         if(filename)
             FcStrFree(filename);
     }
-#endif
     FcStrBufDestroy (&parse->pstack->str);
 
   bail:
-------------- next part --------------
--- fontconfig-2.11.93/conf.d/50-user.conf.orig	2014-01-20 08:14:19.000000000 +0000
+++ fontconfig-2.11.93/conf.d/50-user.conf	2015-03-22 15:03:31.722983400 +0000
@@ -10,6 +10,6 @@
 	<include ignore_missing="yes" prefix="xdg">fontconfig/conf.d</include>
 	<include ignore_missing="yes" prefix="xdg">fontconfig/fonts.conf</include>
 	<!-- the following elements will be removed in the future -->
-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf.d</include>
-	<include ignore_missing="yes" deprecated="yes">~/.fonts.conf</include>
+	<include ignore_missing="yes" >~/.fonts.conf.d</include>
+	<include ignore_missing="yes" >~/.fonts.conf</include>
 </fontconfig>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0x922360B0.asc
Type: application/pgp-keys
Size: 1717 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/fontconfig/attachments/20150324/a9e89cf8/attachment.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freedesktop.org/archives/fontconfig/attachments/20150324/a9e89cf8/attachment.sig>