42026 2010-07-10 03:35:27 -0700 [GTK] run-launcher fails if WebKitGTK+ compiled with GTK+-3.0 support 2010-08-23 08:33:50 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 pnormand webkit-unassigned mrobinson svillar xan.lopez oldest_to_newest 249501 0 pnormand 2010-07-10 03:35:27 -0700 WebKitTools/Scripts/webkitdirs.pm line 599 hardcodes libwebkitgtk-1.0.so but if webkit is compiled against gtk3 it should be libwebkitgtk-3.0.so To test: run-launcher --gtk Error: Can't find built framework at "/home/phil/gst/jhbuild/build/WebKit/WebKitBuild/gtk-fullscreen2/Release/JavaScriptCore/../.libs/libwebkitgtk-1.0.so". 249502 1 pnormand 2010-07-10 03:39:34 -0700 Because we support build of gtk2 and gtk3 at the moment I think it'd make sense to have: build-webkit --gtk3 and the current --gtk option (renamed to --gtk2?) instead of build-webkit --gtk --use-gtk=3.0 This be used for the launcher too: run-launcher --gtk2 run-launcher --gtk3 249555 2 mrobinson 2010-07-10 14:24:02 -0700 Why not just have the script detect what the appropriate version of the library is, by looking at the directory contents? 249557 3 xan.lopez 2010-07-10 14:32:49 -0700 (In reply to comment #2) > Why not just have the script detect what the appropriate version of the library is, by looking at the directory contents? You could have both libraries, so a switch might make sense to force one or the other. 249558 4 mrobinson 2010-07-10 14:38:12 -0700 True, I think that only if both exist should an extra switch be required to select the right one. 249704 5 pnormand 2010-07-12 00:01:23 -0700 The less intrusive is probably to assume --gtk is for gtk2 (for now) and add a --gtk3 switch. So later on when we drop support for gtk2, just assume --gtk is for gtk3 and drop --gtk3... What ya think? Renaming the current --gtk to --gtk2 would imply we need to update the buildbot scripts at least. It might also confuse the current people who use --gtk. 267891 6 65114 xan.lopez 2010-08-23 07:26:38 -0700 Created attachment 65114 gtk3build.diff So, let's do first what Martin suggested. It should work well enough for our common work routine, and if anybody needs something more sophisticated he can go ahead and write it. 267911 7 65114 mrobinson 2010-08-23 08:06:23 -0700 Comment on attachment 65114 gtk3build.diff LGTM! 267919 8 svillar 2010-08-23 08:27:57 -0700 *** Bug 44425 has been marked as a duplicate of this bug. *** 267922 9 65114 xan.lopez 2010-08-23 08:33:40 -0700 Comment on attachment 65114 gtk3build.diff Landed as r65811. 267923 10 xan.lopez 2010-08-23 08:33:50 -0700 Closing bug. 65114 2010-08-23 07:26:38 -0700 2010-08-23 08:33:40 -0700 gtk3build.diff gtk3build.diff text/plain 2124 xan.lopez RnJvbSAwZjA2Y2NjZTM2OTFjMTYyYjhmMWVjMzFmNTFlODI4NDI0MzY4ZDVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBN b24sIDIzIEF1ZyAyMDEwIDIzOjI1OjAxICswOTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMC0wOC0y MyAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBydW4tbGF1bmNoZXIgZmFpbHMgaWYgV2ViS2l0 R1RLKyBjb21waWxlZCB3aXRoIEdUSystMy4wIHN1cHBvcnQKICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIwMjYKCiAgICAgICAgSWYgYSBHVEsrIDMueCBi dWlsZCBpcyBwcmVzZW50IHJldHVybiB0aGF0IGFzIHRoZSBsaWJyYXJ5IHRvIHVzZSwKICAgICAg ICBvdGhlcndpc2UgZmFsbGJhY2sgdG8gdGhlIEdUSysgMi54IGJ1aWxkLgoKICAgICAgICAqIFNj cmlwdHMvd2Via2l0ZGlycy5wbToKLS0tCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAg ICAgfCAgIDEyICsrKysrKysrKysrKwogV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt IHwgICAgNiArKysrKy0KIDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKaW5kZXggZWRhNGI3Yy4uZjU1MGVlZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDEwLTA4LTIzICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RLXSBydW4tbGF1bmNoZXIg ZmFpbHMgaWYgV2ViS2l0R1RLKyBjb21waWxlZCB3aXRoIEdUSystMy4wIHN1cHBvcnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDI2CisKKyAgICAg ICAgSWYgYSBHVEsrIDMueCBidWlsZCBpcyBwcmVzZW50IHJldHVybiB0aGF0IGFzIHRoZSBsaWJy YXJ5IHRvIHVzZSwKKyAgICAgICAgb3RoZXJ3aXNlIGZhbGxiYWNrIHRvIHRoZSBHVEsrIDIueCBi dWlsZC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKwogMjAxMC0wOC0yMiAg Tm8nYW0gUm9zZW50aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdGRpcnMucG0gYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXgg NjUzMDI0NC4uMzkwMTYxMSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRk aXJzLnBtCisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtNTk3LDcg KzU5NywxMSBAQCBzdWIgYnVpbHREeWxpYlBhdGhGb3JOYW1lCiAgICAgICAgIHJldHVybiAiJGNv bmZpZ3VyYXRpb25Qcm9kdWN0RGlyL2xpYnd4d2Via2l0LmR5bGliIjsKICAgICB9CiAgICAgaWYg KGlzR3RrKCkpIHsKLSAgICAgICAgcmV0dXJuICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvJGxp YnJhcnlOYW1lLy4uLy5saWJzL2xpYndlYmtpdGd0ay0xLjAuc28iOworICAgICAgICBteSAkbGli cmFyeURpciA9ICIkY29uZmlndXJhdGlvblByb2R1Y3REaXIvJGxpYnJhcnlOYW1lLy4uLy5saWJz LyI7CisgICAgICAgIGlmICgtZSAkbGlicmFyeURpciAuICJsaWJ3ZWJraXRndGstMy4wLnNvIikg eworICAgICAgICAgICAgcmV0dXJuICRsaWJyYXJ5RGlyIC4gImxpYndlYmtpdGd0ay0zLjAuc28i OworICAgICAgICB9CisgICAgICAgIHJldHVybiAkbGlicmFyeURpciAuICJsaWJ3ZWJraXRndGst MS4wLnNvIjsKICAgICB9CiAgICAgaWYgKGlzRWZsKCkpIHsKICAgICAgICAgcmV0dXJuICIkY29u ZmlndXJhdGlvblByb2R1Y3REaXIvJGxpYnJhcnlOYW1lLy4uLy5saWJzL2xpYmV3ZWJraXQuc28i OwotLSAKMS43LjIuMQoK