pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www/cliqz



Module Name:    pkgsrc
Committed By:   fox
Date:           Fri Jul 24 07:29:32 UTC 2020

Modified Files:
        pkgsrc/www/cliqz: Makefile PLIST distinfo mozilla-common.mk
        pkgsrc/www/cliqz/patches: patch-cliqz__env.sh
            patch-mozilla-release_js_src_jsfriendapi.h
            patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp
Added Files:
        pkgsrc/www/cliqz/patches: patch-mozilla-release_configure.in
            patch-mozilla-release_gfx_cairo_cairo_src_cairo-type1-subset.c
            patch-mozilla-release_gfx_thebes_gfxPlatform.cpp
            patch-mozilla-release_mach
            patch-mozilla-release_media_libtheora_lib_info.c
            patch-mozilla-release_media_libvorbis_lib_vorbis__info.c
            patch-mozilla-release_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
            patch-mozilla-release_security_nss_lib_freebl_mpi_mpi.c
            patch-mozilla-release_third__party_rust_authenticator_.cargo-checksum.json
            patch-mozilla-release_third__party_rust_authenticator_src_lib.rs
            patch-mozilla-release_third__party_rust_authenticator_src_netbsd_device.rs
            patch-mozilla-release_third__party_rust_authenticator_src_netbsd_fd.rs
            patch-mozilla-release_third__party_rust_authenticator_src_netbsd_mod.rs
            patch-mozilla-release_third__party_rust_authenticator_src_netbsd_monitor.rs
            patch-mozilla-release_third__party_rust_authenticator_src_netbsd_transaction.rs
            patch-mozilla-release_third__party_rust_authenticator_src_netbsd_uhid.rs
            patch-mozilla-release_third__party_rust_getrandom_src_lib.rs
            patch-mozilla-release_widget_gtk_WaylandDMABufSurface.cpp
Removed Files:
        pkgsrc/www/cliqz/patches: patch-mozilla-release_image_imgFrame.h

Log Message:
www/cliqz: Updates to 1.38.0

- Removes some of the obsolete patches.
- Bumps versions of dependencies.

Changes since 1.36.0:

Merge with Firefox 78.0.2


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/cliqz/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/cliqz/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/cliqz/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/cliqz/mozilla-common.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/cliqz/patches/patch-cliqz__env.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_configure.in \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_cairo_cairo_src_cairo-type1-subset.c \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_thebes_gfxPlatform.cpp \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_mach \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libtheora_lib_info.c \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libvorbis_lib_vorbis__info.c \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_security_nss_lib_freebl_mpi_mpi.c \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_.cargo-checksum.json \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_lib.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_device.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_fd.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_mod.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_monitor.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_transaction.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_uhid.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_getrandom_src_lib.rs \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_widget_gtk_WaylandDMABufSurface.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_image_imgFrame.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/cliqz/Makefile
diff -u pkgsrc/www/cliqz/Makefile:1.43 pkgsrc/www/cliqz/Makefile:1.44
--- pkgsrc/www/cliqz/Makefile:1.43      Sun Jun 14 15:33:28 2020
+++ pkgsrc/www/cliqz/Makefile   Fri Jul 24 07:29:32 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2020/06/14 15:33:28 nia Exp $
+# $NetBSD: Makefile,v 1.44 2020/07/24 07:29:32 fox Exp $
 
-DISTNAME=      cliqz-1.36.0
-PKGREVISION=   1
+DISTNAME=      cliqz-1.38.0
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=cliqz-oss/}
 GITHUB_PROJECT=        browser-f
@@ -16,7 +15,7 @@ DIST_SUBDIR=  ${PKGNAME_NOREV}
 CLIQZ_CHANNEL=         release
 # If the PKGVERSION_NOREV is updated, make sure to update the last build id from
 # ftp -Vo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/lastbuildid
-CLIQZ_LAST_BUILD_ID=   20200512121102
+CLIQZ_LAST_BUILD_ID=   20200721193739
 CLIQZ_PLUGIN_SUFX=     @cliqz.com.xpi
 
 SITES.adult-domains.bin= \
@@ -54,24 +53,33 @@ USE_TOOLS+= pkg-config perl gmake autoco
 # so outside the normal compiler selection framework.
 USE_LANGUAGES+=        c99 c++
 
+.include "mozilla-common.mk"
+.include "options.mk"
+
 # Build script does not support python 3.x yet.
 # https://firefox-source-docs.mozilla.org/build/buildsystem/python.html
 PYTHON_VERSIONS_ACCEPTED=      27
 PYTHON_FOR_BUILD_ONLY=         tool
-TOOL_DEPENDS+=                 cbindgen>=0.13.1:../../devel/cbindgen
+TOOL_DEPENDS+=                 cbindgen>=0.14.2:../../devel/cbindgen
 TOOL_DEPENDS+=                 nodejs-[0-9]*:../../lang/nodejs
 
+.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
+TOOL_DEPENDS+=                 python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
+ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
+.else
+TOOL_DEPENDS+=                 python37-[0-9]*:../../lang/python37
+ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python3.7
+.endif
+
 # Depend on Python3 sqlite3 module.
 .if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
 BUILD_DEPENDS+=                        py${PYTHON_VERSION_DEFAULT}-sqlite3-[0-9]*:../../databases/py-sqlite3
 .else
 BUILD_DEPENDS+=                        py37-sqlite3-[0-9]*:../../databases/py-sqlite3
 .endif
-# XXX: For now depend on python 2.7 version of sqlite3 since cliqz
-# cannot detect py37-sqlite3 correctly.
-BUILD_DEPENDS+=                        py27-sqlite3-[0-9]*:../../databases/py-sqlite3
+
 BUILD_DEPENDS+=                        yasm>=1.1:../../devel/yasm
-BUILD_DEPENDS+=                        nasm>=1.1:../../devel/nasm
+BUILD_DEPENDS+=                        nasm>=2.14:../../devel/nasm
 
 WRKSRC=                        ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
@@ -84,9 +92,6 @@ MAKE_ENV+=    CQZ_RELEASE_CHANNEL=${CLIQZ_C
 MAKE_ENV+=     CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID}
 MAKE_ENV+=     MOZBUILD_STATE_PATH=${WRKDIR}/.home/.mozbuild
 
-.include "mozilla-common.mk"
-.include "options.mk"
-
 CHECK_WRKREF_SKIP+=    lib/cliqz/chrome/toolkit/content/global/buildconfig.html
 
 REPLACE_BASH+= magic_build_and_package.sh
@@ -99,35 +104,43 @@ NOT_PAX_MPROTECT_SAFE+=    lib/cliqz/cliqz
 NOT_PAX_MPROTECT_SAFE+=        lib/cliqz/cliqz-bin
 NOT_PAX_MPROTECT_SAFE+=        lib/cliqz/plugin-container
 
+#
+# Generate list of subst entries for various .cargo-checksum.json files.  These
+# are all handled together in one big substitution to simplify things rather
+# than one substitution entry per file, but are kept separate below to ease
+# updating and verification.
+#
+
+CKSUM_CRATES+= mozilla-release/third_party/rust/libc
+
+# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs
+CKSUMS+=       a3540eab4dbc52e006e84e288bad17e1dae3865fea49020e0ed8b5a7724a9532
+CKSUMS+=       5e58a2109f5eff0f497dfac150c161c1d517a2227b49e086da96c3d66522ac3a
+
+CKSUM_CRATES+= mozilla-release/third_party/rust/getrandom
+
+# patch-third__party_rust_getrandom_src_lib.rs
+CKSUMS+=       0e52f6bde42d7bb05c297ce1c25b9879d61b28caba98f6226a152bff538db6c2
+CKSUMS+=       394425b4ba03c21c494e64d993678f7014575b1e3d590b9ee452b5c2d83ec4ac
+
+SUBST_CLASSES+=                cksum
+SUBST_STAGE.cksum=     pre-configure
+.for crate in ${CKSUM_CRATES}
+SUBST_FILES.cksum+=    ${crate}/.cargo-checksum.json
+.endfor
+.for from to in ${CKSUMS}
+SUBST_SED.cksum+=      -e 's,${from},${to},g'
+.endfor
+
 post-extract:
-       ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}
+       ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin \
+               ${WRKSRC}/mozilla-release/browser/adult-domains.bin
        ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features
        ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz${CLIQZ_PLUGIN_SUFX} \
                ${DISTDIR}/${DIST_SUBDIR}/dat${CLIQZ_PLUGIN_SUFX} \
                ${DISTDIR}/${DIST_SUBDIR}/https-everywhere${CLIQZ_PLUGIN_SUFX} \
                ${DISTDIR}/${DIST_SUBDIR}/gdprtool${CLIQZ_PLUGIN_SUFX} \
                ${WRKSRC}/obj/dist/bin/browser/features
-# XXX Hack taken from lang/rust.
-# XXX Taken from www/firefox.
-# patch(1) in NetBSD does not handle .cargo-checksum.json like long width file.
-# Replace checksum fields for following patches:
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1
-# patch-third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_other_mod.rs,v 1.1
-# patch-rust-1.39.0
-       ${CP} ${WRKSRC}/mozilla-release/third_party/rust/libc/.cargo-checksum.json \
-             ${WRKSRC}/mozilla-release/third_party/rust/libc/.cargo-checksum.json.orig
-       ${SED}  -e 's/4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212/7f3da734d5e2e9426051da4f406e46d9e9bed43ed2d7d048e8afc8af7ed44795/' \
-               -e 's/1cd66ed5967c788562d4ad626cfbeb1544f4b9267111de5f6790379b8327f28e/6ae549dd21581748b2f1d82880eaca3445c11e3354965e5b49b20342075a3e52/' \
-               -e 's/a3540eab4dbc52e006e84e288bad17e1dae3865fea49020e0ed8b5a7724a9532/5e58a2109f5eff0f497dfac150c161c1d517a2227b49e086da96c3d66522ac3a/' \
-               < ${WRKSRC}/mozilla-release/third_party/rust/libc/.cargo-checksum.json.orig \
-               > ${WRKSRC}/mozilla-release/third_party/rust/libc/.cargo-checksum.json
-       ${CP} ${WRKSRC}/mozilla-release/third_party/rust/bindgen/.cargo-checksum.json \
-             ${WRKSRC}/mozilla-release/third_party/rust/bindgen/.cargo-checksum.json.orig
-       ${SED}  -e 's/5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd/8c92a52c0f859c7bec7bfbc36b9d18f904baab0c8c9dc1b3e7af34de1a0b0da4/' \
-               -e 's/b73865b6689d4f3546edd91909a47c329c4ae630ea97715d29bc683ae1dc17ad/efdada601d13c489451da9d65a78c42598841cebddf6f3a8012add2380628a51/' \
-               -e 's/34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db/e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe/' \
-               < ${WRKSRC}/mozilla-release/third_party/rust/bindgen/.cargo-checksum.json.orig \
-               > ${WRKSRC}/mozilla-release/third_party/rust/bindgen/.cargo-checksum.json
 
 post-patch:
        ${SED}  -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \

Index: pkgsrc/www/cliqz/PLIST
diff -u pkgsrc/www/cliqz/PLIST:1.12 pkgsrc/www/cliqz/PLIST:1.13
--- pkgsrc/www/cliqz/PLIST:1.12 Sun May 17 10:10:18 2020
+++ pkgsrc/www/cliqz/PLIST      Fri Jul 24 07:29:32 2020
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.12 2020/05/17 10:10:18 fox Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/07/24 07:29:32 fox Exp $
 bin/cliqz
+lib/cliqz/actors/AboutHttpsOnlyErrorChild.jsm
+lib/cliqz/actors/AboutHttpsOnlyErrorParent.jsm
 lib/cliqz/actors/AudioPlaybackChild.jsm
 lib/cliqz/actors/AudioPlaybackParent.jsm
 lib/cliqz/actors/AutoCompleteChild.jsm
@@ -28,6 +30,7 @@ lib/cliqz/actors/PopupBlockingChild.jsm
 lib/cliqz/actors/PopupBlockingParent.jsm
 lib/cliqz/actors/PrintingChild.jsm
 lib/cliqz/actors/PurgeSessionHistoryChild.jsm
+lib/cliqz/actors/RemotePageChild.jsm
 lib/cliqz/actors/SelectChild.jsm
 lib/cliqz/actors/SelectParent.jsm
 lib/cliqz/actors/SidebarSearchParent.jsm
@@ -41,12 +44,21 @@ lib/cliqz/actors/ViewSourcePageParent.js
 lib/cliqz/actors/WebChannelChild.jsm
 lib/cliqz/actors/WebChannelParent.jsm
 lib/cliqz/actors/WebNavigationChild.jsm
-lib/cliqz/actors/ZoomChild.jsm
-lib/cliqz/actors/ZoomParent.jsm
 lib/cliqz/application.ini
 lib/cliqz/browser/actors/AboutLoginsChild.jsm
 lib/cliqz/browser/actors/AboutLoginsParent.jsm
+lib/cliqz/browser/actors/AboutNewInstallChild.jsm
+lib/cliqz/browser/actors/AboutNewInstallParent.jsm
+lib/cliqz/browser/actors/AboutNewTabChild.jsm
+lib/cliqz/browser/actors/AboutPluginsChild.jsm
+lib/cliqz/browser/actors/AboutPluginsParent.jsm
+lib/cliqz/browser/actors/AboutPrivateBrowsingChild.jsm
+lib/cliqz/browser/actors/AboutPrivateBrowsingParent.jsm
+lib/cliqz/browser/actors/AboutProtectionsChild.jsm
+lib/cliqz/browser/actors/AboutProtectionsParent.jsm
 lib/cliqz/browser/actors/AboutReaderChild.jsm
+lib/cliqz/browser/actors/AboutTabCrashedChild.jsm
+lib/cliqz/browser/actors/AboutTabCrashedParent.jsm
 lib/cliqz/browser/actors/AboutWelcomeChild.jsm
 lib/cliqz/browser/actors/AboutWelcomeParent.jsm
 lib/cliqz/browser/actors/BlockedSiteChild.jsm
@@ -58,6 +70,7 @@ lib/cliqz/browser/actors/ClickHandlerPar
 lib/cliqz/browser/actors/ContentMetaChild.jsm
 lib/cliqz/browser/actors/ContentMetaParent.jsm
 lib/cliqz/browser/actors/ContentSearchChild.jsm
+lib/cliqz/browser/actors/ContentSearchParent.jsm
 lib/cliqz/browser/actors/ContextMenuChild.jsm
 lib/cliqz/browser/actors/ContextMenuParent.jsm
 lib/cliqz/browser/actors/DOMFullscreenChild.jsm
@@ -285,6 +298,7 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/browser/browser-tabsintitlebar.js
 lib/cliqz/browser/chrome/browser/content/browser/browser-thumbnails.js
 lib/cliqz/browser/chrome/browser/content/browser/browser-toolbarKeyNav.js
+lib/cliqz/browser/chrome/browser/content/browser/browser-webrtc.js
 lib/cliqz/browser/chrome/browser/content/browser/browser.css
 lib/cliqz/browser/chrome/browser/content/browser/browser.js
 lib/cliqz/browser/chrome/browser/content/browser/browser.xhtml
@@ -379,6 +393,9 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/browser/parent/ext-url-overrides.js
 lib/cliqz/browser/chrome/browser/content/browser/parent/ext-urlbar.js
 lib/cliqz/browser/chrome/browser/content/browser/parent/ext-windows.js
