135505 2014-08-01 06:19:53 -0700 [GTK] Be able to disable gtk2 dependency 2014-08-06 08:01:54 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mcrha webkit-unassigned bunhere cdumez cgarcia commit-queue gustavo gyuyoung.kim mrobinson rakuco sergio oldest_to_newest 1026233 0 mcrha 2014-08-01 06:19:53 -0700 Please add a configure option to be able to disable gtk2 dependency. It's not good to mix gtk3 and gtk2 (I build webkitgtk for gtk3), and it's sometimes not needed (like for evolution). If you can enable it by default, but allow a configure option to disable it, then it'll help to build softer webkit (like under Win32, I know, I know, webkit2 doesn't work right now, but let's start with small steps). It's understood that disable of the gtk2 dependency removes some functionality, like the famous flash, but that's understood and fine. 1026234 1 cgarcia 2014-08-01 06:22:07 -0700 Now that the default plugin process doesn't use GTK2, it's possible to build without gtk2 support. And of course GTK+2 plugins like flash would not work. 1026616 2 235969 cgarcia 2014-08-04 02:47:27 -0700 Created attachment 235969 Add an option to disable WebKitPluginProcess2 WebKitPluginProcess2 is the only reason we depend on GTK+2. 1027151 3 235969 gustavo 2014-08-06 07:18:59 -0700 Comment on attachment 235969 Add an option to disable WebKitPluginProcess2 View in context: https://bugs.webkit.org/attachment.cgi?id=235969&action=review > Source/WebKit2/PlatformGTK.cmake:-580 > - list(APPEND PluginProcessGTK2_INCLUDE_DIRECTORIES > - "${WEBKIT2_DIR}/PluginProcess/unix" > - ) > - > - include_directories(${PluginProcessGTK2_INCLUDE_DIRECTORIES}) This path is already added on a more general basis, I imagine? 1027159 4 235969 cgarcia 2014-08-06 07:57:43 -0700 Comment on attachment 235969 Add an option to disable WebKitPluginProcess2 View in context: https://bugs.webkit.org/attachment.cgi?id=235969&action=review >> Source/WebKit2/PlatformGTK.cmake:-580 >> - include_directories(${PluginProcessGTK2_INCLUDE_DIRECTORIES}) > > This path is already added on a more general basis, I imagine? Yes, see the previous chunk 1027160 5 cgarcia 2014-08-06 08:01:54 -0700 Committed r172144: <http://trac.webkit.org/changeset/172144> 235969 2014-08-04 02:47:27 -0700 2014-08-06 07:57:42 -0700 Add an option to disable WebKitPluginProcess2 wk2-gtk2.diff text/plain 6543 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA4MzFhM2FjLi4zZDY3YWVi IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTQtMDgtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIEJlIGFibGUgdG8gZGlzYWJsZSBndGsyIGRlcGVuZGVuY3kKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTUwNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBFTkFCTEVfUExV R0lOX1BST0NFU1NfR1RLMiBjb21waWxlIG9wdGlvbi4gR1RLKzIgaXMgb25seQorICAgICAgICBy ZXF1aXJlZCB3aGVuIGl0J3MgZW5hYmxlZC4gSXQncyBlbmFibGVkIGJ5IGRlZmF1bHQuCisKKyAg ICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZToKKwogMjAxNC0wOC0wMyAgUnl1 YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gTW92ZSBE QVRBX0lOU1RBTExfRElSIHRvIGV3ZWJraXQyLTAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlNDE4M2UxLi5hMTQ3 YTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDgtMDQgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEJlIGFibGUg dG8gZGlzYWJsZSBndGsyIGRlcGVuZGVuY3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzNTUwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIERvIG5vdCBidWlsZCBXZWJDb3JlUGxhdGZvcm1HVEsyIHdoZW4g RU5BQkxFX1BMVUdJTl9QUk9DRVNTX0dUSzIKKyAgICAgICAgaXMgT0ZGLgorCisgICAgICAgICog UGxhdGZvcm1HVEsuY21ha2U6CisKIDIwMTQtMDgtMDMgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFw cGxlLmNvbT4KIAogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTc3ODI1Mjk+IFJFR1JFU1NJT046 IE9TIG1hcmtldGluZyB2ZXJzaW9uIGluIGlPUyBTaW11bGF0b3IgdXNlci1hZ2VudCBzdHJpbmcg aXMgdGhlIGhvc3QgT1PigJlzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9QbGF0Zm9ybUdU Sy5jbWFrZSBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IDI1ZDIxNzcu LmJiMDE5OWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCisr KyBiL1NvdXJjZS9XZWJDb3JlL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC0zODIsOCArMzgyLDggQEAg aWYgKFdURl9VU0VfRUdMKQogICAgICkKIGVuZGlmICgpCiAKLWlmIChFTkFCTEVfV0VCS0lUMikK LSAgICAjIFdlYktpdDIgbmVlZHMgYSB2ZXJzaW9uIG9mIFdlYkNvcmUgY29tcGlsZWQgYWdhaW5z dCBHVEsrMiwgc28gd2UndmUgaXNvbGF0ZWQgYWxsIHRoZSBHVEsrCitpZiAoRU5BQkxFX1BMVUdJ Tl9QUk9DRVNTX0dUSzIpCisgICAgIyBXZWJLaXRQbHVnaW5Qcm9jZXNzMiBuZWVkcyBhIHZlcnNp b24gb2YgV2ViQ29yZSBjb21waWxlZCBhZ2FpbnN0IEdUSysyLCBzbyB3ZSd2ZSBpc29sYXRlZCBh bGwgdGhlIEdUSysKICAgICAjIGRlcGVuZGVudCBmaWxlcyBpbnRvIGEgc2VwYXJhdGUgbGlicmFy eSB3aGljaCBjYW4gYmUgdXNlZCB0byBjb25zdHJ1Y3QgYSBHVEsrMiBXZWJDb3JlCiAgICAgIyBm b3IgdGhlIHBsdWdpbiBwcm9jZXNzLgogICAgIGFkZF9saWJyYXJ5KFdlYkNvcmVQbGF0Zm9ybUdU SzIgJHtXZWJDb3JlX0xJQlJBUllfVFlQRX0gJHtXZWJDb3JlUGxhdGZvcm1HVEtfU09VUkNFU30p CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKaW5kZXggMjhiYTI2OS4uZjEwZmRlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE0LTA4LTA0ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNv bT4KKworICAgICAgICBbR1RLXSBCZSBhYmxlIHRvIGRpc2FibGUgZ3RrMiBkZXBlbmRlbmN5Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzU1MDUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFBsYXRmb3Jt R1RLLmNtYWtlOiBPbmx5IGJ1aWxkIFdlYktpdFBsdWdpblByb2Nlc3MyIHdoZW4KKyAgICAgICAg RU5BQkxFX1BMVUdJTl9QUk9DRVNTX0dUSzIgaXMgT04uCisgICAgICAgICogVUlQcm9jZXNzL0xh dW5jaGVyL2d0ay9Qcm9jZXNzTGF1bmNoZXJHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpQcm9j ZXNzTGF1bmNoZXI6OmxhdW5jaFByb2Nlc3MpOiBEbyBub3QgdHJ5IHRvIGxhdW5jaAorICAgICAg ICBXZWJLaXRQbHVnaW5Qcm9jZXNzMiBleGVjdXRhYmxlIHdoZW4gRU5BQkxFX1BMVUdJTl9QUk9D RVNTX0dUSzIgaXMgT0ZGLgorCiAyMDE0LTA4LTAyICBKZXJlbXkgSm9uZXMgIDxqZXJlbXlqQGFw cGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0IGJvdGggd2luZG93IGFuZCB2aWV3IGJhc2VkIHZp ZGVvIGZ1bGxzY3JlZW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybUdUSy5j bWFrZSBiL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCmluZGV4IDNhMjBkMTMuLjA3 ZjFiYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCisrKyBi L1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtR1RLLmNtYWtlCkBAIC0zOTcsNiArMzk3LDcgQEAgbGlz dChJTlNFUlQgV2ViS2l0Ml9JTkNMVURFX0RJUkVDVE9SSUVTIDAKICkKIAogbGlzdChBUFBFTkQg V2ViS2l0Ml9JTkNMVURFX0RJUkVDVE9SSUVTCisgICAgIiR7V0VCS0lUMl9ESVJ9L1BsdWdpblBy b2Nlc3MvdW5peCIKICAgICAiJHtXRUJDT1JFX0RJUn0vcGxhdGZvcm0vY2Fpcm8iCiAgICAgIiR7 V0VCQ09SRV9ESVJ9L3BsYXRmb3JtL2d0ayIKICAgICAiJHtXRUJDT1JFX0RJUn0vcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8iCkBAIC01NzEsMTMgKzU3Miw4IEBAIHNldChXRUJLSVQyX0VYVFJBX0RF UEVOREVOQ0lFUwogICAgICB3ZWJraXQyZ3RrLWZvcndhcmRpbmctaGVhZGVycwogKQogCi1pZiAo RU5BQkxFX1BMVUdJTl9QUk9DRVNTKQoraWYgKEVOQUJMRV9QTFVHSU5fUFJPQ0VTU19HVEsyKQog ICAgIHNldChQbHVnaW5Qcm9jZXNzR1RLMl9FWEVDVVRBQkxFX05BTUUgV2ViS2l0UGx1Z2luUHJv Y2VzczIpCi0gICAgbGlzdChBUFBFTkQgUGx1Z2luUHJvY2Vzc0dUSzJfSU5DTFVERV9ESVJFQ1RP UklFUwotICAgICAgICAiJHtXRUJLSVQyX0RJUn0vUGx1Z2luUHJvY2Vzcy91bml4IgotICAgICkK LQotICAgIGluY2x1ZGVfZGlyZWN0b3JpZXMoJHtQbHVnaW5Qcm9jZXNzR1RLMl9JTkNMVURFX0RJ UkVDVE9SSUVTfSkKIAogICAgICMgRklYTUU6IFdlIHNob3VsZCBmaWd1cmUgb3V0IGEgd2F5IHRv IGF2b2lkIGNvbXBpbGluZyBmaWxlcyB0aGF0IGFyZSBjb21tb24gYmV0d2VlbiB0aGUgcGx1Z2lu CiAgICAgIyBwcm9jZXNzIGFuZCBXZWJLaXQyIG9ubHkgb25jZSBpbnN0ZWFkIG9mIHJlY29tcGls aW5nIHRoZW0gZm9yIHRoZSBwbHVnaW4gcHJvY2Vzcy4KQEAgLTcxMCwxMyArNzA2LDEyIEBAIGlm IChFTkFCTEVfUExVR0lOX1BST0NFU1MpCiAgICAgYWRkX2RlcGVuZGVuY2llcyhXZWJLaXRQbHVn aW5Qcm9jZXNzMiBXZWJLaXQyKQogCiAgICAgaW5zdGFsbChUQVJHRVRTIFdlYktpdFBsdWdpblBy b2Nlc3MyIERFU1RJTkFUSU9OICIke0xJQkVYRUNfSU5TVEFMTF9ESVJ9IikKK2VuZGlmICgpICMg RU5BQkxFX1BMVUdJTl9QUk9DRVNTX0dUSzIKIAotICAgICMgR1RLMyBQbHVnaW5Qcm9jZXNzCi0g ICAgbGlzdChBUFBFTkQgUGx1Z2luUHJvY2Vzc19TT1VSQ0VTCi0gICAgICAgIFBsdWdpblByb2Nl c3MvRW50cnlQb2ludC91bml4L1BsdWdpblByb2Nlc3NNYWluLmNwcAotICAgICkKLQotZW5kaWYg KCkgIyBFTkFCTEVfUExVR0lOX1BST0NFU1MKKyMgR1RLMyBQbHVnaW5Qcm9jZXNzCitsaXN0KEFQ UEVORCBQbHVnaW5Qcm9jZXNzX1NPVVJDRVMKKyAgICBQbHVnaW5Qcm9jZXNzL0VudHJ5UG9pbnQv dW5peC9QbHVnaW5Qcm9jZXNzTWFpbi5jcHAKKykKIAogIyBDb21tYW5kcyBmb3IgYnVpbGRpbmcg dGhlIGJ1aWx0LWluIGluamVjdGVkIGJ1bmRsZS4KIGluY2x1ZGVfZGlyZWN0b3JpZXMoCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvZ3RrL1Byb2Nlc3NMYXVu Y2hlckd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTGF1bmNoZXIvZ3RrL1Byb2Nl c3NMYXVuY2hlckd0ay5jcHAKaW5kZXggZWFmOWVhMi4uMzYyMzY1YyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0xhdW5jaGVyL2d0ay9Qcm9jZXNzTGF1bmNoZXJHdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9MYXVuY2hlci9ndGsvUHJvY2Vzc0xhdW5j aGVyR3RrLmNwcApAQCAtNjcsOCArNjcsMTAgQEAgdm9pZCBQcm9jZXNzTGF1bmNoZXI6OmxhdW5j aFByb2Nlc3MoKQogICAgICAgICBicmVhazsKICAgICBjYXNlIFBsdWdpblByb2Nlc3M6CiAgICAg ICAgIGV4ZWN1dGFibGVQYXRoID0gZXhlY3V0YWJsZVBhdGhPZlBsdWdpblByb2Nlc3MoKTsKKyNp ZiBFTkFCTEUoUExVR0lOX1BST0NFU1NfR1RLMikKICAgICAgICAgaWYgKG1fbGF1bmNoT3B0aW9u cy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5jb250YWlucygicmVxdWlyZXMtZ3RrMiIpKQogICAg ICAgICAgICAgZXhlY3V0YWJsZVBhdGguYXBwZW5kKCcyJyk7CisjZW5kaWYKICAgICAgICAgcGx1 Z2luUGF0aCA9IG1fbGF1bmNoT3B0aW9ucy5leHRyYUluaXRpYWxpemF0aW9uRGF0YS5nZXQoInBs dWdpbi1wYXRoIik7CiAgICAgICAgIHJlYWxQbHVnaW5QYXRoID0gZmlsZVN5c3RlbVJlcHJlc2Vu dGF0aW9uKHBsdWdpblBhdGgpOwogICAgICAgICBicmVhazsKZGlmZiAtLWdpdCBhL1NvdXJjZS9j bWFrZS9PcHRpb25zR1RLLmNtYWtlIGIvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKaW5k ZXggY2E0NTRmZC4uZjg2YmUyYiAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsu Y21ha2UKKysrIGIvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKQEAgLTI5LDggKzI5LDYg QEAgc2V0KFdFQktJVEdUS19IRUFERVJfSU5TVEFMTF9ESVIgIiR7Q01BS0VfSU5TVEFMTF9JTkNM VURFRElSfS93ZWJraXRndGstJHtXRUJLSVQKIGZpbmRfcGFja2FnZShDYWlybyAxLjEwLjIgUkVR VUlSRUQpCiBmaW5kX3BhY2thZ2UoRm9udGNvbmZpZyAyLjguMCBSRVFVSVJFRCkKIGZpbmRfcGFj a2FnZShGcmVldHlwZTIgMi40LjIgUkVRVUlSRUQpCi1maW5kX3BhY2thZ2UoR1RLMiAyLjI0LjEw IFJFUVVJUkVEKQotZmluZF9wYWNrYWdlKEdESzIgMi4yNC4xMCBSRVFVSVJFRCkKIGZpbmRfcGFj a2FnZShIYXJmQnV6eiAwLjkuMiBSRVFVSVJFRCkKIGZpbmRfcGFja2FnZShJQ1UgUkVRVUlSRUQp CiBmaW5kX3BhY2thZ2UoSlBFRyBSRVFVSVJFRCkKQEAgLTU5LDYgKzU3LDggQEAgaWYgKEVOQUJM RV9YMTFfVEFSR0VUKQogZW5kaWYgKCkKIAogV0VCS0lUX09QVElPTl9CRUdJTigpCitXRUJLSVRf T1BUSU9OX0RFRklORShFTkFCTEVfUExVR0lOX1BST0NFU1NfR1RLMiAiV2hldGhlciB0byBidWls ZCBXZWJLaXRQbHVnaW5Qcm9jZXNzMiB0byBsb2FkIEdUSzIgYmFzZWQgcGx1Z2lucy4iIE9OKQor CiBpZiAoT1BFTkdMX0ZPVU5EIEFORCAoR0xYX0ZPVU5EIE9SIEVHTF9GT1VORCkpCiAgICAgV0VC S0lUX09QVElPTl9ERUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX1dFQkdMIE9OKQogCkBAIC0xNTEs NiArMTUxLDEyIEBAIFdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9ORVRX T1JLX1BST0NFU1MgT04pCiBXRUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShXVEZfVVNF X1RJTEVEX0JBQ0tJTkdfU1RPUkUgT0ZGKQogV0VCS0lUX09QVElPTl9FTkQoKQogCitpZiAoRU5B QkxFX1BMVUdJTl9QUk9DRVNTX0dUSzIpCisgICAgZmluZF9wYWNrYWdlKEdUSzIgMi4yNC4xMCBS RVFVSVJFRCkKKyAgICBmaW5kX3BhY2thZ2UoR0RLMiAyLjI0LjEwIFJFUVVJUkVEKQorICAgIGFk ZF9kZWZpbml0aW9ucygtREVOQUJMRV9QTFVHSU5fUFJPQ0VTU19HVEsyPTEpCitlbmRpZiAoKQor CiBpZiAoRU5BQkxFX1gxMV9UQVJHRVQpCiAgICAgYWRkX2RlZmluaXRpb25zKC1EV1RGX1BMQVRG T1JNX1gxMT0xKQogICAgIGFkZF9kZWZpbml0aW9ucygtRE1PWl9YMTE9MSkK