116978 2013-05-29 11:02:17 -0700 [GTK] Needs to check for harfbuzz-icu 2013-05-30 07:55:37 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 pochu27 webkit-unassigned behdad berto commit-queue mrobinson william.jon.mccann oldest_to_newest 895025 0 pochu27 2013-05-29 11:02:17 -0700 Latest harfbuzz has splitted hb_icu into its own library libharfbuzz-icu.so. Therefore webkit needs to check for harfbuzz-icu in addition to harfbuzz to a) make sure harfbuzz-icu is available and b) get the necessary cflags / libs. 895437 1 berto 2013-05-30 03:00:12 -0700 I'll take a look. 895469 2 203339 berto 2013-05-30 03:47:47 -0700 Created attachment 203339 Patch Here's the patch. Emilio, can you double check if it works for you? 895479 3 pochu27 2013-05-30 04:19:12 -0700 I don't have harfbuzz 0.9.18 yet so not now. The patch looks good. Something you could do is abort the build if harfbuzz-icu is not available but harfbuzz is >= 0.9.18, with: if pkg-config --atleast-version 0.9.18 harfbuzz; then PKG_CHECK_MODULES(HARFBUZZ_ICU, harfbuzz-icu >= $harfbuzz_required_version) FREETYPE_CFLAGS+=" $HARFBUZZ_ICU_CFLAGS" FREETYPE_LIBS+=" $HARFBUZZ_ICU_LIBS" fi This is useful in case somebody builds harfbuzz but doesn't have libicu installed, as harfbuzz-icu will be automatically disabled and he may not notice. 895512 4 berto 2013-05-30 06:11:34 -0700 (In reply to comment #3) > The patch looks good. Something you could do is abort the build if > harfbuzz-icu is not available but harfbuzz is >= 0.9.18 Yes, I was also considering doing that. I thought it's actually a better option in case someone builds harfbuzz without icu support. I'll upload a new patch. 895513 5 203347 berto 2013-05-30 06:17:38 -0700 Created attachment 203347 Patch 895520 6 pochu27 2013-05-30 06:54:27 -0700 Patch looks good. I should be able to test it tomorrow in case that's still useful by then. 895523 7 203347 mrobinson 2013-05-30 07:00:01 -0700 Comment on attachment 203347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=203347&action=review > Source/autotools/FindDependencies.m4:379 > +# Since we support earlier HarfBuzz versions we keep this conditional by now. English nit: by now -> for now > Source/autotools/FindDependencies.m4:380 > +if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz ; then Nit: extra space after 'harfbuzz' 895524 8 203352 berto 2013-05-30 07:04:28 -0700 Created attachment 203352 Patch I fixed the nits that Martin pointed out. 895530 9 203352 xan.lopez 2013-05-30 07:27:54 -0700 Comment on attachment 203352 Patch r=me 895534 10 203352 commit-queue 2013-05-30 07:55:35 -0700 Comment on attachment 203352 Patch Clearing flags on attachment: 203352 Committed r150963: <http://trac.webkit.org/changeset/150963> 895535 11 commit-queue 2013-05-30 07:55:37 -0700 All reviewed patches have been landed. Closing bug. 203339 2013-05-30 03:47:47 -0700 2013-05-30 06:17:38 -0700 Patch 116978.diff text/plain 1647 berto ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA3NDg3ODg2Li5lOTEzYTA3 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTMtMDUtMzAgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIE5lZWRzIHRvIGNoZWNrIGZvciBoYXJmYnV6ei1pY3UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjk3OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhcmZCdXp6IDAuOS4xOCBzcGxpdHMg aGFyYnV6ei1pY3UgaW50byBhIHNlcGFyYXRlIGxpYnJhcnkgc28gd2UKKyAgICAgICAgYWxzbyBu ZWVkIHRvIGNoZWNrIGZvciBpdCBpbiBvcmRlciB0byBnZXQgdGhlIG5lY2Vzc2FyeSBmbGFncyBm b3IKKyAgICAgICAgdGhlIGNvbXBpbGVyIGFuZCB0aGUgbGlua2VyLgorCisgICAgICAgIFdlIGtl ZXAgdGhpcyBvcHRpb25hbCBieSBub3cgc2luY2Ugd2Ugc3RpbGwgd2FudCB0byBzdXBwb3J0Cisg ICAgICAgIGVhcmxpZXIgdmVyc2lvbnMgb2YgSGFyZkJ1enogd2l0aG91dCBhIHNlcGFyYXRlIGhh cmZidXp6LWljdS4KKworICAgICAgICAqIFNvdXJjZS9hdXRvdG9vbHMvRmluZERlcGVuZGVuY2ll cy5tNDoKKwogMjAxMy0wNS0yOSAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgUmVtb3ZlIGxlZnRvdmVyIGZpbGVzIGZvciBFTkFCTEVfUEFHRV9QT1BVUCBhbmQg RU5BQkxFX0NBTEVOREFSX1BJQ0tFUgpkaWZmIC0tZ2l0IGEvU291cmNlL2F1dG90b29scy9GaW5k RGVwZW5kZW5jaWVzLm00IGIvU291cmNlL2F1dG90b29scy9GaW5kRGVwZW5kZW5jaWVzLm00Cmlu ZGV4IGE5MDY3YzUuLmI0YjRmMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9hdXRvdG9vbHMvRmluZERl cGVuZGVuY2llcy5tNAorKysgYi9Tb3VyY2UvYXV0b3Rvb2xzL0ZpbmREZXBlbmRlbmNpZXMubTQK QEAgLTM3NSw2ICszNzUsMTMgQEAgZWxzZQogICAgIFBLR19DSEVDS19NT0RVTEVTKFtGUkVFVFlQ RV0sCiAgICAgICAgIFtjYWlyby1mdCBmb250Y29uZmlnID49IGZvbnRjb25maWdfcmVxdWlyZWRf dmVyc2lvbiBmcmVldHlwZTIgPj0gZnJlZXR5cGUyX3JlcXVpcmVkX3ZlcnNpb24gaGFyZmJ1enog Pj0gaGFyZmJ1enpfcmVxdWlyZWRfdmVyc2lvbl0pCiBmaQorIyBIYXJmQnV6eiAwLjkuMTggc3Bs aXRzIGhhcmJ1enotaWN1IGludG8gYSBzZXBhcmF0ZSBsaWJyYXJ5LgorIyBTaW5jZSB3ZSBzdXBw b3J0IGVhcmxpZXIgSGFyZkJ1enogdmVyc2lvbnMgd2Uga2VlcCB0aGlzIG9wdGlvbmFsIGJ5IG5v dy4KK2lmICRQS0dfQ09ORklHIC0tZXhpc3RzIGhhcmZidXp6LWljdSA7IHRoZW4KKyAgICBQS0df Q0hFQ0tfTU9EVUxFUyhIQVJGQlVaWl9JQ1UsIGhhcmZidXp6LWljdSA+PSAkaGFyZmJ1enpfcmVx dWlyZWRfdmVyc2lvbikKKyAgICBGUkVFVFlQRV9DRkxBR1MrPSIgJEhBUkZCVVpaX0lDVV9DRkxB R1MiCisgICAgRlJFRVRZUEVfTElCUys9IiAkSEFSRkJVWlpfSUNVX0xJQlMiCitmaQogQUNfU1VC U1QoW0ZSRUVUWVBFX0NGTEFHU10pCiBBQ19TVUJTVChbRlJFRVRZUEVfTElCU10pCiAK 203347 2013-05-30 06:17:38 -0700 2013-05-30 07:04:28 -0700 Patch 116978.diff text/plain 1633 berto ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA3NDg3ODg2Li4zNTM4NTE3 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTMtMDUtMzAgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIE5lZWRzIHRvIGNoZWNrIGZvciBoYXJmYnV6ei1pY3UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjk3OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhcmZCdXp6IDAuOS4xOCBzcGxpdHMg aGFyYnV6ei1pY3UgaW50byBhIHNlcGFyYXRlIGxpYnJhcnkgc28gd2UKKyAgICAgICAgYWxzbyBu ZWVkIHRvIGNoZWNrIGZvciBpdCBpbiBvcmRlciB0byBnZXQgdGhlIG5lY2Vzc2FyeSBmbGFncyBm b3IKKyAgICAgICAgdGhlIGNvbXBpbGVyIGFuZCB0aGUgbGlua2VyLgorCisgICAgICAgIFdlIGtl ZXAgdGhpcyBjb25kaXRpb25hbCBieSBub3cgc2luY2Ugd2Ugc3RpbGwgd2FudCB0byBzdXBwb3J0 CisgICAgICAgIGVhcmxpZXIgdmVyc2lvbnMgb2YgSGFyZkJ1enouCisKKyAgICAgICAgKiBTb3Vy Y2UvYXV0b3Rvb2xzL0ZpbmREZXBlbmRlbmNpZXMubTQ6CisKIDIwMTMtMDUtMjkgIEtlbnQgVGFt dXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJlbW92ZSBsZWZ0b3ZlciBmaWxl cyBmb3IgRU5BQkxFX1BBR0VfUE9QVVAgYW5kIEVOQUJMRV9DQUxFTkRBUl9QSUNLRVIKZGlmZiAt LWdpdCBhL1NvdXJjZS9hdXRvdG9vbHMvRmluZERlcGVuZGVuY2llcy5tNCBiL1NvdXJjZS9hdXRv dG9vbHMvRmluZERlcGVuZGVuY2llcy5tNAppbmRleCBhOTA2N2M1Li41ZTc4YTBlIDEwMDY0NAot LS0gYS9Tb3VyY2UvYXV0b3Rvb2xzL0ZpbmREZXBlbmRlbmNpZXMubTQKKysrIGIvU291cmNlL2F1 dG90b29scy9GaW5kRGVwZW5kZW5jaWVzLm00CkBAIC0zNzUsNiArMzc1LDEzIEBAIGVsc2UKICAg ICBQS0dfQ0hFQ0tfTU9EVUxFUyhbRlJFRVRZUEVdLAogICAgICAgICBbY2Fpcm8tZnQgZm9udGNv bmZpZyA+PSBmb250Y29uZmlnX3JlcXVpcmVkX3ZlcnNpb24gZnJlZXR5cGUyID49IGZyZWV0eXBl Ml9yZXF1aXJlZF92ZXJzaW9uIGhhcmZidXp6ID49IGhhcmZidXp6X3JlcXVpcmVkX3ZlcnNpb25d KQogZmkKKyMgSGFyZkJ1enogMC45LjE4IHNwbGl0cyBoYXJidXp6LWljdSBpbnRvIGEgc2VwYXJh dGUgbGlicmFyeS4KKyMgU2luY2Ugd2Ugc3VwcG9ydCBlYXJsaWVyIEhhcmZCdXp6IHZlcnNpb25z IHdlIGtlZXAgdGhpcyBjb25kaXRpb25hbCBieSBub3cuCitpZiAkUEtHX0NPTkZJRyAtLWF0bGVh c3QtdmVyc2lvbiAwLjkuMTggaGFyZmJ1enogOyB0aGVuCisgICAgUEtHX0NIRUNLX01PRFVMRVMo SEFSRkJVWlpfSUNVLCBoYXJmYnV6ei1pY3UgPj0gJGhhcmZidXp6X3JlcXVpcmVkX3ZlcnNpb24p CisgICAgRlJFRVRZUEVfQ0ZMQUdTKz0iICRIQVJGQlVaWl9JQ1VfQ0ZMQUdTIgorICAgIEZSRUVU WVBFX0xJQlMrPSIgJEhBUkZCVVpaX0lDVV9MSUJTIgorZmkKIEFDX1NVQlNUKFtGUkVFVFlQRV9D RkxBR1NdKQogQUNfU1VCU1QoW0ZSRUVUWVBFX0xJQlNdKQogCg== 203352 2013-05-30 07:04:28 -0700 2013-05-30 07:55:35 -0700 Patch 116978.diff text/plain 1634 berto ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA3NDg3ODg2Li4xNjUxNmE0 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTMtMDUtMzAgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIE5lZWRzIHRvIGNoZWNrIGZvciBoYXJmYnV6ei1pY3UKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNjk3OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhcmZCdXp6IDAuOS4xOCBzcGxpdHMg aGFyYnV6ei1pY3UgaW50byBhIHNlcGFyYXRlIGxpYnJhcnkgc28gd2UKKyAgICAgICAgYWxzbyBu ZWVkIHRvIGNoZWNrIGZvciBpdCBpbiBvcmRlciB0byBnZXQgdGhlIG5lY2Vzc2FyeSBmbGFncyBm b3IKKyAgICAgICAgdGhlIGNvbXBpbGVyIGFuZCB0aGUgbGlua2VyLgorCisgICAgICAgIFdlIGtl ZXAgdGhpcyBjb25kaXRpb25hbCBmb3Igbm93IHNpbmNlIHdlIHN0aWxsIHdhbnQgdG8gc3VwcG9y dAorICAgICAgICBlYXJsaWVyIHZlcnNpb25zIG9mIEhhcmZCdXp6LgorCisgICAgICAgICogU291 cmNlL2F1dG90b29scy9GaW5kRGVwZW5kZW5jaWVzLm00OgorCiAyMDEzLTA1LTI5ICBLZW50IFRh bXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgbGVmdG92ZXIgZmls ZXMgZm9yIEVOQUJMRV9QQUdFX1BPUFVQIGFuZCBFTkFCTEVfQ0FMRU5EQVJfUElDS0VSCmRpZmYg LS1naXQgYS9Tb3VyY2UvYXV0b3Rvb2xzL0ZpbmREZXBlbmRlbmNpZXMubTQgYi9Tb3VyY2UvYXV0 b3Rvb2xzL0ZpbmREZXBlbmRlbmNpZXMubTQKaW5kZXggYTkwNjdjNS4uYWVhZDI5NSAxMDA2NDQK LS0tIGEvU291cmNlL2F1dG90b29scy9GaW5kRGVwZW5kZW5jaWVzLm00CisrKyBiL1NvdXJjZS9h dXRvdG9vbHMvRmluZERlcGVuZGVuY2llcy5tNApAQCAtMzc1LDYgKzM3NSwxMyBAQCBlbHNlCiAg ICAgUEtHX0NIRUNLX01PRFVMRVMoW0ZSRUVUWVBFXSwKICAgICAgICAgW2NhaXJvLWZ0IGZvbnRj b25maWcgPj0gZm9udGNvbmZpZ19yZXF1aXJlZF92ZXJzaW9uIGZyZWV0eXBlMiA+PSBmcmVldHlw ZTJfcmVxdWlyZWRfdmVyc2lvbiBoYXJmYnV6eiA+PSBoYXJmYnV6el9yZXF1aXJlZF92ZXJzaW9u XSkKIGZpCisjIEhhcmZCdXp6IDAuOS4xOCBzcGxpdHMgaGFyYnV6ei1pY3UgaW50byBhIHNlcGFy YXRlIGxpYnJhcnkuCisjIFNpbmNlIHdlIHN1cHBvcnQgZWFybGllciBIYXJmQnV6eiB2ZXJzaW9u cyB3ZSBrZWVwIHRoaXMgY29uZGl0aW9uYWwgZm9yIG5vdy4KK2lmICRQS0dfQ09ORklHIC0tYXRs ZWFzdC12ZXJzaW9uIDAuOS4xOCBoYXJmYnV6ejsgdGhlbgorICAgIFBLR19DSEVDS19NT0RVTEVT KEhBUkZCVVpaX0lDVSwgaGFyZmJ1enotaWN1ID49ICRoYXJmYnV6el9yZXF1aXJlZF92ZXJzaW9u KQorICAgIEZSRUVUWVBFX0NGTEFHUys9IiAkSEFSRkJVWlpfSUNVX0NGTEFHUyIKKyAgICBGUkVF VFlQRV9MSUJTKz0iICRIQVJGQlVaWl9JQ1VfTElCUyIKK2ZpCiBBQ19TVUJTVChbRlJFRVRZUEVf Q0ZMQUdTXSkKIEFDX1NVQlNUKFtGUkVFVFlQRV9MSUJTXSkKIAo=