+lib/cliqz/browser/chrome/browser/content/browser/pioneer.css
+lib/cliqz/browser/chrome/browser/content/browser/pioneer.html
+lib/cliqz/browser/chrome/browser/content/browser/pioneer.js
 lib/cliqz/browser/chrome/browser/content/browser/places/bookmarkProperties.js
 lib/cliqz/browser/chrome/browser/content/browser/places/bookmarkProperties.xhtml
 lib/cliqz/browser/chrome/browser/content/browser/places/bookmarkProperties2.xhtml
@@ -401,55 +418,56 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/browser/policies/policies-active.svg
 lib/cliqz/browser/chrome/browser/content/browser/policies/policies-documentation.svg
 lib/cliqz/browser/chrome/browser/content/browser/policies/policies-error.svg
-lib/cliqz/browser/chrome/browser/content/browser/preferences/applicationManager.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/applicationManager.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/blocklists.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/blocklists.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/browserLanguages.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/browserLanguages.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/clearSiteData.css
-lib/cliqz/browser/chrome/browser/content/browser/preferences/clearSiteData.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/clearSiteData.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/colors.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/colors.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/connection.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/connection.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/cliqz.home.js
 lib/cliqz/browser/chrome/browser/content/browser/preferences/containers.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/containers.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/fonts.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/fonts.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/handlers.css
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/cliqz.home.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/containers.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/experiments.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/extensionControlled.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/findInPage.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/main.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/preferences.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/preferences.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/privacy.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/search.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/subdialogs.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/sync.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/syncChooseWhatToSync.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/in-content/syncChooseWhatToSync.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/languages.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/languages.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/permissions.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/permissions.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/sanitize.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/sanitize.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/selectBookmark.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/selectBookmark.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/siteDataRemoveSelected.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/siteDataRemoveSelected.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/siteDataSettings.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/siteDataSettings.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/sitePermissions.css
-lib/cliqz/browser/chrome/browser/content/browser/preferences/sitePermissions.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/sitePermissions.xhtml
-lib/cliqz/browser/chrome/browser/content/browser/preferences/translation.js
-lib/cliqz/browser/chrome/browser/content/browser/preferences/translation.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/applicationManager.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/applicationManager.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/blocklists.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/blocklists.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/browserLanguages.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/browserLanguages.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/clearSiteData.css
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/clearSiteData.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/clearSiteData.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/colors.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/colors.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/connection.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/connection.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/containers.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/containers.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/fonts.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/fonts.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/handlers.css
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/languages.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/languages.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/permissions.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/permissions.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/sanitize.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/sanitize.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/selectBookmark.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/selectBookmark.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/siteDataRemoveSelected.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/siteDataRemoveSelected.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/siteDataSettings.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/siteDataSettings.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/sitePermissions.css
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/sitePermissions.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/sitePermissions.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/syncChooseWhatToSync.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/syncChooseWhatToSync.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/translation.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/dialogs/translation.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/experiments.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/extensionControlled.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/findInPage.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/home.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/main.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/preferences.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/preferences.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/preferences/privacy.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/search.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/subdialogs.js
+lib/cliqz/browser/chrome/browser/content/browser/preferences/sync.js
 lib/cliqz/browser/chrome/browser/content/browser/robot.ico
 lib/cliqz/browser/chrome/browser/content/browser/safeMode.css
 lib/cliqz/browser/chrome/browser/content/browser/safeMode.js
@@ -503,6 +521,8 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/browser/webext-panels.xhtml
 lib/cliqz/browser/chrome/browser/content/browser/webrtcIndicator.js
 lib/cliqz/browser/chrome/browser/content/browser/webrtcIndicator.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/webrtcLegacyIndicator.js
+lib/cliqz/browser/chrome/browser/content/browser/webrtcLegacyIndicator.xhtml
 lib/cliqz/browser/chrome/browser/content/cart.svg
 lib/cliqz/browser/chrome/browser/content/chill.svg
 lib/cliqz/browser/chrome/browser/content/circle.svg
@@ -515,6 +535,8 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/pet.svg
 lib/cliqz/browser/chrome/browser/content/tree.svg
 lib/cliqz/browser/chrome/browser/content/vacation.svg
+lib/cliqz/browser/chrome/browser/search-extensions/1und1/favicon.ico
+lib/cliqz/browser/chrome/browser/search-extensions/1und1/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/allaannonser-sv-SE/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/allaannonser-sv-SE/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/allegro-pl/favicon.ico
@@ -531,6 +553,8 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/amazon/_locales/nl/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/amazon/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/amazon/manifest.json
+lib/cliqz/browser/chrome/browser/search-extensions/amazondotcn/_locales/default/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/amazondotcn/_locales/mozillaonline/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/amazondotcn/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/amazondotcn/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/amazondotcom/_locales/de/messages.json
@@ -559,10 +583,6 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/ceneji/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/chambers-en-GB/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/chambers-en-GB/manifest.json
-lib/cliqz/browser/chrome/browser/search-extensions/cliqz/_locales/de/messages.json
-lib/cliqz/browser/chrome/browser/search-extensions/cliqz/_locales/en/messages.json
-lib/cliqz/browser/chrome/browser/search-extensions/cliqz/cliqz.png
-lib/cliqz/browser/chrome/browser/search-extensions/cliqz/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/coccoc/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/coccoc/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/daum-kr/favicon.ico
@@ -608,6 +628,10 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/gmaps/_locales/en/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/gmaps/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/gmaps/manifest.json
+lib/cliqz/browser/chrome/browser/search-extensions/gmx/_locales/de/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/gmx/_locales/shopping/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/gmx/favicon.png
+lib/cliqz/browser/chrome/browser/search-extensions/gmx/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/google/_locales/b-1-d/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/google/_locales/b-1-e/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/google/_locales/b-d/messages.json
@@ -630,6 +654,19 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/list.json
 lib/cliqz/browser/chrome/browser/search-extensions/longdo/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/longdo/manifest.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailcom/favicon.ico
+lib/cliqz/browser/chrome/browser/search-extensions/mailcom/manifest.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/default/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/mailru001/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-az/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-en-US/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-hy-AM/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-kk/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-ro/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-ru/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-tr/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-uk/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/mailru/_locales/okru-uz/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/mailru/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/mailru/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/mapy-cz/favicon.ico
@@ -681,6 +718,8 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/qwant/_locales/en/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/qwant/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/qwant/manifest.json
+lib/cliqz/browser/chrome/browser/search-extensions/qwantjr/favicon.ico
+lib/cliqz/browser/chrome/browser/search-extensions/qwantjr/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/qxl-NO/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/qxl-NO/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/rakuten/favicon.ico
@@ -707,6 +746,8 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/tyda-sv-SE/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/vatera/favicon.ico
 lib/cliqz/browser/chrome/browser/search-extensions/vatera/manifest.json
+lib/cliqz/browser/chrome/browser/search-extensions/webde/favicon.ico
+lib/cliqz/browser/chrome/browser/search-extensions/webde/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/NN/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/NO/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/af/messages.json
@@ -816,6 +857,7 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/yandex/_locales/kk/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/yandex/_locales/ru/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/yandex/_locales/tr/messages.json
+lib/cliqz/browser/chrome/browser/search-extensions/yandex/_locales/ua/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/yandex/manifest.json
 lib/cliqz/browser/chrome/browser/search-extensions/yandex/yahoo.ico
 lib/cliqz/browser/chrome/browser/search-extensions/yandex/yandex-en.ico
@@ -870,7 +912,6 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/fingerprinters-disabled.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/fingerprinters.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/hero-message-background.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/info.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/mcb-disabled.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/panel.css
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/socialblock-disabled.svg
@@ -880,6 +921,7 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/trackers.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/tracking-protection.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/controlcenter/warning.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/critical.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/customizableui/density-compact.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/customizableui/density-normal.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/customizableui/density-touch.svg
@@ -980,6 +1022,7 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-detailed.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/microphone.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/midi.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/minimize.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage-blocked.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/plugin-badge.svg
@@ -1003,7 +1046,9 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/panic-panel/icons.png
 lib/cliqz/browser/chrome/browser/skin/classic/browser/panic-panel/icons%2x.png@localhost
 lib/cliqz/browser/chrome/browser/skin/classic/browser/permissions.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/pin-12.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/pin-tab.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/pioneer.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/places/editBookmark.css
@@ -1015,37 +1060,35 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/places/tag.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/places/tree-icons.css
 lib/cliqz/browser/chrome/browser/skin/classic/browser/places/unfiledBookmarks.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/pocket-animation.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/pocket-outline.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/pocket.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
 lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/applications.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/bookmark.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/containers-dialog.css
 lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/containers.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/bookmark.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/experiments.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/extensions.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-sad.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-smile.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/formfill.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/fxaPairDevice.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/general.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/history.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-bar.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-results.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy-security.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/search-arrow-indicator.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/search-bar.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/siteDataSettings.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/sync.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/tab.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/dialog.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/experiments.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/extensions.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/face-sad.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/face-smile.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/formfill.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/fxaPairDevice.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/general.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/history.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/no-search-bar.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/no-search-results.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/preferences.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/privacy-security.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/privacy.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/search-arrow-indicator.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/search-bar.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/search.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/search.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/siteDataSettings.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/sync.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/tab.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/print.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/private-browsing.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/privateBrowsing.svg
@@ -1054,6 +1097,10 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/privatebrowsing/favicon.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/privatebrowsing/private-browsing.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/profiler-popup-backdrop.png
+lib/cliqz/browser/chrome/browser/skin/classic/browser/protections/breached-password.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/protections/new-feature.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/protections/resolved-breach-gray.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/protections/resolved-breach.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/quit.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/readerMode.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/reload-to-stop.svg
@@ -1068,7 +1115,6 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/searchbar.css
 lib/cliqz/browser/chrome/browser/skin/classic/browser/send-to-device.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/settings.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/sidebars-right.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/sidebars.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/sign-out.svg
@@ -1115,6 +1161,7 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/update-badge.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/warning.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/webRTC-indicator.css
+lib/cliqz/browser/chrome/browser/skin/classic/browser/webRTC-legacy-indicator.css
 lib/cliqz/browser/chrome/browser/skin/classic/browser/welcome-back.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/whatsnew.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/wifi.svg
@@ -1168,6 +1215,7 @@ lib/cliqz/browser/chrome/devtools/conten
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/icons/play.svg
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/icons/shield.svg
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/CustomRequestPanel.css
+lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/HeadersPanel.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/NetworkActionBar.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/NetworkDetailsBar.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/RequestBlockingPanel.css
@@ -1176,6 +1224,7 @@ lib/cliqz/browser/chrome/devtools/conten
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatusBar.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatusCode.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/Toolbar.css
+lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/UrlPreview.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/httpi.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/netmonitor.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/search.css
@@ -1198,6 +1247,7 @@ lib/cliqz/browser/chrome/devtools/conten
 lib/cliqz/browser/chrome/devtools/content/shared/sourceeditor/codemirror/mozilla.css
 lib/cliqz/browser/chrome/devtools/content/shared/splitview.css
 lib/cliqz/browser/chrome/devtools/content/shared/theme-switching.js
+lib/cliqz/browser/chrome/devtools/content/shared/toolbarbutton.css
 lib/cliqz/browser/chrome/devtools/content/shared/vendor/d3.js
 lib/cliqz/browser/chrome/devtools/content/shared/vendor/dagre-d3.js
 lib/cliqz/browser/chrome/devtools/content/shared/webextension-fallback.html
@@ -1384,13 +1434,14 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/Sidebar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/SidebarItem.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/SidebarItem.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/Registration.css
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/Registration.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/RegistrationList.css
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/RegistrationList.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/RegistrationListEmpty.css
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/RegistrationListEmpty.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/Worker.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/Worker.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/WorkerList.css
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/WorkerList.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/WorkerListEmpty.css
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/WorkerListEmpty.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/WorkersPage.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/WorkersPage.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/ui/UIButton.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/ui/UIButton.js
@@ -1539,6 +1590,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/highlightCalls.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/inlinePreview.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/mapDisplayNames.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/mapFrames.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/mapScopes.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/pauseOnExceptions.js
@@ -1779,6 +1831,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/pause/mapScopes/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/pause/mapScopes/locColumn.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/pause/mapScopes/mappingContains.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/pause/mapScopes/optimizedOut.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/pause/mapScopes/positionCmp.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/pause/mapScopes/rangeMetadata.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/pause/scopes/getScope.js
@@ -1861,6 +1914,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/components/ToolboxToolbar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/devtools-browser.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/devtools.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/enable-devtools-popup.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/menu-item.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/menu.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/reducers/dom-mutation-breakpoints.js
@@ -1892,6 +1946,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/descriptors/webextension.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/device.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/environment.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/eventsource.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/framerate.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/highlighters.js
@@ -1924,6 +1979,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/targets/worker.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/thread.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/walker.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/watcher.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/webconsole.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/websocket.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/fronts/worker/push-subscription.js
@@ -2004,20 +2060,21 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/utils/changes-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/utils/l10n.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/CompatibilityView.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/UserSettings.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/actions/compatibility.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/actions/index.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/BrowserIcon.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/CompatibilityApp.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/Footer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/IssueItem.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/IssueList.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/IssuePane.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/NodeItem.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/NodeList.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/NodePane.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/Settings.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/UnsupportedBrowserItem.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/UnsupportedBrowserList.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/lib/MDNCompatibility.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/lib/dataset/browsers.json
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/lib/dataset/css-properties.json
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/reducers/compatibility.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/types.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/utils/cases.js
@@ -2110,7 +2167,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/markup/views/text-editor.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/node-picker.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/panel.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/reducers.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/rules/actions/class-list.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/rules/actions/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/rules/actions/pseudo-classes.js
@@ -2172,7 +2228,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/css/json-panel.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/css/main.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/css/search-box.css
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/css/search.svg
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/css/text-panel.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/css/toolbar.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/json-viewer.js
@@ -2250,11 +2305,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/App.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CustomRequestPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/DropHarHandler.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/HeadersPanel.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/JSONPreview.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/MonitorPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/NetworkActionBar.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/PropertiesView.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/SecurityState.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/SourceEditor.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StatisticsPanel.js
@@ -2265,18 +2317,19 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/previews/HtmlPreview.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/previews/ImagePreview.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/previews/SourcePreview.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/previews/UrlPreview.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-blocking/RequestBlockingPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/CachePanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/CookiesPanel.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/HeadersPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/NetworkDetailsBar.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/ParamsPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/PropertiesView.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/RequestPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/ResponsePanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/SecurityPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/StackTracePanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-details/TimingsPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestList.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnCause.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnContentSize.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnCookies.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnDomain.js
@@ -2387,6 +2440,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/sort-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/tooltips.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/PropertiesViewContextMenu.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/RequestBlockingContextMenu.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/RequestListContextMenu.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/RequestListHeaderContextMenu.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/WaterfallBackground.js
@@ -2414,6 +2468,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/store/actions.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/store/reducers.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/store/selectors.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/symbolication.jsm.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/typescript-lazy-load.jsm.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance/components/JITOptimizations.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance/components/JITOptimizationsItem.js
@@ -2604,6 +2660,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/thunk.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/wait-service.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/redux/non-react-subscriber.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/redux/subscriber.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/redux/visibility-handler-connect.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/remote-debugging/adb/adb-addon.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/remote-debugging/adb/adb-binary.js
@@ -2696,6 +2753,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/storage/VariablesView.jsm
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/storage/panel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/storage/ui.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/storage/utils/l10n.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/storage/utils/mdn-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEditorUI.jsm
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEditorUtil.jsm
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleSheetEditor.jsm
@@ -2816,6 +2875,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/descriptors/frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/descriptors/process.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/descriptors/tab.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/descriptors/watcher/FrameWatchers.jsm
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/descriptors/watcher/watcher.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/descriptors/webextension.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/device.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/emulation/content-viewer.js
@@ -2830,7 +2891,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/accessible.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/auto-refresh.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model-observer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model-renderer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/css-grid.js
@@ -2839,7 +2899,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/flexbox.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/fonts.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/geometry-editor.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/highlighter-renderer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/measuring-tool.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/paused-debugger.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/highlighters/rulers.js
@@ -2863,6 +2922,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/manifest.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/memory.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/channel-event-sink.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/eventsource-actor.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-event.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-monitor.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-observer.js
@@ -2911,6 +2971,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/logEvent.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/shapes-utils.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/source-map-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/track-change-emitter.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
@@ -2942,7 +3003,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/connectors/frame-connector.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/connectors/js-window-actor/DevToolsFrameChild.jsm
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/connectors/js-window-actor/DevToolsFrameParent.jsm
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/connectors/js-window-actor/frame-js-window-actor-connector.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/connectors/worker-connector.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/devtools-server-connection.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/devtools-server.js
@@ -2967,6 +3027,9 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/async-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/base-loader.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/builtin-modules.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/compatibility/MDNCompatibility.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/compatibility/dataset/browsers.json
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/compatibility/dataset/css-properties.json
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/constants.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/content-observer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/css/color-db.js
@@ -3034,6 +3097,15 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/qrcode/decoder/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/qrcode/encoder/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/qrcode/index.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/console-messages.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/error-messages.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/platform-messages.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-listeners/root-node.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-frames-watcher.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-processes-watcher.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-serviceworkers-watcher.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-sharedworkers-watcher.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/legacy-target-watchers/legacy-workers-watcher.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/resource-watcher.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/resources/target-list.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/screenshot/capture.js
@@ -3057,6 +3129,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/webextension.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/device.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/environment.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/eventsource.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/framerate.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/heap-snapshot-file.js
@@ -3096,6 +3169,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/thread.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/timeline.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/walker.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/watcher.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/webconsole.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/websocket.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/worker/push-subscription.js
@@ -3246,6 +3320,7 @@ lib/cliqz/browser/chrome/devtools/skin/i
 lib/cliqz/browser/chrome/devtools/skin/images/profiler-stopwatch.svg
 lib/cliqz/browser/chrome/devtools/skin/images/pseudo-class.svg
 lib/cliqz/browser/chrome/devtools/skin/images/reload.svg
