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:           Sat Apr 18 07:58:37 UTC 2020

Modified Files:
        pkgsrc/www/cliqz: Makefile PLIST distinfo mozilla-common.mk
        pkgsrc/www/cliqz/patches:
            patch-mozilla-release_config_gcc-stl-wrapper.template.h
            patch-mozilla-release_toolkit_mozapps_installer_packager.mk
Added Files:
        pkgsrc/www/cliqz/patches:
            patch-mozilla-release_browser_components_BrowserGlue.jsm
            patch-mozilla-release_image_imgFrame.h
            patch-mozilla-release_js_src_jsfriendapi.h

Log Message:
www/cliqz: Updates to 1.35.0

* Bumps version dependencies.
* Adds python3 based SQLite3 library.
* Imports a couple of patches from www/firefox.

Changes since 1.34.1:

Improvements

   * Cliqz got updated to Firefox 75.0 with various improvements and fixes.
   * The built-in security add-on HTTPS Everywhere got updated to the latest
     version 2020.3.16.
   * The Cliqz Browser now supports eight content processes by default. This
     should make it run even faster on powerful machines.
   * The Enterprise version of the Cliqz Browser offers a new setting to disable
     MyOffrz via enterprise policy.

Fixes

   * Minor fixes for Cliqz Tab improve performance and stability.
   * Some websites that use third-party cookies were no longer working
     properly. These problems should now be fixed.

Miscellaneous

   * We removed the "Do Not Track" option from the browser settings as it often
     has no effect and gives you a false sense of security. Thanks to the
     Anti-Tracking technology built into the Cliqz Browser, you are fully
     protected from data collectors anyway. (Power users can still configure Do
     Not Track via about:config.)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/www/cliqz/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/www/cliqz/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/cliqz/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/cliqz/mozilla-common.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_browser_components_BrowserGlue.jsm \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_image_imgFrame.h \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk

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.38 pkgsrc/www/cliqz/Makefile:1.39
--- pkgsrc/www/cliqz/Makefile:1.38      Sun Apr 12 08:29:16 2020
+++ pkgsrc/www/cliqz/Makefile   Sat Apr 18 07:58:36 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2020/04/12 08:29:16 adam Exp $
+# $NetBSD: Makefile,v 1.39 2020/04/18 07:58:36 fox Exp $
 
-DISTNAME=      cliqz-1.34.1
-PKGREVISION=   1
+DISTNAME=      cliqz-1.35.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=   20200404160144
+CLIQZ_LAST_BUILD_ID=   20200414182840
 CLIQZ_PLUGIN_SUFX=     @cliqz.com.xpi
 
 SITES.adult-domains.bin= \
@@ -39,17 +38,34 @@ COMMENT=    Secure browser (Mozilla based) 
 LICENSE=       mpl-2.0 AND gnu-gpl-v2
 
 USE_TOOLS+=    pkg-config perl gmake autoconf213 unzip zip bash pax
-# Some modules written in Rust dislike gnu++17 as of 74.0 (www/firefox).
-USE_LANGUAGES+=        c99 gnu++14
+# cliqz (which is based on firefox) needs a compiler that supports
+# gnu++14 and gnu++17.  However, passing --std=gnu++17 (from wrappers,
+# as a result of USE_LANGUAGES), results in problems for some Rust
+# modules (as of 74.0).  Therefore, do not declare the languages that
+# are actually needed.
+# \todo In pkgsrc infrastructure, separate the concept of needing a
+# compiler that can implement a standard, and the concept of forcibly
+# adding a --std flag.  (The build system of a package should be
+# setting the --std flag that is needed, rather than relying on the
+# defaults of a particular compiler version.)
+# NB: Even when building cliqz (which is based on firefox) with
+# PKGSRC_COMPILER=gcc, the package will depend on and use clang, doing
+# so outside the normal compiler selection framework.
+USE_LANGUAGES+=        c99 c++
 
 # 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.0:../../devel/cbindgen
+TOOL_DEPENDS+=                 cbindgen>=0.13.1:../../devel/cbindgen
 TOOL_DEPENDS+=                 nodejs-[0-9]*:../../lang/nodejs
-TOOL_DEPENDS+=                 ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
+# 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
 BUILD_DEPENDS+=                        yasm>=1.1:../../devel/yasm
 BUILD_DEPENDS+=                        nasm>=1.1:../../devel/nasm
 
@@ -147,12 +163,16 @@ post-install:
 
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/compiler.mk"
+# Force the use of clang from pkgsrc, regardless of the setting of
+# PKGSRC_COMPILER.
+# \todo This breaks the use of ccache, which should be fixed, probably
+# by adding support for this kind of forcing to pkgsrc infrastructure.
 PKG_CC=                ${PREFIX}/bin/clang
 PKG_CXX=       ${PREFIX}/bin/clang++
 BUILDLINK_DEPMETHOD.clang=     build
 .include "../../lang/clang/buildlink3.mk"
 BUILDLINK_DEPMETHOD.rust=      build
-BUILDLINK_API_DEPENDS.rust+=   rust>=1.39.0
+BUILDLINK_API_DEPENDS.rust+=   rust>=1.41.0
 .include "../../lang/rust/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/cliqz/PLIST
diff -u pkgsrc/www/cliqz/PLIST:1.10 pkgsrc/www/cliqz/PLIST:1.11
--- pkgsrc/www/cliqz/PLIST:1.10 Tue Mar 31 15:40:54 2020
+++ pkgsrc/www/cliqz/PLIST      Sat Apr 18 07:58:36 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2020/03/31 15:40:54 fox Exp $
+@comment $NetBSD: PLIST,v 1.11 2020/04/18 07:58:36 fox Exp $
 bin/cliqz
 lib/cliqz/actors/AudioPlaybackChild.jsm
 lib/cliqz/actors/AudioPlaybackParent.jsm
@@ -29,6 +29,7 @@ lib/cliqz/actors/PrintingChild.jsm
 lib/cliqz/actors/PurgeSessionHistoryChild.jsm
 lib/cliqz/actors/SelectChild.jsm
 lib/cliqz/actors/SelectParent.jsm
