126688 2014-01-09 03:02:21 -0800 [GTK] Add an option to enable MiniBrowser for non developer builds and always install it 2016-09-29 02:30:54 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 135752 1 bugzilla webkit-unassigned berto cgarcia clopez gustavo mcatanzaro mrobinson pnormand oldest_to_newest 965825 0 bugzilla 2014-01-09 03:02:21 -0800 So that distributions can ship it in the -devel package. It's useful for debugging bugs in other users of webkitgtk such as epiphany or gnome-online-accounts. 1009087 1 clopez 2014-05-13 14:51:53 -0700 Seems that Debian has a patch for this: http://anonscm.debian.org/gitweb/?p=pkg-webkit/webkit.git;a=blob;f=debian/patches/install-minibrowser.patch 1009219 2 berto 2014-05-14 03:35:31 -0700 (In reply to comment #1) > Seems that Debian has a patch for this Yes, I actually wrote that patch :) I see how shipping the MiniBrowser is useful, I'm not so sure about the best way to do it upstream, though. Would you install it in all cases? Would you put it under /usr/bin or somewhere else? 1009226 3 gustavo 2014-05-14 05:08:53 -0700 How about on libexec? 1009230 4 berto 2014-05-14 05:16:17 -0700 (In reply to comment #3) > How about on libexec? That's what we do in Debian, and I have to say that I'm not completely convinced, but whatever. There's one more thing: we're hardcoding WEBKIT_INJECTED_BUNDLE_PATH to the build directory via g_setenv() so the user can test the MiniBrowser without having to install webkitgtk. If we are going to to install the MiniBrowser we don't want to hardcode that, but we still want users to be able to run it from the build directory. So we have to come up with a solution. 1075941 5 cgarcia 2015-03-10 03:43:03 -0700 (In reply to comment #2) > (In reply to comment #1) > > Seems that Debian has a patch for this > > Yes, I actually wrote that patch :) > > I see how shipping the MiniBrowser is useful, I'm not so sure about > the best way to do it upstream, though. > > Would you install it in all cases? Would you put it under /usr/bin or > somewhere else? gtk3-demo, for example, is provided in debian by gtk-3-examples and it's installed in /usr/bin. So, I think we could install it in /usr/bin by default, and distros can patch that if the want. 1075949 6 248329 cgarcia 2015-03-10 05:36:12 -0700 Created attachment 248329 Patch So, in the end I've added an option ENABLE_MINIBROWSER, that is enabled by default on development builds and disable for production builds to keep backwards compatibility. It can be enabled for production builds by passing -DENABLE_MINIBROWSER=ON. And it's always installed when enabled. 1075991 7 248329 zan 2015-03-10 11:01:53 -0700 Comment on attachment 248329 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248329&action=review > Tools/MiniBrowser/gtk/CMakeLists.txt:-48 > -add_definitions(-DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") Is this not needed anymore? > Tools/MiniBrowser/gtk/main.c:259 > +#if defined(DEVELOPMENT_BUILD) Where is DEVELOPMENT_BUILD defined? should this also check that DEVELOPMENT_BUILD is defined to a non-null value? 1075993 8 248329 zan 2015-03-10 11:03:39 -0700 Comment on attachment 248329 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248329&action=review >> Tools/MiniBrowser/gtk/main.c:259 >> +#if defined(DEVELOPMENT_BUILD) > > Where is DEVELOPMENT_BUILD defined? should this also check that DEVELOPMENT_BUILD is defined to a non-null value? Just saw, it's defined in bug #135752. 1075995 9 cgarcia 2015-03-10 11:06:52 -0700 (In reply to comment #7) > Comment on attachment 248329 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=248329&action=review > > > Tools/MiniBrowser/gtk/CMakeLists.txt:-48 > > -add_definitions(-DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") > > Is this not needed anymore? No, I guess we removed that at some point and forgot to remove this from the makefile. The binaries are all in bin, including MiniBroeser, so for development builds, those will be used. 1075996 10 cgarcia 2015-03-10 11:07:33 -0700 (In reply to comment #8) > Comment on attachment 248329 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=248329&action=review > > >> Tools/MiniBrowser/gtk/main.c:259 > >> +#if defined(DEVELOPMENT_BUILD) > > > > Where is DEVELOPMENT_BUILD defined? should this also check that DEVELOPMENT_BUILD is defined to a non-null value? > > Just saw, it's defined in bug #135752. Yes, that's why I made this bug depend on #135752 1076372 11 cgarcia 2015-03-11 11:09:16 -0700 Committed r181395: <http://trac.webkit.org/changeset/181395> 1233792 12 mcatanzaro 2016-09-27 03:14:18 -0700 (In reply to comment #4) > (In reply to comment #3) > > How about on libexec? > > That's what we do in Debian, and I have to say that I'm not completely > convinced, but whatever. It should go into pkglibexecdir (i.e. $(libexecdir)/webkit2gtk-4.0) so that it can be parallel-installable. Bug #162602. P.S. Berto, you should really drop the patch in the Debian package and pass -DENABLE_MINIBROWSER=ON in the Debian rules file instead. 1233796 13 mcatanzaro 2016-09-27 03:23:15 -0700 (In reply to comment #12) > It should go into pkglibexecdir (i.e. $(libexecdir)/webkit2gtk-4.0) so that > it can be parallel-installable. Bug #162602. That's actually what the Debian patch does, the LIBEXEC_INSTALL_DIR CMake variable is actually set to pkglibexecdir. 1234758 14 berto 2016-09-29 02:30:54 -0700 (In reply to comment #12) > P.S. Berto, you should really drop the patch in the Debian package > and pass -DENABLE_MINIBROWSER=ON in the Debian rules file instead. Yeah, now after r206434 I'll drop the patch. 248329 2015-03-10 05:36:12 -0700 2015-03-11 07:14:23 -0700 Patch wk-enable-minibrowser.diff text/plain 5494 cgarcia ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA5MDE4NWJjLi41NTk1Yjcy IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAK IDIwMTUtMDMtMTAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgog CisgICAgICAgIFtHVEtdIEFkZCBhbiBvcHRpb24gdG8gZW5hYmxlIE1pbmlCcm93c2VyIGZvciBu b24gZGV2ZWxvcGVyIGJ1aWxkcyBhbmQgYWx3YXlzIGluc3RhbGwgaXQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNjY4OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBFTkFCTEVfTUlOSUJST1dTRVIg b3B0aW9uLCBlbmFibGVkIGJ5IGRlZmF1bHQgZm9yIGRldmVsb3BtZW50CisgICAgICAgIGJ1aWxk cyBhbmQgZGlzYWJsZWQgZm9yIHByb2R1Y3Rpb24gYnVpbGRzIHVubGVzcyBleHBsaWNpbHR5IGVu YWJsZWQuCisKKyAgICAgICAgKiBTb3VyY2UvY21ha2UvT3B0aW9uc0dUSy5jbWFrZToKKworMjAx NS0wMy0xMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAg ICAgICAgW0dUS10gRG8gbm90IGxvb2sgZm9yIGNoaWxkIHByb2Nlc3NlcyBpbiB0aGUgVUkgcHJv Y2VzcyBiaW5hcnkgcGF0aAogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM1NzUyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9jbWFrZS9PcHRpb25zR1RLLmNt YWtlIGIvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKaW5kZXggODZmNDJiYS4uNTRlNTRl MyAxMDA2NDQKLS0tIGEvU291cmNlL2NtYWtlL09wdGlvbnNHVEsuY21ha2UKKysrIGIvU291cmNl L2NtYWtlL09wdGlvbnNHVEsuY21ha2UKQEAgLTc4LDYgKzc4LDcgQEAgZW5kaWYgKCkKIAogV0VC S0lUX09QVElPTl9CRUdJTigpCiBXRUJLSVRfT1BUSU9OX0RFRklORShFTkFCTEVfUExVR0lOX1BS T0NFU1NfR1RLMiAiV2hldGhlciB0byBidWlsZCBXZWJLaXRQbHVnaW5Qcm9jZXNzMiB0byBsb2Fk IEdUSzIgYmFzZWQgcGx1Z2lucy4iIE9OKQorV0VCS0lUX09QVElPTl9ERUZJTkUoRU5BQkxFX01J TklCUk9XU0VSICJXaGV0aGVyIHRvIGVuYWJsZSBNaW5pQnJvd3NlciBjb21waWxhdGlvbi4iIE9G RikKIAogaWYgKChPUEVOR0xfRk9VTkQgT1IgT1BFTkdMRVMyX0ZPVU5EKSBBTkQgKEdMWF9GT1VO RCBPUiBFR0xfRk9VTkQpKQogICAgIFdFQktJVF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVO QUJMRV9XRUJHTCBPTikKQEAgLTEyNSwxMCArMTI2LDEwIEBAIGVsc2UgKCkKIGVuZGlmICgpCiAK IGlmIChERVZFTE9QRVJfTU9ERSkKLSAgICBzZXQoRU5BQkxFX1RPT0xTIE9OKQorICAgIFdFQktJ VF9PUFRJT05fREVGQVVMVF9QT1JUX1ZBTFVFKEVOQUJMRV9NSU5JQlJPV1NFUiBPTikKICAgICBX RUJLSVRfT1BUSU9OX0RFRkFVTFRfUE9SVF9WQUxVRShFTkFCTEVfQVBJX1RFU1RTIE9OKQogZWxz ZSAoKQotICAgIHNldChFTkFCTEVfVE9PTFMgT0ZGKQorICAgIFdFQktJVF9PUFRJT05fREVGQVVM VF9QT1JUX1ZBTFVFKEVOQUJMRV9NSU5JQlJPV1NFUiBPRkYpCiAgICAgV0VCS0lUX09QVElPTl9E RUZBVUxUX1BPUlRfVkFMVUUoRU5BQkxFX0FQSV9URVNUUyBPRkYpCiAgICAgc2V0KFdlYktpdDJf VkVSU0lPTl9TQ1JJUFQgIi1XbCwtLXZlcnNpb24tc2NyaXB0LCR7Q01BS0VfTU9EVUxFX1BBVEh9 L2d0a3N5bWJvbHMuZmlsdGVyIikKIGVuZGlmICgpCmRpZmYgLS1naXQgYS9Ub29scy9DTWFrZUxp c3RzLnR4dCBiL1Rvb2xzL0NNYWtlTGlzdHMudHh0CmluZGV4IDRkNGQ1OTcuLjY0MGRhNWYgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NNYWtlTGlzdHMudHh0CisrKyBiL1Rvb2xzL0NNYWtlTGlzdHMudHh0 CkBAIC0xLDIwICsxLDIzIEBACi1pZiAoRU5BQkxFX1dFQktJVDIpCi0gICAgYWRkX3N1YmRpcmVj dG9yeShXZWJLaXRUZXN0UnVubmVyKQotZW5kaWYgKCkKLQogaWYgKCIke1BPUlR9IiBTVFJFUVVB TCAiRWZsIikKKyAgICBhZGRfc3ViZGlyZWN0b3J5KFdlYktpdFRlc3RSdW5uZXIpCiAgICAgYWRk X3N1YmRpcmVjdG9yeShJbWFnZURpZmYpCiAKICAgICBhZGRfc3ViZGlyZWN0b3J5KE1pbmlCcm93 c2VyL2VmbCkKICAgICBhZGRfc3ViZGlyZWN0b3J5KER1bXBSZW5kZXJUcmVlL1Rlc3ROZXRzY2Fw ZVBsdWdJbikKIGVsc2VpZiAoIiR7UE9SVH0iIFNUUkVRVUFMICJHVEsiKQotICAgIGFkZF9zdWJk aXJlY3RvcnkoSW1hZ2VEaWZmKQotICAgIGlmIChFTkFCTEVfV0VCS0lUMikKLSAgICAgICAgYWRk X3N1YmRpcmVjdG9yeShNaW5pQnJvd3Nlci9ndGspCi0gICAgICAgIGFkZF9zdWJkaXJlY3Rvcnko VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrKQorICAgIGlmIChERVZFTE9QRVJfTU9ERSkK KyAgICAgIGFkZF9zdWJkaXJlY3RvcnkoV2ViS2l0VGVzdFJ1bm5lcikKKyAgICAgIGFkZF9zdWJk aXJlY3RvcnkoSW1hZ2VEaWZmKQorICAgICAgaWYgKEVOQUJMRV9BUElfVEVTVFMpCisgICAgICAg ICAgYWRkX3N1YmRpcmVjdG9yeShUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGspCisgICAg ICBlbmRpZiAoKQorICAgICAgaWYgKEVOQUJMRV9YMTFfVEFSR0VUKQorICAgICAgICAgIGFkZF9z dWJkaXJlY3RvcnkoRHVtcFJlbmRlclRyZWUvVGVzdE5ldHNjYXBlUGx1Z0luKQorICAgICAgZW5k aWYgKCkKICAgICBlbmRpZiAoKQotICAgIGlmIChFTkFCTEVfWDExX1RBUkdFVCkKLSAgICAgICAg YWRkX3N1YmRpcmVjdG9yeShEdW1wUmVuZGVyVHJlZS9UZXN0TmV0c2NhcGVQbHVnSW4pCisKKyAg ICBpZiAoRU5BQkxFX01JTklCUk9XU0VSKQorICAgICAgICBhZGRfc3ViZGlyZWN0b3J5KE1pbmlC cm93c2VyL2d0aykKICAgICBlbmRpZiAoKQogZW5kaWYgKCkKIApkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFiNTlmNjQuLmE3NWJlM2YgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OSBAQAorMjAxNS0wMy0xMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0dUS10gQWRkIGFuIG9wdGlvbiB0byBlbmFibGUgTWluaUJyb3dzZXIg Zm9yIG5vbiBkZXZlbG9wZXIgYnVpbGRzIGFuZCBhbHdheXMgaW5zdGFsbCBpdAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2Njg4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBDTWFrZUxpc3RzLnR4dDog QnVpbGQgdGVzdGluZyB0b29scyBvbmx5IGZvciBkZXZlbG9wZXIgYnVpbGRzLAorICAgICAgICBi dXQgTWluaUJyb3dzZXIgd2hlbiBFTkFCTEVfTUlOSUJST1dTRVIgb3B0aW9uIGlzIE9OLgorICAg ICAgICAqIE1pbmlCcm93c2VyL2d0ay9DTWFrZUxpc3RzLnR4dDogT25seSBhZGQKKyAgICAgICAg LURXRUJLSVRfSU5KRUNURURfQlVORExFX1BBVEggdG8gdGhlIGJ1aWxkIGZvciBkZXZlbG9wZXIg YnVpbGRzLAorICAgICAgICBhbmQgYWRkIGEgcnVsZSB0byBpbnN0YWxsIHRoZSBNaW5pQnJvd3Nl ci4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci9ndGsvbWFpbi5jOgorICAgICAgICAobWFpbik6IE9u bHkgc2V0IFdFQktJVF9JTkpFQ1RFRF9CVU5ETEVfUEFUSCBlbnYgdmFyIGZvciBkZXZlbG9wZXIK KyAgICAgICAgYnVpbGRzLgorCiAyMDE1LTAzLTA5ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBh cHBsZS5jb20+CiAKICAgICAgICAgQXR0ZW1wdCB0byBmaXggdGltZW91dHMgb24gaU9TIFNpbXVs YXRvciBsYXlvdXQgdGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9DTWFr ZUxpc3RzLnR4dCBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9DTWFrZUxpc3RzLnR4dAppbmRleCBj OTY1MDlkLi4yY2Y5M2U4IDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9ndGsvQ01ha2VM aXN0cy50eHQKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvZ3RrL0NNYWtlTGlzdHMudHh0CkBAIC00 NSwxMCArNDUsMTMgQEAgYWRkX2N1c3RvbV9jb21tYW5kKAogICAgIENPTU1BTkQgZ2xpYi1nZW5t YXJzaGFsIC0tcHJlZml4PWJyb3dzZXJfbWFyc2hhbCAke01JTklCUk9XU0VSX0RJUn0vYnJvd3Nl ci1tYXJzaGFsLmxpc3QgLS1oZWFkZXIgPiAke0RFUklWRURfU09VUkNFU19NSU5JQlJPV1NFUl9E SVJ9L0Jyb3dzZXJNYXJzaGFsLmgKICAgICBWRVJCQVRJTSkKIAotYWRkX2RlZmluaXRpb25zKC1E V0VCS0lUX0VYRUNfUEFUSD0iJHtDTUFLRV9SVU5USU1FX09VVFBVVF9ESVJFQ1RPUll9IikKLWFk ZF9kZWZpbml0aW9ucygtRFdFQktJVF9JTkpFQ1RFRF9CVU5ETEVfUEFUSD0iJHtDTUFLRV9MSUJS QVJZX09VVFBVVF9ESVJFQ1RPUll9IikKK2lmIChERVZFTE9QRVJfTU9ERSkKKyAgICBhZGRfZGVm aW5pdGlvbnMoLURXRUJLSVRfSU5KRUNURURfQlVORExFX1BBVEg9IiR7Q01BS0VfTElCUkFSWV9P VVRQVVRfRElSRUNUT1JZfSIpCitlbmRpZiAoKQogCiBpbmNsdWRlX2RpcmVjdG9yaWVzKCR7TWlu aUJyb3dzZXJfSU5DTFVERV9ESVJFQ1RPUklFU30pCiBhZGRfZXhlY3V0YWJsZShNaW5pQnJvd3Nl ciAke01pbmlCcm93c2VyX1NPVVJDRVN9KQogdGFyZ2V0X2xpbmtfbGlicmFyaWVzKE1pbmlCcm93 c2VyICR7TWluaUJyb3dzZXJfTElCUkFSSUVTfSkKIHNldF90YXJnZXRfcHJvcGVydGllcyhNaW5p QnJvd3NlciBQUk9QRVJUSUVTIEZPTERFUiAiVG9vbHMiKQorCitpbnN0YWxsKFRBUkdFVFMgTWlu aUJyb3dzZXIgREVTVElOQVRJT04gIiR7RVhFQ19JTlNUQUxMX0RJUn0iKQpcIE5vIG5ld2xpbmUg YXQgZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMg Yi9Ub29scy9NaW5pQnJvd3Nlci9ndGsvbWFpbi5jCmluZGV4IGU1ZTRkYTMuLjQ3MGMzZDggMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9tYWluLmMKKysrIGIvVG9vbHMvTWluaUJy b3dzZXIvZ3RrL21haW4uYwpAQCAtMjU2LDcgKzI1Niw5IEBAIGFib3V0VVJJU2NoZW1lUmVxdWVz dENhbGxiYWNrKFdlYktpdFVSSVNjaGVtZVJlcXVlc3QgKnJlcXVlc3QsIGdwb2ludGVyIHVzZXJE YXRhCiBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQogewogICAgIGd0a19pbml0KCZh cmdjLCAmYXJndik7CisjaWYgZGVmaW5lZChERVZFTE9QTUVOVF9CVUlMRCkKICAgICBnX3NldGVu digiV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9QQVRIIiwgV0VCS0lUX0lOSkVDVEVEX0JVTkRMRV9Q QVRILCBGQUxTRSk7CisjZW5kaWYKIAogICAgIGNvbnN0IGdjaGFyICptdWx0aXByb2Nlc3MgPSBn X2dldGVudigiTUlOSUJST1dTRVJfTVVMVElQUk9DRVNTIik7CiAgICAgaWYgKG11bHRpcHJvY2Vz cyAmJiAqbXVsdGlwcm9jZXNzKSB7Cg==