+lib/cliqz/browser/chrome/devtools/skin/images/report.svg
 lib/cliqz/browser/chrome/devtools/skin/images/reveal.svg
 lib/cliqz/browser/chrome/devtools/skin/images/rewind.svg
 lib/cliqz/browser/chrome/devtools/skin/images/rules-view-print-simulation.svg
@@ -3308,7 +3383,6 @@ lib/cliqz/browser/chrome/en-US/locale/br
 lib/cliqz/browser/chrome/en-US/locale/browser/browser.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/browser.properties
 lib/cliqz/browser/chrome/en-US/locale/browser/customizableui/customizableWidgets.properties
-lib/cliqz/browser/chrome/en-US/locale/browser/downloads/downloads.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/downloads/downloads.properties
 lib/cliqz/browser/chrome/en-US/locale/browser/downloads/settingsChange.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/feeds/subscribe.properties
@@ -3318,7 +3392,6 @@ lib/cliqz/browser/chrome/en-US/locale/br
 lib/cliqz/browser/chrome/en-US/locale/browser/netError.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/newInstall.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/places/bookmarkProperties.properties
-lib/cliqz/browser/chrome/en-US/locale/browser/places/editBookmarkOverlay.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/places/places.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/places/places.properties
 lib/cliqz/browser/chrome/en-US/locale/browser/pocket.properties
@@ -3574,8 +3647,6 @@ lib/cliqz/browser/chrome/pdfjs/content/w
 lib/cliqz/browser/chrome/pdfjs/content/web/images/findbarButton-next%2x.png@localhost
 lib/cliqz/browser/chrome/pdfjs/content/web/images/findbarButton-previous.png
 lib/cliqz/browser/chrome/pdfjs/content/web/images/findbarButton-previous%2x.png@localhost
-lib/cliqz/browser/chrome/pdfjs/content/web/images/grab.cur
-lib/cliqz/browser/chrome/pdfjs/content/web/images/grabbing.cur
 lib/cliqz/browser/chrome/pdfjs/content/web/images/loading-icon.gif
 lib/cliqz/browser/chrome/pdfjs/content/web/images/loading-small.png
 lib/cliqz/browser/chrome/pdfjs/content/web/images/loading-small%2x.png@localhost
@@ -3654,6 +3725,9 @@ lib/cliqz/browser/defaults/preferences/d
 lib/cliqz/browser/defaults/preferences/firefox-branding.js
 lib/cliqz/browser/defaults/preferences/firefox-l10n.js
 lib/cliqz/browser/defaults/preferences/firefox.js
+lib/cliqz/browser/defaults/settings/blocklists/addons-bloomfilters.json
+lib/cliqz/browser/defaults/settings/blocklists/addons-bloomfilters/addons-mlbf.bin
+lib/cliqz/browser/defaults/settings/blocklists/addons-bloomfilters/addons-mlbf.bin.meta.json
 lib/cliqz/browser/defaults/settings/blocklists/addons.json
 lib/cliqz/browser/defaults/settings/blocklists/gfx.json
 lib/cliqz/browser/defaults/settings/blocklists/plugins.json
@@ -3663,6 +3737,7 @@ lib/cliqz/browser/defaults/settings/main
 lib/cliqz/browser/defaults/settings/main/language-dictionaries.json
 lib/cliqz/browser/defaults/settings/main/onboarding.json
 lib/cliqz/browser/defaults/settings/main/search-config.json
+lib/cliqz/browser/defaults/settings/main/search-default-override-allowlist.json
 lib/cliqz/browser/defaults/settings/main/sites-classification.json
 lib/cliqz/browser/defaults/settings/main/url-classifier-skip-urls.json
 lib/cliqz/browser/defaults/settings/pinning/pins.json
@@ -3683,6 +3758,7 @@ lib/cliqz/browser/localization/en-US/bro
 lib/cliqz/browser/localization/en-US/browser/aboutRobots.ftl
 lib/cliqz/browser/localization/en-US/browser/aboutSessionRestore.ftl
 lib/cliqz/browser/localization/en-US/browser/aboutTabCrashed.ftl
+lib/cliqz/browser/localization/en-US/browser/allTabsMenu.ftl
 lib/cliqz/browser/localization/en-US/browser/appMenuNotifications.ftl
 lib/cliqz/browser/localization/en-US/browser/appmenu.ftl
 lib/cliqz/browser/localization/en-US/browser/branding/brandings.ftl
@@ -3692,6 +3768,8 @@ lib/cliqz/browser/localization/en-US/bro
 lib/cliqz/browser/localization/en-US/browser/browserSets.ftl
 lib/cliqz/browser/localization/en-US/browser/cliqzPrivateBrowsing.ftl
 lib/cliqz/browser/localization/en-US/browser/customizeMode.ftl
+lib/cliqz/browser/localization/en-US/browser/downloads.ftl
+lib/cliqz/browser/localization/en-US/browser/editBookmarkOverlay.ftl
 lib/cliqz/browser/localization/en-US/browser/menubar.ftl
 lib/cliqz/browser/localization/en-US/browser/newInstallPage.ftl
 lib/cliqz/browser/localization/en-US/browser/newtab/asrouter.ftl
@@ -3700,6 +3778,7 @@ lib/cliqz/browser/localization/en-US/bro
 lib/cliqz/browser/localization/en-US/browser/nsserrors.ftl
 lib/cliqz/browser/localization/en-US/browser/pageInfo.ftl
 lib/cliqz/browser/localization/en-US/browser/panicButton.ftl
+lib/cliqz/browser/localization/en-US/browser/places.ftl
 lib/cliqz/browser/localization/en-US/browser/policies/policies-descriptions.ftl
 lib/cliqz/browser/localization/en-US/browser/preferences/applicationManager.ftl
 lib/cliqz/browser/localization/en-US/browser/preferences/blocklists.ftl
@@ -3729,14 +3808,17 @@ lib/cliqz/browser/localization/en-US/bro
 lib/cliqz/browser/localization/en-US/browser/tabContextMenu.ftl
 lib/cliqz/browser/localization/en-US/browser/toolbarContextMenu.ftl
 lib/cliqz/browser/localization/en-US/browser/touchbar/touchbar.ftl
+lib/cliqz/browser/localization/en-US/browser/webrtcIndicator.ftl
 lib/cliqz/browser/localization/en-US/devtools/client/aboutdebugging.ftl
 lib/cliqz/browser/localization/en-US/devtools/client/accessibility.ftl
 lib/cliqz/browser/localization/en-US/devtools/client/application.ftl
+lib/cliqz/browser/localization/en-US/devtools/client/storage.ftl
 lib/cliqz/browser/localization/en-US/devtools/client/styleeditor.ftl
 lib/cliqz/browser/localization/en-US/devtools/client/toolbox-options.ftl
 lib/cliqz/browser/localization/en-US/devtools/client/tooltips.ftl
 lib/cliqz/browser/localization/en-US/devtools/startup/aboutDevTools.ftl
 lib/cliqz/browser/localization/en-US/preview/interventions.ftl
+lib/cliqz/browser/localization/en-US/preview/pioneer.ftl
 lib/cliqz/browser/modules/AboutDebuggingRegistration.jsm
 lib/cliqz/browser/modules/AboutDevToolsRegistration.jsm
 lib/cliqz/browser/modules/AboutDevToolsToolboxRegistration.jsm
@@ -3755,7 +3837,6 @@ lib/cliqz/browser/modules/ChromeProfileM
 lib/cliqz/browser/modules/CliqzResources.jsm
 lib/cliqz/browser/modules/ContentCrashHandlers.jsm
 lib/cliqz/browser/modules/ContentObservers.js
-lib/cliqz/browser/modules/ContentSearch.jsm
 lib/cliqz/browser/modules/CustomizableUI.jsm
 lib/cliqz/browser/modules/CustomizableWidgets.jsm
 lib/cliqz/browser/modules/CustomizeMode.jsm
@@ -3787,6 +3868,7 @@ lib/cliqz/browser/modules/PingCentre.jsm
 lib/cliqz/browser/modules/PlacesUIUtils.jsm
 lib/cliqz/browser/modules/ProcessHangMonitor.jsm
 lib/cliqz/browser/modules/ProfileMigrator.jsm
+lib/cliqz/browser/modules/PromptCollection.jsm
 lib/cliqz/browser/modules/ReaderParent.jsm
 lib/cliqz/browser/modules/Sanitizer.jsm
 lib/cliqz/browser/modules/ScreenshotChild.jsm
@@ -3801,6 +3883,7 @@ lib/cliqz/browser/modules/TRRPerformance
 lib/cliqz/browser/modules/TabUnloader.jsm
 lib/cliqz/browser/modules/TabsList.jsm
 lib/cliqz/browser/modules/ThemeVariableMap.jsm
+lib/cliqz/browser/modules/TopSiteAttribution.jsm
 lib/cliqz/browser/modules/TransientPrefs.jsm
 lib/cliqz/browser/modules/UITour.jsm
 lib/cliqz/browser/modules/UITourChild.jsm
@@ -3814,7 +3897,9 @@ lib/cliqz/browser/modules/UrlbarProvider
 lib/cliqz/browser/modules/UrlbarProviderInterventions.jsm
 lib/cliqz/browser/modules/UrlbarProviderOpenTabs.jsm
 lib/cliqz/browser/modules/UrlbarProviderPrivateSearch.jsm
+lib/cliqz/browser/modules/UrlbarProviderSearchSuggestions.jsm
 lib/cliqz/browser/modules/UrlbarProviderSearchTips.jsm
+lib/cliqz/browser/modules/UrlbarProviderTokenAliasEngines.jsm
 lib/cliqz/browser/modules/UrlbarProviderTopSites.jsm
 lib/cliqz/browser/modules/UrlbarProviderUnifiedComplete.jsm
 lib/cliqz/browser/modules/UrlbarProvidersManager.jsm
@@ -3825,7 +3910,6 @@ lib/cliqz/browser/modules/UrlbarValueFor
 lib/cliqz/browser/modules/UrlbarView.jsm
 lib/cliqz/browser/modules/WebProtocolHandlerRegistrar.jsm
 lib/cliqz/browser/modules/ZoomUI.jsm
-lib/cliqz/browser/modules/aboutpages/AboutPrivateBrowsingHandler.jsm
 lib/cliqz/browser/modules/distribution.js
 lib/cliqz/browser/modules/pdfjs.js
 lib/cliqz/browser/modules/policies/BookmarksPolicies.jsm
@@ -3869,9 +3953,9 @@ lib/cliqz/browser/modules/themes/light/m
 lib/cliqz/browser/modules/translation/BingTranslator.jsm
 lib/cliqz/browser/modules/translation/GoogleTranslator.jsm
 lib/cliqz/browser/modules/translation/LanguageDetector.jsm
-lib/cliqz/browser/modules/translation/Translation.jsm
-lib/cliqz/browser/modules/translation/TranslationContentHandler.jsm
+lib/cliqz/browser/modules/translation/TranslationChild.jsm
 lib/cliqz/browser/modules/translation/TranslationDocument.jsm
+lib/cliqz/browser/modules/translation/TranslationParent.jsm
 lib/cliqz/browser/modules/translation/YandexTranslator.jsm
 lib/cliqz/browser/modules/translation/cld-worker.js
 lib/cliqz/browser/modules/translation/cld-worker.js.mem
@@ -3957,9 +4041,7 @@ lib/cliqz/chrome/en-US/locale/en-US/moza
 lib/cliqz/chrome/en-US/locale/en-US/mozapps/extensions/extensions.properties
 lib/cliqz/chrome/en-US/locale/en-US/mozapps/handling/handling.dtd
 lib/cliqz/chrome/en-US/locale/en-US/mozapps/handling/handling.properties
-lib/cliqz/chrome/en-US/locale/en-US/mozapps/profile/profileDowngrade.dtd
 lib/cliqz/chrome/en-US/locale/en-US/mozapps/profile/profileSelection.properties
-lib/cliqz/chrome/en-US/locale/en-US/mozapps/update/updates.dtd
 lib/cliqz/chrome/en-US/locale/en-US/mozapps/update/updates.properties
 lib/cliqz/chrome/en-US/locale/en-US/necko/necko.properties
 lib/cliqz/chrome/en-US/locale/en-US/passwordmgr/passwordmgr.properties
@@ -3995,6 +4077,7 @@ lib/cliqz/chrome/marionette/content/moda
 lib/cliqz/chrome/marionette/content/navigate.js
 lib/cliqz/chrome/marionette/content/packets.js
 lib/cliqz/chrome/marionette/content/prefs.js
+lib/cliqz/chrome/marionette/content/print.js
 lib/cliqz/chrome/marionette/content/proxy.js
 lib/cliqz/chrome/marionette/content/reftest.js
 lib/cliqz/chrome/marionette/content/reftest.xhtml
@@ -4119,7 +4202,6 @@ lib/cliqz/chrome/toolkit/content/extensi
 lib/cliqz/chrome/toolkit/content/extensions/schemas/web_request.json
 lib/cliqz/chrome/toolkit/content/global/BrowserElementChild.js
 lib/cliqz/chrome/toolkit/content/global/BrowserElementChildPreload.js
-lib/cliqz/chrome/toolkit/content/global/BrowserElementCopyPaste.js
 lib/cliqz/chrome/toolkit/content/global/TopLevelVideoDocument.js
 lib/cliqz/chrome/toolkit/content/global/aboutAbout.html
 lib/cliqz/chrome/toolkit/content/global/aboutAbout.js
