126212 2013-12-24 06:47:50 -0800 [GTK][CMake] Add support for building the GTK+ port with cmake to build-webkit 2014-01-06 13:27:33 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 126505 115966 126503 1 gustavo mrobinson commit-queue dbates mrobinson oldest_to_newest 962766 0 gustavo 2013-12-24 06:47:50 -0800 We could add a --gtk-cmake or a flag to go along with --gtk. This would allow us to move one of our buildbots to cmake too. 964525 1 220405 mrobinson 2014-01-05 15:09:48 -0800 Created attachment 220405 Patch 964544 2 220405 mrobinson 2014-01-05 20:05:09 -0800 Comment on attachment 220405 Patch Clearing flags on attachment: 220405 Committed r161328: <http://trac.webkit.org/changeset/161328> 220405 2014-01-05 15:09:48 -0800 2014-01-05 20:05:09 -0800 Patch bug-126212-20140105150948.patch text/plain 7129 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxMzExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNmQ4YTVkYjZhZWQ2NzMzZDVhNzMyODJmZjhkMjM1Njli MDFjZDg2My4uN2Q2ODRkOGI0NTA2YWQzNmNmNzJjMjA0OGU4OWIxOTkxN2Y4Njg4NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDE0LTAxLTA1ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXVtDTWFrZV0gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHRoZSBHVEsr IHBvcnQgd2l0aCBjbWFrZSB0byBidWlsZC13ZWJraXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjIxMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IGJ1aWxkaW5nIHRoZSBHVEsrIGNtYWtlIHBv cnQgd2l0aCAtLWd0a2NtYWtlLgorCisgICAgICAgICogU2NyaXB0cy9idWlsZC13ZWJraXQ6IFVz ZSB0aGUgbmV3IGlzR3RrQ01ha2UgZnVuY3Rpb24gdG8gaGVhZCBkb3duIHRoZSBDTWFrZSBwYXRo CisgICAgICAgIHdoZW4gYXBwcm9wcmlhdGUuIFNraXAgdGhlIGF1dG90b29zIHBhdGggd2hlbiBp c0d0a0F1dG90b29scyBpcyBmYWxzZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06 IEFkZCBhbiBpc0d0a0NNYWtlIHBhdGggaW4gYWRkaXRpb24gdG8gdGhlIG5ld2x5IHJlbmFtZWQg aXNHdGtBdXRvdG9vbHMuCisgICAgICAgIEFkZCBpc0d0ayB3aGljaCBjaGVja3MgaXNHdGtDTWFr ZSB8fCBpc0d0a0F1dG90b29scworICAgICAgICAoZGV0ZXJtaW5lQXJjaGl0ZWN0dXJlKTogVXNl IHRoZSBDTWFrZSBwYXRoIGZvciBHVEsrIHdoZW4gYXBwcm9wcmlhdGUuCisgICAgICAgIChhcmd1 bWVudHNGb3JDb25maWd1cmF0aW9uKTogdXNlIC0tZ3RrY21ha2Ugd2hlbiBhcHByb3ByaWF0ZS4K KyAgICAgICAgKGpzY1Byb2R1Y3REaXIpOiBMb29rIGluIHRoZSBDTWFrZSBkaXJlY3Rvcnkgd2hl biBhcHByb3ByaWF0ZS4KKyAgICAgICAgKGJ1aWx0RHlsaWJQYXRoRm9yTmFtZSk6IENNYWtlIGJ1 aWxkcyB0aGUgbGlicmFyeSBpbnRvIGEgZGlmZmVyZW50IGRpcmVjdG9yeSwgc28gaGFuZGxlIHRo YXQuCisgICAgICAgIChkZXRlcm1pbmVJc0d0a0NNYWtlKTogQWRkZWQuCisgICAgICAgIChpc0d0 a0NNYWtlKTogQWRkZWQuCisgICAgICAgIChpc0d0a0F1dG90b29scyk6IFJlbmFtZWQgZnJvbSBp c0d0ay4KKyAgICAgICAgKGlzR3RrKTogTmV3IGZ1bmN0aW9uIHdoaWNoIHJldHVybnMgaXNHdGtB dXRvdG9vbHMgfHwgaXNHdGtDTWFrZS4KKyAgICAgICAgKGRldGVybWluZUlzR3RrQXV0b3Rvb2xz KTogUmVuYW1lZCBmcm9tIGRldGVybWluZUlzR3RrLgorICAgICAgICAoY21ha2VCYXNlZFBvcnRO YW1lKTogQWRkZWQgYSBHVEsrIHBhdGguCisKIDIwMTQtMDEtMDQgIENhcmxvcyBHYXJjaWEgQ2Ft cG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIE1vdmUgYWxsIEdUSy9H T2JqZWN0IHVuaXQgdGVzdHMgdG8gVG9vbHMvVGVzdFdlYktpdEFQSQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy9idWlsZC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRl eCBjNGI0N2Q2M2NmNjJlMmY0YzYxMjU3M2YwOTNhOWFiZjlhYmMxNWIwLi5jNWZlOWU1ZDhkNmNj ZjU2NjY0MTdkZGRlMDIxMTU2MWMzZmI4ODJmIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1 aWxkLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtMjkwLDcgKzI5 MCw3IEBAIGlmIChpc05peCgpKSB7CiAgICAgYnVpbGRDTWFrZVByb2plY3RPckV4aXQoJGNsZWFu LCAiTml4IiwgJHByZWZpeFBhdGgsICRtYWtlQXJncywgKGNtYWtlQmFzZWRQb3J0QXJndW1lbnRz KCksIGNNYWtlQXJnc0Zyb21GZWF0dXJlcygpKSwgJGNtYWtlQXJncyk7CiB9CiAKLWlmIChpc0Vm bCgpKSB7CitpZiAoaXNFZmwoKSB8fCBpc0d0a0NNYWtlKCkpIHsKICAgICAjIEJ5IGRlZmF1bHQg d2UgYnVpbGQgdXNpbmcgYWxsIG9mIHRoZSBhdmFpbGFibGUgQ1BVcy4KICAgICAkbWFrZUFyZ3Mg Lj0gKCRtYWtlQXJncyA/ICIgIiA6ICIiKSAuICItaiIgLiBudW1iZXJPZkNQVXMoKSBpZiAkbWFr ZUFyZ3MgIX4gLy1qXHMqXGQrLzsKICAgICAkY21ha2VBcmdzID0gIi1ERU5BQkxFX1dFQktJVD1P RkYgIiAgLiAkY21ha2VBcmdzIGlmICRub1dlYktpdDE7CkBAIC0zMDAsNyArMzAwLDggQEAgaWYg KGlzRWZsKCkpIHsKICAgICAjIHdlIGVuYWJsZSBuZXcgZmVhdHVyZXMuIFRoaXMgZm9yY2VzIGEg cmVjb25maWd1cmF0aW9uLgogICAgIHJlbW92ZUNNYWtlQ2FjaGUoKTsKIAotICAgIGJ1aWxkQ01h a2VQcm9qZWN0T3JFeGl0KCRjbGVhbiwgIkVmbCIsICRwcmVmaXhQYXRoLCAkbWFrZUFyZ3MsIChj bWFrZUJhc2VkUG9ydEFyZ3VtZW50cygpLCBjTWFrZUFyZ3NGcm9tRmVhdHVyZXMoKSksICRjbWFr ZUFyZ3MpOworICAgIG15ICRwb3J0TmFtZSA9IChpc0VmbCgpID8gIkVmbCIgOiAiR1RLIik7Cisg ICAgYnVpbGRDTWFrZVByb2plY3RPckV4aXQoJGNsZWFuLCAkcG9ydE5hbWUsICRwcmVmaXhQYXRo LCAkbWFrZUFyZ3MsIChjbWFrZUJhc2VkUG9ydEFyZ3VtZW50cygpLCBjTWFrZUFyZ3NGcm9tRmVh dHVyZXMoKSksICRjbWFrZUFyZ3MpOwogfQogCiBpZiAoaXNXaW5DRSgpKSB7CkBAIC0zMjUsMTQg KzMyNiwxNCBAQCBmb3IgbXkgJGRpciAoQHByb2plY3RzKSB7CiAgICAgJHJlc3VsdCA9IDA7CiAK ICAgICAjIEZvciBHdGsgdGhlIFdlYktpdCBwcm9qZWN0IGJ1aWxkcyBhbGwgb3RoZXJzCi0gICAg aWYgKGlzR3RrKCkgJiYgJGRpciBuZSAiU291cmNlL1dlYktpdCIpIHsKKyAgICBpZiAoaXNHdGtB dXRvdG9vbHMoKSAmJiAkZGlyIG5lICJTb3VyY2UvV2ViS2l0IikgewogICAgICAgICBjaGRpcldl YktpdCgpOwogICAgICAgICBuZXh0OwogICAgIH0KIAogICAgIG15ICRwcm9qZWN0ID0gYmFzZW5h bWUoJGRpcik7CiAgICAgbXkgJGJhc2VQcm9kdWN0RGlyID0gYmFzZVByb2R1Y3REaXIoKTsKLSAg ICBpZiAoaXNHdGsoKSkgeworICAgIGlmIChpc0d0a0F1dG90b29scygpKSB7CiAgICAgICAgICRy ZXN1bHQgPSBidWlsZEd0a1Byb2plY3QoJHByb2plY3QsICRjbGVhbiwgJHByZWZpeFBhdGgsICRt YWtlQXJncywgJG5vV2ViS2l0MSwgJG5vV2ViS2l0MiwgQGZlYXR1cmVzKTsKICAgICB9IGVsc2lm IChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgbXkgQGxvY2FsX29wdGlvbnMgPSBAb3B0 aW9uczsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBmOWJiMGFmZGQ3MjYxZGYyZDQyYjVlNWQ4NThlMzNh OWFiYjAzM2Q2Li41MjBmNDQwYmQwOGUwNWNhYzYzMzI0YmE4ZTIwNDUwN2FhMTNjYjYzIDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCkBAIC05MCw3ICs5MCw4IEBAIG15ICRkZWJ1Z2dlcjsKIG15ICRubVBhdGg7 CiBteSAkb3NYVmVyc2lvbjsKIG15ICRnZW5lcmF0ZURzeW07Ci1teSAkaXNHdGs7CitteSAkaXNH dGtBdXRvdG9vbHM7CitteSAkaXNHdGtDTWFrZTsKIG15ICRpc1dpbkNFOwogbXkgJGlzV2luQ2Fp cm87CiBteSAkaXNXaW42NDsKQEAgLTI5MSw3ICsyOTIsNyBAQCBzdWIgZGV0ZXJtaW5lQXJjaGl0 ZWN0dXJlCiAgICAgZGV0ZXJtaW5lQmFzZVByb2R1Y3REaXIoKTsKICAgICBkZXRlcm1pbmVYY29k ZVNESygpOwogCi0gICAgaWYgKGlzR3RrKCkpIHsKKyAgICBpZiAoaXNHdGtBdXRvdG9vbHMoKSkg ewogICAgICAgICBkZXRlcm1pbmVDb25maWd1cmF0aW9uUHJvZHVjdERpcigpOwogICAgICAgICBt eSAkaG9zdF90cmlwbGUgPSBgZ3JlcCAtRSAnXmhvc3QgPSAnICRjb25maWd1cmF0aW9uUHJvZHVj dERpci9HTlVtYWtlZmlsZSAyPiAvZGV2L251bGxgOwogICAgICAgICBpZiAoJGhvc3RfdHJpcGxl ID1+IG0vXmhvc3QgPSAoW14tXSspLS8pIHsKQEAgLTMxNiw3ICszMTcsNyBAQCBzdWIgZGV0ZXJt aW5lQXJjaGl0ZWN0dXJlCiAgICAgICAgICAgICAgICAgJGFyY2hpdGVjdHVyZSA9ICdhcm12Nyc7 CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KLSAgICB9IGVsc2lmIChpc0VmbCgpIHx8IGlzTml4 KCkpIHsKKyAgICB9IGVsc2lmIChpc0VmbCgpIHx8IGlzTml4KCkgfHwgaXNHdGtDTWFrZSgpKSB7 CiAgICAgICAgIG15ICRob3N0X3Byb2Nlc3NvciA9ICIiOwogICAgICAgICAkaG9zdF9wcm9jZXNz b3IgPSBgY21ha2UgLS1zeXN0ZW0taW5mb3JtYXRpb24gfCBncmVwIENNQUtFX1NZU1RFTV9QUk9D RVNTT1JgOwogICAgICAgICBpZiAoJGhvc3RfcHJvY2Vzc29yID1+IG0vXkNNQUtFX1NZU1RFTV9Q Uk9DRVNTT1IgXCIoW14iXSspXCIvKSB7CkBAIC0zNzksNyArMzgwLDggQEAgc3ViIGFyZ3VtZW50 c0ZvckNvbmZpZ3VyYXRpb24oKQogICAgIHB1c2goQGFyZ3MsICctLXJlbGVhc2UnKSBpZiAoJGNv bmZpZ3VyYXRpb24gPX4gIl5SZWxlYXNlIik7CiAgICAgcHVzaChAYXJncywgJy0tMzItYml0Jykg aWYgKCRhcmNoaXRlY3R1cmUgbmUgIng4Nl82NCIgYW5kICFpc1dpbjY0KCkpOwogICAgIHB1c2go QGFyZ3MsICctLTY0LWJpdCcpIGlmIChpc1dpbjY0KCkpOwotICAgIHB1c2goQGFyZ3MsICctLWd0 aycpIGlmIGlzR3RrKCk7CisgICAgcHVzaChAYXJncywgJy0tZ3RrJykgaWYgaXNHdGtBdXRvdG9v bHMoKTsKKyAgICBwdXNoKEBhcmdzLCAnLS1ndGtjbWFrZScpIGlmIGlzR3RrQ01ha2UoKTsKICAg ICBwdXNoKEBhcmdzLCAnLS1lZmwnKSBpZiBpc0VmbCgpOwogICAgIHB1c2goQGFyZ3MsICctLW5p eCcpIGlmIGlzTml4KCk7CiAgICAgcHVzaChAYXJncywgJy0td2luY2Fpcm8nKSBpZiBpc1dpbkNh aXJvKCk7CkBAIC01MzIsOCArNTM0LDggQEAgc3ViIHByb2R1Y3REaXIKIHN1YiBqc2NQcm9kdWN0 RGlyCiB7CiAgICAgbXkgJHByb2R1Y3REaXIgPSBwcm9kdWN0RGlyKCk7Ci0gICAgJHByb2R1Y3RE aXIgLj0gIi9iaW4iIGlmIChpc0VmbCgpIHx8IGlzTml4KCkpOwotICAgICRwcm9kdWN0RGlyIC49 ICIvUHJvZ3JhbXMiIGlmIGlzR3RrKCk7CisgICAgJHByb2R1Y3REaXIgLj0gIi9iaW4iIGlmIChp c0VmbCgpIHx8IGlzTml4KCkgfHwgaXNHdGtDTWFrZSgpKTsKKyAgICAkcHJvZHVjdERpciAuPSAi L1Byb2dyYW1zIiBpZiBpc0d0a0F1dG90b29scygpOwogCiAgICAgcmV0dXJuICRwcm9kdWN0RGly OwogfQpAQCAtNzc3LDggKzc3OSwxMyBAQCBzdWIgYnVpbHREeWxpYlBhdGhGb3JOYW1lCiAgICAg ICAgIG15IEBsaWJyYXJpZXMgPSAoImxpYndlYmtpdGd0ay0xLjAiLCAibGlid2Via2l0Z3RrLTMu MCIsICJsaWJ3ZWJraXQyZ3RrLTMuMCIpOwogICAgICAgICBteSAkZXh0ZW5zaW9uID0gaXNEYXJ3 aW4oKSA/ICIuZHlsaWIiIDogIi5zbyI7CiAKKyAgICAgICAgbXkgJGJ1aWx0TGlicmFyeVBhdGgg PSAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyLy5saWJzLyI7CisgICAgICAgIGlmIChpc0d0a0NN YWtlKCkpIHsKKyAgICAgICAgICAgICRidWlsdExpYnJhcnlQYXRoID0gIiRjb25maWd1cmF0aW9u UHJvZHVjdERpci9saWIvIjsKKyAgICAgICAgfQorCiAgICAgICAgIGZvcmVhY2ggJGxpYnJhcnlO YW1lIChAbGlicmFyaWVzKSB7Ci0gICAgICAgICAgICBteSAkbGlicmFyeVBhdGggPSAiJGNvbmZp Z3VyYXRpb25Qcm9kdWN0RGlyLy5saWJzLyIgLiAkbGlicmFyeU5hbWUgLiAkZXh0ZW5zaW9uOwor ICAgICAgICAgICAgbXkgJGxpYnJhcnlQYXRoID0gIiRidWlsdExpYnJhcnlQYXRoIiAuICRsaWJy YXJ5TmFtZSAuICRleHRlbnNpb247CiAgICAgICAgICAgICByZXR1cm4gJGxpYnJhcnlQYXRoIGlm IC1lICRsaWJyYXJ5UGF0aDsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gIk5vdEZvdW5kIjsK QEAgLTEwNDUsNiArMTA1MiwxOCBAQCBzdWIgaXNFZmwoKQogICAgIHJldHVybiAkaXNFZmw7CiB9 CiAKK3N1YiBkZXRlcm1pbmVJc0d0a0NNYWtlKCkKK3sKKyAgICByZXR1cm4gaWYgZGVmaW5lZCgk aXNHdGtDTWFrZSk7CisgICAgJGlzR3RrQ01ha2UgPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3Zl RnJvbUFSR1YoIi0tZ3RrY21ha2UiKTsKK30KKworc3ViIGlzR3RrQ01ha2UoKQoreworICAgIGRl dGVybWluZUlzR3RrQ01ha2UoKTsKKyAgICByZXR1cm4gJGlzR3RrQ01ha2U7Cit9CisKIHN1YiBk ZXRlcm1pbmVJc05peCgpCiB7CiAgICAgcmV0dXJuIGlmIGRlZmluZWQoJGlzTml4KTsKQEAgLTEw NTYsMTYgKzEwNzUsMjIgQEAgc3ViIGlzTml4KCkKICAgICBkZXRlcm1pbmVJc05peCgpOwogICAg IHJldHVybiAkaXNOaXg7CiB9CisKK3N1YiBpc0d0a0F1dG90b29scygpCit7CisgICAgZGV0ZXJt aW5lSXNHdGtBdXRvdG9vbHMoKTsKKyAgICByZXR1cm4gJGlzR3RrQXV0b3Rvb2xzOworfQorCiBz dWIgaXNHdGsoKQogewotICAgIGRldGVybWluZUlzR3RrKCk7Ci0gICAgcmV0dXJuICRpc0d0azsK KyAgICByZXR1cm4gaXNHdGtDTWFrZSgpIHx8IGlzR3RrQXV0b3Rvb2xzKCk7CiB9CiAKLXN1YiBk ZXRlcm1pbmVJc0d0aygpCitzdWIgZGV0ZXJtaW5lSXNHdGtBdXRvdG9vbHMoKQogewotICAgIHJl dHVybiBpZiBkZWZpbmVkKCRpc0d0ayk7Ci0gICAgJGlzR3RrID0gY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BUkdWKCItLWd0ayIpOworICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc0d0a0F1 dG90b29scyk7CisgICAgJGlzR3RrQXV0b3Rvb2xzID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92 ZUZyb21BUkdWKCItLWd0ayIpOwogfQogCiBzdWIgaXNXaW5DRSgpCkBAIC0yMDk2LDYgKzIxMjEs NyBAQCBzdWIgY21ha2VCYXNlZFBvcnROYW1lKCkKICAgICByZXR1cm4gIkVmbCIgaWYgaXNFZmwo KTsKICAgICByZXR1cm4gIldpbkNFIiBpZiBpc1dpbkNFKCk7CiAgICAgcmV0dXJuICJOaXgiIGlm IGlzTml4KCk7CisgICAgcmV0dXJuICJHVEsiIGlmIGlzR3RrKCk7CiAgICAgcmV0dXJuICIiOwog fQogCg==