fontconfig: Branch 'master'

[email protected] (GitLab Mirror) Mon, 28 Oct 2019 08:33:37 +0000 (UTC)
Newsgroups gmane.comp.fonts.fontconfig
Message-ID <[email protected]>
IHNyYy9mY2NhY2hlLmMgICAgfCAgIDM2ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQog
dGVzdC9ydW4tdGVzdC5zaCB8ICAgNjYgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr
KysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA5NiBpbnNlcnRpb25zKCsp
LCA2IGRlbGV0aW9ucygtKQoKTmV3IGNvbW1pdHM6CmNvbW1pdCBjOTg2MmI2ZWE3YzMyMzRiMjlm
NjUwMGM3ZDA3MzU5ODQ3ZTU1ZWQ3CkF1dGhvcjogQWtpcmEgVEFHT0ggPGFraXJhQHRhZ29oLm9y
Zz4KRGF0ZTogICBNb24gT2N0IDI4IDE3OjExOjM4IDIwMTkgKzA5MDAKCiAgICBSZWFkIGxhdGVz
dCBjYWNoZSBpbiBwYXRocwogICAgCiAgICBSaWdodCBub3cgZm9udGNvbmZpZyB1c2VzIGEgY2Fj
aGUgZm91bmQgZmlyc3QgaW4gYSBwYXRoIGFuZAogICAgY2FjaGVkaXJzIGFyZSB0aGUgb3JkZXIg
b2YgdGhlIHN5c3RlbS13aWRlIHBhdGggYW5kIHRoZW4gdGhlIHVzZXIgcGF0aC4KICAgIHRoaXMg
aXMgZHVlIHRvIGF2b2lkIHdyaXRpbmcgY2FjaGVzIGludG8gdGhlIHVzZXIgcGF0aCB3aGVuIHJ1
bm5pbmcgYXMgcm9vdC4KICAgIAogICAgSG93ZXZlciwgY2hhbmdpbmcgY2FjaGVzIGJ5IGNlcnRh
aW4gY29uZmlnIG9ubHksIGUuZy4gdXNpbmcgPG1hdGNoIHRhcmdldD0ic2NhbiI+CiAgICBtYXkg
bm90IHRha2UgZWZmZWN0IGJ5IHRoaXMgYmVoYXZpb3IsIGJlY2F1c2UgaXQgbWF5IGJlIHN0b3Jl
ZCBpbnRvIHRoZSB1c2VyIHBhdGguCiAgICAKICAgIFRodXMsIG5lZWRpbmcgdG8gZmluZCB0aGUg
bGF0ZXN0IGNhY2hlIG91dCBmcm9tIHBhdGhzLgogICAgCiAgICBGaXhlcyBodHRwczovL2dpdGxh
Yi5mcmVlZGVza3RvcC5vcmcvZm9udGNvbmZpZy9mb250Y29uZmlnL2lzc3Vlcy8xODIKCmRpZmYg
LS1naXQgYS9zcmMvZmNjYWNoZS5jIGIvc3JjL2ZjY2FjaGUuYwppbmRleCAwOTc2MjAxLi40YWNk
ZTIyIDEwMDY0NAotLS0gYS9zcmMvZmNjYWNoZS5jCisrKyBiL3NyYy9mY2NhY2hlLmMKQEAgLTMz
OCw3ICszMzgsNyBAQCBGY0RpckNhY2hlT3BlbkZpbGUgKGNvbnN0IEZjQ2hhcjggKmNhY2hlX2Zp
bGUsIHN0cnVjdCBzdGF0ICpmaWxlX3N0YXQpCiBzdGF0aWMgRmNCb29sCiBGY0RpckNhY2hlUHJv
Y2VzcyAoRmNDb25maWcgKmNvbmZpZywgY29uc3QgRmNDaGFyOCAqZGlyLAogCQkgICBGY0Jvb2wg
KCpjYWxsYmFjaykgKEZjQ29uZmlnICpjb25maWcsIGludCBmZCwgc3RydWN0IHN0YXQgKmZkX3N0
YXQsCi0JCQkJICAgICAgIHN0cnVjdCBzdGF0ICpkaXJfc3RhdCwgdm9pZCAqY2xvc3VyZSksCisJ
CQkJICAgICAgIHN0cnVjdCBzdGF0ICpkaXJfc3RhdCwgc3RydWN0IHRpbWV2YWwgKmNhY2hlX210
aW1lLCB2b2lkICpjbG9zdXJlKSwKIAkJICAgdm9pZCAqY2xvc3VyZSwgRmNDaGFyOCAqKmNhY2hl
X2ZpbGVfcmV0KQogewogICAgIGludAkJZmQgPSAtMTsKQEAgLTM0OCw2ICszNDgsNyBAQCBGY0Rp
ckNhY2hlUHJvY2VzcyAoRmNDb25maWcgKmNvbmZpZywgY29uc3QgRmNDaGFyOCAqZGlyLAogICAg
IHN0cnVjdCBzdGF0IGZpbGVfc3RhdCwgZGlyX3N0YXQ7CiAgICAgRmNCb29sCXJldCA9IEZjRmFs
c2U7CiAgICAgY29uc3QgRmNDaGFyOCAqc3lzcm9vdCA9IEZjQ29uZmlnR2V0U3lzUm9vdCAoY29u
ZmlnKTsKKyAgICBzdHJ1Y3QgdGltZXZhbCBsYXRlc3RfbXRpbWUgPSAoc3RydWN0IHRpbWV2YWwp
eyAwIH07CiAKICAgICBpZiAoc3lzcm9vdCkKIAlkID0gRmNTdHJCdWlsZEZpbGVuYW1lIChzeXNy
b290LCBkaXIsIE5VTEwpOwpAQCAtMzgzLDE1ICszODQsMTggQEAgRmNEaXJDYWNoZVByb2Nlc3Mg
KEZjQ29uZmlnICpjb25maWcsIGNvbnN0IEZjQ2hhcjggKmRpciwKICNlbmRpZgogICAgICAgICBm
ZCA9IEZjRGlyQ2FjaGVPcGVuRmlsZSAoY2FjaGVfaGFzaGVkLCAmZmlsZV9zdGF0KTsKICAgICAg
ICAgaWYgKGZkID49IDApIHsKLQkgICAgcmV0ID0gKCpjYWxsYmFjaykgKGNvbmZpZywgZmQsICZm
aWxlX3N0YXQsICZkaXJfc3RhdCwgY2xvc3VyZSk7CisJICAgIHJldCA9ICgqY2FsbGJhY2spIChj
b25maWcsIGZkLCAmZmlsZV9zdGF0LCAmZGlyX3N0YXQsICZsYXRlc3RfbXRpbWUsIGNsb3N1cmUp
OwogCSAgICBjbG9zZSAoZmQpOwogCSAgICBpZiAocmV0KQogCSAgICB7CiAJCWlmIChjYWNoZV9m
aWxlX3JldCkKKwkJeworCQkgICAgaWYgKCpjYWNoZV9maWxlX3JldCkKKwkJCUZjU3RyRnJlZSAo
KmNhY2hlX2ZpbGVfcmV0KTsKIAkJICAgICpjYWNoZV9maWxlX3JldCA9IGNhY2hlX2hhc2hlZDsK
KwkJfQogCQllbHNlCiAJCSAgICBGY1N0ckZyZWUgKGNhY2hlX2hhc2hlZCk7Ci0JCWJyZWFrOwog
CSAgICB9CiAJfQogI2lmbmRlZiBfV0lOMzIKQEAgLTQxNCw3ICs0MTgsOCBAQCBGY0RpckNhY2hl
UHJvY2VzcyAoRmNDb25maWcgKmNvbmZpZywgY29uc3QgRmNDaGFyOCAqZGlyLAogCSAgICB9CiAJ
fQogI2VuZGlmCi0gICAgCUZjU3RyRnJlZSAoY2FjaGVfaGFzaGVkKTsKKwllbHNlCisJICAgIEZj
U3RyRnJlZSAoY2FjaGVfaGFzaGVkKTsKICAgICB9CiAgICAgRmNTdHJMaXN0RG9uZSAobGlzdCk7
CiAKQEAgLTk5OCwxMiArMTAwMywzMSBAQCBGY0RpckNhY2hlVW5sb2FkIChGY0NhY2hlICpjYWNo
ZSkKIH0KIAogc3RhdGljIEZjQm9vbAotRmNEaXJDYWNoZU1hcEhlbHBlciAoRmNDb25maWcgKmNv
bmZpZywgaW50IGZkLCBzdHJ1Y3Qgc3RhdCAqZmRfc3RhdCwgc3RydWN0IHN0YXQgKmRpcl9zdGF0
LCB2b2lkICpjbG9zdXJlKQorRmNEaXJDYWNoZU1hcEhlbHBlciAoRmNDb25maWcgKmNvbmZpZywg
aW50IGZkLCBzdHJ1Y3Qgc3RhdCAqZmRfc3RhdCwgc3RydWN0IHN0YXQgKmRpcl9zdGF0LCBzdHJ1
Y3QgdGltZXZhbCAqbGF0ZXN0X2NhY2hlX210aW1lLCB2b2lkICpjbG9zdXJlKQogewogICAgIEZj
Q2FjaGUgKmNhY2hlID0gRmNEaXJDYWNoZU1hcEZkIChjb25maWcsIGZkLCBmZF9zdGF0LCBkaXJf
c3RhdCk7CisgICAgc3RydWN0IHRpbWV2YWwgY2FjaGVfbXRpbWU7CiAKICAgICBpZiAoIWNhY2hl
KQogCXJldHVybiBGY0ZhbHNlOworICAgIGNhY2hlX210aW1lLnR2X3NlYyA9IGZkX3N0YXQtPnN0
X210aW1lOworI2lmZGVmIEhBVkVfU1RSVUNUX1NUQVRfU1RfTVRJTQorICAgIGNhY2hlX210aW1l
LnR2X3VzZWMgPSBmZF9zdGF0LT5zdF9tdGltLnR2X25zZWMgLyAxMDAwOworI2Vsc2UKKyAgICBj
YWNoZV9tdGltZS50dl91c2VjID0gMDsKKyNlbmRpZgorICAgIGlmICh0aW1lcmNtcCAobGF0ZXN0
X2NhY2hlX210aW1lLCAmY2FjaGVfbXRpbWUsIDwpKQorICAgIHsKKwlpZiAoKigoRmNDYWNoZSAq
KikgY2xvc3VyZSkpCisJICAgIEZjRGlyQ2FjaGVVbmxvYWQgKCooKEZjQ2FjaGUgKiopIGNsb3N1
cmUpKTsKKyAgICB9CisgICAgZWxzZQorICAgIHsKKwlGY0RpckNhY2hlVW5sb2FkIChjYWNoZSk7
CisJcmV0dXJuIEZjRmFsc2U7CisgICAgfQorICAgIGxhdGVzdF9jYWNoZV9tdGltZS0+dHZfc2Vj
ID0gY2FjaGVfbXRpbWUudHZfc2VjOworICAgIGxhdGVzdF9jYWNoZV9tdGltZS0+dHZfdXNlYyA9
IGNhY2hlX210aW1lLnR2X3VzZWM7CiAgICAgKigoRmNDYWNoZSAqKikgY2xvc3VyZSkgPSBjYWNo
ZTsKICAgICByZXR1cm4gRmNUcnVlOwogfQpAQCAtMTA5Myw3ICsxMTE3LDcgQEAgRmNEaXJDaGVj
a3N1bU5hbm8gKHN0cnVjdCBzdGF0ICpzdGF0YikKICAqIHRoZSBtYWdpYyBudW1iZXIgYW5kIHRo
ZSBzaXplIGZpZWxkCiAgKi8KIHN0YXRpYyBGY0Jvb2wKLUZjRGlyQ2FjaGVWYWxpZGF0ZUhlbHBl
ciAoRmNDb25maWcgKmNvbmZpZywgaW50IGZkLCBzdHJ1Y3Qgc3RhdCAqZmRfc3RhdCwgc3RydWN0
IHN0YXQgKmRpcl9zdGF0LCB2b2lkICpjbG9zdXJlIEZDX1VOVVNFRCkKK0ZjRGlyQ2FjaGVWYWxp
ZGF0ZUhlbHBlciAoRmNDb25maWcgKmNvbmZpZywgaW50IGZkLCBzdHJ1Y3Qgc3RhdCAqZmRfc3Rh
dCwgc3RydWN0IHN0YXQgKmRpcl9zdGF0LCBzdHJ1Y3QgdGltZXZhbCAqbGF0ZXN0X2NhY2hlX210
aW1lLCB2b2lkICpjbG9zdXJlIEZDX1VOVVNFRCkKIHsKICAgICBGY0Jvb2wgIHJldCA9IEZjVHJ1
ZTsKICAgICBGY0NhY2hlCWM7CmRpZmYgLS1naXQgYS90ZXN0L3J1bi10ZXN0LnNoIGIvdGVzdC9y
dW4tdGVzdC5zaAppbmRleCA0ZTU5NjhiLi44YWQwOWUzIDEwMDY0NAotLS0gYS90ZXN0L3J1bi10
ZXN0LnNoCisrKyBiL3Rlc3QvcnVuLXRlc3Quc2gKQEAgLTM0MCw2ICszNDAsNzIgQEAgZmkKIAog
cm0gLXJmICRNeVBXRC9zeXNyb290CiAKK2RvdGVzdCAicmVhZCBuZXdlciBjYWNoZXMgd2hlbiBt
dWx0aXBsZSBwbGFjZXMgYXJlIGFsbG93ZWQgdG8gc3RvcmUiCitwcmVwCitjcCAkRk9OVDEgJEZP
TlQyICRGT05URElSCitpZiBbIC1uICR7U09VUkNFX0RBVEVfRVBPQ0g6LX0gXSAmJiBbICR7I1NP
VVJDRV9EQVRFX0VQT0NIfSAtZ3QgMCBdOyB0aGVuCisgICAgdG91Y2ggLW0gLXQgImBkYXRlIC1k
IFwiQCR7U09VUkNFX0RBVEVfRVBPQ0h9XCIgKyV5JW0lZCVIJU0uJVNgIiAkRk9OVERJUgorZmkK
K01ZQ0FDSEVCQVNFRElSPWBta3RlbXAgLWQgL3RtcC9mb250Y29uZmlnLlhYWFhYWFhYYAorTVlD
QUNIRURJUj0kTVlDQUNIRUJBU0VESVIvY2FjaGUuZGlyCitNWU9XTkNBQ0hFRElSPSRNWUNBQ0hF
QkFTRURJUi9vd25jYWNoZS5kaXIKK01ZQ09ORklHPWBta3RlbXAgL3RtcC9mb250Y29uZmlnLlhY
WFhYWFhYYAorCitta2RpciAtcCAkTVlDQUNIRURJUgorbWtkaXIgLXAgJE1ZT1dOQ0FDSEVESVIK
Kworc2VkICJzIUBGT05URElSQCEkRk9OVERJUiEKK3MhQFJFTUFQRElSQCEhCitzIUBDQUNIRURJ
UkAhJE1ZQ0FDSEVESVIhIiA8ICRURVNURElSL2ZvbnRzLmNvbmYuaW4gPiBteS1mb250cy5jb25m
CisKK0ZPTlRDT05GSUdfRklMRT0kTXlQV0QvbXktZm9udHMuY29uZiAkRkNDQUNIRSAkRk9OVERJ
UgorCitzbGVlcCAxCitjYXQ8PEVPRj4kTVlDT05GSUcKKzxmb250Y29uZmlnPgorICA8bWF0Y2gg
dGFyZ2V0PSJzY2FuIj4KKyAgICA8dGVzdCBuYW1lPSJmaWxlIj48c3RyaW5nPiRGT05URElSLzR4
Ni5wY2Y8L3N0cmluZz48L3Rlc3Q+CisgICAgPGVkaXQgbmFtZT0icGl4ZWxzaXplIj48aW50Pjg8
L2ludD48L2VkaXQ+CisgIDwvbWF0Y2g+Cis8L2ZvbnRjb25maWc+CitFT0YKK3NlZCAicyFARk9O
VERJUkAhJEZPTlRESVIhCitzIUBSRU1BUERJUkAhPGluY2x1ZGUgaWdub3JlX21pc3Npbmc9XCJ5
ZXNcIj4kTVlDT05GSUc8L2luY2x1ZGU+IQorcyFAQ0FDSEVESVJAISRNWU9XTkNBQ0hFRElSISIg
PCAkVEVTVERJUi9mb250cy5jb25mLmluID4gbXktZm9udHMuY29uZgorCitpZiBbIC1uICR7U09V
UkNFX0RBVEVfRVBPQ0g6LX0gXTsgdGhlbgorICBvbGRfZXBvY2g9JHtTT1VSQ0VfREFURV9FUE9D
SH0KKyAgU09VUkNFX0RBVEVfRVBPQ0g9YGV4cHIgJFNPVVJDRV9EQVRFX0VQT0NIICsgMWAKK2Zp
CitGT05UQ09ORklHX0ZJTEU9JE15UFdEL215LWZvbnRzLmNvbmYgJEZDQ0FDSEUgLWYgJEZPTlRE
SVIKK2lmIFsgLW4gJHtTT1VSQ0VfREFURV9FUE9DSDotfSBdOyB0aGVuCisgIFNPVVJDRV9EQVRF
X0VQT0NIPSR7b2xkX2Vwb2NofQorZmkKKworc2VkICJzIUBGT05URElSQCEkRk9OVERJUiEKK3Mh
QFJFTUFQRElSQCE8aW5jbHVkZSBpZ25vcmVfbWlzc2luZz1cInllc1wiPiRNWUNPTkZJRzwvaW5j
bHVkZT4hCitzIUBDQUNIRURJUkAhJE1ZQ0FDSEVESVI8L2NhY2hlZGlyPjxjYWNoZWRpcj4kTVlP
V05DQUNIRURJUiEiIDwgJFRFU1RESVIvZm9udHMuY29uZi5pbiA+IG15LWZvbnRzLmNvbmYKKwor
Rk9OVENPTkZJR19GSUxFPSRNeVBXRC9teS1mb250cy5jb25mICRGQ0xJU1QgLSBmYW1pbHkgcGl4
ZWxzaXplIHwgc29ydCA+IG15LW91dAorZWNobyAiPSIgPj4gbXktb3V0CitGT05UQ09ORklHX0ZJ
TEU9JE15UFdEL215LWZvbnRzLmNvbmYgJEZDTElTVCAtIGZhbWlseSBwaXhlbHNpemUgfCBzb3J0
ID4+IG15LW91dAorZWNobyAiPSIgPj4gbXktb3V0CitGT05UQ09ORklHX0ZJTEU9JE15UFdEL215
LWZvbnRzLmNvbmYgJEZDTElTVCAtIGZhbWlseSBwaXhlbHNpemUgfCBzb3J0ID4+IG15LW91dAor
dHIgLWQgJ1wwMTUnIDxteS1vdXQgPm15LW91dC50bXA7IG12IG15LW91dC50bXAgbXktb3V0Citz
ZWQgLWUgJ3MvcGl4ZWxzaXplPTYvcGl4ZWxzaXplPTgvZycgJEJVSUxEVEVTVERJUi8kRVhQRUNU
RUQgPiBteS1vdXQuZXhwZWN0ZWQKKworaWYgY21wIG15LW91dCBteS1vdXQuZXhwZWN0ZWQgPiAv
ZGV2L251bGwgOyB0aGVuIDogOyBlbHNlCisgICAgZWNobyAiKioqIFRlc3QgZmFpbGVkOiAkVEVT
VCIKKyAgICBlY2hvICIqKiogb3V0cHV0IGlzIGluICdteS1vdXQnLCBleHBlY3RlZCBvdXRwdXQg
aW4gJ215LW91dC5leHBlY3RlZCciCisgICAgZWNobyAiQWN0dWFsIFJlc3VsdCIKKyAgICBjYXQg
bXktb3V0CisgICAgZWNobyAiRXhwZWN0ZWQgUmVzdWx0IgorICAgIGNhdCBteS1vdXQuZXhwZWN0
ZWQKKyAgICBleGl0IDEKK2ZpCisKK3JtIC1yZiAkTVlDQUNIRUJBU0VESVIgJE1ZQ09ORklHIG15
LWZvbnRzLmNvbmYgbXktb3V0IG15LW91dC5leHBlY3RlZAorCiBmaSAjIGlmIFsgIngkRVhFRVhU
IiA9ICJ4IiBdCiAKIHJtIC1yZiAkRk9OVERJUiAkQ0FDSEVGSUxFICRDQUNIRURJUiAkQkFTRURJ
UiAkRk9OVENPTkZJR19GSUxFIG91dApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fXwpGb250Y29uZmlnIG1haWxpbmcgbGlzdApGb250Y29uZmlnQGxpc3RzLmZy
ZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp
bmZvL2ZvbnRjb25maWc=