@@ -4177,14 +4259,21 @@ lib/cliqz/chrome/toolkit/content/global/
 lib/cliqz/chrome/toolkit/content/global/certviewer/certviewer.css
 lib/cliqz/chrome/toolkit/content/global/certviewer/certviewer.html
 lib/cliqz/chrome/toolkit/content/global/certviewer/certviewer.js
+lib/cliqz/chrome/toolkit/content/global/certviewer/components/about-certificate-items.js
+lib/cliqz/chrome/toolkit/content/global/certviewer/components/about-certificate-section.css
+lib/cliqz/chrome/toolkit/content/global/certviewer/components/about-certificate-section.js
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/certificate-section.css
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/certificate-section.js
+lib/cliqz/chrome/toolkit/content/global/certviewer/components/certificate-tabs-section.js
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/error-section.css
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/error-section.js
+lib/cliqz/chrome/toolkit/content/global/certviewer/components/info-group-container.js
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/info-group.css
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/info-group.js
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/info-item.css
 lib/cliqz/chrome/toolkit/content/global/certviewer/components/info-item.js
+lib/cliqz/chrome/toolkit/content/global/certviewer/components/list-item.css
+lib/cliqz/chrome/toolkit/content/global/certviewer/components/list-item.js
 lib/cliqz/chrome/toolkit/content/global/certviewer/ctlognames.js
 lib/cliqz/chrome/toolkit/content/global/certviewer/pkijs_bundle.js
 lib/cliqz/chrome/toolkit/content/global/certviewer/pvutils_bundle.js
@@ -4235,6 +4324,9 @@ lib/cliqz/chrome/toolkit/content/global/
 lib/cliqz/chrome/toolkit/content/global/globalOverlay.js
 lib/cliqz/chrome/toolkit/content/global/gmp-sources/openh264.json
 lib/cliqz/chrome/toolkit/content/global/gmp-sources/widevinecdm.json
+lib/cliqz/chrome/toolkit/content/global/httpsonlyerror/cert-error.svg
+lib/cliqz/chrome/toolkit/content/global/httpsonlyerror/errorpage.html
+lib/cliqz/chrome/toolkit/content/global/httpsonlyerror/errorpage.js
 lib/cliqz/chrome/toolkit/content/global/license.html
 lib/cliqz/chrome/toolkit/content/global/minimal-xul.css
 lib/cliqz/chrome/toolkit/content/global/mozilla.xhtml
@@ -4284,7 +4376,6 @@ lib/cliqz/chrome/toolkit/content/mozapps
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/aboutaddons.js
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/aboutaddonsCommon.js
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/abuse-report-frame.html
-lib/cliqz/chrome/toolkit/content/mozapps/extensions/abuse-report-frame.js
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/abuse-report-panel.css
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/abuse-report-panel.js
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/abuse-reports.js
@@ -4306,7 +4397,6 @@ lib/cliqz/chrome/toolkit/content/mozapps
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/rating-star.css
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/shortcuts.css
 lib/cliqz/chrome/toolkit/content/mozapps/extensions/shortcuts.js
-lib/cliqz/chrome/toolkit/content/mozapps/extensions/toggle-button.css
 lib/cliqz/chrome/toolkit/content/mozapps/handling/dialog.js
 lib/cliqz/chrome/toolkit/content/mozapps/handling/dialog.xhtml
 lib/cliqz/chrome/toolkit/content/mozapps/handling/handler.css
@@ -4321,8 +4411,6 @@ lib/cliqz/chrome/toolkit/content/mozapps
 lib/cliqz/chrome/toolkit/content/mozapps/profile/profileDowngrade.xhtml
 lib/cliqz/chrome/toolkit/content/mozapps/profile/profileSelection.js
 lib/cliqz/chrome/toolkit/content/mozapps/profile/profileSelection.xhtml
-lib/cliqz/chrome/toolkit/content/passwordmgr/passwordManager.js
-lib/cliqz/chrome/toolkit/content/passwordmgr/passwordManager.xhtml
 lib/cliqz/chrome/toolkit/content/passwordmgr/recipes.json
 lib/cliqz/chrome/toolkit/content/providers.json
 lib/cliqz/chrome/toolkit/featuregates/FeatureGate.jsm
@@ -4361,6 +4449,7 @@ lib/cliqz/chrome/toolkit/res/messaging-s
 lib/cliqz/chrome/toolkit/res/messaging-system/lib/Logger.jsm
 lib/cliqz/chrome/toolkit/res/messaging-system/lib/RemoteSettingsExperimentLoader.jsm
 lib/cliqz/chrome/toolkit/res/messaging-system/lib/SharedDataMap.jsm
+lib/cliqz/chrome/toolkit/res/messaging-system/lib/SpecialMessageActions.jsm
 lib/cliqz/chrome/toolkit/res/noframes.css
 lib/cliqz/chrome/toolkit/res/normandy/Normandy.jsm
 lib/cliqz/chrome/toolkit/res/normandy/NormandyMigrations.jsm
@@ -4418,6 +4507,7 @@ lib/cliqz/chrome/toolkit/res/ua.css
 lib/cliqz/chrome/toolkit/skin/classic/global/about.css
 lib/cliqz/chrome/toolkit/skin/classic/global/aboutCache.css
 lib/cliqz/chrome/toolkit/skin/classic/global/aboutCacheEntry.css
+lib/cliqz/chrome/toolkit/skin/classic/global/aboutHttpsOnlyError.css
 lib/cliqz/chrome/toolkit/skin/classic/global/aboutLicense.css
 lib/cliqz/chrome/toolkit/skin/classic/global/aboutMemory.css
 lib/cliqz/chrome/toolkit/skin/classic/global/aboutNetworking.css
@@ -4432,6 +4522,7 @@ lib/cliqz/chrome/toolkit/skin/classic/gl
 lib/cliqz/chrome/toolkit/skin/classic/global/autocomplete.css
 lib/cliqz/chrome/toolkit/skin/classic/global/button.css
 lib/cliqz/chrome/toolkit/skin/classic/global/checkbox.css
+lib/cliqz/chrome/toolkit/skin/classic/global/close-icon.css
 lib/cliqz/chrome/toolkit/skin/classic/global/commonDialog.css
 lib/cliqz/chrome/toolkit/skin/classic/global/config.css
 lib/cliqz/chrome/toolkit/skin/classic/global/datetimeinputpickers.css
@@ -4471,8 +4562,8 @@ lib/cliqz/chrome/toolkit/skin/classic/gl
 lib/cliqz/chrome/toolkit/skin/classic/global/icons/question-64.png
 lib/cliqz/chrome/toolkit/skin/classic/global/icons/resizer.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/icons/search-textbox.svg
-lib/cliqz/chrome/toolkit/skin/classic/global/icons/search.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/icons/searchfield-cancel.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/icons/settings.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/icons/shortcut.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/icons/spinner-arrow-down.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/icons/spinner-arrow-up.svg
@@ -4488,6 +4579,7 @@ lib/cliqz/chrome/toolkit/skin/classic/gl
 lib/cliqz/chrome/toolkit/skin/classic/global/in-content/dropdown.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/in-content/info-pages.css
 lib/cliqz/chrome/toolkit/skin/classic/global/in-content/radio.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/in-content/toggle-button.css
 lib/cliqz/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
 lib/cliqz/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css
 lib/cliqz/chrome/toolkit/skin/classic/global/media/audioMutedButton.svg
@@ -4515,14 +4607,14 @@ lib/cliqz/chrome/toolkit/skin/classic/gl
 lib/cliqz/chrome/toolkit/skin/classic/global/narrate/back.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/narrate/fast.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/narrate/forward.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/narrate/headphone-active.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/narrate/headphone.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/narrate/slow.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/narrate/start.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/narrate/stop.svg
-lib/cliqz/chrome/toolkit/skin/classic/global/narrate/waveform.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/netError.css
 lib/cliqz/chrome/toolkit/skin/classic/global/notification.css
 lib/cliqz/chrome/toolkit/skin/classic/global/numberinput.css
-lib/cliqz/chrome/toolkit/skin/classic/global/passwordmgr.css
 lib/cliqz/chrome/toolkit/skin/classic/global/pictureinpicture/audio-mute.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/pictureinpicture/audio.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/pictureinpicture/close-pip.svg
@@ -4541,15 +4633,18 @@ lib/cliqz/chrome/toolkit/skin/classic/gl
 lib/cliqz/chrome/toolkit/skin/classic/global/popup.css
 lib/cliqz/chrome/toolkit/skin/classic/global/popupnotification.css
 lib/cliqz/chrome/toolkit/skin/classic/global/radio.css
-lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Close-24x24.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Content-Width-Minus-42x16.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Line-Height-Minus-38x14.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Line-Height-Plus-38x24.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Minus-24x24.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Plus-24x24.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Sans-Serif.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Serif.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-24x24.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/reader/RM-Type-Controls-Arrow.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/reader/close-16.svg
+lib/cliqz/chrome/toolkit/skin/classic/global/reader/pocket.svg
 lib/cliqz/chrome/toolkit/skin/classic/global/richlistbox.css
 lib/cliqz/chrome/toolkit/skin/classic/global/scrollbars.css
 lib/cliqz/chrome/toolkit/skin/classic/global/search-textbox.css
@@ -4574,7 +4669,6 @@ lib/cliqz/chrome/toolkit/skin/classic/mo
 lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/rating-star.svg
 lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/recommended.svg
 lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.svg
-lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/utilities.svg
 lib/cliqz/chrome/toolkit/skin/classic/mozapps/handling/handling.css
 lib/cliqz/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.svg
 lib/cliqz/chrome/toolkit/skin/classic/mozapps/profile/information.svg
@@ -4655,6 +4749,7 @@ lib/cliqz/localization/en-US/toolkit/abo
 lib/cliqz/localization/en-US/toolkit/about/aboutAddons.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutCompat.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutConfig.ftl
+lib/cliqz/localization/en-US/toolkit/about/aboutHttpsOnlyError.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutNetworking.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutPerformance.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutPlugins.ftl
@@ -4669,19 +4764,23 @@ lib/cliqz/localization/en-US/toolkit/abo
 lib/cliqz/localization/en-US/toolkit/extensions/blocklist.ftl
 lib/cliqz/localization/en-US/toolkit/global/createProfileWizard.ftl
 lib/cliqz/localization/en-US/toolkit/global/processTypes.ftl
+lib/cliqz/localization/en-US/toolkit/global/profileDowngrade.ftl
 lib/cliqz/localization/en-US/toolkit/global/profileSelection.ftl
 lib/cliqz/localization/en-US/toolkit/global/resetProfile.ftl
 lib/cliqz/localization/en-US/toolkit/global/textActions.ftl
+lib/cliqz/localization/en-US/toolkit/global/unknownContentType.ftl
 lib/cliqz/localization/en-US/toolkit/global/wizard.ftl
 lib/cliqz/localization/en-US/toolkit/intl/languageNames.ftl
 lib/cliqz/localization/en-US/toolkit/intl/regionNames.ftl
+lib/cliqz/localization/en-US/toolkit/main-window/autocomplete.ftl
 lib/cliqz/localization/en-US/toolkit/main-window/findbar.ftl
-lib/cliqz/localization/en-US/toolkit/passwordmgr/passwordManagerList.ftl
 lib/cliqz/localization/en-US/toolkit/pictureinpicture/pictureinpicture.ftl
 lib/cliqz/localization/en-US/toolkit/preferences/preferences.ftl
 lib/cliqz/localization/en-US/toolkit/printing/printDialogs.ftl
 lib/cliqz/localization/en-US/toolkit/printing/printPreview.ftl
+lib/cliqz/localization/en-US/toolkit/updates/elevation.ftl
 lib/cliqz/localization/en-US/toolkit/updates/history.ftl
+lib/cliqz/modules/AboutCertViewerHandler.jsm
 lib/cliqz/modules/AboutPagesUtils.jsm
 lib/cliqz/modules/AboutReader.jsm
 lib/cliqz/modules/AbuseReporter.jsm
@@ -4780,8 +4879,10 @@ lib/cliqz/modules/ExtensionSearchHandler
 lib/cliqz/modules/ExtensionSettingsStore.jsm
 lib/cliqz/modules/ExtensionShortcuts.jsm
 lib/cliqz/modules/ExtensionStorage.jsm
+lib/cliqz/modules/ExtensionStorageComponents.jsm
 lib/cliqz/modules/ExtensionStorageIDB.jsm
 lib/cliqz/modules/ExtensionStorageSync.jsm
+lib/cliqz/modules/ExtensionStorageSyncKinto.jsm
 lib/cliqz/modules/ExtensionTelemetry.jsm
 lib/cliqz/modules/ExtensionUtils.jsm
 lib/cliqz/modules/FileUtils.jsm
@@ -4838,8 +4939,10 @@ lib/cliqz/modules/L10nRegistry.jsm
 lib/cliqz/modules/LightweightThemeConsumer.jsm
 lib/cliqz/modules/LightweightThemeManager.jsm
 lib/cliqz/modules/Localization.jsm
+lib/cliqz/modules/LocationHelper.jsm
 lib/cliqz/modules/Log.jsm
 lib/cliqz/modules/LoginAutoComplete.jsm
+lib/cliqz/modules/LoginExport.jsm
 lib/cliqz/modules/LoginFormFactory.jsm
 lib/cliqz/modules/LoginHelper.jsm
 lib/cliqz/modules/LoginImport.jsm
@@ -4927,11 +5030,13 @@ lib/cliqz/modules/RFPHelper.jsm
 lib/cliqz/modules/ReaderMode.jsm
 lib/cliqz/modules/Readerable.jsm
 lib/cliqz/modules/RecordingCmdLine.jsm
-lib/cliqz/modules/RemoteSecurityUI.jsm
+lib/cliqz/modules/Region.jsm
+lib/cliqz/modules/RemotePageAccessManager.jsm
 lib/cliqz/modules/RemoteWebNavigation.jsm
 lib/cliqz/modules/RemoteWebProgress.jsm
 lib/cliqz/modules/ResetProfile.jsm
 lib/cliqz/modules/ResponsivenessMonitor.jsm
+lib/cliqz/modules/RustFxAccount.js
 lib/cliqz/modules/SafeBrowsing.jsm
 lib/cliqz/modules/Schemas.jsm
 lib/cliqz/modules/SearchEngine.jsm
@@ -4974,6 +5079,7 @@ lib/cliqz/modules/TooltipTextProvider.js
 lib/cliqz/modules/TrackingDBService.jsm
 lib/cliqz/modules/Troubleshoot.jsm
 lib/cliqz/modules/UITelemetry.jsm
+lib/cliqz/modules/URIFixup.jsm
 lib/cliqz/modules/URLDecorationAnnotationsService.jsm
 lib/cliqz/modules/URLFormatter.jsm
 lib/cliqz/modules/UnifiedComplete.jsm
@@ -4992,8 +5098,6 @@ lib/cliqz/modules/WebNavigation.jsm
 lib/cliqz/modules/WebNavigationContent.js
 lib/cliqz/modules/WebNavigationFrames.jsm
 lib/cliqz/modules/WebRequest.jsm
-lib/cliqz/modules/WebRequestCommon.jsm
-lib/cliqz/modules/WebRequestContent.js
 lib/cliqz/modules/WebRequestUpload.jsm
 lib/cliqz/modules/WebVTTParserWrapper.jsm
 lib/cliqz/modules/WellKnownOpportunisticUtils.jsm
