diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-22 15:17:53 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-09-22 15:17:53 -0500 |
| commit | 2203f710988eaa3061e75b083296944e34e17d59 (patch) | |
| tree | ab998c8df770f34affb35b6864f7363038fb88ec | |
| parent | cd619d3e9d683237f6317f979d5c6a7290d7e429 (diff) | |
| download | libproxy-git-2203f710988eaa3061e75b083296944e34e17d59.tar.gz | |
Disable mozjs extension by default
mozjs doesn't have a stable API, so distros wind up carrying a bunch of
patches to make it work with newer mozjs. Crashes ensue if it gets
linked into gjs applications and the versions don't match. There's
really no benefit to using this over the WebKit extension, so let's
nudge distros towards using that instead.
Distros: don't wait for this commit, go ahead and build with
-DWITH_MOZJS=OFF today to use the WebKit backend instead.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | libproxy/cmake/modules.cmk | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 6d3e81d..67abba4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,6 +39,7 @@ script: -DWITH_GNOME3=ON \ -DWITH_KDE=ON \ -DWITH_WEBKIT3=ON \ + -DWITH_MOZJS=ON \ -DBIPR=0 - make - sudo make install @@ -101,7 +101,7 @@ WITH_KDE: Default to ON. Enables plug-in to read proxy settings Note: this plug-in only has a *runtime* dependency on either kreadconfig or kreadconfig5. -WITH_MOZJS: Default to ON. Enable Mozilla javascript bindings. As +WITH_MOZJS: Default to OFF. Enable Mozilla javascript bindings. As Mozilla Javascript engine is often installed multiple you can set prefered order using MOZJS_SEARCH_ORDER, wich defaults to "xulrunner-js;firefox-js;mozilla-js;seamonkey-js". diff --git a/libproxy/cmake/modules.cmk b/libproxy/cmake/modules.cmk index 0794a6e..11d2d43 100644 --- a/libproxy/cmake/modules.cmk +++ b/libproxy/cmake/modules.cmk @@ -44,7 +44,7 @@ if(NM_FOUND OR NMold_FOUND) set(NM_BUILD 1) endif(NM_FOUND OR NMold_FOUND) px_module(network_networkmanager "${NM_BUILD}" 0 ${NM_LIBRARIES}${NMold_LIBRARIES}) -px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES}) +px_module(pacrunner_mozjs 0 ${BIPR} ${MOZJS_LIBRARIES}) px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) px_module(wpad_dns_alias 1 1) |