+lib/cliqz/actors/SidebarSearchParent.jsm
 lib/cliqz/actors/ThumbnailsChild.jsm
 lib/cliqz/actors/UAWidgetsChild.jsm
 lib/cliqz/actors/UnselectedTabHoverChild.jsm
@@ -44,6 +45,8 @@ lib/cliqz/application.ini
 lib/cliqz/browser/actors/AboutLoginsChild.jsm
 lib/cliqz/browser/actors/AboutLoginsParent.jsm
 lib/cliqz/browser/actors/AboutReaderChild.jsm
+lib/cliqz/browser/actors/AboutWelcomeChild.jsm
+lib/cliqz/browser/actors/AboutWelcomeParent.jsm
 lib/cliqz/browser/actors/BlockedSiteChild.jsm
 lib/cliqz/browser/actors/BlockedSiteParent.jsm
 lib/cliqz/browser/actors/BrowserTabChild.jsm
@@ -64,7 +67,6 @@ lib/cliqz/browser/actors/LinkHandlerChil
 lib/cliqz/browser/actors/LinkHandlerParent.jsm
 lib/cliqz/browser/actors/NetErrorChild.jsm
 lib/cliqz/browser/actors/NetErrorParent.jsm
-lib/cliqz/browser/actors/OfflineAppsChild.jsm
 lib/cliqz/browser/actors/PageInfoChild.jsm
 lib/cliqz/browser/actors/PageStyleChild.jsm
 lib/cliqz/browser/actors/PageStyleParent.jsm
@@ -74,6 +76,7 @@ lib/cliqz/browser/actors/PromptParent.js
 lib/cliqz/browser/actors/RFPHelperChild.jsm
 lib/cliqz/browser/actors/RFPHelperParent.jsm
 lib/cliqz/browser/actors/SearchTelemetryChild.jsm
+lib/cliqz/browser/actors/SearchTelemetryParent.jsm
 lib/cliqz/browser/actors/SiteSpecificBrowserChild.jsm
 lib/cliqz/browser/actors/SiteSpecificBrowserParent.jsm
 lib/cliqz/browser/actors/SwitchDocumentDirectionChild.jsm
@@ -107,8 +110,8 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/browser/aboutNetError.js
 lib/cliqz/browser/chrome/browser/content/browser/aboutNetError.xhtml
 lib/cliqz/browser/chrome/browser/content/browser/aboutPrivateBrowsing.css
+lib/cliqz/browser/chrome/browser/content/browser/aboutPrivateBrowsing.html
 lib/cliqz/browser/chrome/browser/content/browser/aboutPrivateBrowsing.js
-lib/cliqz/browser/chrome/browser/content/browser/aboutPrivateBrowsing.xhtml
 lib/cliqz/browser/chrome/browser/content/browser/aboutRestartRequired.js
 lib/cliqz/browser/chrome/browser/content/browser/aboutRestartRequired.xhtml
 lib/cliqz/browser/chrome/browser/content/browser/aboutRobots-icon.png
@@ -335,7 +338,10 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/browser/illustrations/error-server-not-found.svg
 lib/cliqz/browser/chrome/browser/content/browser/illustrations/under-construction.svg
 lib/cliqz/browser/chrome/browser/content/browser/license.html
-lib/cliqz/browser/chrome/browser/content/browser/logos/lockwise-mobile-app.svg
+lib/cliqz/browser/chrome/browser/content/browser/logos/etp-mobile-dark.svg
+lib/cliqz/browser/chrome/browser/content/browser/logos/etp-mobile-light.svg
+lib/cliqz/browser/chrome/browser/content/browser/logos/lockwise-dark.svg
+lib/cliqz/browser/chrome/browser/content/browser/logos/lockwise-light.svg
 lib/cliqz/browser/chrome/browser/content/browser/logos/lockwise.svg
 lib/cliqz/browser/chrome/browser/content/browser/logos/monitor.svg
 lib/cliqz/browser/chrome/browser/content/browser/logos/proxy.svg
@@ -395,8 +401,8 @@ lib/cliqz/browser/chrome/browser/content
 lib/cliqz/browser/chrome/browser/content/browser/places/places.xhtml
 lib/cliqz/browser/chrome/browser/content/browser/places/treeView.js
 lib/cliqz/browser/chrome/browser/content/browser/policies/aboutPolicies.css
+lib/cliqz/browser/chrome/browser/content/browser/policies/aboutPolicies.html
 lib/cliqz/browser/chrome/browser/content/browser/policies/aboutPolicies.js
-lib/cliqz/browser/chrome/browser/content/browser/policies/aboutPolicies.xhtml
 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
@@ -936,13 +942,16 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/home.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/identity-icon.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/illustrations/error-session-restore.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/import-export.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/import.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/info.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/install-ssb.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/library-bookmark-animation.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/library-pocket-animation.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/library.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/link.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/login.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/logo-android.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/logo-ios.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/mail.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/menu-badged.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/menu.svg
@@ -1029,8 +1038,6 @@ lib/cliqz/browser/chrome/browser/skin/cl
 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/logo-android.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/preferences/in-content/logo-ios.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
@@ -1052,6 +1059,7 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css
 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/quit.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/readerMode.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/reload-to-stop.svg
@@ -1071,7 +1079,6 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/sidebars.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/sign-out.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
-lib/cliqz/browser/chrome/browser/skin/classic/browser/sort.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/stop-to-reload.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/stop.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/sync.svg
@@ -1180,10 +1187,10 @@ lib/cliqz/browser/chrome/devtools/conten
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/search.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/variables.css
 lib/cliqz/browser/chrome/devtools/content/netmonitor/src/assets/styles/websockets.css