@@ -5018,6 +5122,7 @@ lib/cliqz/modules/components-utils/Filte
 lib/cliqz/modules/components-utils/JsonSchemaValidator.jsm
 lib/cliqz/modules/components-utils/PreferenceFilters.jsm
 lib/cliqz/modules/components-utils/Sampling.jsm
+lib/cliqz/modules/components-utils/WindowsVersionInfo.jsm
 lib/cliqz/modules/components-utils/mozjexl.js
 lib/cliqz/modules/crypto-SDR.js
 lib/cliqz/modules/ctypes.jsm
@@ -5082,10 +5187,12 @@ lib/cliqz/modules/services-crypto/jwcryp
 lib/cliqz/modules/services-crypto/utils.js
 lib/cliqz/modules/services-settings/Attachments.jsm
 lib/cliqz/modules/services-settings/Database.jsm
+lib/cliqz/modules/services-settings/IDBHelpers.jsm
 lib/cliqz/modules/services-settings/RemoteSettingsClient.jsm
 lib/cliqz/modules/services-settings/RemoteSettingsComponents.jsm
 lib/cliqz/modules/services-settings/RemoteSettingsWorker.js
 lib/cliqz/modules/services-settings/RemoteSettingsWorker.jsm
+lib/cliqz/modules/services-settings/SharedUtils.jsm
 lib/cliqz/modules/services-settings/Utils.jsm
 lib/cliqz/modules/services-settings/remote-settings.js
 lib/cliqz/modules/sessionstore/PrivacyFilter.jsm

Index: pkgsrc/www/cliqz/distinfo
diff -u pkgsrc/www/cliqz/distinfo:1.25 pkgsrc/www/cliqz/distinfo:1.26
--- pkgsrc/www/cliqz/distinfo:1.25      Sun May 17 10:10:18 2020
+++ pkgsrc/www/cliqz/distinfo   Fri Jul 24 07:29:32 2020
@@ -1,53 +1,70 @@
-$NetBSD: distinfo,v 1.25 2020/05/17 10:10:18 fox Exp $
+$NetBSD: distinfo,v 1.26 2020/07/24 07:29:32 fox Exp $
 
-SHA1 (cliqz-1.36.0/adult-domains.bin) = 39f8b7a881e70828fdb411eefd5a70540a3699bd
-RMD160 (cliqz-1.36.0/adult-domains.bin) = a41b8d15df385dbce6904f184552eb542161ce54
-SHA512 (cliqz-1.36.0/adult-domains.bin) = 8896a629efd0f67b98393928edda20400350938f911f7eedc05f776b2626a656dfb092714fc5cb1766e4aee4efccfed62d297f211c07b3cca57fff1cd282ced1
-Size (cliqz-1.36.0/adult-domains.bin) = 528392 bytes
-SHA1 (cliqz-1.36.0/cliqz-1.36.0.tar.gz) = ab59b8ccb14e98f07b5e96d4e25d4027957e6336
-RMD160 (cliqz-1.36.0/cliqz-1.36.0.tar.gz) = c922d5e97d660db40a9de461d503f8f2d3d847de
-SHA512 (cliqz-1.36.0/cliqz-1.36.0.tar.gz) = bd92517b231869e873c0aa2e56bf0c42c265e2adf84b606435d8b7f799d160fa01f8872539a0710452ed77ccfccfcf2fa1b651abff1107ce2d16716b0e3dba0c
-Size (cliqz-1.36.0/cliqz-1.36.0.tar.gz) = 505954787 bytes
-SHA1 (cliqz-1.36.0/cliqz%cliqz.com.xpi@localhost) = 5e1dc7cd03092eb71cc60de671ad1cc33ab23450
-RMD160 (cliqz-1.36.0/cliqz%cliqz.com.xpi@localhost) = 4e8fe878956a1f413c974ba3a4324cf39e79d684
-SHA512 (cliqz-1.36.0/cliqz%cliqz.com.xpi@localhost) = d0f612bb56c6c9e46b1d0ba62589a28f773a6b271d9fe65be5cf259580fd08b680ff8e48d78026e98f382bc411e038df30afb77b9068c5219d12b3a19a5062d6
-Size (cliqz-1.36.0/cliqz%cliqz.com.xpi@localhost) = 4275778 bytes
-SHA1 (cliqz-1.36.0/dat%cliqz.com.xpi@localhost) = ffeeb096509fb570cd9387c2c273d457be529d07
-RMD160 (cliqz-1.36.0/dat%cliqz.com.xpi@localhost) = 61e47dabb836866cf2bf63f1ff657d8b4ad67cbb
-SHA512 (cliqz-1.36.0/dat%cliqz.com.xpi@localhost) = 3e6937f8eead1d4f2c0d5efb0dfdc25e4236da22f3b66be9f418c6acc77b28c72f6b4c50e50742aca85661c880218762857d41989c786616894b53b1fd7f0098
-Size (cliqz-1.36.0/dat%cliqz.com.xpi@localhost) = 988736 bytes
-SHA1 (cliqz-1.36.0/gdprtool%cliqz.com.xpi@localhost) = 1a95888fd7b49ea2b38c3d7ba2fb901115fc19aa
-RMD160 (cliqz-1.36.0/gdprtool%cliqz.com.xpi@localhost) = 02676ca33b7ef732649cc2e9c1b5e3110b45ab9c
-SHA512 (cliqz-1.36.0/gdprtool%cliqz.com.xpi@localhost) = f59850063a542436484983abfe96b93ecd6e6e90f154e117bdfaca8b0fcc8e2abde715ee1a4e75661d0cf8cf8a8840529a06186a8f133300dff287e7f74efa85
-Size (cliqz-1.36.0/gdprtool%cliqz.com.xpi@localhost) = 219684 bytes
-SHA1 (cliqz-1.36.0/https-everywhere%cliqz.com.xpi@localhost) = f0693d85bbf7b46549b4ea3a2d0a7dc82fadb609
-RMD160 (cliqz-1.36.0/https-everywhere%cliqz.com.xpi@localhost) = 496a7d3f1bbf5a4cc0af852335b09b1187a9ec8d
-SHA512 (cliqz-1.36.0/https-everywhere%cliqz.com.xpi@localhost) = 7b437a06c76fe083537c02724de38db8980a9701cbbb62fba01417b8384d30c149ff894b17f441226e414807b815f1cc46101bb9be53348573580abd3a8735a7
-Size (cliqz-1.36.0/https-everywhere%cliqz.com.xpi@localhost) = 2058305 bytes
+SHA1 (cliqz-1.38.0/adult-domains.bin) = 39f8b7a881e70828fdb411eefd5a70540a3699bd
+RMD160 (cliqz-1.38.0/adult-domains.bin) = a41b8d15df385dbce6904f184552eb542161ce54
+SHA512 (cliqz-1.38.0/adult-domains.bin) = 8896a629efd0f67b98393928edda20400350938f911f7eedc05f776b2626a656dfb092714fc5cb1766e4aee4efccfed62d297f211c07b3cca57fff1cd282ced1
+Size (cliqz-1.38.0/adult-domains.bin) = 528392 bytes
+SHA1 (cliqz-1.38.0/cliqz-1.38.0.tar.gz) = fc083a5ab4eb9cebfa82ed019b8bc1cc46f3cc5a
+RMD160 (cliqz-1.38.0/cliqz-1.38.0.tar.gz) = 63ec52bdd6b9295a5133f232ba14ff25932194ee
+SHA512 (cliqz-1.38.0/cliqz-1.38.0.tar.gz) = 94574d14f78b2b9cd0b071cbeaa7be151a3ec65117a00dbdf495840b9b0e6fdc656affb51e2524d7a0e78e482327c2cff60fee8638b87dc334c2b84652ed85bc
+Size (cliqz-1.38.0/cliqz-1.38.0.tar.gz) = 519049842 bytes
+SHA1 (cliqz-1.38.0/cliqz%cliqz.com.xpi@localhost) = 23335676edb21a4d02fb5a0a57a11528efffdf26
+RMD160 (cliqz-1.38.0/cliqz%cliqz.com.xpi@localhost) = 4932d40bcdc86baf1e56b29b197e53a37320ece4
+SHA512 (cliqz-1.38.0/cliqz%cliqz.com.xpi@localhost) = 6b36867a99fb799179bd411caddbc1c2eafdf7b132229887c65d61152de72768e29b88091a08fcddf8d9f31d8cf3fc6ac780cda50f30b6decaebfaff270ed1ca
+Size (cliqz-1.38.0/cliqz%cliqz.com.xpi@localhost) = 4107644 bytes
+SHA1 (cliqz-1.38.0/dat%cliqz.com.xpi@localhost) = ffeeb096509fb570cd9387c2c273d457be529d07
+RMD160 (cliqz-1.38.0/dat%cliqz.com.xpi@localhost) = 61e47dabb836866cf2bf63f1ff657d8b4ad67cbb
+SHA512 (cliqz-1.38.0/dat%cliqz.com.xpi@localhost) = 3e6937f8eead1d4f2c0d5efb0dfdc25e4236da22f3b66be9f418c6acc77b28c72f6b4c50e50742aca85661c880218762857d41989c786616894b53b1fd7f0098
+Size (cliqz-1.38.0/dat%cliqz.com.xpi@localhost) = 988736 bytes
+SHA1 (cliqz-1.38.0/gdprtool%cliqz.com.xpi@localhost) = 1a95888fd7b49ea2b38c3d7ba2fb901115fc19aa
+RMD160 (cliqz-1.38.0/gdprtool%cliqz.com.xpi@localhost) = 02676ca33b7ef732649cc2e9c1b5e3110b45ab9c
+SHA512 (cliqz-1.38.0/gdprtool%cliqz.com.xpi@localhost) = f59850063a542436484983abfe96b93ecd6e6e90f154e117bdfaca8b0fcc8e2abde715ee1a4e75661d0cf8cf8a8840529a06186a8f133300dff287e7f74efa85
+Size (cliqz-1.38.0/gdprtool%cliqz.com.xpi@localhost) = 219684 bytes
+SHA1 (cliqz-1.38.0/https-everywhere%cliqz.com.xpi@localhost) = f0693d85bbf7b46549b4ea3a2d0a7dc82fadb609
+RMD160 (cliqz-1.38.0/https-everywhere%cliqz.com.xpi@localhost) = 496a7d3f1bbf5a4cc0af852335b09b1187a9ec8d
+SHA512 (cliqz-1.38.0/https-everywhere%cliqz.com.xpi@localhost) = 7b437a06c76fe083537c02724de38db8980a9701cbbb62fba01417b8384d30c149ff894b17f441226e414807b815f1cc46101bb9be53348573580abd3a8735a7
+Size (cliqz-1.38.0/https-everywhere%cliqz.com.xpi@localhost) = 2058305 bytes
 SHA1 (patch-browser_app_profile_firefox.js) = c8a672c798fae39228fb136dd2cc22a04e1ba119
-SHA1 (patch-cliqz__env.sh) = 69df75c62d887365be1ba7b8d72aa93bcbd14cc7
+SHA1 (patch-cliqz__env.sh) = b618c0d79f55bdf7eb9aa982d52de11d7a7324d6
 SHA1 (patch-config_makefiles_rust.mk) = c31696b6c65709a554691342b3caa521e31675b0
 SHA1 (patch-mozilla-release_browser_config_cliqz.mozconfig) = f59e4c0405ed2f8a5fbb0f3e3ce7c62206c1bca8
 SHA1 (patch-mozilla-release_build_moz.configure_rust.configure) = d94eb6cdad57d96786b82185bf91491f3fa76437
 SHA1 (patch-mozilla-release_config_gcc-stl-wrapper.template.h) = 5c8f3b820adec446c79393bdae7ac224c4a831a9
 SHA1 (patch-mozilla-release_config_rules.mk) = bd87f0625df38b6b44291cdb6bc589c1e4d34f7b
+SHA1 (patch-mozilla-release_configure.in) = 9a6a13af3adb9fb9bd149acde708d4068813fd6c
 SHA1 (patch-mozilla-release_dom_base_nsAttrName.h) = 5583d7f6aafb29f4b8e8be794902adf2850e1b5f
 SHA1 (patch-mozilla-release_gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = c696b0dc6d2f25773ac4d928857b00b4f3799838
 SHA1 (patch-mozilla-release_gfx_angle_checkout_src_compiler_translator_InfoSink.h) = e5f9cb8fac413267546a268ca0e50611b9965542
+SHA1 (patch-mozilla-release_gfx_cairo_cairo_src_cairo-type1-subset.c) = c88332431538f2ebf8fb21cf5677dd7f92cdf883
 SHA1 (patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp) = 52be4b6a3be94a34c7ba274fbbf98de0551deff6
-SHA1 (patch-mozilla-release_image_imgFrame.h) = 00adb685261e3c251087ed617c9168c45000ecc4
+SHA1 (patch-mozilla-release_gfx_thebes_gfxPlatform.cpp) = d2096f5f67ee71296b81eb16ba5b23cda348f1d4
 SHA1 (patch-mozilla-release_ipc_chromium_src_base_lock__impl__posix.cc) = 11283db62c0a392dc592b1a82c2d9c0788ee11bb
 SHA1 (patch-mozilla-release_ipc_chromium_src_base_message__pump__libevent.cc) = 49051c927711fd5558f90aa651dccd99a887e95f
 SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore.h) = 9dbd97480789aef4a0c51c92c8ab3b089cdad821
 SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore__posix.cpp) = 44791e6e689c6716d1e807412247c0d14b219436
 SHA1 (patch-mozilla-release_ipc_glue_GeckoChildProcessHost.cpp) = 2667be0de782205e62a7b0a5359de83223bd4fc3
-SHA1 (patch-mozilla-release_js_src_jsfriendapi.h) = 607b8e8e117a1c98995b919e25168ff5a63aee16
+SHA1 (patch-mozilla-release_js_src_jsfriendapi.h) = 27eda76522cb511732aa2eaacaa134aac5f75651
+SHA1 (patch-mozilla-release_mach) = ec0c348204447aebcaa076b99ca4b58ad89e8496
 SHA1 (patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h) = be0d566790aaaf7b4dd3f2110f6c8c6639399e4a
+SHA1 (patch-mozilla-release_media_libtheora_lib_info.c) = a8e0fa6baa7c552f8795d234ae713c782434d39e
+SHA1 (patch-mozilla-release_media_libvorbis_lib_vorbis__info.c) = 38a9b9e82da636abfd53ac86a8273b5970d65809
+SHA1 (patch-mozilla-release_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc) = cf563fdeb2e629bbb0da53dc785b901c3db3c2e8
 SHA1 (patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c) = 75dbd240fa5e615ca7d77299e4ae7f4811026697
 SHA1 (patch-mozilla-release_old-configure.in) = a99aabb553f2396c865e5073a9548e42c447f68a
