-From be8bf4e2f9734d67b24de176b472591c42dadd68 Mon Sep 17 00:00:00 2001
+From 2bba0e4374c38925aa40fa0db7ac32e9032c0356 Mon Sep 17 00:00:00 2001
 From: Martin Herkt <lachs0r@srsfckn.biz>
-Date: Sat, 7 Sep 2013 14:37:48 +0200
-Subject: [PATCH 1/2] =?UTF-8?q?Changes=20for=20lachs0r=E2=80=99s=20Windows?=
- =?UTF-8?q?=20builds?=
+Date: Sat, 14 Jun 2014 17:11:47 +0200
+Subject: [PATCH] =?UTF-8?q?Changes=20for=20lachs0r=E2=80=99s=20Windows=20b?=
+ =?UTF-8?q?uilds?=
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 ---
- src/fcdir.c  | 26 +++++++++++++++++---------
+ src/fcdir.c  | 30 +++++++++++++++++++++---------
  src/fcinit.c | 35 +++++++++++++++++++++++++++++++++++
  src/fcxml.c  |  2 --
- 3 files changed, 52 insertions(+), 11 deletions(-)
+ 3 files changed, 56 insertions(+), 11 deletions(-)
 
 diff --git a/src/fcdir.c b/src/fcdir.c
-index b040a28..4ef7085 100644
+index 49259c1..cf044fa 100644
 --- a/src/fcdir.c
 +++ b/src/fcdir.c
 @@ -77,14 +77,7 @@ FcFileScanFontConfig (FcFontSet		*set,

     }
     return FcTrue;
-- 
1.8.3.4


 
 	/*
 	 * Edit pattern with user-defined rules
@@ -196,8 +189,8 @@ FcDirScanConfig (FcFontSet	*set,
     base = file + strlen ((char *) file);
 
     if (FcDebug () & FC_DBG_SCAN)
-	printf ("\tScanning dir %s\n", dir);
-	
+	fprintf (stderr, "[fontconfig] Scanning dir %s\n", dir);
+
     d = opendir ((char *) dir);
     if (!d)
     {
@@ -233,8 +226,24 @@ FcDirScanConfig (FcFontSet	*set,
     /*
      * Scan file files to build font patterns
      */
+    char buf1[512], buf2[512], pad[512], *str = &buf1[0], *prev = &buf2[0], *tmp;
+    int j, diff;
+    prev[0] = pad[0] = 0;
+
     for (i = 0; i < files->num; i++)
     {
+	snprintf (str, 512, "\r[%d/%d] %s", i+1, files->num, files->strs[i]);
+
+	for (diff = strlen (prev) - strlen (str), j = 0; diff > 0; diff--, j++)
+	    pad[j] = ' ';
+
+	pad[j] = 0;
+
+	if (FcDebug () & FC_DBG_SCAN)
+	    fprintf (stderr, "%s%s", str, pad);
+
+	tmp = str; str = prev; prev = tmp;
+
 	if (scanOnly)
 	{
 	    if (FcFileIsDir (files->strs[i]))
@@ -246,6 +255,9 @@ FcDirScanConfig (FcFontSet	*set,
 	}
     }
 
+    if (FcDebug () & FC_DBG_SCAN)
+	fprintf (stderr, "\n[fontconfig] Finished scanning dir %s\n", dir);
+
 bail2:
     FcStrSetDestroy (files);
 bail1:
diff --git a/src/fcinit.c b/src/fcinit.c
index b8d5d06..1a25b97 100644
--- a/src/fcinit.c