+lib/cliqz/browser/chrome/devtools/content/performance-new/aboutprofiling/index.xhtml
+lib/cliqz/browser/chrome/devtools/content/performance-new/aboutprofiling/initializer.js
 lib/cliqz/browser/chrome/devtools/content/performance-new/frame-script.js
 lib/cliqz/browser/chrome/devtools/content/performance-new/index.xhtml
-lib/cliqz/browser/chrome/devtools/content/performance-new/popup/initializer.js
-lib/cliqz/browser/chrome/devtools/content/performance-new/popup/popup.xhtml
 lib/cliqz/browser/chrome/devtools/content/performance/index.xhtml
 lib/cliqz/browser/chrome/devtools/content/responsive/index.xhtml
 lib/cliqz/browser/chrome/devtools/content/responsive/toolbar.xhtml
@@ -1300,6 +1307,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/types/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/types/runtime.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/types/ui.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/accessibility/accessibility-proxy.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/accessibility/accessibility-startup.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/accessibility/accessibility-view.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/accessibility/accessibility.css
@@ -1439,10 +1447,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/prettyPrint.svg
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/regex-match.svg
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/reload.svg
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/replay-pause.svg
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/replay-resume.svg
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/resume.svg
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/rewind.svg
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/search.svg
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/sources/aframe.svg
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/images/sources/angular.svg
@@ -1536,6 +1541,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/expandScopes.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/fetchFrames.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/fetchScopes.js
+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/mapFrames.js
@@ -1595,6 +1601,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/EmptyLines.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Footer.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Footer.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/HighlightCalls.css
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/HighlightCalls.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/HighlightLine.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/HighlightLines.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/InlinePreview.css
@@ -1641,8 +1649,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/EventListeners.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Expressions.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Expressions.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/FrameTimeline.css
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/FrameTimeline.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Frames/Frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Frames/FrameIndent.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Frames/FrameMenu.js
@@ -1656,7 +1662,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Thread.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Threads.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/Threads.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/UtilsBar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/WhyPaused.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/WhyPaused.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/components/SecondaryPanes/XHRBreakpoints.css
@@ -1848,6 +1853,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/dom/panel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/actions/dom-mutation-breakpoints.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/actions/index.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/actions/threads.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/browser-menus.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/browser-toolbox/Launcher.jsm
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/components/DebugTargetErrorPage.css
@@ -1864,6 +1870,7 @@ lib/cliqz/browser/chrome/devtools/module
 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
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/reducers/index.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/reducers/threads.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/selection.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/source-map-url-service.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/framework/store-provider.js
@@ -2125,6 +2132,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/actions/census-display.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/actions/diffing.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/actions/filter.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/actions/front.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/actions/io.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/actions/label-display.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/actions/refresh.js
@@ -2164,6 +2172,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/reducers/diffing.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/reducers/errors.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/reducers/filter.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/reducers/front.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/reducers/individuals.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/reducers/label-display.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/memory/reducers/sizes.js
@@ -2189,8 +2198,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/api.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/app.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/App.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CachePanel.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CookiesPanel.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
@@ -2199,10 +2206,8 @@ lib/cliqz/browser/chrome/devtools/module
 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/NetworkDetailsPanel.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/ParamsPanel.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/ResponsePanel.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/SecurityPanel.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/StackTracePanel.js
@@ -2212,13 +2217,20 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/TabboxPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/TimingsPanel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/Toolbar.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/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/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/SecurityPanel.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
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnFile.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnInitiator.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnMethod.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnProtocol.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list/RequestListColumnRemoteIP.js
@@ -2322,6 +2334,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/request-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/sort-predicates.js
 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/RequestListContextMenu.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/widgets/RequestListHeaderContextMenu.js
@@ -2344,6 +2357,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/panel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/popup/background.jsm.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/popup/menu-button.jsm.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/popup/panel.jsm.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/preference-management.js
 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
@@ -2461,7 +2475,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/browser-loader.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/Accordion.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/Accordion.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/AutoCompletePopup.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/Frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/HSplitBox.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/List.css
@@ -2471,6 +2484,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/NotificationBox.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/NotificationBox.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/SearchBox.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/SearchBoxAutocompletePopup.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/Sidebar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/SidebarToggle.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/components/SidebarToggle.js
@@ -2648,6 +2662,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/EagerEvaluation.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/EagerEvaluation.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/EditorToolbar.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/EvaluationSelector.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/JSTerm.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/ReverseSearchInput.css
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/ReverseSearchInput.js
@@ -2708,18 +2723,16 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-ui.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-wrapper.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webreplay/components/WebReplayPlayer.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webreplay/menu.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/whats-new/panel.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/whats-new/src/main.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/whats-new/src/whats-new.css
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/accessibility-parent.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/accessibility.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/accessible.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/audit/contrast.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/audit/keyboard.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/audit/text-label.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/constants.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/parent-accessibility.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/simulator.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/walker.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/accessibility/worker.js
@@ -2735,6 +2748,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/css-properties.js
 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/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
@@ -2787,6 +2801,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-observer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/network-response-listener.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/stack-trace-collector.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/utils/wildcard-to-regexp.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/network-monitor/websocket-actor.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/object.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/object/previewers.js
@@ -2802,14 +2817,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/preference.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/process.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/reflow.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/connection-worker.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/connection.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/control.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/debugger.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/graphics.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/inspector.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/replay.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/replay/utils/findStepOffsets.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/root.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/screenshot.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/source.js
@@ -2820,7 +2827,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/targets/browsing-context.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/targets/chrome-window.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/targets/content-process.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/targets/frame-proxy.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/targets/frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/targets/parent-process.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/targets/webextension.js
@@ -2847,15 +2853,18 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/commands.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/content-process-forward.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/eager-ecma-whitelist.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/eager-function-whitelist.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/eval-with-debugger.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/console-api.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/console-progress.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/console-file-activity.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/console-reflow.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/console-service.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/content-process.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/listeners/document-events.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/message-manager-mock.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/utils.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/webidl-pure-whitelist.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/worker-listeners.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/worker/push-subscription.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/worker/service-worker-process.js
@@ -2869,8 +2878,8 @@ lib/cliqz/browser/chrome/devtools/module
 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/debugger-server-connection.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/server/debugger-server.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/devtools-server-connection.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/devtools-server.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/performance/framerate.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/performance/memory.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/performance/profiler.js