+SHA1 (patch-mozilla-release_security_nss_lib_freebl_mpi_mpi.c) = d35dc74e7f061db0f63732584f582d895386d001
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_.cargo-checksum.json) = 09cdee20e0c6bd87ed460e51519eaf63a7dcfe44
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_src_lib.rs) = 2550a53d28ffc797799c6ea367e0acfa4a9a6566
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_src_netbsd_device.rs) = 23b1e2f60de905150b3744cabd331bd3563426b0
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_src_netbsd_fd.rs) = ee0f6ee02e998ce5f53c1213428755708562292c
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_src_netbsd_mod.rs) = c0dd14dd2f8f8be21c324f914e8cab7831ed08cc
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_src_netbsd_monitor.rs) = 2a01e8378a932fdb4870e491e1329456155df033
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_src_netbsd_transaction.rs) = c565cb970819446cb5e2d672401249de4a7aca65
+SHA1 (patch-mozilla-release_third__party_rust_authenticator_src_netbsd_uhid.rs) = 7f72b66eaac8e342f05ff2843b257c507c8e237c
+SHA1 (patch-mozilla-release_third__party_rust_getrandom_src_lib.rs) = 2a14a2546e4033017c08e0776625e62064b78cb4
 SHA1 (patch-mozilla-release_third__party_rust_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 836836c19ecd22cd7902a28d3f8118cee77679c6
-SHA1 (patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp) = c439a1612f8d8ce4ceae5bbbff164cfc6e90e525
+SHA1 (patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp) = d7f6622f19ee41792df71db4578e33c841925563
 SHA1 (patch-mozilla-release_toolkit_modules_subprocess_subprocess__shared__unix.js) = d72e47521ed87cf00a01981de15d8512fc2b43b8
 SHA1 (patch-mozilla-release_toolkit_mozapps_installer_packager.mk) = 9c436e7050d386d4473308ef9200a1955e1507a6
+SHA1 (patch-mozilla-release_widget_gtk_WaylandDMABufSurface.cpp) = 26f121da70afb9d066228d39455e9e51faf75e11
 SHA1 (patch-mozilla-release_xpcom_base_nscore.h) = 594cf7bed236bb024a6c8ea857f325ac3bf174e6
 SHA1 (patch-mozilla-release_xpcom_build_BinaryPath.h) = a351eed0681872d50193a0232e61752c223026d1

Index: pkgsrc/www/cliqz/mozilla-common.mk
diff -u pkgsrc/www/cliqz/mozilla-common.mk:1.11 pkgsrc/www/cliqz/mozilla-common.mk:1.12
--- pkgsrc/www/cliqz/mozilla-common.mk:1.11     Sun May 17 10:10:18 2020
+++ pkgsrc/www/cliqz/mozilla-common.mk  Fri Jul 24 07:29:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.11 2020/05/17 10:10:18 fox Exp $
+# $NetBSD: mozilla-common.mk,v 1.12 2020/07/24 07:29:32 fox Exp $
 #
 # Common Makefile fragment for mozilla packages based on gecko 2.0.
 # derived from www/firefox
@@ -36,7 +36,6 @@ MOZ_CONFIGURE_ARGS+=  "ac_add_options --d
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --disable-debug-symbols"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --disable-tests"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --disable-necko-wifi"
-MOZ_CONFIGURE_ARGS+=   "ac_add_options --disable-libjpeg-turbo"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --disable-icf"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --disable-jemalloc"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --disable-webrtc"
@@ -45,7 +44,6 @@ MOZ_CONFIGURE_ARGS+=  "ac_add_options --w
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --with-system-nss"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --with-system-nspr"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --with-system-zlib"
-MOZ_CONFIGURE_ARGS+=   "ac_add_options --with-system-bz2"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --with-system-libvpx"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --with-system-libevent=${BUILDLINK_PREFIX.libevent}"
 
@@ -56,7 +54,6 @@ MOZ_CONFIGURE_ARGS+=  "ac_add_options --e
 #MOZ_CONFIGURE_ARGS+=  "ac_add_options --enable-rust-simd"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-system-ffi"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-chrome-format=flat"
-MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-gconf"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --with-libclang-path=${PREFIX}/lib"
 
 # Fix binary path
@@ -74,7 +71,7 @@ BUILDLINK_API_DEPENDS.libevent+=       l
 BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.25
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nss+=     nss>=3.52
+BUILDLINK_API_DEPENDS.nss+=     nss>=3.53
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"

Index: pkgsrc/www/cliqz/patches/patch-cliqz__env.sh
diff -u pkgsrc/www/cliqz/patches/patch-cliqz__env.sh:1.3 pkgsrc/www/cliqz/patches/patch-cliqz__env.sh:1.4
--- pkgsrc/www/cliqz/patches/patch-cliqz__env.sh:1.3    Sun Feb 23 00:10:41 2020
+++ pkgsrc/www/cliqz/patches/patch-cliqz__env.sh        Fri Jul 24 07:29:32 2020
@@ -1,11 +1,11 @@
-$NetBSD: patch-cliqz__env.sh,v 1.3 2020/02/23 00:10:41 fox Exp $
+$NetBSD: patch-cliqz__env.sh,v 1.4 2020/07/24 07:29:32 fox Exp $
 
 Commented out the various wget(1) to prevent http traffic during build
 phase.
 
---- cliqz_env.sh.orig  2020-02-19 14:20:43.000000000 +0000
+--- cliqz_env.sh.orig  2020-07-17 14:00:07.000000000 +0000
 +++ cliqz_env.sh
-@@ -110,9 +110,9 @@ export S3_BUCKET=repository.cliqz.com
+@@ -109,9 +109,9 @@ export S3_BUCKET=repository.cliqz.com
  export S3_BUCKET_SERVICE=cliqz-browser-data
  
  # check CQZ_BUILD_ID and try to obtain, if not specified
@@ -18,12 +18,12 @@ phase.
  
  if [ -z $CQZ_BUILD_ID ]; then
    echo "CQZ_BUILD_ID not specified and can not be obtain from "$S3_BUCKET
-@@ -135,7 +135,7 @@ OBJ_DIR=$MOZ_OBJDIR
+@@ -134,7 +134,7 @@ OBJ_DIR=$MOZ_OBJDIR
  SRC_BASE=mozilla-release
  
  # automatic forget tab - start
--wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
-+#wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
- export CQZ_ADULT_DOMAINS_BF=../adult-domains.bin
+-wget -O mozilla-release/browser/adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
++#wget -O mozilla-release/browser/adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
+ export CQZ_ADULT_DOMAINS_BF="adult-domains.bin"
  # automatic forget tab - end
  

Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h
diff -u pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h:1.1 pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h:1.2
--- pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h:1.1     Sat Apr 18 07:58:36 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h Fri Jul 24 07:29:32 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-mozilla-release_js_src_jsfriendapi.h,v 1.1 2020/04/18 07:58:36 fox Exp $
+$NetBSD: patch-mozilla-release_js_src_jsfriendapi.h,v 1.2 2020/07/24 07:29:32 fox Exp $
 
 * Fix va_list error.
 
 Taken from www/firefox
 
---- mozilla-release/js/src/jsfriendapi.h.orig  2020-04-03 19:34:47.000000000 +0000
+--- mozilla-release/js/src/jsfriendapi.h.orig  2020-05-22 02:11:19.000000000 +0000
 +++ mozilla-release/js/src/jsfriendapi.h
-@@ -13,6 +13,7 @@
- #include "mozilla/MemoryReporting.h"
+@@ -14,6 +14,7 @@
+ #include "mozilla/PodOperations.h"
  #include "mozilla/UniquePtr.h"
  
 +#include <stdarg.h>
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp
diff -u pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp:1.1 
pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp:1.2
--- pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp:1.1   Fri Apr 19 14:02:03 2019
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp       Fri Jul 24 07:29:32 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp,v 1.1 2019/04/19 14:02:03 fox Exp $
+$NetBSD: patch-mozilla-release_toolkit_components_terminator_nsTerminator.cpp,v 1.2 2020/07/24 07:29:32 fox Exp $
 
 * Fix segfault on exit under NetBSD
 
-Original patch from ryoon, imported from www/firefox
+Taken from www/firefox
 
---- mozilla-release/toolkit/components/terminator/nsTerminator.cpp.orig        2018-11-16 08:40:07.000000000 +0000
+--- mozilla-release/toolkit/components/terminator/nsTerminator.cpp.orig        2020-05-21 22:38:09.000000000 +0000
 +++ mozilla-release/toolkit/components/terminator/nsTerminator.cpp
 @@ -36,7 +36,7 @@
  #if defined(XP_WIN)
@@ -15,7 +15,7 @@ Original patch from ryoon, imported from
  #endif
  
  #include "mozilla/ArrayUtils.h"
-@@ -170,7 +170,10 @@ void RunWatchdog(void* arg) {
+@@ -180,7 +180,10 @@ void RunWatchdog(void* arg) {
  #if defined(XP_WIN)
      Sleep(1000 /* ms */);
  #else
@@ -25,5 +25,5 @@ Original patch from ryoon, imported from
 +    tickd.tv_nsec = 0;
 +    nanosleep(&tickd, NULL);
  #endif
- 
      if (gHeartbeat++ < timeToLive) {
+ #if !defined(MOZ_VALGRIND) || !defined(MOZ_CODE_COVERAGE)

Added files:

Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_configure.in
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_configure.in:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_configure.in Fri Jul 24 07:29:32 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-mozilla-release_configure.in,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+* Accept Python 3.x from pkgsrc.
+
+Taken from www/firefox
+
+--- mozilla-release/configure.in.orig  2020-05-21 22:37:47.000000000 +0000
++++ mozilla-release/configure.in
+@@ -22,4 +22,4 @@ SRCDIR=$(dirname $0)
+ TOPSRCDIR="$SRCDIR"
+ export OLD_CONFIGURE="$SRCDIR"/old-configure
+ 
+-exec python3 "$TOPSRCDIR/configure.py" "$@"
++exec ${PYTHON3} "$TOPSRCDIR/configure.py" "$@"
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_cairo_cairo_src_cairo-type1-subset.c
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_cairo_cairo_src_cairo-type1-subset.c:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_cairo_cairo_src_cairo-type1-subset.c     Fri Jul 24 07:29:32 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-mozilla-release_gfx_cairo_cairo_src_cairo-type1-subset.c,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Fix undefined behavior when calling <ctype.h> functions with illegal values.
+
+gfx/cairo/cairo/src/cairo-type1-subset.c:273:11: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642081
+
+Taken from www/firefox
+
+--- mozilla-release/gfx/cairo/cairo/src/cairo-type1-subset.c.orig      2020-05-07 18:34:10.000000000 +0000
++++ mozilla-release/gfx/cairo/cairo/src/cairo-type1-subset.c
+@@ -270,7 +270,7 @@ cairo_type1_font_subset_find_segments (c
+       font->eexec_segment = (char *) p + font->header_segment_size;
+       font->eexec_segment_is_ascii = TRUE;
+       for (i = 0; i < 4; i++) {
+-          if (!isxdigit(font->eexec_segment[i]))
++          if (!isxdigit((unsigned char) font->eexec_segment[i]))
+               font->eexec_segment_is_ascii = FALSE;
+       }
+     }
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_thebes_gfxPlatform.cpp
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_thebes_gfxPlatform.cpp:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_thebes_gfxPlatform.cpp   Fri Jul 24 07:29:32 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-mozilla-release_gfx_thebes_gfxPlatform.cpp,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Don't rely on CrossProcessSemaphore on NetBSD. It has some implementation
+issues that cause issues (kern/55386, not available on NetBSD<9)
+
+This idea is borrowed from macOS which has the same limitation.
+
+Taken from www/firefox
+
+--- mozilla-release/gfx/thebes/gfxPlatform.cpp.orig    2020-06-03 01:04:50.000000000 +0000
++++ mozilla-release/gfx/thebes/gfxPlatform.cpp
+@@ -2922,6 +2922,10 @@ bool gfxPlatform::UsesOffMainThreadCompo
+ }
+ 
+ bool gfxPlatform::UsesTiling() const {
++#ifdef __NetBSD__
++  // Avoid relying on CrossProcessSemaphore
++  return true;
++#else
+   bool usesSkia = GetDefaultContentBackend() == BackendType::SKIA;
+ 
+   // We can't just test whether the PaintThread is initialized here because
+@@ -2934,6 +2938,7 @@ bool gfxPlatform::UsesTiling() const {
+   return StaticPrefs::layers_enable_tiles_AtStartup() ||
+          (StaticPrefs::layers_enable_tiles_if_skia_pomtp_AtStartup() &&
+           usesSkia && usesPOMTP);
++#endif
+ }
+ 
+ bool gfxPlatform::ContentUsesTiling() const {
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_mach
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_mach:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_mach Fri Jul 24 07:29:32 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-mozilla-release_mach,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+* Accept Python 3.x from pkgsrc.
+
+--- mozilla-release/mach.orig  2020-07-23 22:08:42.682115705 +0000
++++ mozilla-release/mach
+@@ -94,7 +94,7 @@ fi
+ 
+ if [ -z "$first_arg" ]; then
+     # User ran `./mach` or `./mach help`, use Python 3.
+-    run_py python3 "$@"
++    run_py ${PYTHON3} "$@"
+ fi
+ 
+ case "${first_arg}" in
+@@ -121,12 +121,12 @@ case " $(echo $py2commands) " in
+         run_py python2.7 "$@"
+         ;;
+     *)
+-        run_py python3 "$@"
++        run_py ${PYTHON3} "$@"
+         ;;
+ esac
+ 
+ # Run Python 3 for everything else.
+-run_py python3 "$@"
++run_py ${PYTHON3} "$@"
+ '''
+ 
+ from __future__ import absolute_import, print_function, unicode_literals
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libtheora_lib_info.c
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libtheora_lib_info.c:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libtheora_lib_info.c   Fri Jul 24 07:29:32 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-mozilla-release_media_libtheora_lib_info.c,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Fix undefined behavior when calling <ctype.h> functions with illegal values.
+
+media/libtheora/lib/info.c:32:8: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642081
+
+Taken from www/firefox
+
+--- mozilla-release/media/libtheora/lib/info.c.orig    2020-05-07 18:34:12.000000000 +0000
++++ mozilla-release/media/libtheora/lib/info.c
+@@ -29,7 +29,7 @@
+ static int oc_tagcompare(const char *_s1,const char *_s2,int _n){
+   int c;
+   for(c=0;c<_n;c++){
+-    if(toupper(_s1[c])!=toupper(_s2[c]))return !0;
++    if(toupper((unsigned char)_s1[c])!=toupper((unsigned char)_s2[c]))return !0;
+   }
+   return _s1[c]!='=';
+ }
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libvorbis_lib_vorbis__info.c
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libvorbis_lib_vorbis__info.c:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_media_libvorbis_lib_vorbis__info.c   Fri Jul 24 07:29:32 2020
@@ -0,0 +1,21 @@
+$NetBSD: patch-mozilla-release_media_libvorbis_lib_vorbis__info.c,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Fix undefined behavior when calling <ctype.h> functions with illegal values.
+
+media/libvorbis/lib/vorbis_info.c:81:8: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642081
+
+Taken from www/firefox
+
+--- mozilla-release/media/libvorbis/lib/vorbis_info.c.orig     2020-05-07 18:34:46.000000000 +0000
++++ mozilla-release/media/libvorbis/lib/vorbis_info.c
+@@ -78,7 +78,7 @@ void vorbis_comment_add_tag(vorbis_comme
+ static int tagcompare(const char *s1, const char *s2, int n){
+   int c=0;
+   while(c < n){
+-    if(toupper(s1[c]) != toupper(s2[c]))
++    if(toupper((unsigned char) s1[c]) != toupper((unsigned char) s2[c]))
+       return !0;
+     c++;
+   }
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc        Fri Jul 24 07:29:32 2020
@@ -0,0 +1,48 @@
+$NetBSD: patch-mozilla-release_media_webrtc_trunk_webrtc_modules_video__capture_linux_device__info__linux.cc,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+* Fix buiuld under NetBSD.
+  NetBSD's sys/videoio.h does not have v4l2_capability.device_caps
+  and video capture does not work for me anyway.
+
+Taken from www/firefox
+
+--- mozilla-release/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc.orig    2020-06-19 00:11:06.000000000 +0000
++++ mozilla-release/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
+@@ -207,10 +207,12 @@ uint32_t DeviceInfoLinux::NumberOfDevice
+     sprintf(device, "/dev/video%d", n);
+     if ((fd = open(device, O_RDONLY)) != -1) {
+       // query device capabilities and make sure this is a video capture device
++#if !defined(__NetBSD__)
+       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !(cap.device_caps & V4L2_CAP_VIDEO_CAPTURE)) {
+         close(fd);
+         continue;
+       }
++#endif
+ 
+       close(fd);
+       count++;
+@@ -241,10 +243,12 @@ int32_t DeviceInfoLinux::GetDeviceName(u
+     sprintf(device, "/dev/video%d", device_index);
+     if ((fd = open(device, O_RDONLY)) != -1) {
+       // query device capabilities and make sure this is a video capture device
++#if !defined(__NetBSD__)
+       if (ioctl(fd, VIDIOC_QUERYCAP, &cap) < 0 || !(cap.device_caps & V4L2_CAP_VIDEO_CAPTURE)) {
+         close(fd);
+         continue;
+       }
++#endif
+       if (count == deviceNumber) {
+         // Found the device
+         found = true;
+@@ -328,9 +332,11 @@ int32_t DeviceInfoLinux::CreateCapabilit
+     struct v4l2_capability cap;
+     if (ioctl(fd, VIDIOC_QUERYCAP, &cap) == 0) {
+       // skip devices without video capture capability
++#if !defined(__NetBSD__)
+       if (!(cap.device_caps & V4L2_CAP_VIDEO_CAPTURE)) {
+         continue;
+       }
++#endif
+ 
+       if (cap.bus_info[0] != 0) {
+         if (strncmp((const char*)cap.bus_info, (const char*)deviceUniqueIdUTF8,
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_security_nss_lib_freebl_mpi_mpi.c
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_security_nss_lib_freebl_mpi_mpi.c:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_security_nss_lib_freebl_mpi_mpi.c    Fri Jul 24 07:29:32 2020
@@ -0,0 +1,37 @@
+$NetBSD: patch-mozilla-release_security_nss_lib_freebl_mpi_mpi.c,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Fix undefined behavior when calling <ctype.h> functions with illegal values.
+
+security/nss/lib/freebl/mpi/mpi.c:4565:15: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+        xch = toupper(ch);
+
+security/nss/lib/freebl/mpi/mpi.c:4611:14: error: array subscript is of type 'char' [-Werror,-Wchar-subscripts]
+        ch = tolower(ch);
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1642081
+
+Taken from www/firefox
+
+--- mozilla-release/security/nss/lib/freebl/mpi/mpi.c.orig     2020-05-07 18:35:01.000000000 +0000
++++ mozilla-release/security/nss/lib/freebl/mpi/mpi.c
+@@ -4560,9 +4560,9 @@ s_mp_tovalue(char ch, int r)
+     int val, xch;
+ 
+     if (r > 36)
+-        xch = ch;
++        xch = (unsigned char) ch;
+     else
+-        xch = toupper(ch);
++        xch = toupper((unsigned char) ch);
+ 
+     if (isdigit(xch))
+         val = xch - '0';
+@@ -4608,7 +4608,7 @@ s_mp_todigit(mp_digit val, int r, int lo
+     ch = s_dmap_1[val];
+ 
+     if (r <= 36 && low)
+-        ch = tolower(ch);
++        ch = tolower((unsigned char) ch);
+ 
+     return ch;
+ 
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_.cargo-checksum.json
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_.cargo-checksum.json:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_.cargo-checksum.json Fri Jul 24 07:29:32 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_.cargo-checksum.json,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/.cargo-checksum.json.orig   2020-07-08 21:55:03.000000000 +0000
++++ mozilla-release/third_party/rust/authenticator/.cargo-checksum.json
+@@ -1 +1 @@
+-{"files":{"Cargo.lock":"4e90be1a6ead1f94b74ab22da0ad669e69bb7c112849d0e43e8942b83ca5ba7b","Cargo.toml":"31b25c3aadc79a147603253dee37c7fcd74e1a20bb62dd3d3b506e097b555fa2","LICENSE":"e866c8f5864d4cacfe403820e722e9dc03fe3c7565efa5e4dad9051d827bb92a","README.md":"f7b1f971632873f3d3c322c2f5cf980fbcd0116786efb580b89fe6ddac07fc07","build.rs":"bc308b771ae9741d775370e3efe45e9cca166fd1d0335f4214b00497042ccc55","examples/main.rs":"7af9e288b1836fb9362589b6bf54c1f1d277bdf64df60c1caccef98c1bfe792c","rustfmt.toml":"de4e1daab481c1572805aed3e51e72c5dc1b3e5af757bc675e1717b251c6e922","src/capi.rs":"99f0d0742bf102451698c7e32db0fc4941b8ac10bec2fb309f41e7e5d99b05bd","src/consts.rs":"4c34980f94d1017e5e75e29b26750c1678e0609c9227296951ffbb9e180a5adf","src/freebsd/device.rs":"914ac446ff24cc3fc050732372e286e1fedf8341a8d4754e392bc9f38393b142","src/freebsd/mod.rs":"42dcb57fbeb00140003a8ad39acac9b547062b8f281a3fa5deb5f92a6169dde6","src/freebsd/monitor.rs":"3683370931b15f05403d240a788a87b1bea801284ee74b849e1f330
 
a4a231dd0","src/freebsd/transaction.rs":"e3615cfdd7f23e9a80a53c32e0fa2a5ae290a432b009bed2b2e74e0df77f8266","src/freebsd/uhid.rs":"d19ade6e808e63981ba5f93d482d676ffa9dff29cb2b7011486591f69ddbbdcd","src/hidproto.rs":"9de8d86509d706e3a0ade2b5a57eec7730afd4073d9cdd99aa8ca1376be37f83","src/lib.rs":"4b43ad18b4eae9356ba6d7954542a38f3015ab8a72ab1fde28169aaf343721d8","src/linux/device.rs":"2271fbb8d176ec01f83a899c0c8194a954465fdd8670a9b136ab88baaba2ee48","src/linux/hidraw.rs":"0d5804d1cd99e7c30c8bde3089f8ed98d7d683d3cd487821e29b133b1ee90228","src/linux/hidwrapper.h":"72785db3a9b27ea72b6cf13a958fee032af54304522d002f56322473978a20f9","src/linux/hidwrapper.rs":"4be65676cf3220929700bf4906938dcbd1538ba53d40c60b08f9ba8890c910f6","src/linux/ioctl_aarch64le.rs":"f482a967c8006d0c34c03e9f2aeca4c4f426c5c27f7f930f3230129caf176060","src/linux/ioctl_armle.rs":"f482a967c8006d0c34c03e9f2aeca4c4f426c5c27f7f930f3230129caf176060","src/linux/ioctl_mips64le.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5
 
322c3047d474fd","src/linux/ioctl_powerpc64be.rs":"fbda309934ad8bda689cd4fb5c0ca696fe26dedb493fe9d5a5322c3047d474fd","src/linux/ioctl_powerpc64le.rs":"0d50afd0bf094b5146d65d263544cba141ff248e487d90d6c03559e9b3c2fd55","src/linux/ioctl_powerpcbe.rs":"0d50afd0bf094b5146d65d263544cba141ff248e487d90d6c03559e9b3c2fd55","src/linux/ioctl_s390xbe.rs":"2d8b265cd39a9f46816f83d5a5df0701c13eb842bc609325bad42ce50add3bf0","src/linux/ioctl_x86.rs":"f482a967c8006d0c34c03e9f2aeca4c4f426c5c27f7f930f3230129caf176060","src/linux/ioctl_x86_64.rs":"f482a967c8006d0c34c03e9f2aeca4c4f426c5c27f7f930f3230129caf176060","src/linux/mod.rs":"446e435126d2a58f167f648dd95cba28e8ac9c17f1f799e1eaeab80ea800fc57","src/linux/monitor.rs":"57890c5f000829c5c0f44032fe5364126e60451605d517c79ba4d4fe4fd6c94b","src/linux/transaction.rs":"92b47d064c1fa5fe2674f65d06c519601480fc1c2b03667ade19a186a6ec9d13","src/macos/device.rs":"29863c88f851a957ec754f16aae6f789b300b00fcfe9a6c198a7cdcf1c9fcfe4","src/macos/iokit.rs":"a0fd818224718e96ad5
 
d106dfc235f4bc9218a59f5114b9f9825abe3ee62bce7","src/macos/mod.rs":"333e561554fc901d4f6092f6e4c85823e2b0c4ff31c9188d0e6d542b71a0a07c","src/macos/monitor.rs":"d3a1dadfbfb5bfd665d75493d72bfbca3da9c43692262230f10d5feadb928e62","src/macos/transaction.rs":"cf2e67530401b0ef18e978557f470aa2661b3a5f4ef64cd3053d6e11f2f19b2b","src/manager.rs":"7428fc23038b004841936d8f27f8dc33234d5c06361efa75b73c7a5c035dae75","src/openbsd/device.rs":"b5de51a8b3ae0e542373a2064cff1ae6e1f91ac78e1406805d9ca8a05ce758c9","src/openbsd/mod.rs":"514274d414042ff84b3667a41a736e78581e22fda87ccc97c2bc05617e381a30","src/openbsd/monitor.rs":"953800ab8fd6adf5d70633059b20d2cf0f5a2701d92e58a06d1ec33208983bc4","src/openbsd/transaction.rs":"10be1ce983c72513fec57baaa6869ef02b9cdbd8ea66bb2dfe24d857faf054f5","src/statemachine.rs":"28477fba601f5086b85e911da1e4f04af3f0060329e6e0e1172b960f9c52fd41","src/stub/device.rs":"32e134fc8826667d16b02fe32831fc29f4d52d0a7a065d7d649c4a1c5faa0dcc","src/stub/mod.rs":"6a7fec504a52d403b0241b18cd8b95088
 
a31807571f4c0a67e4055afc74f4453","src/stub/transaction.rs":"8655bc37b69c318ff0bc69a62fcb31820eb6ad7921a53e0cecffa15e80d97630","src/u2fhid-capi.h":"fc2575f720ab8f6bc0c523c57310f35c464576bd5150c3c2b1873d3abde5909b","src/u2fprotocol.rs":"77b6d5005d8b3d98cd96e480013c1e97155da5df3cf5e19819ee82ac8e3b6c7d","src/u2ftypes.rs":"cf972d805b15a95f4c18d556aa01660ce451f1d3bce1516b0ce73d17e73199aa","src/util.rs":"c517750c9bf00f44fb63cada8c40d0227a4d3765488499a1f4d3c0f01daa67a7","src/windows/device.rs":"86a6ecc239608977a963f375336780746e90e95c3eb9ff303347beb983c40ab6","src/windows/mod.rs":"218e7f2fe91ecb390c12bba5a5ffdad2c1f0b22861c937f4d386262e5b3dd617","src/windows/monitor.rs":"d8e8316e5bd9fc6ebed737bd8d6e0713c99287aca04f392f6319cdfd8576f754","src/windows/transaction.rs":"1b9a5af866048911ccaec8c94b698b28ae1b80e3d4842f9d6ed38462f459c796","src/windows/winapi.rs":"a4286fd5e8dcb178e37df512ba7752b2a3c38fe30e1176022767d2c05c242bf8"},"package":"ff593fb4dd388fe452c5e63d4d668699466bd46b571c4b852dfbca4bac8f
 0706"}
+\ No newline at end of file
++{"files":{},"package":"ff593fb4dd388fe452c5e63d4d668699466bd46b571c4b852dfbca4bac8f0706"}
+\ No newline at end of file
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_lib.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_lib.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_lib.rs   Fri Jul 24 07:29:32 2020
@@ -0,0 +1,40 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_src_lib.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/src/lib.rs.orig     2020-07-08 19:27:16.000000000 +0000
++++ mozilla-release/third_party/rust/authenticator/src/lib.rs
+@@ -5,7 +5,7 @@
+ #[macro_use]
+ mod util;
+ 
+-#[cfg(any(target_os = "linux", target_os = "freebsd"))]
++#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "netbsd"))]
+ pub mod hidproto;
+ 
+ #[cfg(any(target_os = "linux"))]
+@@ -22,6 +22,10 @@ extern crate devd_rs;
+ #[path = "freebsd/mod.rs"]
+ pub mod platform;
+ 
++#[cfg(any(target_os = "netbsd"))]
++#[path = "netbsd/mod.rs"]
++pub mod platform;
++
+ #[cfg(any(target_os = "openbsd"))]
+ #[path = "openbsd/mod.rs"]
+ pub mod platform;
+@@ -41,6 +45,7 @@ pub mod platform;
+     target_os = "linux",
+     target_os = "freebsd",
+     target_os = "openbsd",
++    target_os = "netbsd",
+     target_os = "macos",
+     target_os = "windows"
+ )))]
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_device.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_device.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_device.rs Fri Jul 24 07:29:32 2020
@@ -0,0 +1,147 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_src_netbsd_device.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/src/netbsd/device.rs.orig   2020-07-15 16:29:34.208835297 +0000
++++ mozilla-release/third_party/rust/authenticator/src/netbsd/device.rs
+@@ -0,0 +1,134 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++extern crate libc;
++
++use std::mem;
++use std::io::Read;
++use std::io::Write;
++use std::io;
++
++use consts::CID_BROADCAST;
++use consts::HID_RPT_SIZE;
++use platform::fd::Fd;
++use platform::uhid;
++use u2ftypes::U2FDevice;
++use util::io_err;
++
++#[derive(Debug)]
++pub struct Device {
++    fd: Fd,
++    cid: [u8; 4],
++}
++
++impl Device {
++    pub fn new(fd: Fd) -> io::Result<Self> {
++        Ok(Self { fd, cid: CID_BROADCAST })
++    }
++
++    pub fn is_u2f(&mut self) -> bool {
++        if !uhid::is_u2f_device(&self.fd) {
++            return false;
++        }
++        // This step is not strictly necessary -- NetBSD puts fido
++        // devices into raw mode automatically by default, but in
++        // principle that might change, and this serves as a test to
++        // verify that we're running on a kernel with support for raw
++        // mode at all so we don't get confused issuing writes that try
++        // to set the report descriptor rather than transfer data on
++        // the output interrupt pipe as we need.
++        match uhid::hid_set_raw(&self.fd, true) {
++            Ok(_) => (),
++            Err(_) => return false,
++        }
++        if let Err(_) = self.ping() {
++            return false;
++        }
++        true
++    }
++
++    fn ping(&mut self) -> io::Result<()> {
++        for i in 0..10 {
++            let mut buf = vec![0u8; 1 + HID_RPT_SIZE];
++
++            buf[0] = 0;         // report number
++            buf[1] = 0xff;      // CID_BROADCAST
++            buf[2] = 0xff;
++            buf[3] = 0xff;
++            buf[4] = 0xff;
++            buf[5] = 0x81;      // ping
++            buf[6] = 0;
++            buf[7] = 1;         // one byte
++
++            self.write(&buf[..])?;
++
++            // Wait for response
++            let mut pfd: libc::pollfd = unsafe { mem::zeroed() };
++            pfd.fd = self.fd.fileno;
++            pfd.events = libc::POLLIN;
++            let nfds = unsafe { libc::poll(&mut pfd, 1, 100) };
++            if nfds == -1 {
++                return Err(io::Error::last_os_error());
++            }
++            if nfds == 0 {
++                debug!("device timeout {}", i);
++                continue;
++            }
++
++            // Read response
++            self.read(&mut buf[..])?;
++
++            return Ok(());
++        }
++
++        Err(io_err("no response from device"))
++    }
++}
++
++impl PartialEq for Device {
++    fn eq(&self, other: &Device) -> bool {
++        self.fd == other.fd
++    }
++}
++
++impl Read for Device {
++    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
++        let bufp = buf.as_mut_ptr() as *mut libc::c_void;
++        let nread = unsafe { libc::read(self.fd.fileno, bufp, buf.len()) };
++        if nread == -1 {
++            return Err(io::Error::last_os_error());
++        }
++        Ok(nread as usize)
++    }
++}
++
++impl Write for Device {
++    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
++        // Always skip the first byte (report number)
++        let data = &buf[1..];
++        let data_ptr = data.as_ptr() as *const libc::c_void;
++        let nwrit = unsafe {
++            libc::write(self.fd.fileno, data_ptr, data.len())
++        };
++        if nwrit == -1 {
++            return Err(io::Error::last_os_error());
++        }
++        // Pretend we wrote the report number byte
++        Ok(nwrit as usize + 1)
++    }
++
++    fn flush(&mut self) -> io::Result<()> {
++        Ok(())
++    }
++}
++
++impl U2FDevice for Device {
++    fn get_cid<'a>(&'a self) -> &'a [u8; 4] {
++        &self.cid
++    }
++
++    fn set_cid(&mut self, cid: [u8; 4]) {
++        self.cid = cid;
++    }
++}
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_fd.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_fd.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_fd.rs     Fri Jul 24 07:29:32 2020
@@ -0,0 +1,60 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_src_netbsd_fd.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/src/netbsd/fd.rs.orig       2020-07-15 16:29:34.209237373 +0000
++++ mozilla-release/third_party/rust/authenticator/src/netbsd/fd.rs
+@@ -0,0 +1,47 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++extern crate libc;
++
++use std::ffi::CString;
++use std::io;
++use std::mem;
++use std::os::raw::c_int;
++use std::os::unix::io::RawFd;
++
++#[derive(Debug)]
++pub struct Fd {
++    pub fileno: RawFd,
++}
++
++impl Fd {
++    pub fn open(path: &str, flags: c_int) -> io::Result<Fd> {
++        let cpath = CString::new(path.as_bytes())?;
++        let rv = unsafe { libc::open(cpath.as_ptr(), flags) };
++        if rv == -1 {
++            return Err(io::Error::last_os_error());
++        }
++        Ok(Fd { fileno: rv })
++    }
++}
++
++impl Drop for Fd {
++    fn drop(&mut self) {
++        unsafe { libc::close(self.fileno) };
++    }
++}
++
++impl PartialEq for Fd {
++    fn eq(&self, other: &Fd) -> bool {
++        let mut st: libc::stat = unsafe { mem::zeroed() };
++        let mut sto: libc::stat = unsafe { mem::zeroed() };
++        if unsafe { libc::fstat(self.fileno, &mut st) } == -1 {
++            return false;
++        }
++        if unsafe { libc::fstat(other.fileno, &mut sto) } == -1 {
++            return false;
++        }
++        (st.st_dev == sto.st_dev) & (st.st_ino == sto.st_ino)
++    }
++}
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_mod.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_mod.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_mod.rs    Fri Jul 24 07:29:32 2020
@@ -0,0 +1,23 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_src_netbsd_mod.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/src/netbsd/mod.rs.orig      2020-07-15 16:29:34.210141360 +0000
++++ mozilla-release/third_party/rust/authenticator/src/netbsd/mod.rs
+@@ -0,0 +1,10 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++pub mod device;
++pub mod transaction;
++
++mod fd;
++mod monitor;
++mod uhid;
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_monitor.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_monitor.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_monitor.rs        Fri Jul 24 07:29:32 2020
@@ -0,0 +1,102 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_src_netbsd_monitor.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/src/netbsd/monitor.rs.orig  2020-07-15 16:29:34.210607689 +0000
++++ mozilla-release/third_party/rust/authenticator/src/netbsd/monitor.rs
+@@ -0,0 +1,89 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++use std::collections::HashMap;
++use std::ffi::OsString;
++use std::io;
++use std::sync::Arc;
++use std::thread;
++use std::time::Duration;
++
++use runloop::RunLoop;
++
++use platform::fd::Fd;
++
++// XXX Should use drvctl, but it doesn't do pubsub properly yet so
++// DRVGETEVENT requires write access to /dev/drvctl.  Instead, for now,
++// just poll every 500ms.
++const POLL_TIMEOUT: u64 = 500;
++
++pub struct Monitor<F>
++where
++    F: Fn(Fd, &dyn Fn() -> bool) + Send + Sync + 'static,
++{
++    runloops: HashMap<OsString, RunLoop>,
++    new_device_cb: Arc<F>,
++}
++
++impl<F> Monitor<F>
++where
++    F: Fn(Fd, &dyn Fn() -> bool) + Send + Sync + 'static,
++{
++    pub fn new(new_device_cb: F) -> Self {
++        Self {
++            runloops: HashMap::new(),
++            new_device_cb: Arc::new(new_device_cb),
++        }
++    }
++
++    pub fn run(&mut self, alive: &dyn Fn() -> bool) -> io::Result<()> {
++        while alive() {
++            for n in 0..100 {
++                let uhidpath = format!("/dev/uhid{}", n);
++                match Fd::open(&uhidpath, libc::O_RDWR | libc::O_CLOEXEC) {
++                    Ok(uhid) => {
++                        self.add_device(uhid, OsString::from(&uhidpath));
++                    },
++                    Err(ref err) => {
++                        match err.raw_os_error() {
++                            Some(libc::EBUSY) => continue,
++                            Some(libc::ENOENT) => break,
++                            _ => self.remove_device(OsString::from(&uhidpath)),
++                        }
++                    },
++                }
++            }
++            thread::sleep(Duration::from_millis(POLL_TIMEOUT));
++        }
++        self.remove_all_devices();
++        Ok(())
++    }
++
++    fn add_device(&mut self, fd: Fd, path: OsString) {
++        let f = self.new_device_cb.clone();
++
++        let runloop = RunLoop::new(move |alive| {
++            if alive() {
++                f(fd, alive);
++            }
++        });
++
++        if let Ok(runloop) = runloop {
++            self.runloops.insert(path.clone(), runloop);
++        }
++    }
++
++    fn remove_device(&mut self, path: OsString) {
++        if let Some(runloop) = self.runloops.remove(&path) {
++            runloop.cancel();
++        }
++    }
++
++    fn remove_all_devices(&mut self) {
++        while !self.runloops.is_empty() {
++            let path = self.runloops.keys().next().unwrap().clone();
++            self.remove_device(path);
++        }
++    }
++}
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_transaction.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_transaction.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_transaction.rs    Fri Jul 24 07:29:32 2020
@@ -0,0 +1,63 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_src_netbsd_transaction.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/src/netbsd/transaction.rs.orig      2020-07-15 16:29:34.212621486 +0000
++++ mozilla-release/third_party/rust/authenticator/src/netbsd/transaction.rs
+@@ -0,0 +1,50 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++use runloop::RunLoop;
++use util::OnceCallback;
++
++use platform::fd::Fd;
++use platform::monitor::Monitor;
++
++pub struct Transaction {
++    // Handle to the thread loop.
++    thread: Option<RunLoop>,
++}
++
++impl Transaction {
++    pub fn new<F, T>(
++        timeout: u64,
++        callback: OnceCallback<T>,
++        new_device_cb: F,
++    ) -> Result<Self, ::Error>
++    where
++        F: Fn(Fd, &dyn Fn() -> bool) + Sync + Send + 'static,
++        T: 'static,
++    {
++        let thread = RunLoop::new_with_timeout(
++            move |alive| {
++                // Create a new device monitor.
++                let mut monitor = Monitor::new(new_device_cb);
++
++                // Start polling for new devices.
++                try_or!(monitor.run(alive), |_| callback.call(Err(::Error::Unknown)));
++
++                // Send an error, if the callback wasn't called already.
++                callback.call(Err(::Error::NotAllowed));
++            },
++            timeout,
++        )
++        .map_err(|_| ::Error::Unknown)?;
++
++        Ok(Self {
++            thread: Some(thread),
++        })
++    }
++
++    pub fn cancel(&mut self) {
++        // This must never be None.
++        self.thread.take().unwrap().cancel();
++    }
++}
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_uhid.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_uhid.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_authenticator_src_netbsd_uhid.rs   Fri Jul 24 07:29:32 2020
@@ -0,0 +1,92 @@
+$NetBSD: patch-mozilla-release_third__party_rust_authenticator_src_netbsd_uhid.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+Add NetBSD support for U2F.
+
+Submitted upstream:
+
+https://github.com/mozilla/authenticator-rs/pull/116
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/authenticator/src/netbsd/uhid.rs.orig     2020-07-15 16:29:34.213005315 +0000
++++ mozilla-release/third_party/rust/authenticator/src/netbsd/uhid.rs
+@@ -0,0 +1,79 @@
++/* This Source Code Form is subject to the terms of the Mozilla Public
++ * License, v. 2.0. If a copy of the MPL was not distributed with this
++ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
++
++extern crate libc;
++
++use std::io;
++use std::mem;
++use std::os::raw::c_int;
++use std::os::raw::c_uchar;
++
++use hidproto::ReportDescriptor;
++use hidproto::has_fido_usage;
++use platform::fd::Fd;
++use util::io_err;
++
++/* sys/ioccom.h */
++
++const IOCPARM_MASK: u32 = 0x1fff;
++const IOCPARM_SHIFT: u32 = 16;
++const IOCGROUP_SHIFT: u32 = 8;
++
++//const IOC_VOID: u32 = 0x20000000;
++const IOC_OUT: u32 = 0x40000000;
++const IOC_IN: u32 = 0x80000000;
++//const IOC_INOUT: u32 = IOC_IN|IOC_OUT;
++
++macro_rules! ioctl {
++    ($dir:expr, $name:ident, $group:expr, $nr:expr, $ty:ty) => {
++        unsafe fn $name(fd: libc::c_int, val: *mut $ty)
++                -> io::Result<libc::c_int> {
++            let ioc = ($dir as u32)
++                | ((mem::size_of::<$ty>() as u32 & IOCPARM_MASK)
++                   << IOCPARM_SHIFT)
++                | (($group as u32) << IOCGROUP_SHIFT)
++                | ($nr as u32);
++            let rv = libc::ioctl(fd, ioc as libc::c_ulong, val);
++            if rv == -1 {
++                return Err(io::Error::last_os_error());
++            }
++            Ok(rv)
++        }
++    };
++}
++
++#[allow(non_camel_case_types)]
++#[repr(C)]
++struct usb_ctl_report_desc {
++    ucrd_size: c_int,
++    ucrd_data: [c_uchar; 1024],
++}
++
++ioctl!(IOC_OUT, usb_get_report_desc, b'U', 21, usb_ctl_report_desc);
++
++fn read_report_descriptor(fd: &Fd) -> io::Result<ReportDescriptor> {
++    let mut desc = unsafe { mem::zeroed() };
++    unsafe { usb_get_report_desc(fd.fileno, &mut desc) }?;
++    if desc.ucrd_size < 0 {
++        return Err(io_err("negative report descriptor size"));
++    }
++    let size = desc.ucrd_size as usize;
++    let value = Vec::from(&desc.ucrd_data[..size]);
++    Ok(ReportDescriptor { value })
++}
++
++pub fn is_u2f_device(fd: &Fd) -> bool {
++    match read_report_descriptor(fd) {
++        Ok(desc) => has_fido_usage(desc),
++        Err(_) => false,
++    }
++}
++
++ioctl!(IOC_IN, usb_hid_set_raw_ioctl, b'h', 2, c_int);
++
++pub fn hid_set_raw(fd: &Fd, raw: bool) -> io::Result<()> {
++    let mut raw_int: c_int = if raw { 1 } else { 0 };
++    unsafe { usb_hid_set_raw_ioctl(fd.fileno, &mut raw_int) }?;
++    Ok(())
++}
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_getrandom_src_lib.rs
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_getrandom_src_lib.rs:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_third__party_rust_getrandom_src_lib.rs       Fri Jul 24 07:29:32 2020
@@ -0,0 +1,26 @@
+$NetBSD: patch-mozilla-release_third__party_rust_getrandom_src_lib.rs,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+https://github.com/rust-random/getrandom/pull/115
+
+Taken from www/firefox
+
+--- mozilla-release/third_party/rust/getrandom/src/lib.rs.orig 2020-06-02 23:37:31.000000000 +0000
++++ mozilla-release/third_party/rust/getrandom/src/lib.rs
+@@ -17,7 +17,7 @@
+ //! | macOS, iOS       | [`SecRandomCopyBytes`][4]
+ //! | FreeBSD          | [`kern.arandom`][5]
+ //! | OpenBSD, Bitrig  | [`getentropy`][6]
+-//! | NetBSD           | [`/dev/urandom`][7] after reading from `/dev/random` once
++//! | NetBSD           | [`kern.arandom`][5]
+ //! | Dragonfly BSD    | [`/dev/random`][8]
+ //! | Solaris, illumos | [`getrandom`][9] system call if available, otherwise [`/dev/random`][10]
+ //! | Fuchsia OS       | [`cprng_draw`][11]
+@@ -184,7 +184,7 @@ mod_use!(cfg(target_os = "illumos"), sol
+ mod_use!(cfg(target_os = "ios"), macos);
+ mod_use!(cfg(target_os = "linux"), linux_android);
+ mod_use!(cfg(target_os = "macos"), macos);
+-mod_use!(cfg(target_os = "netbsd"), use_file);
++mod_use!(cfg(target_os = "netbsd"), freebsd);
+ mod_use!(cfg(target_os = "openbsd"), openbsd_bitrig);
+ mod_use!(cfg(target_os = "redox"), use_file);
+ mod_use!(cfg(target_os = "solaris"), solaris_illumos);
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_widget_gtk_WaylandDMABufSurface.cpp
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_widget_gtk_WaylandDMABufSurface.cpp:1.1
--- /dev/null   Fri Jul 24 07:29:33 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_widget_gtk_WaylandDMABufSurface.cpp  Fri Jul 24 07:29:32 2020
@@ -0,0 +1,34 @@
+$NetBSD: patch-mozilla-release_widget_gtk_WaylandDMABufSurface.cpp,v 1.1 2020/07/24 07:29:32 fox Exp $
+
+* Fix build under NetBSD.
+
+Taken from www/firefox
+
+--- mozilla-release/widget/gtk/WaylandDMABufSurface.cpp.orig   2020-06-19 02:17:05.000000000 +0000
++++ mozilla-release/widget/gtk/WaylandDMABufSurface.cpp
+@@ -18,7 +18,9 @@
+ #include <sys/time.h>
+ #include <dlfcn.h>
+ #include <sys/mman.h>
++#if !defined(__NetBSD__)
+ #include <sys/eventfd.h>
++#endif
+ #include <poll.h>
+ 
+ #include "mozilla/widget/gbm.h"
+@@ -91,6 +93,7 @@ void WaylandDMABufSurface::GlobalRefAdd(
+ }
+ 
+ void WaylandDMABufSurface::GlobalRefCountCreate() {
++#if !defined(__NetBSD__)
+   MOZ_ASSERT(!mGlobalRefCountFd);
+   mGlobalRefCountFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK | EFD_SEMAPHORE);
+   if (mGlobalRefCountFd < 0) {
+@@ -98,6 +101,7 @@ void WaylandDMABufSurface::GlobalRefCoun
+     mGlobalRefCountFd = 0;
+     return;
+   }
++#endif
+ }
+ 
+ void WaylandDMABufSurface::GlobalRefCountImport(int aFd) {



Home | Main Index | Thread Index | Old Index