121414 2013-09-16 02:42:53 -0700 [GTK][2.2] Enable the Wayland target by default if the GTK+ Wayland dependency is available 2013-09-16 14:03:24 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 zan zan cgarcia gustavo mrobinson oldest_to_newest 929587 0 zan 2013-09-16 02:42:53 -0700 The Wayland target should be enabled by default if the GTK+ dependency is of version >= 3.10 was produced with the Wayland backend enabled. This bug covers the 2.2 stable branch. I plan to do the same thing for the trunk, but in a separate bug with hopefully some additional refactoring regarding the --with-target configuration option. 929593 1 211748 zan 2013-09-16 03:02:56 -0700 Created attachment 211748 Patch 929669 2 211748 gustavo 2013-09-16 06:19:48 -0700 Comment on attachment 211748 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211748&action=review > Source/autotools/ReadCommandLineArguments.m4:65 > + if test "$with_wayland_target" != "auto"; then This would also match no, so wayland ends up being a hard requirement if it was explicitly disabled? 929672 3 211748 zan 2013-09-16 06:31:47 -0700 Comment on attachment 211748 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211748&action=review >> Source/autotools/ReadCommandLineArguments.m4:65 >> + if test "$with_wayland_target" != "auto"; then > > This would also match no, so wayland ends up being a hard requirement if it was explicitly disabled? This checks that with_wayland_target wasn't previously set to 'auto', i.e. that it's basically still undefined. 929674 4 211748 zan 2013-09-16 06:34:01 -0700 Comment on attachment 211748 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211748&action=review > Source/autotools/Versions.m4:21 > +m4_define([gtk3_wayland_required_version], [3.9.14]) A question about the version to use here. The idea is to use the 3.10 series, but putting 3.10.0 here isn't possible just yet. Is 3.9.14 fine here? Will this be bumped to 3.10.0 once 2.2 is released? 929845 5 211748 mrobinson 2013-09-16 11:56:56 -0700 Comment on attachment 211748 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211748&action=review Looks good, but please look into removing the unnecessary temporary variable before landing. > Source/autotools/FindDependencies.m4:223 > + ], [have_gtk_wayland=yes], [have_gtk_wayland=no]) > + if test "$have_gtk_wayland" = "no"; then > + if test "$with_wayland_target" = "yes"; then > + AC_MSG_ERROR([GTK+ Wayland dependency (gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version) not found.]) > + else > + AC_MSG_WARN([GTK+ Wayland dependency (gtk+-wayland-$GTK_API_VERSION >= gtk3_wayland_required_version) not found, disabling the Wayland target.]) > + with_wayland_target=no > + fi > + else > + with_wayland_target=yes > + fi > fi You don't have to have the temporary variable have_gtk_wayland. Instead you can put the code you want to execute in the square brackets. 929912 6 zan 2013-09-16 14:03:24 -0700 Landed the adjusted patch in r155899. http://trac.webkit.org/changeset/155899 211748 2013-09-16 03:02:56 -0700 2013-09-16 11:56:56 -0700 Patch p text/plain 6302 zan SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDE1NTg0 NykKKysrIENoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTA5 LTE2ICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RL XVsyLjJdIEVuYWJsZSB0aGUgV2F5bGFuZCB0YXJnZXQgYnkgZGVmYXVsdCBpZiB0aGUgR1RLKyBX YXlsYW5kIGRlcGVuZGVuY3kgaXMgYXZhaWxhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjE0MTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFNvdXJjZS9hdXRvdG9vbHMvRmluZERlcGVuZGVuY2ll cy5tNDogSWYgdGhlIFdheWxhbmQgdGFyZ2V0IGlzIG5vdCBzdHJpY3RseSBkaXNhYmxlZCwgYWxz byBjaGVjayB0aGF0IHRoZSBHVEsrIFdheWxhbmQKKyAgICAgICAgcGFja2FnZSAoZ3RrKy13YXls YW5kLTMuMCkgaGFzIGEgcmVjZW50LWVub3VnaCB2ZXJzaW9uLiBJZiB0aGUgZGVwZW5kZW5jeSBj b3VsZCBub3QgYmUgc2F0aXNmaWVkLCBlaXRoZXIgYSB3YXJuaW5nIG9yIGFuCisgICAgICAgIGVy cm9yIGlzIHByaW50ZWQgb3V0LCBkZXBlbmRpbmcgaWYgdGhlIFdheWxhbmQgdGFyZ2V0IHdhcyBy ZXF1aXJlZCBvciBqdXN0IG9wdGlvbmFsLgorICAgICAgICAqIFNvdXJjZS9hdXRvdG9vbHMvUHJp bnRCdWlsZENvbmZpZ3VyYXRpb24ubTQ6IEFkZCBhIG5ldyBtYWNybywgQU1fQVBQRU5EX1RPX0RF U1JJUFRJT04sIHRoYXQncyBoZWxwZnVsIHdoZW4gcHJvZHVjaW5nCisgICAgICAgIGEgZGVzY3Jp cHRpb24gc3RyaW5nIHRoYXQgY2FuIGNvbnRhaW4gbXVsdGlwbGUgaXRlbXMgdGhhdCBzaG91bGQg YmUgbmljZWx5IGZvcm1hdHRlZCB3aGVuIGxpc3RlZCBpbiB0aGF0IHN0cmluZy4gVGhpcyBpcwor ICAgICAgICB0aGVuIHVzZWQgd2hlbiBjcmVhdGluZyB0aGUgZGVzY3JpcHRpb24gZm9yIGFsbCB0 aGUgZW5hYmxlZCB0YXJnZXRzLCBzbyBmb3IgaW5zdGFuY2UgJ3gxMSwgd2F5bGFuZCcgc3RyaW5n IHdvdWxkIGJlIGRpc3BsYXllZAorICAgICAgICBpZiBib3RoIHRoZSBYMTEgYW5kIFdheWxhbmQg dGFyZ2V0cyBhcmUgZW5hYmxlZC4KKyAgICAgICAgKiBTb3VyY2UvYXV0b3Rvb2xzL1JlYWRDb21t YW5kTGluZUFyZ3VtZW50cy5tNDogVGhlIC0td2l0aC10YXJnZXQgY29uZmlndXJhdGlvbiBvcHRp b25zIHNob3VsZCBkZWZhdWx0IHRvICd4MTEsd2F5bGFuZCcgaWYKKyAgICAgICAgbm90IGdpdmVu LCB3aXRoIHRoZSBXYXlsYW5kIHRhcmdldCBpbiB0aGF0IGNhc2Ugbm90IGJlaW5nIGEgaGFyZCBy ZXF1aXJlbWVudCAoaS5lLiBpdCBzaG91bGQgYmUgZGlzYWJsZWQgaWYgdGhlIGRlcGVuZGVuY2ll cworICAgICAgICBmb3IgdGhlIFdheWxhbmQgdGFyZ2V0IGNvdWxkIG5vdCBiZSBmb3VuZCkuCisg ICAgICAgICogU291cmNlL2F1dG90b29scy9WZXJzaW9ucy5tNDogVGhlIEdUSysgV2F5bGFuZCBk ZXBlbmRlbmN5IHNob3VsZCBiZSBvZiB2ZXJzaW9uIDMuOS4xNCBvciBncmVhdGVyICh0aGUgMy4x MCByZWxlYXNlIHNlcmllcykuCisKIDIwMTMtMDktMTEgIEFsYmVydG8gR2FyY2lhICA8YmVydG9A aWdhbGlhLmNvbT4KIAogICAgICAgICBhdXRvZ2VuLnNoOiBmaXggcmVtb3ZhbCBvZiBhdXRvbTR0 ZS5jYWNoZQpJbmRleDogU291cmNlL2F1dG90b29scy9GaW5kRGVwZW5kZW5jaWVzLm00Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9hdXRvdG9vbHMvRmluZERlcGVuZGVuY2llcy5tNAkocmV2aXNpb24g MTU1ODM0KQorKysgU291cmNlL2F1dG90b29scy9GaW5kRGVwZW5kZW5jaWVzLm00CSh3b3JraW5n IGNvcHkpCkBAIC0yMDQsOSArMjA0LDIyIEBACiAgICAgZW5hYmxlX2dseD1ubwogZmkKIAotaWYg dGVzdCAiJHdpdGhfd2F5bGFuZF90YXJnZXQiID0gInllcyI7IHRoZW4KK2lmIHRlc3QgIiR3aXRo X3dheWxhbmRfdGFyZ2V0IiAhPSAibm8iOyB0aGVuCiAgICAgIyBUaGUgR1RLKyBXYXlsYW5kIHRh cmdldCBkZXBlbmRlbmN5IHNob3VsZCBtYXRjaCB0aGUgdmVyc2lvbiBvZiB0aGUgbWFzdGVyIEdU SysgZGVwZW5kZW5jeS4KLSAgICBQS0dfQ0hFQ0tfTU9EVUxFUyhHVEtfV0FZTEFORCwgZ3RrKy13 YXlsYW5kLSRHVEtfQVBJX1ZFUlNJT04gPSAkR1RLX0FDVFVBTF9WRVJTSU9OKQorICAgIFBLR19D SEVDS19NT0RVTEVTKFtHVEtfV0FZTEFORF0sIFsKKyAgICAgICAgZ3RrKy13YXlsYW5kLSRHVEtf QVBJX1ZFUlNJT04gPSAkR1RLX0FDVFVBTF9WRVJTSU9OCisgICAgICAgIGd0aystd2F5bGFuZC0k R1RLX0FQSV9WRVJTSU9OID49IGd0azNfd2F5bGFuZF9yZXF1aXJlZF92ZXJzaW9uCisgICAgXSwg W2hhdmVfZ3RrX3dheWxhbmQ9eWVzXSwgW2hhdmVfZ3RrX3dheWxhbmQ9bm9dKQorICAgIGlmIHRl c3QgIiRoYXZlX2d0a193YXlsYW5kIiA9ICJubyI7IHRoZW4KKyAgICAgICAgaWYgdGVzdCAiJHdp dGhfd2F5bGFuZF90YXJnZXQiID0gInllcyI7IHRoZW4KKyAgICAgICAgICAgIEFDX01TR19FUlJP UihbR1RLKyBXYXlsYW5kIGRlcGVuZGVuY3kgKGd0aystd2F5bGFuZC0kR1RLX0FQSV9WRVJTSU9O ID49IGd0azNfd2F5bGFuZF9yZXF1aXJlZF92ZXJzaW9uKSBub3QgZm91bmQuXSkKKyAgICAgICAg ZWxzZQorICAgICAgICAgICAgQUNfTVNHX1dBUk4oW0dUSysgV2F5bGFuZCBkZXBlbmRlbmN5IChn dGsrLXdheWxhbmQtJEdUS19BUElfVkVSU0lPTiA+PSBndGszX3dheWxhbmRfcmVxdWlyZWRfdmVy c2lvbikgbm90IGZvdW5kLCBkaXNhYmxpbmcgdGhlIFdheWxhbmQgdGFyZ2V0Ll0pCisgICAgICAg ICAgICB3aXRoX3dheWxhbmRfdGFyZ2V0PW5vCisgICAgICAgIGZpCisgICAgZWxzZQorICAgICAg ICB3aXRoX3dheWxhbmRfdGFyZ2V0PXllcworICAgIGZpCiBmaQogCiBBQ19DSEVDS19IRUFERVJT KFtHTC9nbHguaF0sIFtoYXZlX2dseD0ieWVzIl0sIFtoYXZlX2dseD0ibm8iXSkKSW5kZXg6IFNv dXJjZS9hdXRvdG9vbHMvUHJpbnRCdWlsZENvbmZpZ3VyYXRpb24ubTQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL2F1dG90b29scy9QcmludEJ1aWxkQ29uZmlndXJhdGlvbi5tNAkocmV2aXNpb24gMTU1 ODM0KQorKysgU291cmNlL2F1dG90b29scy9QcmludEJ1aWxkQ29uZmlndXJhdGlvbi5tNAkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACitkbmwgQU1fQVBQRU5EX1RPX0RFU0NSSVBUSU9O CitkbmwgQXBwZW5kcyB0aGUgZ2l2ZW4gc3RyaW5nIHRvIHRoZSBkZXNjcmlwdGlvbiB2YXJpYWJs ZSwKK2RubCB1c2luZyBhIHNlcGFyYXRvciBpZiB0aGUgZGVzY3JpcHRpb24gdmFyaWFibGUgaXMg bm90IGVtcHR5LgorZG5sCitkbmwgVXNhZ2U6CitkbmwgQU1fQVBQRU5EX1RPX0RFU0NSSVBUSU9O KFtERVNDUklQVElPTl0sIFtTVFJJTkddKQorQUNfREVGVU4oW0FNX0FQUEVORF9UT19ERVNDUklQ VElPTl0sIFsKKyAgaWYgdGVzdCAiJCQxIiAhPSAiIjsgdGhlbgorICAgICQxPSIkeyQxfSwgIgor ICBmaQorCisgICQxPSIkeyQxfSQyIgorXSkgZG5sIEFNX0FQUEVORF9UT19ERVNDUklQVElPTgor CisKK3RhcmdldF9kZXNjcmlwdGlvbj0iIgoraWYgdGVzdCAiJHdpdGhfeDExX3RhcmdldCIgPSAi eWVzIjsgdGhlbgorICAgIEFNX0FQUEVORF9UT19ERVNDUklQVElPTih0YXJnZXRfZGVzY3JpcHRp b24sICJ4MTEiKQorZmkKK2lmIHRlc3QgIiR3aXRoX3dheWxhbmRfdGFyZ2V0IiA9ICJ5ZXMiOyB0 aGVuCisgICAgQU1fQVBQRU5EX1RPX0RFU0NSSVBUSU9OKHRhcmdldF9kZXNjcmlwdGlvbiwgIndh eWxhbmQiKQorZmkKK2lmIHRlc3QgIiR3aXRoX3RhcmdldCIgPSAid2luMzIiOyB0aGVuCisgICAg QU1fQVBQRU5EX1RPX0RFU0NSSVBUSU9OKHRhcmdldF9kZXNjcmlwdGlvbiwgIndpbjMyIikKK2Zp CitpZiB0ZXN0ICIkd2l0aF90YXJnZXQiID0gInF1YXJ0eiI7IHRoZW4KKyAgICBBTV9BUFBFTkRf VE9fREVTQ1JJUFRJT04odGFyZ2V0X2Rlc2NyaXB0aW9uLCAicXVhcnR6IikKK2ZpCitpZiB0ZXN0 ICIkd2l0aF90YXJnZXQiID0gImRpcmVjdGZiIjsgdGhlbgorICAgIEFNX0FQUEVORF9UT19ERVND UklQVElPTih0YXJnZXRfZGVzY3JpcHRpb24sICJkaXJlY3RmYiIpCitmaQorCiBBQ19PVVRQVVQK IAogZWNobyAiCkBAIC0zMyw3ICs2NSw3IEBACiAKIEdUSysgY29uZmlndXJhdGlvbjoKICBHVEsr IHZlcnNpb24gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6ICR3 aXRoX2d0awotIEdESyB0YXJnZXRzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDogJHdpdGhfdGFyZ2V0CisgR0RLIHRhcmdldHMgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgOiAkdGFyZ2V0X2Rlc2NyaXB0aW9uCiAgSW50cm9z cGVjdGlvbiBzdXBwb3J0ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgOiAkZW5h YmxlX2ludHJvc3BlY3Rpb24KICBHZW5lcmF0ZSBkb2N1bWVudGF0aW9uICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA6ICRlbmFibGVfZ3RrX2RvYwogIgpJbmRleDogU291cmNlL2F1 dG90b29scy9SZWFkQ29tbWFuZExpbmVBcmd1bWVudHMubTQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L2F1dG90b29scy9SZWFkQ29tbWFuZExpbmVBcmd1bWVudHMubTQJKHJldmlzaW9uIDE1NTgzNCkK KysrIFNvdXJjZS9hdXRvdG9vbHMvUmVhZENvbW1hbmRMaW5lQXJndW1lbnRzLm00CSh3b3JraW5n IGNvcHkpCkBAIC01NCw3ICs1NCw3IEBACiAgICAgICAgICAgICAqKSBBQ19NU0dfRVJST1IoW0lu dmFsaWQgdGFyZ2V0OiBtdXN0IGJlIHgxMSwgd2F5bGFuZCwgYm90aCB4MTEgYW5kIHdheWxhbmQg KHgxMSx3YXlsYW5kKSwgcXVhcnR6LCB3aW4zMiwgb3IgZGlyZWN0ZmIuXSkgOzsKICAgICAgICAg ZXNhYwogICAgIF0sCi0gICAgW3dpdGhfdGFyZ2V0PSJ4MTEiXSkKKyAgICBbd2l0aF90YXJnZXQ9 IngxMSx3YXlsYW5kIjsgd2l0aF93YXlsYW5kX3RhcmdldD0iYXV0byJdKQogQUNfTVNHX1JFU1VM VChbJHdpdGhfdGFyZ2V0XSkKIAogIyBUbyBzdXBwb3J0IGJ1aWxkaW5nIGZvciBYMTEgYW5kIFdh eWxhbmQgdGFyZ2V0cyBjb25jdXJyZW50bHksIHRoZSAkd2l0aF90YXJnZXQgdmFsdWUgaXMgY2hl Y2tlZCBmb3IgdGhpcwpAQCAtNjIsNyArNjIsOSBAQAogIyB0aGUgWDExIHRhcmdldCwgdGhlIFdh eWxhbmQgdGFyZ2V0LCBib3RoIG9mIHRoZXNlIG9yIG5laXRoZXIuCiBpZiB0ZXN0ICIkd2l0aF90 YXJnZXQiID0gIngxMSx3YXlsYW5kIjsgdGhlbgogICAgIHdpdGhfeDExX3RhcmdldD15ZXMKLSAg ICB3aXRoX3dheWxhbmRfdGFyZ2V0PXllcworICAgIGlmIHRlc3QgIiR3aXRoX3dheWxhbmRfdGFy Z2V0IiAhPSAiYXV0byI7IHRoZW4KKyAgICAgICAgd2l0aF93YXlsYW5kX3RhcmdldD15ZXMKKyAg ICBmaQogZWxpZiB0ZXN0ICIkd2l0aF90YXJnZXQiID0gIngxMSI7IHRoZW4KICAgICB3aXRoX3gx MV90YXJnZXQ9eWVzCiAgICAgd2l0aF93YXlsYW5kX3RhcmdldD1ubwpJbmRleDogU291cmNlL2F1 dG90b29scy9WZXJzaW9ucy5tNAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvYXV0b3Rvb2xzL1ZlcnNp b25zLm00CShyZXZpc2lvbiAxNTU4MzQpCisrKyBTb3VyY2UvYXV0b3Rvb2xzL1ZlcnNpb25zLm00 CSh3b3JraW5nIGNvcHkpCkBAIC0xOCw2ICsxOCw3IEBACiBtNF9kZWZpbmUoW2d0azJfcmVxdWly ZWRfdmVyc2lvbl0sIFsyLjI0LjEwXSkKIG00X2RlZmluZShbZ2FpbDJfcmVxdWlyZWRfdmVyc2lv bl0sIFsxLjhdKQogbTRfZGVmaW5lKFtndGszX3JlcXVpcmVkX3ZlcnNpb25dLCBbMy42LjBdKQor bTRfZGVmaW5lKFtndGszX3dheWxhbmRfcmVxdWlyZWRfdmVyc2lvbl0sIFszLjkuMTRdKQogbTRf ZGVmaW5lKFtnYWlsM19yZXF1aXJlZF92ZXJzaW9uXSwgWzMuMF0pCiAKIG00X2RlZmluZShbYXRz cGkyX3JlcXVpcmVkX3ZlcnNpb25dLCBbMi41LjNdKQo=