@@ -2909,7 +2918,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/builtin-modules.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/client/connection-manager.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/client/constants.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/shared/client/debugger-client.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/client/devtools-client.js
 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
@@ -2926,7 +2935,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/dom-node-constants.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/dom-node-filter-constants.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/event-emitter.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/shared/execution-point-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/extend.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/flags.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/accessibility.js
@@ -2940,6 +2948,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/css-properties.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/descriptors/frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/descriptors/process.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/descriptors/tab.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/descriptors/webextension.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/device.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/emulation.js
@@ -3049,6 +3058,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/css-properties.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/frame.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/process.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/descriptors/tab.js
 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/emulation.js
@@ -3121,6 +3131,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/worker/helper.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/worker/loader.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/worker/worker.js
+lib/cliqz/browser/chrome/devtools/skin/aboutprofiling.css
 lib/cliqz/browser/chrome/devtools/skin/accessibility-color-contrast.css
 lib/cliqz/browser/chrome/devtools/skin/animation.css
 lib/cliqz/browser/chrome/devtools/skin/badge.css
@@ -3187,7 +3198,6 @@ lib/cliqz/browser/chrome/devtools/skin/i
 lib/cliqz/browser/chrome/devtools/skin/images/command-paintflashing.svg
 lib/cliqz/browser/chrome/devtools/skin/images/command-pick-accessibility.svg
 lib/cliqz/browser/chrome/devtools/skin/images/command-pick.svg
-lib/cliqz/browser/chrome/devtools/skin/images/command-replay.svg
 lib/cliqz/browser/chrome/devtools/skin/images/command-responsivemode.svg
 lib/cliqz/browser/chrome/devtools/skin/images/command-rulers.svg
 lib/cliqz/browser/chrome/devtools/skin/images/command-screenshot.svg
@@ -3228,7 +3238,6 @@ lib/cliqz/browser/chrome/devtools/skin/i
 lib/cliqz/browser/chrome/devtools/skin/images/item-toggle.svg
 lib/cliqz/browser/chrome/devtools/skin/images/lock.svg
 lib/cliqz/browser/chrome/devtools/skin/images/more.svg
-lib/cliqz/browser/chrome/devtools/skin/images/next-circle.svg
 lib/cliqz/browser/chrome/devtools/skin/images/next.svg
 lib/cliqz/browser/chrome/devtools/skin/images/open-3-pane.svg
 lib/cliqz/browser/chrome/devtools/skin/images/open-inspector.svg
@@ -3242,7 +3251,6 @@ lib/cliqz/browser/chrome/devtools/skin/i
 lib/cliqz/browser/chrome/devtools/skin/images/play.svg
 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/read-only.svg
 lib/cliqz/browser/chrome/devtools/skin/images/reload.svg
 lib/cliqz/browser/chrome/devtools/skin/images/reveal.svg
 lib/cliqz/browser/chrome/devtools/skin/images/rewind.svg
@@ -3271,8 +3279,7 @@ lib/cliqz/browser/chrome/devtools/skin/i
 lib/cliqz/browser/chrome/devtools/skin/images/tool-webconsole.svg
 lib/cliqz/browser/chrome/devtools/skin/images/vview-delete.svg
 lib/cliqz/browser/chrome/devtools/skin/images/vview-edit.svg
-lib/cliqz/browser/chrome/devtools/skin/images/vview-lock.png
-lib/cliqz/browser/chrome/devtools/skin/images/vview-lock%2x.png@localhost
+lib/cliqz/browser/chrome/devtools/skin/images/vview-lock.svg
 lib/cliqz/browser/chrome/devtools/skin/images/webconsole/editor.svg
 lib/cliqz/browser/chrome/devtools/skin/images/webconsole/input.svg
 lib/cliqz/browser/chrome/devtools/skin/images/webconsole/navigation.svg
@@ -3307,7 +3314,6 @@ lib/cliqz/browser/chrome/en-US/locale/br
 lib/cliqz/browser/chrome/en-US/locale/browser/brandings.dtd
 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/cliqzPrivateBrowsing.dtd
 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
@@ -3325,7 +3331,6 @@ lib/cliqz/browser/chrome/en-US/locale/br
 lib/cliqz/browser/chrome/en-US/locale/browser/pocket.properties
 lib/cliqz/browser/chrome/en-US/locale/browser/safebrowsing/safebrowsing.properties
 lib/cliqz/browser/chrome/en-US/locale/browser/search.properties
-lib/cliqz/browser/chrome/en-US/locale/browser/setDesktopBackground.dtd
 lib/cliqz/browser/chrome/en-US/locale/browser/shellservice.properties
 lib/cliqz/browser/chrome/en-US/locale/browser/siteData.properties
 lib/cliqz/browser/chrome/en-US/locale/browser/sitePermissions.properties
@@ -3365,7 +3370,6 @@ lib/cliqz/browser/chrome/en-US/locale/en
 lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/client/startup.properties
 lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/client/storage.dtd
 lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/client/storage.properties
-lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.dtd
 lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.properties
 lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/client/toolbox.properties
 lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/client/webconsole.properties
@@ -3707,6 +3711,7 @@ lib/cliqz/browser/localization/en-US/bro
 lib/cliqz/browser/localization/en-US/browser/browser.ftl
 lib/cliqz/browser/localization/en-US/browser/browserContext.ftl
 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/menubar.ftl
 lib/cliqz/browser/localization/en-US/browser/newInstallPage.ftl
@@ -3738,6 +3743,7 @@ lib/cliqz/browser/localization/en-US/bro
 lib/cliqz/browser/localization/en-US/browser/safebrowsing/blockedSite.ftl
 lib/cliqz/browser/localization/en-US/browser/sanitize.ftl
 lib/cliqz/browser/localization/en-US/browser/screenshots.ftl
