71359 2011-11-02 05:54:59 -0700 [GTK] [DRT] ttf-liberation fonts moved to a new location (in Debian) 2011-11-03 00:38:31 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned pnormand oldest_to_newest 494571 0 pnormand 2011-11-02 05:54:59 -0700 The fonts-liberation package (previously ttf-liberation) installs the fonts to /usr/share/fonts/truetype/liberation We already added a case for Fedora font paths one year ago. For each font filename there were 2 possible paths. Adding a new search path involves adding a new dimension in the fontPaths variable in initializeFonts(). This is rather painful, I'd propose to have two separate arrays, one for the directories and one for the font filenames we need to register in fontconfig. While this involves a speed penalization I think it's easier to maintain. 494574 1 113307 pnormand 2011-11-02 06:02:03 -0700 Created attachment 113307 proposed patch 494575 2 pnormand 2011-11-02 06:05:07 -0700 If this approach is not liked I can just do the copy/paste and add a 3rd(!) dimension to that (nasty) array ;) 494680 3 113307 mrobinson 2011-11-02 09:49:36 -0700 Comment on attachment 113307 proposed patch Okay. Do you mind making a similar fix in ActivateFontsGtk.cpp. I hope to get away from this soon! 494687 4 pnormand 2011-11-02 10:00:37 -0700 (In reply to comment #3) > (From update of attachment 113307 [details]) > Okay. Do you mind making a similar fix in ActivateFontsGtk.cpp. I hope to get away from this soon! Ok, will file a new patch for this, most likely tomorrow. Thanks for the review :) 495241 5 pnormand 2011-11-03 00:38:31 -0700 Committed r99147: <http://trac.webkit.org/changeset/99147> 113307 2011-11-02 06:02:03 -0700 2011-11-02 09:49:36 -0700 proposed patch proposed-patch.patch text/plain 7201 pnormand RnJvbSA5MjdiM2VjNzY4NjQxMTM0ODM5ODU2MGVlZmE2Y2UzMDgxNmRiY2Y1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBXZWQsIDIgTm92IDIwMTEgMTQ6MDE6MjEgKzAxMDAKU3ViamVjdDogW1BBVENIXSBw cm9wb3NlZCBwYXRjaAoKLS0tCiBUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHwgICAxMiArKysrCiBUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRy ZWUuY3BwIHwgICA4NCArKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdl ZCwgNTIgaW5zZXJ0aW9ucygrKSwgNDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDg2MGJmYWYuLjIxYWIxODUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NSBAQAorMjAxMS0xMS0wMiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dUS10gW0RSVF0gdHRmLWxpYmVyYXRpb24gZm9udHMgbW92ZWQgdG8gYSBu ZXcgbG9jYXRpb24gKGluIERlYmlhbikKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTcxMzU5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwOgor ICAgICAgICAoaW5pdGlhbGl6ZUZvbnRzKTogQWRkIHRoZSBuZXcgZm9udCBwYXRoIGZvciBEZWJp YW4gZm9udHMgYW5kCisgICAgICAgIHJlZmFjdG9yZWQgdGhlIGZvbnQgZmlsZXMgbG9hZGluZyBj b2RlIHRvIGF2b2lkIGNvcHkvcGFzdGVzLCBlYXNlCisgICAgICAgIG1haW50ZW5hbmNlIGFuZCBm dXR1cmUgZm9udCBkaXJlY3RvcmllcyBhZGRpdGlvbnMuCisKIDIwMTEtMTEtMDIgIFNpbW9uIEhh dXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBB ZGQgc3VwcG9ydCBmb3IgdG91Y2ggZXZlbnQgdGVzdGluZyB0byBXZWJLaXRUZXN0UnVubmVyCmRp ZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3BwIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcAppbmRleCBkNGVjOTdk Li42ZDI2NjllIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRl clRyZWUuY3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5j cHAKQEAgLTE3Nyw2NiArMTc3LDYyIEBAIHN0YXRpYyB2b2lkIGluaXRpYWxpemVGb250cyhjb25z dCBjaGFyKiB0ZXN0VVJMID0gMCkKICAgICBpZiAoIUZjQ29uZmlnUGFyc2VBbmRMb2FkKGNvbmZp ZywgcmVpbnRlcnByZXRfY2FzdDxGY0NoYXI4Kj4oZm9udENvbmZpZ0ZpbGVuYW1lLmdldCgpKSwg dHJ1ZSkpCiAgICAgICAgIGdfZXJyb3IoIkNvdWxkbid0IGxvYWQgZm9udCBjb25maWd1cmF0aW9u IGZpbGUgZnJvbTogJXMiLCBmb250Q29uZmlnRmlsZW5hbWUuZ2V0KCkpOwogCi0gICAgc3RhdGlj IGNvbnN0IGNoYXIgKmNvbnN0IGZvbnRQYXRoc1tdWzJdID0gewotICAgICAgICB7ICIvdXNyL3No YXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1saWJlcmF0aW9uL0xpYmVyYXRpb25Nb25vLUJvbGRJdGFs aWMudHRmIiwKLSAgICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9saWJlcmF0aW9uL0xpYmVyYXRp b25Nb25vLUJvbGRJdGFsaWMudHRmIiwgfSwKLSAgICAgICAgeyAiL3Vzci9zaGFyZS9mb250cy90 cnVldHlwZS90dGYtbGliZXJhdGlvbi9MaWJlcmF0aW9uTW9uby1Cb2xkLnR0ZiIsCi0gICAgICAg ICAgIi91c3Ivc2hhcmUvZm9udHMvbGliZXJhdGlvbi9MaWJlcmF0aW9uTW9uby1Cb2xkLnR0ZiIs IH0sCi0gICAgICAgIHsgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWxpYmVyYXRpb24v TGliZXJhdGlvbk1vbm8tSXRhbGljLnR0ZiIsCi0gICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMv bGliZXJhdGlvbi9MaWJlcmF0aW9uTW9uby1JdGFsaWMudHRmIiwgfSwKLSAgICAgICAgeyAiL3Vz ci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtbGliZXJhdGlvbi9MaWJlcmF0aW9uTW9uby1SZWd1 bGFyLnR0ZiIsCi0gICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvbGliZXJhdGlvbi9MaWJlcmF0 aW9uTW9uby1SZWd1bGFyLnR0ZiIsIH0sCi0gICAgICAgIHsgIi91c3Ivc2hhcmUvZm9udHMvdHJ1 ZXR5cGUvdHRmLWxpYmVyYXRpb24vTGliZXJhdGlvblNhbnMtQm9sZEl0YWxpYy50dGYiLAotICAg ICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL2xpYmVyYXRpb24vTGliZXJhdGlvblNhbnMtQm9sZEl0 YWxpYy50dGYiLCB9LAotICAgICAgICB7ICIvdXNyL3NoYXJlL2ZvbnRzL3RydWV0eXBlL3R0Zi1s aWJlcmF0aW9uL0xpYmVyYXRpb25TYW5zLUJvbGQudHRmIiwKLSAgICAgICAgICAiL3Vzci9zaGFy ZS9mb250cy9saWJlcmF0aW9uL0xpYmVyYXRpb25TYW5zLUJvbGQudHRmIiwgfSwKLSAgICAgICAg eyAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtbGliZXJhdGlvbi9MaWJlcmF0aW9uU2Fu cy1JdGFsaWMudHRmIiwKLSAgICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9saWJlcmF0aW9uL0xp YmVyYXRpb25TYW5zLUl0YWxpYy50dGYiLCB9LAotICAgICAgICB7ICIvdXNyL3NoYXJlL2ZvbnRz L3RydWV0eXBlL3R0Zi1saWJlcmF0aW9uL0xpYmVyYXRpb25TYW5zLVJlZ3VsYXIudHRmIiwKLSAg ICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9saWJlcmF0aW9uL0xpYmVyYXRpb25TYW5zLVJlZ3Vs YXIudHRmIiwgfSwKLSAgICAgICAgeyAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtbGli ZXJhdGlvbi9MaWJlcmF0aW9uU2VyaWYtQm9sZEl0YWxpYy50dGYiLAotICAgICAgICAgICIvdXNy L3NoYXJlL2ZvbnRzL2xpYmVyYXRpb24vTGliZXJhdGlvblNlcmlmLUJvbGRJdGFsaWMudHRmIiwg fSwKLSAgICAgICAgeyAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYtbGliZXJhdGlvbi9M aWJlcmF0aW9uU2VyaWYtQm9sZC50dGYiLAotICAgICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL2xp YmVyYXRpb24vTGliZXJhdGlvblNlcmlmLUJvbGQudHRmIiwgfSwKLSAgICAgICAgeyAiL3Vzci9z aGFyZS9mb250cy90cnVldHlwZS90dGYtbGliZXJhdGlvbi9MaWJlcmF0aW9uU2VyaWYtSXRhbGlj LnR0ZiIsCi0gICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvbGliZXJhdGlvbi9MaWJlcmF0aW9u U2VyaWYtSXRhbGljLnR0ZiIsIH0sCi0gICAgICAgIHsgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5 cGUvdHRmLWxpYmVyYXRpb24vTGliZXJhdGlvblNlcmlmLVJlZ3VsYXIudHRmIiwKLSAgICAgICAg ICAiL3Vzci9zaGFyZS9mb250cy9saWJlcmF0aW9uL0xpYmVyYXRpb25TZXJpZi1SZWd1bGFyLnR0 ZiIsIH0sCi0gICAgICAgIHsgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWRlamF2dS9E ZWphVnVTYW5zLnR0ZiIsCi0gICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvZGVqYXZ1L0RlamFW dVNhbnMudHRmIiwgfSwKLSAgICAgICAgeyAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS90dGYt ZGVqYXZ1L0RlamFWdVNlcmlmLnR0ZiIsCi0gICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvZGVq YXZ1L0RlamFWdVNlcmlmLnR0ZiIsIH0sCisgICAgc3RhdGljIGNvbnN0IGNoYXIgKmNvbnN0IGZv bnREaXJlY3Rvcmllc1tdID0geworICAgICAgICAiL3Vzci9zaGFyZS9mb250cy90cnVldHlwZS9s aWJlcmF0aW9uIiwKKyAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWxpYmVy YXRpb24iLAorICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9saWJlcmF0aW9uIiwKKyAgICAgICAg Ii91c3Ivc2hhcmUvZm9udHMvdHJ1ZXR5cGUvdHRmLWRlamF2dSIsCisgICAgICAgICIvdXNyL3No YXJlL2ZvbnRzL2RlamF2dSIsCisgICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL29wZW50eXBlL3N0 aXgiLAorICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9zdGl4IgorICAgIH07CisKKyAgICBzdGF0 aWMgY29uc3QgY2hhciAqY29uc3QgZm9udFBhdGhzW10gPSB7CisgICAgICAgICJMaWJlcmF0aW9u TW9uby1Cb2xkSXRhbGljLnR0ZiIsCisgICAgICAgICJMaWJlcmF0aW9uTW9uby1Cb2xkLnR0ZiIs CisgICAgICAgICJMaWJlcmF0aW9uTW9uby1JdGFsaWMudHRmIiwKKyAgICAgICAgIkxpYmVyYXRp b25Nb25vLVJlZ3VsYXIudHRmIiwKKyAgICAgICAgIkxpYmVyYXRpb25TYW5zLUJvbGRJdGFsaWMu dHRmIiwKKyAgICAgICAgIkxpYmVyYXRpb25TYW5zLUJvbGQudHRmIiwKKyAgICAgICAgIkxpYmVy YXRpb25TYW5zLUl0YWxpYy50dGYiLAorICAgICAgICAiTGliZXJhdGlvblNhbnMtUmVndWxhci50 dGYiLAorICAgICAgICAiTGliZXJhdGlvblNlcmlmLUJvbGRJdGFsaWMudHRmIiwKKyAgICAgICAg IkxpYmVyYXRpb25TZXJpZi1Cb2xkLnR0ZiIsCisgICAgICAgICJMaWJlcmF0aW9uU2VyaWYtSXRh bGljLnR0ZiIsCisgICAgICAgICJMaWJlcmF0aW9uU2VyaWYtUmVndWxhci50dGYiLAorICAgICAg ICAiRGVqYVZ1U2Fucy50dGYiLAorICAgICAgICAiRGVqYVZ1U2VyaWYudHRmIiwKIAogICAgICAg ICAvLyBNYXRoTUwgdGVzdHMgcmVxdWlyZSB0aGUgU1RJWCBmb250cy4KLSAgICAgICAgeyAiL3Vz ci9zaGFyZS9mb250cy9vcGVudHlwZS9zdGl4L1NUSVhHZW5lcmFsLm90ZiIsCi0gICAgICAgICAg Ii91c3Ivc2hhcmUvZm9udHMvc3RpeC9TVElYR2VuZXJhbC5vdGYiIH0sCi0gICAgICAgIHsgIi91 c3Ivc2hhcmUvZm9udHMvb3BlbnR5cGUvc3RpeC9TVElYR2VuZXJhbEJvbEl0YS5vdGYiLAotICAg ICAgICAgICIvdXNyL3NoYXJlL2ZvbnRzL3N0aXgvU1RJWEdlbmVyYWxCb2xJdGEub3RmIiB9LAot ICAgICAgICB7ICIvdXNyL3NoYXJlL2ZvbnRzL29wZW50eXBlL3N0aXgvU1RJWEdlbmVyYWxCb2wu b3RmIiwKLSAgICAgICAgICAiL3Vzci9zaGFyZS9mb250cy9zdGl4L1NUSVhHZW5lcmFsQm9sLm90 ZiIgfSwKLSAgICAgICAgeyAiL3Vzci9zaGFyZS9mb250cy9vcGVudHlwZS9zdGl4L1NUSVhHZW5l cmFsSXRhbGljLm90ZiIsCi0gICAgICAgICAgIi91c3Ivc2hhcmUvZm9udHMvc3RpeC9TVElYR2Vu ZXJhbEl0YWxpYy5vdGYiIH0KKyAgICAgICAgIlNUSVhHZW5lcmFsLm90ZiIsCisgICAgICAgICJT VElYR2VuZXJhbEJvbEl0YS5vdGYiLAorICAgICAgICAiU1RJWEdlbmVyYWxCb2wub3RmIiwKKyAg ICAgICAgIlNUSVhHZW5lcmFsSXRhbGljLm90ZiIKICAgICB9OwogCisgICAgR093blB0cjxnY2hh cj4gZGlyZWN0b3JpZXNEZXNjcmlwdGlvbjsKKyAgICBmb3IgKHNpemVfdCBwYXRoID0gMDsgcGF0 aCA8IEdfTl9FTEVNRU5UUyhmb250RGlyZWN0b3JpZXMpOyBwYXRoKyspCisgICAgICAgIGRpcmVj dG9yaWVzRGVzY3JpcHRpb24uc2V0KGdfc3Ryam9pbigiOiIsIGRpcmVjdG9yaWVzRGVzY3JpcHRp b24ucmVsZWFzZSgpLCBmb250RGlyZWN0b3JpZXNbcGF0aF0sIE5VTEwpKTsKKwogICAgIC8vIFRP RE86IFNvbWUgdGVzdHMgdXNlIEx1Y2lkYS4gV2Ugc2hvdWxkIGxvYWQgdGhlc2UgYXMgd2VsbCwg b25jZSBpdCBiZWNvbWVzCiAgICAgLy8gY2xlYXIgaG93IHRvIGluc3RhbGwgdGhlc2UgZm9udHMg ZWFzaWx5IG9uIEZlZG9yYS4KICAgICBmb3IgKHNpemVfdCBmb250ID0gMDsgZm9udCA8IEdfTl9F TEVNRU5UUyhmb250UGF0aHMpOyBmb250KyspIHsKICAgICAgICAgYm9vbCBmb3VuZCA9IGZhbHNl OwotICAgICAgICBmb3IgKHNpemVfdCBwYXRoID0gMDsgcGF0aCA8IDI7IHBhdGgrKykgewotCi0g ICAgICAgICAgICBpZiAoZ19maWxlX3Rlc3QoZm9udFBhdGhzW2ZvbnRdW3BhdGhdLCBHX0ZJTEVf VEVTVF9FWElTVFMpKSB7CisgICAgICAgIGZvciAoc2l6ZV90IHBhdGggPSAwOyBwYXRoIDwgR19O X0VMRU1FTlRTKGZvbnREaXJlY3Rvcmllcyk7IHBhdGgrKykgeworICAgICAgICAgICAgR093blB0 cjxnY2hhcj4gZnVsbFBhdGgoZ19idWlsZF9maWxlbmFtZShmb250RGlyZWN0b3JpZXNbcGF0aF0s IGZvbnRQYXRoc1tmb250XSwgTlVMTCkpOworICAgICAgICAgICAgaWYgKGdfZmlsZV90ZXN0KGZ1 bGxQYXRoLmdldCgpLCBHX0ZJTEVfVEVTVF9FWElTVFMpKSB7CiAgICAgICAgICAgICAgICAgZm91 bmQgPSB0cnVlOwotICAgICAgICAgICAgICAgIGlmICghRmNDb25maWdBcHBGb250QWRkRmlsZShj b25maWcsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgRmNDaGFyOCo+KGZvbnRQYXRoc1tmb250XVtw YXRoXSkpKQotICAgICAgICAgICAgICAgICAgICBnX2Vycm9yKCJDb3VsZCBub3QgbG9hZCBmb250 IGF0ICVzISIsIGZvbnRQYXRoc1tmb250XVtwYXRoXSk7CisgICAgICAgICAgICAgICAgaWYgKCFG Y0NvbmZpZ0FwcEZvbnRBZGRGaWxlKGNvbmZpZywgcmVpbnRlcnByZXRfY2FzdDxjb25zdCBGY0No YXI4Kj4oZnVsbFBhdGguZ2V0KCkpKSkKKyAgICAgICAgICAgICAgICAgICAgZ19lcnJvcigiQ291 bGQgbm90IGxvYWQgZm9udCBhdCAlcyEiLCBmdWxsUGF0aC5nZXQoKSk7CiAgICAgICAgICAgICAg ICAgZWxzZQogICAgICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogCiAgICAgICAgIGlmICghZm91bmQpCi0gICAgICAgICAgICBnX2Vycm9yKCJDb3VsZCBu b3QgZmluZCBmb250IGF0ICVzLiBFaXRoZXIgaW5zdGFsbCB0aGlzIGZvbnQgb3IgZmlsZSBhIGJ1 ZyAiCisgICAgICAgICAgICBnX2Vycm9yKCJDb3VsZCBub3QgZmluZCBmb250ICVzIGluICVzLiBF aXRoZXIgaW5zdGFsbCB0aGlzIGZvbnQgb3IgZmlsZSBhIGJ1ZyAiCiAgICAgICAgICAgICAgICAg ICAgICJhdCBodHRwOi8vYnVncy53ZWJraXQub3JnIGlmIGl0IGlzIGluc3RhbGxlZCBpbiBhbm90 aGVyIGxvY2F0aW9uLiIsCi0gICAgICAgICAgICAgICAgICAgIGZvbnRQYXRoc1tmb250XVswXSk7 CisgICAgICAgICAgICAgICAgICAgIGZvbnRQYXRoc1tmb250XSwgZGlyZWN0b3JpZXNEZXNjcmlw dGlvbi5nZXQoKSk7CiAgICAgfQogCiAgICAgLy8gQWhlbSBpcyB1c2VkIGJ5IG1hbnkgbGF5b3V0 IHRlc3RzLgotLSAKMS43LjcuMQ==