104781 2012-12-12 01:48:08 -0800 [Qt] Fix linkage against SQLite 2012-12-12 04:58:58 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hausmann hausmann abecsi ossy vestbo webkit.review.bot oldest_to_newest 789341 0 hausmann 2012-12-12 01:48:08 -0800 [Qt] Fix linkage against SQLite 789343 1 179002 hausmann 2012-12-12 01:50:38 -0800 Created attachment 179002 Patch 789386 2 179002 ossy 2012-12-12 02:39:15 -0800 Comment on attachment 179002 Patch LGTM, r=me. 789402 3 hausmann 2012-12-12 02:55:58 -0800 Committed r137444: <http://trac.webkit.org/changeset/137444> 789415 4 ossy 2012-12-12 03:16:54 -0800 (In reply to comment #3) > Committed r137444: <http://trac.webkit.org/changeset/137444> It broke the Mac build: ------------------------ Project ERROR: WebKit requires SQLite. Either make it available via pkg-config, set $SQLITE3SRCDIR or build WebKit under qt5.git. I have no idea why, and I can't debug it without Mac build environment. and the ARM build: ------------------- Failed to set up build environment using qmake! Project ERROR: WebKit requires SQLite. Either make it available via pkg-config, set $SQLITE3SRCDIR or build WebKit under qt5.git. Hmmm ... It is the non-pkg-config (default for cross compiling), non-qt5.git and system sqlite installed case. 789422 5 hausmann 2012-12-12 03:31:34 -0800 Mac fix landed in http://trac.webkit.org/changeset/137446 *crossing fingers* 789465 6 ossy 2012-12-12 04:58:58 -0800 (In reply to comment #5) > Mac fix landed in http://trac.webkit.org/changeset/137446 *crossing fingers* And a typo fixed in http://trac.webkit.org/changeset/137452 179002 2012-12-12 01:50:38 -0800 2012-12-12 03:18:18 -0800 Patch bug-104781-20121212104802.patch text/plain 4603 hausmann U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjFiOThkZGVkMDEyYzE4 ZGNlODc4ODkwMGFlZGQ0YzJkNmEzOTdiOC4uMjEwZDEwZDFiMjMwMzk5YjE2Yjk3ZTllMjlhMjZh ZjRjZWIxNWM3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTEyLTEyICBTaW1v biBIYXVzbWFubiAgPHNpbW9uLmhhdXNtYW5uQGRpZ2lhLmNvbT4KKworICAgICAgICBbUXRdIEZp eCBsaW5rYWdlIGFnYWluc3QgU1FMaXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDQ3ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEZXRlY3QgU1FMaXRlIGVpdGhlciB0aHJvdWdoIHBrZy1jb25maWcs IGZyb20gdGhlIFNRTElURTNTUkNESVIKKyAgICAgICAgZW52aXJvbm1lbnQgdmFyaWFibGUgb3Ig ZnJvbSBxdGJhc2UgdmlhIGEgcXQ1LmdpdCBidWlsZC4gQmFpbCBvdXQgZWFybHkKKyAgICAgICAg d2l0aCBhbiBlcnJvciBtZXNzYWdlIGlmIG5laXRoZXIgb3B0aW9uIGFwcGxpZXMuCisKKyAgICAg ICAgVGhpcyByZW1vdmVzIHRoZSB1c2FnZSBvZiAkJFFULmNvcmUuc291cmNlcyBhbmQgdGhlIGRl cGVuZGVuY3kgb24gUXQncworICAgICAgICBzeXN0ZW0tc3FsaXRlIGNvbmZpZ3VyZSBzZXR0aW5n LiBXZSBzaG91bGQgYWx3YXlzIGZhdm91ciBhIHN5c3RlbQorICAgICAgICBsaWJyYXJ5IG92ZXIg YSBjb3B5IGluIFF0LgorCisgICAgICAgICogVGFyZ2V0LnByaToKKyAgICAgICAgKiBXZWJDb3Jl LnByaToKKwogMjAxMi0xMi0xMiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFp bC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzNzQyOC4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL1RhcmdldC5wcmkgYi9Tb3VyY2UvV2ViQ29yZS9UYXJnZXQu cHJpCmluZGV4IDc1NTNjYTllOTA1YzBjNTdjOGE2MTM1NDY4NWYyOWY4MDZmM2JmZmMuLmNjYWNh Y2JmYTcwMTI4ZDk0MGU2NzlmNmE4ZmIzYWY4YjBiYmE2MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL1RhcmdldC5wcmkKKysrIGIvU291cmNlL1dlYkNvcmUvVGFyZ2V0LnByaQpAQCAtNDA3 Niw3ICs0MDc2LDcgQEAgdXNlPyhXRUJQKSB7CiAgICAgU09VUkNFUyArPSBwbGF0Zm9ybS9pbWFn ZS1kZWNvZGVycy93ZWJwL1dFQlBJbWFnZURlY29kZXIuY3BwCiB9CiAKLSFzeXN0ZW0tc3FsaXRl OmV4aXN0cyggJCR7U1FMSVRFM1NSQ0RJUn0vc3FsaXRlMy5jICkgeworIWhhdmU/KHNxbGl0ZTMp OmV4aXN0cygkJHtTUUxJVEUzU1JDRElSfS9zcWxpdGUzLmMpIHsKICAgICAjIEJ1aWxkIHNxbGl0 ZTMgaW50byBXZWJDb3JlIGZyb20gc291cmNlCiAgICAgIyBzb21ld2hhdCBjb3BpZWQgZnJvbSAk JFFUX1NPVVJDRV9UUkVFL3NyYy9wbHVnaW5zL3NxbGRyaXZlcnMvc3FsaXRlL3NxbGl0ZS5wcm8K ICAgICBTT1VSQ0VTICs9ICQke1NRTElURTNTUkNESVJ9L3NxbGl0ZTMuYwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5wcmkgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQpp bmRleCBhY2FkMjA4Nzc2MmRkNTNjZjY0NDZhMzU0NDdlMDBlZDY4OTI5YjQyLi41NmM2ZDNkNGIw NWZlYjY4OTY4MDZmNWYwOTc2NTNkMjI5MzFjZmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnByaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnByaQpAQCAtMjM0LDE2 ICsyMzQsMTggQEAgdXNlPyhHUkFQSElDU19TVVJGQUNFKSB7CiAgICAgfQogfQogCi1TUUxJVEUz U1JDRElSID0gJCQoU1FMSVRFM1NSQ0RJUikKLWlzRW1wdHkoU1FMSVRFM1NSQ0RJUikgewotICAg IFNRTElURTNTUkNESVIgPSAkJFFULmNvcmUuc291cmNlcy8uLi8zcmRwYXJ0eS9zcWxpdGUvCi19 Ci0hc3lzdGVtLXNxbGl0ZTpleGlzdHMoICQke1NRTElURTNTUkNESVJ9L3NxbGl0ZTMuYyApIHsK LSAgICBJTkNMVURFUEFUSCArPSAkJHtTUUxJVEUzU1JDRElSfQotICAgIERFRklORVMgKz0gU1FM SVRFX0NPUkUgU1FMSVRFX09NSVRfTE9BRF9FWFRFTlNJT04gU1FMSVRFX09NSVRfQ09NUExFVEUK K2hhdmU/KHNxbGl0ZTMpIHsKKyAgICBQS0dDT05GSUcgKz0gc3FsaXRlMwogfSBlbHNlIHsKLSAg ICBJTkNMVURFUEFUSCArPSAkJHtTUUxJVEUzU1JDRElSfQotICAgIExJQlMgKz0gLWxzcWxpdGUz CisgICAgU1FMSVRFM1NSQ0RJUiA9ICQkKFNRTElURTNTUkNESVIpCisgICAgaXNFbXB0eShTUUxJ VEUzU1JDRElSKTogU1FMSVRFM1NSQ0RJUiA9IC4uLy4uLy4uL3F0YmFzZS9zcmMvM3JkcGFydHkv c3FsaXRlLworICAgIGV4aXN0cygkJHtTUUxJVEUzU1JDRElSfS9zcWxpdGUzLmMpIHsKKyAgICAg ICAgSU5DTFVERVBBVEggKz0gJCR7U1FMSVRFM1NSQ0RJUn0KKyAgICAgICAgREVGSU5FUyArPSBT UUxJVEVfQ09SRSBTUUxJVEVfT01JVF9MT0FEX0VYVEVOU0lPTiBTUUxJVEVfT01JVF9DT01QTEVU RQorICAgIH0gZWxzZSB7CisgICAgICAgIElOQ0xVREVQQVRIICs9ICQke1NRTElURTNTUkNESVJ9 CisgICAgICAgIExJQlMgKz0gLWxzcWxpdGUzCisgICAgfQogfQogCiB1c2U/KGxpYmpwZWcpOiBM SUJTICs9IC1sanBlZwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGM5NWJmYmQ4YjdmMDcyNGVlN2U5YWM3YWJhMGQwNWMyMzk5NzZiMWIuLjJkNzli ZGYwYTBjZGNlYWJmODBiZmMzYTI3MDlhMDU2ZDY4MDkxMjggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0xMi0x MiAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBkaWdpYS5jb20+CisKKyAgICAgICAg W1F0XSBGaXggbGlua2FnZSBhZ2FpbnN0IFNRTGl0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA0NzgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgRGV0ZWN0IFNRTGl0ZSBlaXRoZXIgdGhyb3VnaCBwa2ct Y29uZmlnLCBmcm9tIHRoZSBTUUxJVEUzU1JDRElSCisgICAgICAgIGVudmlyb25tZW50IHZhcmlh YmxlIG9yIGZyb20gcXRiYXNlIHZpYSBhIHF0NS5naXQgYnVpbGQuIEJhaWwgb3V0IGVhcmx5Cisg ICAgICAgIHdpdGggYW4gZXJyb3IgbWVzc2FnZSBpZiBuZWl0aGVyIG9wdGlvbiBhcHBsaWVzLgor CisgICAgICAgIFRoaXMgcmVtb3ZlcyB0aGUgdXNhZ2Ugb2YgJCRRVC5jb3JlLnNvdXJjZXMgYW5k IHRoZSBkZXBlbmRlbmN5IG9uIFF0J3MKKyAgICAgICAgc3lzdGVtLXNxbGl0ZSBjb25maWd1cmUg c2V0dGluZy4gV2Ugc2hvdWxkIGFsd2F5cyBmYXZvdXIgYSBzeXN0ZW0KKyAgICAgICAgbGlicmFy eSBvdmVyIGEgY29weSBpbiBRdC4KKworICAgICAgICAqIHFtYWtlL21rc3BlY3MvZmVhdHVyZXMv ZmVhdHVyZXMucHJmOgorCiAyMDEyLTEyLTExICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQu b3JnPgogCiAgICAgICAgIEFkZCBLb2ppIElzaGlpIHRvIHRoZSBsaXN0IG9mIGNvbnRyaWJ1dG9y cy4KZGlmZiAtLWdpdCBhL1Rvb2xzL3FtYWtlL21rc3BlY3MvZmVhdHVyZXMvZmVhdHVyZXMucHJm IGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0dXJlcy5wcmYKaW5kZXggMDIxMmU3 OTY5ZmRlZGEzNDNiNDI3MTc0Y2NhM2I3NDZmODA0MzI1Ni4uMDYyYThjOTgxZjBmYTcyOTRmYjkz YWMzMzJlMzg3YmI2NGEzMGFiYyAxMDA2NDQKLS0tIGEvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0 dXJlcy9mZWF0dXJlcy5wcmYKKysrIGIvVG9vbHMvcW1ha2UvbWtzcGVjcy9mZWF0dXJlcy9mZWF0 dXJlcy5wcmYKQEAgLTEyMCw2ICsxMjAsMTQgQEAgZGVmaW5lVGVzdChkZXRlY3RGZWF0dXJlcykg ewogICAgICAgICBXRUJLSVRfQ09ORklHICs9IHZpZGVvIHVzZV9xdF9tdWx0aW1lZGlhCiAgICAg fQogCisgICAgIyBUcnkgdG8gdXNlIGFuIHN5c3RlbSB3aWRlIFNRbGl0ZSBpbnN0YWxsYXRpb24K KyAgICAhY29udGFpbnMoUVRfQ09ORklHLCBuby1wa2ctY29uZmlnKTpwYWNrYWdlc0V4aXN0KCJz cWxpdGUzIikgeworICAgICAgICBXRUJLSVRfQ09ORklHICs9IGhhdmVfc3FsaXRlMworICAgIH0g ZWxzZSB7CisgICAgICAgIFNRTElURTNTUkNESVIgPSAkJChTUUxJVEUzU1JDRElSKQorICAgICAg ICBpc0VtcHR5KFNRTElURTNTUkNESVIpOmlzRW1wdHkoX1FNQUtFX1NVUEVSX0NBQ0hFXyk6IGVy cm9yKCJXZWJLaXQgcmVxdWlyZXMgU1FMaXRlLiBFaXRoZXIgbWFrZSBpdCBhdmFpbGFibGUgdmlh IHBrZy1jb25maWcsIHNldCAkU1FMSVRFM1NSQ0RJUiBvciBidWlsZCBXZWJLaXQgdW5kZXIgcXQ1 LmdpdC4iKQorICAgIH0KKwogICAgICMgR2FtZXBhZCBBUEkgU3VwcG9ydAogICAgIHBhY2thZ2Vz RXhpc3QobGlidWRldik6IFdFQktJVF9DT05GSUcgKz0gZ2FtZXBhZAogCg==