+lib/cliqz/browser/localization/en-US/browser/setDesktopBackground.ftl
 lib/cliqz/browser/localization/en-US/browser/sync.ftl
 lib/cliqz/browser/localization/en-US/browser/syncedTabs.ftl
 lib/cliqz/browser/localization/en-US/browser/tabContextMenu.ftl
@@ -3746,6 +3752,7 @@ lib/cliqz/browser/localization/en-US/bro
 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/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
@@ -3981,7 +3988,6 @@ lib/cliqz/chrome/en-US/locale/en-US/neck
 lib/cliqz/chrome/en-US/locale/en-US/passwordmgr/passwordmgr.properties
 lib/cliqz/chrome/en-US/locale/en-US/pipnss/nsserrors.properties
 lib/cliqz/chrome/en-US/locale/en-US/pipnss/pipnss.properties
-lib/cliqz/chrome/en-US/locale/en-US/pippki/pippki.dtd
 lib/cliqz/chrome/en-US/locale/en-US/pippki/pippki.properties
 lib/cliqz/chrome/en-US/locale/en-US/places/places.properties
 lib/cliqz/chrome/en-US/locale/en-US/pluginproblem/pluginproblem.dtd
@@ -4138,8 +4144,8 @@ lib/cliqz/chrome/toolkit/content/global/
 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
-lib/cliqz/chrome/toolkit/content/global/aboutAbout.xhtml
 lib/cliqz/chrome/toolkit/content/global/aboutCache.js
 lib/cliqz/chrome/toolkit/content/global/aboutCheckerboard.css
 lib/cliqz/chrome/toolkit/content/global/aboutCheckerboard.js
@@ -4621,6 +4627,7 @@ lib/cliqz/defaults/pref/channel-prefs.js
 lib/cliqz/dependentlibs.list
 lib/cliqz/dictionaries/en-US.aff
 lib/cliqz/dictionaries/en-US.dic
+lib/cliqz/fonts/TwemojiMozilla.ttf
 lib/cliqz/gmp-clearkey/0.1/libclearkey.so
 lib/cliqz/gmp-clearkey/0.1/manifest.json
 lib/cliqz/greprefs.js
@@ -4671,6 +4678,7 @@ lib/cliqz/libxul.so
 lib/cliqz/localization/en-US/crashreporter/aboutcrashes.ftl
 lib/cliqz/localization/en-US/security/certificates/certManager.ftl
 lib/cliqz/localization/en-US/security/certificates/deviceManager.ftl
+lib/cliqz/localization/en-US/security/pippki/pippki.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutAbout.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutAddons.ftl
 lib/cliqz/localization/en-US/toolkit/about/aboutCompat.ftl
@@ -4856,7 +4864,7 @@ lib/cliqz/modules/LightweightThemeConsum
 lib/cliqz/modules/LightweightThemeManager.jsm
 lib/cliqz/modules/Localization.jsm
 lib/cliqz/modules/Log.jsm
-lib/cliqz/modules/LoginAutoCompleteResult.jsm
+lib/cliqz/modules/LoginAutoComplete.jsm
 lib/cliqz/modules/LoginFormFactory.jsm
 lib/cliqz/modules/LoginHelper.jsm
 lib/cliqz/modules/LoginImport.jsm
@@ -4892,7 +4900,6 @@ lib/cliqz/modules/NotificationDB.jsm
 lib/cliqz/modules/NotificationStorage.jsm
 lib/cliqz/modules/OSCrypto.jsm
 lib/cliqz/modules/ObjectUtils.jsm
-lib/cliqz/modules/PageIconProtocolHandler.jsm
 lib/cliqz/modules/PageMenu.jsm
 lib/cliqz/modules/PageThumbUtils.jsm
 lib/cliqz/modules/PageThumbs.jsm
@@ -4929,6 +4936,7 @@ lib/cliqz/modules/PromiseUtils.jsm
 lib/cliqz/modules/PromiseWorker.jsm
 lib/cliqz/modules/Prompter.jsm
 lib/cliqz/modules/ProxyChannelFilter.jsm
+lib/cliqz/modules/PurgeTrackerService.jsm
 lib/cliqz/modules/Push.jsm
 lib/cliqz/modules/PushBroadcastService.jsm
 lib/cliqz/modules/PushComponents.jsm

Index: pkgsrc/www/cliqz/distinfo
diff -u pkgsrc/www/cliqz/distinfo:1.23 pkgsrc/www/cliqz/distinfo:1.24
--- pkgsrc/www/cliqz/distinfo:1.23      Tue Apr  7 02:48:38 2020
+++ pkgsrc/www/cliqz/distinfo   Sat Apr 18 07:58:36 2020
@@ -1,50 +1,53 @@
-$NetBSD: distinfo,v 1.23 2020/04/07 02:48:38 fox Exp $
+$NetBSD: distinfo,v 1.24 2020/04/18 07:58:36 fox Exp $
 
