50395 2010-12-02 09:30:45 -0800 [EFL] Fails to build with non-system cairo 2010-12-02 23:06:10 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 gustavo webkit-unassigned commit-queue leandro oldest_to_newest 316207 0 gustavo 2010-12-02 09:30:45 -0800 While trying to build WebKitEFL with a custom-built cairo, I noticed it was not working. The problem seems to be that FindCairo declares a PATH_SUFFIX, which is added to the end of each PATH given, which causes it to look for ${include_directory_provided_by_pkgconfig}/cairo/cairo.h - which translates to ${prefix}/include/cairo/cairo/cairo.h. I'm attaching a patch that fixes it. 316210 1 75388 gustavo 2010-12-02 09:34:14 -0800 Created attachment 75388 proposed fix 316215 2 leandro 2010-12-02 09:37:04 -0800 Looks good to me. 316559 3 75388 eric 2010-12-02 17:31:10 -0800 Comment on attachment 75388 proposed fix OK. I'm certainly no expert here, but I believe you. 316688 4 75388 commit-queue 2010-12-02 23:06:05 -0800 Comment on attachment 75388 proposed fix Clearing flags on attachment: 75388 Committed r73242: <http://trac.webkit.org/changeset/73242> 316689 5 commit-queue 2010-12-02 23:06:10 -0800 All reviewed patches have been landed. Closing bug. 75388 2010-12-02 09:34:14 -0800 2010-12-02 23:06:05 -0800 proposed fix 0001-proposed-fix.patch text/plain 1303 gustavo RnJvbSBhNDE0ZGY0NWM4YzA5MzFhMTY3Y2RlY2Y3NzYwNjc5MjJlN2M3ZTZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IFRodSwgMiBEZWMgMjAxMCAxNTozMzozNSAtMDIwMApTdWJqZWN0OiBbUEFUQ0hdIHBy b3Bvc2VkIGZpeAoKLS0tCiBDaGFuZ2VMb2cgICAgICAgICAgICAgfCAgIDEyICsrKysrKysrKysr KwogY21ha2UvRmluZENhaXJvLmNtYWtlIHwgICAgMSAtCiAyIGZpbGVzIGNoYW5nZWQsIDEyIGlu c2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvQ2hhbmdlTG9nIGIvQ2hh bmdlTG9nCmluZGV4IGVmMGExNDUuLmNjODczNDcgMTAwNjQ0Ci0tLSBhL0NoYW5nZUxvZworKysg Yi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0xMi0wMiAgR3VzdGF2byBOb3Jvbmhh IFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbRUZMXSBGYWlscyB0byBidWlsZCB3 aXRoIG5vbi1zeXN0ZW0gY2Fpcm8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTUwMzk1CisKKyAgICAgICAgRG8gbm90IGFkZCAnY2Fpcm8nIGFzIGEgc3Vm Zml4IGZvciB0aGUgcGF0aHMgcHJvdmlkZWQgYnkKKyAgICAgICAgcGtnY29uZmlnLiBUaGUgcGF0 aHMgcHJvdmlkZWQgYnkgcGtnY29uZmlnIGFscmVhZHkgaW5jbHVkZSBpdC4KKworICAgICAgICAq IGNtYWtlL0ZpbmRDYWlyby5jbWFrZToKKwogMjAxMC0xMi0wMiAgRGFuaWVsIEJhdGVzICA8ZGJh dGVzQHJpbS5jb20+CiAKICAgICAgICAgQWRkIGF1dG90b29scyBnZW5lcmF0ZWQgZmlsZXMgdG8g c3ZuOmlnbm9yZSBzbyB0aGF0IHRoZXNlCmRpZmYgLS1naXQgYS9jbWFrZS9GaW5kQ2Fpcm8uY21h a2UgYi9jbWFrZS9GaW5kQ2Fpcm8uY21ha2UKaW5kZXggYWNkZTIyZS4uZGI4OTgxZSAxMDA2NDQK LS0tIGEvY21ha2UvRmluZENhaXJvLmNtYWtlCisrKyBiL2NtYWtlL0ZpbmRDYWlyby5jbWFrZQpA QCAtMTcsNyArMTcsNiBAQCBsaWJmaW5kX3BrZ19jaGVja19tb2R1bGVzKENhaXJvX1BLR0NPTkYg Y2Fpcm8pCiBmaW5kX3BhdGgoQ2Fpcm9fSU5DTFVERV9ESVIKICAgTkFNRVMgY2Fpcm8uaAogICBQ QVRIUyAke0NhaXJvX1BLR0NPTkZfSU5DTFVERV9ESVJTfQotICBQQVRIX1NVRkZJWEVTIGNhaXJv CiApCiAKICMgRmluYWxseSB0aGUgbGlicmFyeSBpdHNlbGYKLS0gCjEuNy4yLjMKCg==