[Fontconfig] fontconfig: Branch 'master'

Akira TAGOH akira at tagoh.org
Tue Apr 12 11:42:45 UTC 2016


Indeed, that line was added some while ago. and no changes in requring
lxml module in python to generate fc-blanks.h. given it isn't
installed there, I'm surprised too it was fine before though.

After looking at logs carefully, interestingly I can't see any logs
generating fc-blanks.h in the builds on darwin for the past builds.
dunno how they were generated before and cleaned up for testing every
time. and also interesting it has been fine on cygwin.

Is the installed components for builds same for both environments?

On Tue, Apr 12, 2016 at 5:27 PM, Jeremy Huddleston Sequoia
<jeremyhu at gmail.com> wrote:
> This change seems to be causing build failures on tinderbox (13087e3 was good, 560506b bad):
>
> http://tinderbox.x.org/builds/2016-04-08-0000/logs/fontconfig/#build
>
> Traceback (most recent call last):
>   File "./fc-blanks.py", line 7, in <module>
>     from lxml import html
> ImportError: No module named lxml
>
> That looks odd to me considering that the line existed before and after the change, and I didn't make any changes to the base OS across this update as well.
>
>
>
>> On Apr 6, 2016, at 20:01, Akira TAGOH <tagoh at kemper.freedesktop.org> wrote:
>>
>> fc-blanks/fc-blanks.py |   27 +++++++++++++++------------
>> 1 file changed, 15 insertions(+), 12 deletions(-)
>>
>> New commits:
>> commit 0e837ae6ecc475b02d7114dc10480543d6be98ff
>> Author: Akira TAGOH <akira at tagoh.org>
>> Date:   Thu Apr 7 12:01:14 2016 +0900
>>
>>    Modernize fc-blanks.py
>>
>>    fc-blanks.py now works on both python2 and 3
>>
>> diff --git a/fc-blanks/fc-blanks.py b/fc-blanks/fc-blanks.py
>> index a2f0b95..81b07d2 100755
>> --- a/fc-blanks/fc-blanks.py
>> +++ b/fc-blanks/fc-blanks.py
>> @@ -1,8 +1,11 @@
>> #! /usr/bin/python
>>
>> +from __future__ import absolute_import
>> +from __future__ import print_function
>> import urllib2
>> import sys
>> from lxml import html
>> +from six.moves import range
>>
>> fp = urllib2.urlopen('http://unicode.org/cldr/utility/list-unicodeset.jsp?a=[%3AGC%3DZs%3A][%3ADI%3A]&abb=on&ucd=on&esc=on&g')
>> data = fp.read()
>> @@ -47,12 +50,12 @@ for i in p:
>>         fescape = False
>>     elif i >= '0' and i <= '9' or i.lower() >= 'a' and i.lower() <= 'f':
>>         if fescape == True:
>> -            raise RuntimeError, "Unexpected escape code"
>> +            raise RuntimeError("Unexpected escape code")
>>         if funicode == True:
>>             v <<= 4
>>             v += int(i, 16)
>>         else:
>> -            raise RuntimeError, "Unable to parse Unicode"
>> +            raise RuntimeError("Unable to parse Unicode")
>>     elif i == ' ':
>>         if fescape == True:
>>             funicode = True
>> @@ -71,13 +74,13 @@ for i in p:
>>         frange = False
>>     elif i == '-':
>>         if fescape == True:
>> -            raise RuntimeError, "Unexpected escape code"
>> +            raise RuntimeError("Unexpected escape code")
>>         vbegin = v
>>         v = 0
>>         funicode = False
>>         frange = True
>>     else:
>> -        raise RuntimeError, "Unable to parse Unicode: %s" % i
>> +        raise RuntimeError("Unable to parse Unicode: %s" % i)
>>
>>     if fprocess == True:
>>         vbegin = 0
>> @@ -111,22 +114,22 @@ while True:
>>     s = sys.stdin.readline().rstrip()
>>     if s == "@@@":
>>         break
>> -    print s
>> +    print(s)
>>
>> -print "static FcChar32 _fcBlanks[%s] = {" % (ncode + 1)
>> +print("static FcChar32 _fcBlanks[%s] = {" % (ncode + 1))
>> k = 0
>> -for i in sorted(l, key=lambda(a): a[0]):
>> +for i in sorted(l, key=lambda a: a[0]):
>>     for j in range(i[0], i[1] + 1):
>>         if k != 0:
>> -            print ","
>> -        print "    0x%04x" % j,
>> +            print(",")
>> +        print("    0x%04x" % j, end=' ')
>>         k += 1
>>
>> -print "};"
>> -print '''
>> +print("};")
>> +print('''
>> static FcBlanks fcBlanks = {
>>     %s,
>>     -1,
>>     _fcBlanks
>> };
>> -''' % (ncode + 1)
>> +''' % (ncode + 1))
>> _______________________________________________
>> Fontconfig mailing list
>> Fontconfig at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/fontconfig
>



-- 
Akira TAGOH


More information about the Fontconfig mailing list