-SHA1 (cliqz-1.34.1/adult-domains.bin) = 39f8b7a881e70828fdb411eefd5a70540a3699bd
-RMD160 (cliqz-1.34.1/adult-domains.bin) = a41b8d15df385dbce6904f184552eb542161ce54
-SHA512 (cliqz-1.34.1/adult-domains.bin) = 8896a629efd0f67b98393928edda20400350938f911f7eedc05f776b2626a656dfb092714fc5cb1766e4aee4efccfed62d297f211c07b3cca57fff1cd282ced1
-Size (cliqz-1.34.1/adult-domains.bin) = 528392 bytes
-SHA1 (cliqz-1.34.1/cliqz-1.34.1.tar.gz) = 75e7f38e5c5d70f83e1cc3969e43aed7c3d83efe
-RMD160 (cliqz-1.34.1/cliqz-1.34.1.tar.gz) = e3cfb3ebc6f148bfcd583e92e702b63d385f9466
-SHA512 (cliqz-1.34.1/cliqz-1.34.1.tar.gz) = b54d3dfcbf170901b31e7f3c2dedb2d199b99cd743ca7348a4469568ce0ffc96e1702c78ebba3cb286460a97fd4562520605bf890708ff8489e6d8f7f4c367f8
-Size (cliqz-1.34.1/cliqz-1.34.1.tar.gz) = 500188145 bytes
-SHA1 (cliqz-1.34.1/cliqz%cliqz.com.xpi@localhost) = 638a2058923065382472a700103d4b741b248712
-RMD160 (cliqz-1.34.1/cliqz%cliqz.com.xpi@localhost) = 363200a026f92d3a17e94f43a77501cb96895243
-SHA512 (cliqz-1.34.1/cliqz%cliqz.com.xpi@localhost) = 2927b936f7726375c8e76104093d90910e401c24cda13542e30080c851f6a4c39e8e5db0775337b014d55e329045ff3127d9003c3966bf5951ad9a30ac43c4c2
-Size (cliqz-1.34.1/cliqz%cliqz.com.xpi@localhost) = 4075568 bytes
-SHA1 (cliqz-1.34.1/dat%cliqz.com.xpi@localhost) = ffeeb096509fb570cd9387c2c273d457be529d07
-RMD160 (cliqz-1.34.1/dat%cliqz.com.xpi@localhost) = 61e47dabb836866cf2bf63f1ff657d8b4ad67cbb
-SHA512 (cliqz-1.34.1/dat%cliqz.com.xpi@localhost) = 3e6937f8eead1d4f2c0d5efb0dfdc25e4236da22f3b66be9f418c6acc77b28c72f6b4c50e50742aca85661c880218762857d41989c786616894b53b1fd7f0098
-Size (cliqz-1.34.1/dat%cliqz.com.xpi@localhost) = 988736 bytes
-SHA1 (cliqz-1.34.1/gdprtool%cliqz.com.xpi@localhost) = 1a95888fd7b49ea2b38c3d7ba2fb901115fc19aa
-RMD160 (cliqz-1.34.1/gdprtool%cliqz.com.xpi@localhost) = 02676ca33b7ef732649cc2e9c1b5e3110b45ab9c
-SHA512 (cliqz-1.34.1/gdprtool%cliqz.com.xpi@localhost) = f59850063a542436484983abfe96b93ecd6e6e90f154e117bdfaca8b0fcc8e2abde715ee1a4e75661d0cf8cf8a8840529a06186a8f133300dff287e7f74efa85
-Size (cliqz-1.34.1/gdprtool%cliqz.com.xpi@localhost) = 219684 bytes
-SHA1 (cliqz-1.34.1/https-everywhere%cliqz.com.xpi@localhost) = 6fa290bae96a80722b943aa6906101683f7a7c46
-RMD160 (cliqz-1.34.1/https-everywhere%cliqz.com.xpi@localhost) = 798bf780be5324da30e16cbd6220667df99aeb40
-SHA512 (cliqz-1.34.1/https-everywhere%cliqz.com.xpi@localhost) = 0ef92a49d8974c43478fc427a0d0e535851f4326dd15a9342d1e9f9218cf9db1217e5f0d4876e6a08b08e0f13fb40da238248fd75fc6c8c222937ab2ddb3816a
-Size (cliqz-1.34.1/https-everywhere%cliqz.com.xpi@localhost) = 2038441 bytes
+SHA1 (cliqz-1.35.0/adult-domains.bin) = 39f8b7a881e70828fdb411eefd5a70540a3699bd
+RMD160 (cliqz-1.35.0/adult-domains.bin) = a41b8d15df385dbce6904f184552eb542161ce54
+SHA512 (cliqz-1.35.0/adult-domains.bin) = 8896a629efd0f67b98393928edda20400350938f911f7eedc05f776b2626a656dfb092714fc5cb1766e4aee4efccfed62d297f211c07b3cca57fff1cd282ced1
+Size (cliqz-1.35.0/adult-domains.bin) = 528392 bytes
+SHA1 (cliqz-1.35.0/cliqz-1.35.0.tar.gz) = a508ae57e12c25aeb76101c5e4c2ef2f2eb8b8d5
+RMD160 (cliqz-1.35.0/cliqz-1.35.0.tar.gz) = 6e6ad33a9ba495cd79d6b7d28b5960587993b9c8
+SHA512 (cliqz-1.35.0/cliqz-1.35.0.tar.gz) = 148bfc8f377c65bc5eda710ce315964d66e3f8572128d31bbee589227f339fa6487e88671fbbddc5f94f52988edc2bb25411cb7e896ae1c2b0eabd79202e6b1a
+Size (cliqz-1.35.0/cliqz-1.35.0.tar.gz) = 502919350 bytes
+SHA1 (cliqz-1.35.0/cliqz%cliqz.com.xpi@localhost) = cd0bc84ae7d2efc9240c42958c6798e98691cd6f
+RMD160 (cliqz-1.35.0/cliqz%cliqz.com.xpi@localhost) = d31f1bde13162b9187c4830aff629f52feb32908
+SHA512 (cliqz-1.35.0/cliqz%cliqz.com.xpi@localhost) = 7715ad0ebbee06356340da6488348e8375fec982b9739328d78d69ebf6c8d7ae619fb50ea2d9d67375f6cc91bc2e462de6c980c0075da15b4abea6548f8c956f
+Size (cliqz-1.35.0/cliqz%cliqz.com.xpi@localhost) = 4244727 bytes
+SHA1 (cliqz-1.35.0/dat%cliqz.com.xpi@localhost) = ffeeb096509fb570cd9387c2c273d457be529d07
+RMD160 (cliqz-1.35.0/dat%cliqz.com.xpi@localhost) = 61e47dabb836866cf2bf63f1ff657d8b4ad67cbb
+SHA512 (cliqz-1.35.0/dat%cliqz.com.xpi@localhost) = 3e6937f8eead1d4f2c0d5efb0dfdc25e4236da22f3b66be9f418c6acc77b28c72f6b4c50e50742aca85661c880218762857d41989c786616894b53b1fd7f0098
+Size (cliqz-1.35.0/dat%cliqz.com.xpi@localhost) = 988736 bytes
+SHA1 (cliqz-1.35.0/gdprtool%cliqz.com.xpi@localhost) = 1a95888fd7b49ea2b38c3d7ba2fb901115fc19aa
+RMD160 (cliqz-1.35.0/gdprtool%cliqz.com.xpi@localhost) = 02676ca33b7ef732649cc2e9c1b5e3110b45ab9c
+SHA512 (cliqz-1.35.0/gdprtool%cliqz.com.xpi@localhost) = f59850063a542436484983abfe96b93ecd6e6e90f154e117bdfaca8b0fcc8e2abde715ee1a4e75661d0cf8cf8a8840529a06186a8f133300dff287e7f74efa85
+Size (cliqz-1.35.0/gdprtool%cliqz.com.xpi@localhost) = 219684 bytes
+SHA1 (cliqz-1.35.0/https-everywhere%cliqz.com.xpi@localhost) = f0693d85bbf7b46549b4ea3a2d0a7dc82fadb609
+RMD160 (cliqz-1.35.0/https-everywhere%cliqz.com.xpi@localhost) = 496a7d3f1bbf5a4cc0af852335b09b1187a9ec8d
+SHA512 (cliqz-1.35.0/https-everywhere%cliqz.com.xpi@localhost) = 7b437a06c76fe083537c02724de38db8980a9701cbbb62fba01417b8384d30c149ff894b17f441226e414807b815f1cc46101bb9be53348573580abd3a8735a7
+Size (cliqz-1.35.0/https-everywhere%cliqz.com.xpi@localhost) = 2058305 bytes
 SHA1 (patch-cliqz__env.sh) = 69df75c62d887365be1ba7b8d72aa93bcbd14cc7
 SHA1 (patch-mozilla-release_browser_app_profile_firefox.js) = e76a7a023a72fe9c5c621da416a8be3111ed8894
+SHA1 (patch-mozilla-release_browser_components_BrowserGlue.jsm) = f4f2b632ba8b85e5235373519ffba0ecb509791e
 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) = f4b54934fd8b22d17b762f5567e30789280b7abc
+SHA1 (patch-mozilla-release_config_gcc-stl-wrapper.template.h) = 5c8f3b820adec446c79393bdae7ac224c4a831a9
 SHA1 (patch-mozilla-release_config_rules.mk) = ffd78db919f65d32b5c672b2e0395903fcf23697
 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_skia_skia_src_core_SkCpu.cpp) = 52be4b6a3be94a34c7ba274fbbf98de0551deff6
+SHA1 (patch-mozilla-release_image_imgFrame.h) = 00adb685261e3c251087ed617c9168c45000ecc4
 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) = 741a8fc9eb83bd58415d70a3be1718ccd8b8c888
 SHA1 (patch-mozilla-release_ipc_glue_CrossProcessSemaphore__posix.cpp) = be74788a5bafcf306438cd18afc3e40586038997
 SHA1 (patch-mozilla-release_ipc_glue_GeckoChildProcessHost.cpp) = 2667be0de782205e62a7b0a5359de83223bd4fc3
+SHA1 (patch-mozilla-release_js_src_jsfriendapi.h) = 607b8e8e117a1c98995b919e25168ff5a63aee16
 SHA1 (patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h) = be0d566790aaaf7b4dd3f2110f6c8c6639399e4a
 SHA1 (patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c) = 75dbd240fa5e615ca7d77299e4ae7f4811026697
 SHA1 (patch-mozilla-release_old-configure.in) = a99aabb553f2396c865e5073a9548e42c447f68a
 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_modules_subprocess_subprocess__shared__unix.js) = d72e47521ed87cf00a01981de15d8512fc2b43b8
-SHA1 (patch-mozilla-release_toolkit_mozapps_installer_packager.mk) = 8c3ffe2ceeec5c99fb94b57db79fa1220cb2d534
+SHA1 (patch-mozilla-release_toolkit_mozapps_installer_packager.mk) = 9c436e7050d386d4473308ef9200a1955e1507a6
 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.9 pkgsrc/www/cliqz/mozilla-common.mk:1.10
--- pkgsrc/www/cliqz/mozilla-common.mk:1.9      Tue Mar 31 15:40:54 2020
+++ pkgsrc/www/cliqz/mozilla-common.mk  Sat Apr 18 07:58:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.9 2020/03/31 15:40:54 fox Exp $
+# $NetBSD: mozilla-common.mk,v 1.10 2020/04/18 07:58:36 fox Exp $
 #
 # Common Makefile fragment for mozilla packages based on gecko 2.0.
 # derived from www/firefox
@@ -74,13 +74,13 @@ 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.50
+BUILDLINK_API_DEPENDS.nss+=     nss>=3.51
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libwebp+=        libwebp>=1.0.2
 .include "../../graphics/libwebp/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
+BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.6.0
 .include "../../multimedia/libvpx/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../multimedia/ffmpeg4/buildlink3.mk"

Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h
diff -u pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h:1.1 pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h:1.2
--- pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h:1.1        Tue Mar 31 15:40:54 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h    Sat Apr 18 07:58:36 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-mozilla-release_config_gcc-stl-wrapper.template.h,v 1.1 2020/03/31 15:40:54 fox Exp $
+$NetBSD: patch-mozilla-release_config_gcc-stl-wrapper.template.h,v 1.2 2020/04/18 07:58:36 fox Exp $
 
-Imported from www/firefox
+Taken from www/firefox
 
---- mozilla-release/config/gcc-stl-wrapper.template.h.orig     2020-03-09 13:09:13.000000000 +0000
+--- mozilla-release/config/gcc-stl-wrapper.template.h.orig     2020-04-03 19:34:34.000000000 +0000
 +++ mozilla-release/config/gcc-stl-wrapper.template.h
-@@ -28,14 +28,14 @@
+@@ -28,8 +28,8 @@
  #endif
  
  // Don't include mozalloc for cstdlib. See bug 1245076.
@@ -14,6 +14,8 @@ Imported from www/firefox
 +#  define moz_dont_include_mozalloc_for_${HEADER}
  #endif
  
+ #ifndef moz_dont_include_mozalloc_for_type_traits
+@@ -43,7 +43,7 @@
  // Include mozalloc after the STL header and all other headers it includes
  // have been preprocessed.
  #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \
@@ -22,7 +24,7 @@ Imported from www/firefox
  #  define MOZ_INCLUDE_MOZALLOC_H
  #  define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
  #endif
-@@ -64,4 +64,6 @@
+@@ -72,4 +72,6 @@
  #  include "mozilla/throw_gcc.h"
  #endif
  
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk
diff -u pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk:1.1 pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk:1.2
--- pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk:1.1    Sun Feb 23 00:10:41 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk        Sat Apr 18 07:58:36 2020
@@ -1,12 +1,29 @@
-$NetBSD: patch-mozilla-release_toolkit_mozapps_installer_packager.mk,v 1.1 2020/02/23 00:10:41 fox Exp $
+$NetBSD: patch-mozilla-release_toolkit_mozapps_installer_packager.mk,v 1.2 2020/04/18 07:58:36 fox Exp $
 
 * Symbolic link to lib/firefox/firefox causes 'Couldn't load XPCOM.' error.
+  (taken from www/firefox)
 
-Taken from www/firefox
+* Disable Normandy client file generation since xpcshell is segfaulting
+  since cliqz 1.35.0 (firefox 75.0)
 
---- mozilla-release/toolkit/mozapps/installer/packager.mk.orig 2020-02-19 14:20:43.000000000 +0000
+--- mozilla-release/toolkit/mozapps/installer/packager.mk.orig 2020-04-14 16:26:15.000000000 +0000
 +++ mozilla-release/toolkit/mozapps/installer/packager.mk
-@@ -142,7 +142,7 @@ endif
+@@ -125,10 +125,10 @@ endif
+ 
+ ifdef MOZ_NORMANDY
+ ifndef CROSS_COMPILE
+-      # Generate a file that describes the local Normandy client.
+-      env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(DIST)/$(PKG_PATH)/bin" \
+-              $(DIST)/$(PKG_PATH)/bin/xpcshell \
+-              $(MOZILLA_DIR)/toolkit/components/normandy/metadata-script.js $(MOZ_NORMANDY_JSON)
++#     # Generate a file that describes the local Normandy client.
++#     env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(DIST)/$(PKG_PATH)/bin" \
++#             $(DIST)/$(PKG_PATH)/bin/xpcshell \
++#             $(MOZILLA_DIR)/toolkit/components/normandy/metadata-script.js $(MOZ_NORMANDY_JSON)
+ endif
+ endif
+       $(TOUCH) $@
+@@ -155,7 +155,7 @@ endif
          (cd $(DESTDIR)$(installdir) && tar -xf -)
        $(NSINSTALL) -D $(DESTDIR)$(bindir)
        $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)

Added files:

Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_browser_components_BrowserGlue.jsm
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_browser_components_BrowserGlue.jsm:1.1
--- /dev/null   Sat Apr 18 07:58:37 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_browser_components_BrowserGlue.jsm   Sat Apr 18 07:58:36 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-mozilla-release_browser_components_BrowserGlue.jsm,v 1.1 2020/04/18 07:58:36 fox Exp $
+
+* Silence Service.profiler errors on Tier3 after bug 1613390
+
+Taken from www/firefox
+
+--- mozilla-release/browser/components/BrowserGlue.jsm.orig    2020-04-03 19:34:29.000000000 +0000
++++ mozilla-release/browser/components/BrowserGlue.jsm
+@@ -2289,7 +2289,9 @@ BrowserGlue.prototype = {
+       ChromeUtils.idleDispatch(
+         () => {
+           if (!Services.startup.shuttingDown) {
+-            Services.profiler.AddMarker("startupIdleTask");
++            if (Services.profiler) {
++              Services.profiler.AddMarker("startupIdleTask");
++            }
+             try {
+               task.task();
+             } catch (ex) {
+@@ -2360,7 +2362,9 @@ BrowserGlue.prototype = {
+     for (let task of idleTasks) {
+       ChromeUtils.idleDispatch(() => {
+         if (!Services.startup.shuttingDown) {
+-          Services.profiler.AddMarker("startupLateIdleTask");
++          if (Services.profiler) {
++            Services.profiler.AddMarker("startupLateIdleTask");
++          }
+           try {
+             task();
+           } catch (ex) {
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_image_imgFrame.h
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_image_imgFrame.h:1.1
--- /dev/null   Sat Apr 18 07:58:37 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_image_imgFrame.h     Sat Apr 18 07:58:36 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-mozilla-release_image_imgFrame.h,v 1.1 2020/04/18 07:58:36 fox Exp $
+
+* For std::function
+
+Taken from www/firefox
+
+--- mozilla-release/image/imgFrame.h.orig      2020-04-03 19:34:41.000000000 +0000
++++ mozilla-release/image/imgFrame.h
+@@ -8,6 +8,7 @@
+ #define mozilla_image_imgFrame_h
+ 
+ #include <utility>
++#include <functional>
+ 
+ #include "AnimationParams.h"
+ #include "MainThreadUtils.h"
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h:1.1
--- /dev/null   Sat Apr 18 07:58:37 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_js_src_jsfriendapi.h Sat Apr 18 07:58:36 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-mozilla-release_js_src_jsfriendapi.h,v 1.1 2020/04/18 07:58:36 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
+@@ -13,6 +13,7 @@
+ #include "mozilla/MemoryReporting.h"
+ #include "mozilla/UniquePtr.h"
+ 
++#include <stdarg.h>
+ #include "jspubtd.h"
+ 
+ #include "js/CallArgs.h"



Home | Main Index | Thread Index | Old Index