summaryrefslogtreecommitdiff
path: root/www/cliqz
diff options
context:
space:
mode:
authorfox <fox@pkgsrc.org>2020-02-23 00:10:40 +0000
committerfox <fox@pkgsrc.org>2020-02-23 00:10:40 +0000
commita95d042739aca7b002c186e6b4ad84feb5dc2218 (patch)
tree1d07ee075a0a203d2c5117a55c795526cc891845 /www/cliqz
parent0c0031f7bf413346563e2fff9882179966d81a57 (diff)
downloadpkgsrc-a95d042739aca7b002c186e6b4ad84feb5dc2218.tar.gz
www/cliqz: Updates to 1.33.0
* Bumps version dependencies. Changes (since 1.32.1): Cliqz Browser release 1.33.0 includes the improvements of Firefox’s latest version 73.0.1 with additional Cliqz improvements and bug fixes. Improvements * Cliqz got updated to Firefox 73.0.1 with various improvements and fixes. * In the browser settings you’ll find the new section "Labs". Here you can activate the latest browser features that we’re currently testing. The first one is support for the Dat Protocol that enables the loading of certain web pages via a peer-to-peer network. Fixes * Users of Kaspersky Antivirus could no longer open HTTPS pages in the Cliqz Browser and got the error message "Your Connection is not secure". This problem should not occur again in the future. * When updating from an older browser version it could happen that instead of Cliqz Tab only an empty page was displayed. This issue has been fixed. Miscellaneous * The Connect feature has been removed due to performance issues. But we are already working on a better and more stable solution. Please let us know what features you would like to see.
Diffstat (limited to 'www/cliqz')
-rw-r--r--www/cliqz/Makefile16
-rw-r--r--www/cliqz/PLIST181
-rw-r--r--www/cliqz/distinfo52
-rw-r--r--www/cliqz/mozilla-common.mk8
-rw-r--r--www/cliqz/patches/patch-cliqz__env.sh9
-rw-r--r--www/cliqz/patches/patch-mozilla-release_config_rules.mk14
-rw-r--r--www/cliqz/patches/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c112
-rw-r--r--www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk17
8 files changed, 267 insertions, 142 deletions
diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 92e4c04ec9c..c45caabe0bd 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.32 2020/01/23 08:47:26 fox Exp $
+# $NetBSD: Makefile,v 1.33 2020/02/23 00:10:40 fox Exp $
-DISTNAME= cliqz-1.32.1
+DISTNAME= cliqz-1.33.0
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=cliqz-oss/}
GITHUB_PROJECT= browser-f
DISTFILES= adult-domains.bin \
cliqz@cliqz.com.xpi \
+ dat@cliqz.com.xpi \
https-everywhere@cliqz.com.xpi \
gdprtool@cliqz.com.xpi \
${DISTNAME}${EXTRACT_SUFX}
@@ -14,13 +15,15 @@ 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= 20200121101408
+CLIQZ_LAST_BUILD_ID= 20200219152122
CLIQZ_PLUGIN_SUFX= @cliqz.com.xpi
SITES.adult-domains.bin= \
https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/
SITES.cliqz${CLIQZ_PLUGIN_SUFX}= \
https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
+SITES.dat${CLIQZ_PLUGIN_SUFX}= \
+ https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
SITES.https-everywhere${CLIQZ_PLUGIN_SUFX}= \
https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${PKGVERSION_NOREV}/${CLIQZ_LAST_BUILD_ID}/
SITES.gdprtool${CLIQZ_PLUGIN_SUFX}= \
@@ -41,12 +44,12 @@ USE_LANGUAGES+= c99 gnu++14
# https://firefox-source-docs.mozilla.org/build/buildsystem/python.html
PYTHON_VERSIONS_ACCEPTED= 27
PYTHON_FOR_BUILD_ONLY= tool
-TOOL_DEPENDS+= cbindgen>=0.8.2:../../devel/cbindgen
+TOOL_DEPENDS+= cbindgen>=0.12.0:../../devel/cbindgen
TOOL_DEPENDS+= nodejs-[0-9]*:../../lang/nodejs
TOOL_DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
BUILD_DEPENDS+= yasm>=1.1:../../devel/yasm
-BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
+BUILD_DEPENDS+= nasm>=1.1:../../devel/nasm
WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
@@ -78,6 +81,7 @@ post-extract:
${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}
${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
@@ -147,7 +151,7 @@ BUILDLINK_DEPMETHOD.clang= build
BUILDLINK_API_DEPENDS.clang+= clang>=6.0.1nb1
.include "../../lang/clang/buildlink3.mk"
BUILDLINK_DEPMETHOD.rust= build
-BUILDLINK_API_DEPENDS.rust+= rust>=1.38.0
+BUILDLINK_API_DEPENDS.rust+= rust>=1.39.0
.include "../../lang/rust/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/cliqz/PLIST b/www/cliqz/PLIST
index 4329fdfd821..bd2f2fb8daa 100644
--- a/www/cliqz/PLIST
+++ b/www/cliqz/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2020/01/25 17:12:17 fox Exp $
+@comment $NetBSD: PLIST,v 1.9 2020/02/23 00:10:40 fox Exp $
bin/cliqz
lib/cliqz/actors/AudioPlaybackChild.jsm
lib/cliqz/actors/AudioPlaybackParent.jsm
lib/cliqz/actors/AutoCompleteChild.jsm
lib/cliqz/actors/AutoCompleteParent.jsm
+lib/cliqz/actors/AutoScrollChild.jsm
+lib/cliqz/actors/AutoScrollParent.jsm
lib/cliqz/actors/AutoplayChild.jsm
lib/cliqz/actors/AutoplayParent.jsm
lib/cliqz/actors/BrowserElementChild.jsm
@@ -37,6 +39,7 @@ 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/AboutReaderChild.jsm
lib/cliqz/browser/actors/BlockedSiteChild.jsm
lib/cliqz/browser/actors/BlockedSiteParent.jsm
@@ -68,6 +71,8 @@ lib/cliqz/browser/actors/PromptParent.jsm
lib/cliqz/browser/actors/RFPHelperChild.jsm
lib/cliqz/browser/actors/RFPHelperParent.jsm
lib/cliqz/browser/actors/SearchTelemetryChild.jsm
+lib/cliqz/browser/actors/SiteSpecificBrowserChild.jsm
+lib/cliqz/browser/actors/SiteSpecificBrowserParent.jsm
lib/cliqz/browser/actors/SwitchDocumentDirectionChild.jsm
lib/cliqz/browser/actors/URIFixupChild.jsm
lib/cliqz/browser/actors/WebRTCChild.jsm
@@ -91,7 +96,7 @@ lib/cliqz/browser/chrome/browser/content/browser/aboutDialog-appUpdater-legacy.j
lib/cliqz/browser/chrome/browser/content/browser/aboutDialog-appUpdater.js
lib/cliqz/browser/chrome/browser/content/browser/aboutDialog.css
lib/cliqz/browser/chrome/browser/content/browser/aboutDialog.js
-lib/cliqz/browser/chrome/browser/content/browser/aboutDialog.xul
+lib/cliqz/browser/chrome/browser/content/browser/aboutDialog.xhtml
lib/cliqz/browser/chrome/browser/content/browser/aboutFrameCrashed.html
lib/cliqz/browser/chrome/browser/content/browser/aboutImportedTabs.xhtml
lib/cliqz/browser/chrome/browser/content/browser/aboutLibrary.xhtml
@@ -287,6 +292,7 @@ lib/cliqz/browser/chrome/browser/content/browser/child/ext-omnibox.js
lib/cliqz/browser/chrome/browser/content/browser/child/ext-tabs.js
lib/cliqz/browser/chrome/browser/content/browser/content-refreshblocker.js
lib/cliqz/browser/chrome/browser/content/browser/content-sessionStore.js
+lib/cliqz/browser/chrome/browser/content/browser/contentSearchHandoffUI.js
lib/cliqz/browser/chrome/browser/content/browser/contentSearchUI.css
lib/cliqz/browser/chrome/browser/content/browser/contentSearchUI.js
lib/cliqz/browser/chrome/browser/content/browser/contentTheme.js
@@ -309,7 +315,7 @@ lib/cliqz/browser/chrome/browser/content/browser/defaultthemes/5.preview.jpg
lib/cliqz/browser/chrome/browser/content/browser/downloads/allDownloadsView.js
lib/cliqz/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.css
lib/cliqz/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.js
-lib/cliqz/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.xul
+lib/cliqz/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.xhtml
lib/cliqz/browser/chrome/browser/content/browser/downloads/downloads.css
lib/cliqz/browser/chrome/browser/content/browser/downloads/downloads.js
lib/cliqz/browser/chrome/browser/content/browser/downloads/downloadsCommands.js
@@ -334,13 +340,13 @@ lib/cliqz/browser/chrome/browser/content/browser/logos/tracking-protection-dark-
lib/cliqz/browser/chrome/browser/content/browser/logos/tracking-protection.svg
lib/cliqz/browser/chrome/browser/content/browser/microsoft-translator-attribution.png
lib/cliqz/browser/chrome/browser/content/browser/migration/migration.js
-lib/cliqz/browser/chrome/browser/content/browser/migration/migration.xul
+lib/cliqz/browser/chrome/browser/content/browser/migration/migration.xhtml
lib/cliqz/browser/chrome/browser/content/browser/newInstall.js
-lib/cliqz/browser/chrome/browser/content/browser/newInstall.xul
+lib/cliqz/browser/chrome/browser/content/browser/newInstall.xhtml
lib/cliqz/browser/chrome/browser/content/browser/nsContextMenu.js
lib/cliqz/browser/chrome/browser/content/browser/pageinfo/pageInfo.css
lib/cliqz/browser/chrome/browser/content/browser/pageinfo/pageInfo.js
-lib/cliqz/browser/chrome/browser/content/browser/pageinfo/pageInfo.xul
+lib/cliqz/browser/chrome/browser/content/browser/pageinfo/pageInfo.xhtml
lib/cliqz/browser/chrome/browser/content/browser/pageinfo/permissions.js
lib/cliqz/browser/chrome/browser/content/browser/pageinfo/security.js
lib/cliqz/browser/chrome/browser/content/browser/parent/ext-bookmarks.js
@@ -369,20 +375,20 @@ 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/places/bookmarkProperties.js
-lib/cliqz/browser/chrome/browser/content/browser/places/bookmarkProperties.xul
-lib/cliqz/browser/chrome/browser/content/browser/places/bookmarkProperties2.xul
+lib/cliqz/browser/chrome/browser/content/browser/places/bookmarkProperties.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/places/bookmarkProperties2.xhtml
lib/cliqz/browser/chrome/browser/content/browser/places/bookmarksSidebar.js
-lib/cliqz/browser/chrome/browser/content/browser/places/bookmarksSidebar.xul
+lib/cliqz/browser/chrome/browser/content/browser/places/bookmarksSidebar.xhtml
lib/cliqz/browser/chrome/browser/content/browser/places/browserPlacesViews.js
lib/cliqz/browser/chrome/browser/content/browser/places/controller.js
lib/cliqz/browser/chrome/browser/content/browser/places/editBookmark.js
lib/cliqz/browser/chrome/browser/content/browser/places/historySidebar.js
-lib/cliqz/browser/chrome/browser/content/browser/places/historySidebar.xul
+lib/cliqz/browser/chrome/browser/content/browser/places/historySidebar.xhtml
lib/cliqz/browser/chrome/browser/content/browser/places/places-menupopup.js
lib/cliqz/browser/chrome/browser/content/browser/places/places-tree.js
lib/cliqz/browser/chrome/browser/content/browser/places/places.css
lib/cliqz/browser/chrome/browser/content/browser/places/places.js
-lib/cliqz/browser/chrome/browser/content/browser/places/places.xul
+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.js
@@ -409,8 +415,8 @@ 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/connect.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
@@ -442,8 +448,8 @@ lib/cliqz/browser/chrome/browser/content/browser/preferences/translation.xhtml
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
-lib/cliqz/browser/chrome/browser/content/browser/safeMode.xul
-lib/cliqz/browser/chrome/browser/content/browser/sanitize.xul
+lib/cliqz/browser/chrome/browser/content/browser/safeMode.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/sanitize.xhtml
lib/cliqz/browser/chrome/browser/content/browser/sanitizeDialog.css
lib/cliqz/browser/chrome/browser/content/browser/sanitizeDialog.js
lib/cliqz/browser/chrome/browser/content/browser/schemas/bookmarks.json
@@ -473,7 +479,10 @@ lib/cliqz/browser/chrome/browser/content/browser/search/autocomplete-popup.js
lib/cliqz/browser/chrome/browser/content/browser/search/search-one-offs.js
lib/cliqz/browser/chrome/browser/content/browser/search/searchbar.js
lib/cliqz/browser/chrome/browser/content/browser/setDesktopBackground.js
-lib/cliqz/browser/chrome/browser/content/browser/setDesktopBackground.xul
+lib/cliqz/browser/chrome/browser/content/browser/setDesktopBackground.xhtml
+lib/cliqz/browser/chrome/browser/content/browser/ssb/ssb.css
+lib/cliqz/browser/chrome/browser/content/browser/ssb/ssb.html
+lib/cliqz/browser/chrome/browser/content/browser/ssb/ssb.js
lib/cliqz/browser/chrome/browser/content/browser/static-robot.png
lib/cliqz/browser/chrome/browser/content/browser/syncedtabs/sidebar.js
lib/cliqz/browser/chrome/browser/content/browser/syncedtabs/sidebar.xhtml
@@ -486,9 +495,9 @@ lib/cliqz/browser/chrome/browser/content/browser/translation-notification.js
lib/cliqz/browser/chrome/browser/content/browser/usercontext/usercontext.css
lib/cliqz/browser/chrome/browser/content/browser/utilityOverlay.js
lib/cliqz/browser/chrome/browser/content/browser/webext-panels.js
-lib/cliqz/browser/chrome/browser/content/browser/webext-panels.xul
+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.xul
+lib/cliqz/browser/chrome/browser/content/browser/webrtcIndicator.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
@@ -852,7 +861,6 @@ lib/cliqz/browser/chrome/browser/skin/classic/browser/chevron-animation.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/chevron.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/cliqz/theme.css
lib/cliqz/browser/chrome/browser/skin/classic/browser/compacttheme.css
-lib/cliqz/browser/chrome/browser/skin/classic/browser/connect.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/connection-mixed-active-loaded.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/connection-mixed-passive-loaded.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/connection-secure.svg
@@ -916,7 +924,6 @@ lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/add-device.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/avatar-alert.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/avatar-color.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/avatar-confirm.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/avatar-empty-badged.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/avatar-empty.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/avatar.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/fxa/fxa-spinner.svg
@@ -980,6 +987,8 @@ lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/screen-
lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/screen.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/update.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/webauthn.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/xr-blocked.svg
+lib/cliqz/browser/chrome/browser/skin/classic/browser/notification-icons/xr.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/open-in-new.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/open.svg
lib/cliqz/browser/chrome/browser/skin/classic/browser/pageInfo.css
@@ -1011,9 +1020,9 @@ 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/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/connect.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
@@ -1386,8 +1395,8 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/compon
lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/components/ui/UIButton.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/constants.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/create-store.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/modules/application-services.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/modules/l10n.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/modules/services.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/reducers/index.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/reducers/manifest-state.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/application/src/reducers/page-state.js
@@ -1747,6 +1756,7 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/edi
lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/editor/source-editor.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/editor/source-search.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/editor/token-events.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/evaluation-result.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/expressions.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/function.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/indentation.js
@@ -1937,7 +1947,6 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/acti
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/actions/index.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/components/CSSDeclaration.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/components/ChangesApp.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/constants.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/reducers/changes.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/selectors/changes.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/changes/utils/changes-utils.js
@@ -2082,11 +2091,11 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/highlighters-overlay.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/node-reps.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/node-types.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/reflow-tracker.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-change-tracker.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-menu.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/tooltips-overlay.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/utils.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/shared/walker-event-listener.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/store.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/toolsidebar.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/jsonview/components/Headers.js
@@ -2319,9 +2328,11 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/workers
lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/workers/search/worker.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/workers/worker-utils.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/browser.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/AboutProfiling.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/Description.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/DevToolsAndPopup.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/DirectoryPicker.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/Perf.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/ProfilerEventHandling.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/Range.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/RecordingButton.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/performance-new/components/Settings.js
@@ -2403,6 +2414,7 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/Browser.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/Device.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/DeviceForm.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/DeviceInfo.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/DeviceList.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/DeviceModal.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/components/DevicePixelRatioMenu.js
@@ -2435,6 +2447,7 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/utils/l10n.
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/utils/message.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/utils/notification.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/utils/orientation.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/utils/ua.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/responsive/utils/window.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/SplitView.jsm
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/WeakMapMap.js
@@ -2580,8 +2593,6 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/ShapesI
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/Spectrum.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/TableWidget.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/TreeWidget.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesView.jsm
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesViewController.jsm
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/EventTooltipHelper.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
@@ -2597,6 +2608,7 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/widgets/view-helpers.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/workers-listener.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/shared/zoom-keys.js
+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/styleeditor/StyleEditorUI.jsm
@@ -2629,6 +2641,7 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/
lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/FilterBar/FilterButton.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/FilterBar/FilterCheckbox.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/ConfirmDialog.js
+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/JSTerm.js
lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/components/Input/ReverseSearchInput.css
@@ -2790,6 +2803,8 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/performance.js
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
@@ -2828,6 +2843,7 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/shapes-ut
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
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/utils/watchpoint-map.js
lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webbrowser.js
lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole.js
lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/webconsole/commands.js
@@ -2850,6 +2866,9 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/worker/service-
lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/worker/worker-target-actor-list.js
lib/cliqz/browser/chrome/devtools/modules/devtools/server/connectors/content-process-connector.js
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/debugger-server-connection.js
lib/cliqz/browser/chrome/devtools/modules/devtools/server/debugger-server.js
@@ -3083,6 +3102,7 @@ lib/cliqz/browser/chrome/devtools/modules/devtools/shared/system.js
lib/cliqz/browser/chrome/devtools/modules/devtools/shared/task.js
lib/cliqz/browser/chrome/devtools/modules/devtools/shared/throttle.js
lib/cliqz/browser/chrome/devtools/modules/devtools/shared/transport/child-transport.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/transport/js-window-actor-transport.js
lib/cliqz/browser/chrome/devtools/modules/devtools/shared/transport/local-transport.js
lib/cliqz/browser/chrome/devtools/modules/devtools/shared/transport/packets.js
lib/cliqz/browser/chrome/devtools/modules/devtools/shared/transport/stream-utils.js
@@ -3145,7 +3165,9 @@ lib/cliqz/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.svg
lib/cliqz/browser/chrome/devtools/skin/images/browsers/chrome.svg
lib/cliqz/browser/chrome/devtools/skin/images/browsers/edge.svg
lib/cliqz/browser/chrome/devtools/skin/images/browsers/firefox.svg
+lib/cliqz/browser/chrome/devtools/skin/images/browsers/ie.svg
lib/cliqz/browser/chrome/devtools/skin/images/browsers/mobile.svg
+lib/cliqz/browser/chrome/devtools/skin/images/browsers/opera.svg
lib/cliqz/browser/chrome/devtools/skin/images/browsers/safari.svg
lib/cliqz/browser/chrome/devtools/skin/images/case-match.svg
lib/cliqz/browser/chrome/devtools/skin/images/checkbox.svg
@@ -3661,6 +3683,7 @@ lib/cliqz/browser/defaults/settings/pinning/pins.json
lib/cliqz/browser/defaults/settings/security-state/intermediates.json
lib/cliqz/browser/defaults/settings/security-state/onecrl.json
lib/cliqz/browser/features/cliqz@cliqz.com.xpi
+lib/cliqz/browser/features/dat@cliqz.com.xpi
lib/cliqz/browser/features/gdprtool@cliqz.com.xpi
lib/cliqz/browser/features/https-everywhere@cliqz.com.xpi
lib/cliqz/browser/localization/en-US/branding/brand.ftl
@@ -3679,6 +3702,7 @@ lib/cliqz/browser/localization/en-US/browser/appmenu.ftl
lib/cliqz/browser/localization/en-US/browser/branding/brandings.ftl
lib/cliqz/browser/localization/en-US/browser/branding/sync-brand.ftl
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/customizeMode.ftl
lib/cliqz/browser/localization/en-US/browser/menubar.ftl
lib/cliqz/browser/localization/en-US/browser/newInstallPage.ftl
@@ -3722,7 +3746,6 @@ lib/cliqz/browser/localization/en-US/startup/aboutDevTools.ftl
lib/cliqz/browser/modules/AboutDebuggingRegistration.jsm
lib/cliqz/browser/modules/AboutDevToolsRegistration.jsm
lib/cliqz/browser/modules/AboutDevToolsToolboxRegistration.jsm
-lib/cliqz/browser/modules/AboutLoginsParent.jsm
lib/cliqz/browser/modules/AboutNewTabService.jsm
lib/cliqz/browser/modules/AppUpdater.jsm
lib/cliqz/browser/modules/AsyncTabSwitcher.jsm
@@ -3765,7 +3788,6 @@ lib/cliqz/browser/modules/OpenInTabsUtils.jsm
lib/cliqz/browser/modules/PageActions.jsm
lib/cliqz/browser/modules/PanelMultiView.jsm
lib/cliqz/browser/modules/PermissionUI.jsm
-lib/cliqz/browser/modules/PermissionUITelemetry.jsm
lib/cliqz/browser/modules/PingCentre.jsm
lib/cliqz/browser/modules/PlacesUIUtils.jsm
lib/cliqz/browser/modules/ProcessHangMonitor.jsm
@@ -3779,6 +3801,7 @@ lib/cliqz/browser/modules/SelectionChangedMenulist.jsm
lib/cliqz/browser/modules/ShellService.jsm
lib/cliqz/browser/modules/SiteDataManager.jsm
lib/cliqz/browser/modules/SitePermissions.jsm
+lib/cliqz/browser/modules/SiteSpecificBrowserService.jsm
lib/cliqz/browser/modules/TabUnloader.jsm
lib/cliqz/browser/modules/TabsList.jsm
lib/cliqz/browser/modules/ThemeVariableMap.jsm
@@ -3786,7 +3809,6 @@ lib/cliqz/browser/modules/TransientPrefs.jsm
lib/cliqz/browser/modules/UITour.jsm
lib/cliqz/browser/modules/UITourChild.jsm
lib/cliqz/browser/modules/UITourParent.jsm
-lib/cliqz/browser/modules/UrlbarContextualTip.jsm
lib/cliqz/browser/modules/UrlbarController.jsm
lib/cliqz/browser/modules/UrlbarEventBufferer.jsm
lib/cliqz/browser/modules/UrlbarInput.jsm
@@ -3795,6 +3817,7 @@ lib/cliqz/browser/modules/UrlbarPrefs.jsm
lib/cliqz/browser/modules/UrlbarProviderExtension.jsm
lib/cliqz/browser/modules/UrlbarProviderOpenTabs.jsm
lib/cliqz/browser/modules/UrlbarProviderPrivateSearch.jsm
+lib/cliqz/browser/modules/UrlbarProviderTopSites.jsm
lib/cliqz/browser/modules/UrlbarProviderUnifiedComplete.jsm
lib/cliqz/browser/modules/UrlbarProvidersManager.jsm
lib/cliqz/browser/modules/UrlbarResult.jsm
@@ -3830,6 +3853,7 @@ lib/cliqz/browser/modules/sessionstore/TabAttributes.jsm
lib/cliqz/browser/modules/sessionstore/TabState.jsm
lib/cliqz/browser/modules/sessionstore/TabStateCache.jsm
lib/cliqz/browser/modules/sessionstore/TabStateFlusher.jsm
+lib/cliqz/browser/modules/ssb/ImageTools.jsm
lib/cliqz/browser/modules/syncedtabs/EventEmitter.jsm
lib/cliqz/browser/modules/syncedtabs/SyncedTabsDeckComponent.js
lib/cliqz/browser/modules/syncedtabs/SyncedTabsDeckStore.js
@@ -3980,7 +4004,7 @@ lib/cliqz/chrome/marionette/content/packets.js
lib/cliqz/chrome/marionette/content/prefs.js
lib/cliqz/chrome/marionette/content/proxy.js
lib/cliqz/chrome/marionette/content/reftest.js
-lib/cliqz/chrome/marionette/content/reftest.xul
+lib/cliqz/chrome/marionette/content/reftest.xhtml
lib/cliqz/chrome/marionette/content/server.js
lib/cliqz/chrome/marionette/content/stream-utils.js
lib/cliqz/chrome/marionette/content/sync.js
@@ -4015,55 +4039,6 @@ lib/cliqz/chrome/pippki/content/pippki/setp12password.js
lib/cliqz/chrome/pippki/content/pippki/setp12password.xhtml
lib/cliqz/chrome/recording/content/recording.js
lib/cliqz/chrome/recording/content/recording.xhtml
-lib/cliqz/chrome/remote/content/Connection.jsm
-lib/cliqz/chrome/remote/content/Error.jsm
-lib/cliqz/chrome/remote/content/JSONHandler.jsm
-lib/cliqz/chrome/remote/content/Log.jsm
-lib/cliqz/chrome/remote/content/Protocol.jsm
-lib/cliqz/chrome/remote/content/RecommendedPreferences.jsm
-lib/cliqz/chrome/remote/content/RemoteAgent.jsm
-lib/cliqz/chrome/remote/content/Sync.jsm
-lib/cliqz/chrome/remote/content/TabManager.jsm
-lib/cliqz/chrome/remote/content/WindowManager.jsm
-lib/cliqz/chrome/remote/content/domains/ContentProcessDomain.jsm
-lib/cliqz/chrome/remote/content/domains/ContentProcessDomains.jsm
-lib/cliqz/chrome/remote/content/domains/ContextObserver.jsm
-lib/cliqz/chrome/remote/content/domains/Domain.jsm
-lib/cliqz/chrome/remote/content/domains/Domains.jsm
-lib/cliqz/chrome/remote/content/domains/ParentProcessDomains.jsm
-lib/cliqz/chrome/remote/content/domains/content/DOM.jsm
-lib/cliqz/chrome/remote/content/domains/content/Emulation.jsm
-lib/cliqz/chrome/remote/content/domains/content/Input.jsm
-lib/cliqz/chrome/remote/content/domains/content/Log.jsm
-lib/cliqz/chrome/remote/content/domains/content/Page.jsm
-lib/cliqz/chrome/remote/content/domains/content/Performance.jsm
-lib/cliqz/chrome/remote/content/domains/content/Runtime.jsm
-lib/cliqz/chrome/remote/content/domains/content/Security.jsm
-lib/cliqz/chrome/remote/content/domains/content/runtime/ExecutionContext.jsm
-lib/cliqz/chrome/remote/content/domains/parent/Browser.jsm
-lib/cliqz/chrome/remote/content/domains/parent/Emulation.jsm
-lib/cliqz/chrome/remote/content/domains/parent/Input.jsm
-lib/cliqz/chrome/remote/content/domains/parent/Network.jsm
-lib/cliqz/chrome/remote/content/domains/parent/Page.jsm
-lib/cliqz/chrome/remote/content/domains/parent/Security.jsm
-lib/cliqz/chrome/remote/content/domains/parent/Target.jsm
-lib/cliqz/chrome/remote/content/domains/parent/network/ChannelEventSink.jsm
-lib/cliqz/chrome/remote/content/domains/parent/network/NetworkObserver.jsm
-lib/cliqz/chrome/remote/content/domains/parent/page/DialogHandler.jsm
-lib/cliqz/chrome/remote/content/external/EventUtils.js
-lib/cliqz/chrome/remote/content/server/HTTPD.jsm
-lib/cliqz/chrome/remote/content/server/WebSocketHandshake.jsm
-lib/cliqz/chrome/remote/content/server/WebSocketTransport.jsm
-lib/cliqz/chrome/remote/content/sessions/ContentProcessSession.jsm
-lib/cliqz/chrome/remote/content/sessions/MainProcessSession.jsm
-lib/cliqz/chrome/remote/content/sessions/Session.jsm
-lib/cliqz/chrome/remote/content/sessions/TabSession.jsm
-lib/cliqz/chrome/remote/content/sessions/frame-script.js
-lib/cliqz/chrome/remote/content/targets/MainProcessTarget.jsm
-lib/cliqz/chrome/remote/content/targets/TabObserver.jsm
-lib/cliqz/chrome/remote/content/targets/TabTarget.jsm
-lib/cliqz/chrome/remote/content/targets/Target.jsm
-lib/cliqz/chrome/remote/content/targets/Targets.jsm
lib/cliqz/chrome/toolkit/content/extensions/child/ext-backgroundPage.js
lib/cliqz/chrome/toolkit/content/extensions/child/ext-contentScripts.js
lib/cliqz/chrome/toolkit/content/extensions/child/ext-extension.js
@@ -4075,7 +4050,7 @@ lib/cliqz/chrome/toolkit/content/extensions/child/ext-toolkit.js
lib/cliqz/chrome/toolkit/content/extensions/child/ext-userScripts-content.js
lib/cliqz/chrome/toolkit/content/extensions/child/ext-userScripts.js
lib/cliqz/chrome/toolkit/content/extensions/child/ext-webRequest.js
-lib/cliqz/chrome/toolkit/content/extensions/dummy.xul
+lib/cliqz/chrome/toolkit/content/extensions/dummy.xhtml
lib/cliqz/chrome/toolkit/content/extensions/ext-browser-content.js
lib/cliqz/chrome/toolkit/content/extensions/ext-toolkit.json
lib/cliqz/chrome/toolkit/content/extensions/parent/ext-activityLog.js
@@ -4187,9 +4162,9 @@ lib/cliqz/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.html
lib/cliqz/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.js
lib/cliqz/chrome/toolkit/content/global/alerts/alert.css
lib/cliqz/chrome/toolkit/content/global/alerts/alert.js
-lib/cliqz/chrome/toolkit/content/global/alerts/alert.xul
+lib/cliqz/chrome/toolkit/content/global/alerts/alert.xhtml
lib/cliqz/chrome/toolkit/content/global/appPicker.js
-lib/cliqz/chrome/toolkit/content/global/appPicker.xul
+lib/cliqz/chrome/toolkit/content/global/appPicker.xhtml
lib/cliqz/chrome/toolkit/content/global/autocomplete.css
lib/cliqz/chrome/toolkit/content/global/backgroundPageThumbs.xhtml
lib/cliqz/chrome/toolkit/content/global/backgroundPageThumbsContent.js
@@ -4224,9 +4199,9 @@ lib/cliqz/chrome/toolkit/content/global/certviewer/strings.js
lib/cliqz/chrome/toolkit/content/global/certviewer/utils.js
lib/cliqz/chrome/toolkit/content/global/commonDialog.css
lib/cliqz/chrome/toolkit/content/global/commonDialog.js
-lib/cliqz/chrome/toolkit/content/global/commonDialog.xul
+lib/cliqz/chrome/toolkit/content/global/commonDialog.xhtml
lib/cliqz/chrome/toolkit/content/global/config.js
-lib/cliqz/chrome/toolkit/content/global/config.xul
+lib/cliqz/chrome/toolkit/content/global/config.xhtml
lib/cliqz/chrome/toolkit/content/global/contentAreaUtils.js
lib/cliqz/chrome/toolkit/content/global/customElements.js
lib/cliqz/chrome/toolkit/content/global/datepicker.xhtml
@@ -4280,10 +4255,10 @@ lib/cliqz/chrome/toolkit/content/global/plugins.html
lib/cliqz/chrome/toolkit/content/global/plugins.js
lib/cliqz/chrome/toolkit/content/global/preferencesBindings.js
lib/cliqz/chrome/toolkit/content/global/printPreviewProgress.js
-lib/cliqz/chrome/toolkit/content/global/printPreviewProgress.xul
+lib/cliqz/chrome/toolkit/content/global/printPreviewProgress.xhtml
lib/cliqz/chrome/toolkit/content/global/printPreviewToolbar.js
lib/cliqz/chrome/toolkit/content/global/printProgress.js
-lib/cliqz/chrome/toolkit/content/global/printProgress.xul
+lib/cliqz/chrome/toolkit/content/global/printProgress.xhtml
lib/cliqz/chrome/toolkit/content/global/printUtils.js
lib/cliqz/chrome/toolkit/content/global/process-content.js
lib/cliqz/chrome/toolkit/content/global/reader/aboutReader.html
@@ -4291,10 +4266,10 @@ lib/cliqz/chrome/toolkit/content/global/reader/aboutReader.js
lib/cliqz/chrome/toolkit/content/global/remote-test-ipc.js
lib/cliqz/chrome/toolkit/content/global/resetProfile.css
lib/cliqz/chrome/toolkit/content/global/resetProfile.js
-lib/cliqz/chrome/toolkit/content/global/resetProfile.xul
-lib/cliqz/chrome/toolkit/content/global/resetProfileProgress.xul
+lib/cliqz/chrome/toolkit/content/global/resetProfile.xhtml
+lib/cliqz/chrome/toolkit/content/global/resetProfileProgress.xhtml
lib/cliqz/chrome/toolkit/content/global/selectDialog.js
-lib/cliqz/chrome/toolkit/content/global/selectDialog.xul
+lib/cliqz/chrome/toolkit/content/global/selectDialog.xhtml
lib/cliqz/chrome/toolkit/content/global/simplifyMode.css
lib/cliqz/chrome/toolkit/content/global/tabprompts.css
lib/cliqz/chrome/toolkit/content/global/tabprompts.jsm
@@ -4306,11 +4281,11 @@ lib/cliqz/chrome/toolkit/content/global/viewSource-content.js
lib/cliqz/chrome/toolkit/content/global/viewSourceUtils.js
lib/cliqz/chrome/toolkit/content/global/viewZoomOverlay.js
lib/cliqz/chrome/toolkit/content/global/widgets.css
-lib/cliqz/chrome/toolkit/content/global/win.xul
+lib/cliqz/chrome/toolkit/content/global/win.xhtml
lib/cliqz/chrome/toolkit/content/global/xml/XMLPrettyPrint.css
lib/cliqz/chrome/toolkit/content/global/xml/XMLPrettyPrint.xsl
lib/cliqz/chrome/toolkit/content/global/xul.css
-lib/cliqz/chrome/toolkit/content/mozapps/downloads/unknownContentType.xul
+lib/cliqz/chrome/toolkit/content/mozapps/downloads/unknownContentType.xhtml
lib/cliqz/chrome/toolkit/content/mozapps/extensions/OpenH264-license.txt
lib/cliqz/chrome/toolkit/content/mozapps/extensions/aboutaddons.css
lib/cliqz/chrome/toolkit/content/mozapps/extensions/aboutaddons.html
@@ -4322,11 +4297,11 @@ 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
lib/cliqz/chrome/toolkit/content/mozapps/extensions/blocklist.js
-lib/cliqz/chrome/toolkit/content/mozapps/extensions/blocklist.xul
+lib/cliqz/chrome/toolkit/content/mozapps/extensions/blocklist.xhtml
lib/cliqz/chrome/toolkit/content/mozapps/extensions/default-theme.svg
lib/cliqz/chrome/toolkit/content/mozapps/extensions/extensions.css
lib/cliqz/chrome/toolkit/content/mozapps/extensions/extensions.js
-lib/cliqz/chrome/toolkit/content/mozapps/extensions/extensions.xul
+lib/cliqz/chrome/toolkit/content/mozapps/extensions/extensions.xhtml
lib/cliqz/chrome/toolkit/content/mozapps/extensions/firefox-compact-dark.svg
lib/cliqz/chrome/toolkit/content/mozapps/extensions/firefox-compact-light.svg
lib/cliqz/chrome/toolkit/content/mozapps/extensions/message-bar.css
@@ -4335,13 +4310,13 @@ lib/cliqz/chrome/toolkit/content/mozapps/extensions/named-deck.js
lib/cliqz/chrome/toolkit/content/mozapps/extensions/panel-item.css
lib/cliqz/chrome/toolkit/content/mozapps/extensions/panel-list.css
lib/cliqz/chrome/toolkit/content/mozapps/extensions/pluginPrefs.js
-lib/cliqz/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
+lib/cliqz/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xhtml
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.xul
+lib/cliqz/chrome/toolkit/content/mozapps/handling/dialog.xhtml
lib/cliqz/chrome/toolkit/content/mozapps/handling/handler.css
lib/cliqz/chrome/toolkit/content/mozapps/preferences/changemp.js
lib/cliqz/chrome/toolkit/content/mozapps/preferences/changemp.xhtml
@@ -4349,13 +4324,13 @@ lib/cliqz/chrome/toolkit/content/mozapps/preferences/fontbuilder.js
lib/cliqz/chrome/toolkit/content/mozapps/preferences/removemp.js
lib/cliqz/chrome/toolkit/content/mozapps/preferences/removemp.xhtml
lib/cliqz/chrome/toolkit/content/mozapps/profile/createProfileWizard.js
-lib/cliqz/chrome/toolkit/content/mozapps/profile/createProfileWizard.xul
+lib/cliqz/chrome/toolkit/content/mozapps/profile/createProfileWizard.xhtml
lib/cliqz/chrome/toolkit/content/mozapps/profile/profileDowngrade.js
-lib/cliqz/chrome/toolkit/content/mozapps/profile/profileDowngrade.xul
+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.xul
+lib/cliqz/chrome/toolkit/content/mozapps/profile/profileSelection.xhtml
lib/cliqz/chrome/toolkit/content/passwordmgr/passwordManager.js
-lib/cliqz/chrome/toolkit/content/passwordmgr/passwordManager.xul
+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
@@ -4602,7 +4577,6 @@ lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/category-legacy.svg
lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.svg
lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/category-service.svg
lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.svg
-lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/discover-logo.png
lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/experimentGeneric.svg
lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric-16.svg
lib/cliqz/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.svg
@@ -4705,9 +4679,9 @@ lib/cliqz/localization/en-US/toolkit/about/certviewer.ftl
lib/cliqz/localization/en-US/toolkit/about/url-classifier.ftl
lib/cliqz/localization/en-US/toolkit/global/processTypes.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/intl/languageNames.ftl
lib/cliqz/localization/en-US/toolkit/intl/regionNames.ftl
-lib/cliqz/localization/en-US/toolkit/main-window/editmenu.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
@@ -4727,7 +4701,6 @@ lib/cliqz/modules/AppMenuNotifications.jsm
lib/cliqz/modules/AsyncPrefs.jsm
lib/cliqz/modules/AsyncShutdown.jsm
lib/cliqz/modules/AsyncStreamReader.jsm
-lib/cliqz/modules/AutoScrollController.jsm
lib/cliqz/modules/BSPatch.jsm
lib/cliqz/modules/BackgroundPageThumbs.jsm
lib/cliqz/modules/BinarySearch.jsm
@@ -4881,6 +4854,7 @@ lib/cliqz/modules/LoginHelper.jsm
lib/cliqz/modules/LoginImport.jsm
lib/cliqz/modules/LoginInfo.jsm
lib/cliqz/modules/LoginManager.jsm
+lib/cliqz/modules/LoginManagerAuthPrompter.jsm
lib/cliqz/modules/LoginManagerChild.jsm
lib/cliqz/modules/LoginManagerContextMenu.jsm
lib/cliqz/modules/LoginManagerParent.jsm
@@ -4920,6 +4894,7 @@ lib/cliqz/modules/PasswordGenerator.jsm
lib/cliqz/modules/PerformanceCounters.jsm
lib/cliqz/modules/PermissionsUtils.jsm
lib/cliqz/modules/PictureInPicture.jsm
+lib/cliqz/modules/PictureInPictureTogglePolicy.jsm
lib/cliqz/modules/PlacesBackups.jsm
lib/cliqz/modules/PlacesCategoriesStarter.jsm
lib/cliqz/modules/PlacesDBUtils.jsm
@@ -4959,7 +4934,7 @@ lib/cliqz/modules/RFPHelper.jsm
lib/cliqz/modules/ReaderMode.jsm
lib/cliqz/modules/Readerable.jsm
lib/cliqz/modules/RecordingCmdLine.jsm
-lib/cliqz/modules/RemoteController.js
+lib/cliqz/modules/RemoteController.jsm
lib/cliqz/modules/RemoteSecurityUI.jsm
lib/cliqz/modules/RemoteWebNavigation.jsm
lib/cliqz/modules/RemoteWebProgress.jsm
diff --git a/www/cliqz/distinfo b/www/cliqz/distinfo
index 4ce6366b83c..64912c7a8f8 100644
--- a/www/cliqz/distinfo
+++ b/www/cliqz/distinfo
@@ -1,31 +1,35 @@
-$NetBSD: distinfo,v 1.20 2020/01/23 08:47:26 fox Exp $
+$NetBSD: distinfo,v 1.21 2020/02/23 00:10:40 fox Exp $
-SHA1 (cliqz-1.32.1/adult-domains.bin) = 0cce1cc83b2de16fda1463c21ffa700d1df2a792
-RMD160 (cliqz-1.32.1/adult-domains.bin) = 8d1fa08deea8d68692c684da44a3bdc41d3d3c07
-SHA512 (cliqz-1.32.1/adult-domains.bin) = 1193ca81668746241b6f814a8a6ed5c692d42b6abb7e98e8d19ce0549a940ce6353841a0bb3e6b2485abdaaf3d10321670a47017d5cc1ce2cabfbae8c1c514e5
-Size (cliqz-1.32.1/adult-domains.bin) = 528392 bytes
-SHA1 (cliqz-1.32.1/cliqz-1.32.1.tar.gz) = 200323dffcca0a09a3b14dec76539a699f3891cb
-RMD160 (cliqz-1.32.1/cliqz-1.32.1.tar.gz) = 3cca9cf5fd128b0d47e85ab928ef7dbcdf2f2d7a
-SHA512 (cliqz-1.32.1/cliqz-1.32.1.tar.gz) = 396f11796bb31ac967d457882589adabce4bdf03766f30aed3392785ab4d5cfa4fd727b3cd4acb7ad5c285bcde09705b889c5090a7589fffbe0a4473611b9f79
-Size (cliqz-1.32.1/cliqz-1.32.1.tar.gz) = 495123166 bytes
-SHA1 (cliqz-1.32.1/cliqz@cliqz.com.xpi) = 3b1c17a1871ee95277b9fc55a2da3174149504fc
-RMD160 (cliqz-1.32.1/cliqz@cliqz.com.xpi) = 5b1cdef87b2120d17f7107d0d073e02981fb4b23
-SHA512 (cliqz-1.32.1/cliqz@cliqz.com.xpi) = b5dd5f7f71cb7310faf47b8d2c6a26aac41fea0bc2db9c7a3e96b25a0c2a6cf9695ebb10acc32e4a9ced7e3fe0bb16b6a163cbf52d1d9ea344af663568722b11
-Size (cliqz-1.32.1/cliqz@cliqz.com.xpi) = 3669619 bytes
-SHA1 (cliqz-1.32.1/gdprtool@cliqz.com.xpi) = 63be2c9c779b7c10644b02a8bbb234d1c004e2c2
-RMD160 (cliqz-1.32.1/gdprtool@cliqz.com.xpi) = cdc87373a012e68ac94e9c1292d40a728a6b4974
-SHA512 (cliqz-1.32.1/gdprtool@cliqz.com.xpi) = 63bfa57a93effd508f432b2672505e62f63e1f451082c69cce90ced9f16826496465690233146eae2b8cb0e43f4695c25b42a82058366df026d45361493ec0c9
-Size (cliqz-1.32.1/gdprtool@cliqz.com.xpi) = 222247 bytes
-SHA1 (cliqz-1.32.1/https-everywhere@cliqz.com.xpi) = 6fa290bae96a80722b943aa6906101683f7a7c46
-RMD160 (cliqz-1.32.1/https-everywhere@cliqz.com.xpi) = 798bf780be5324da30e16cbd6220667df99aeb40
-SHA512 (cliqz-1.32.1/https-everywhere@cliqz.com.xpi) = 0ef92a49d8974c43478fc427a0d0e535851f4326dd15a9342d1e9f9218cf9db1217e5f0d4876e6a08b08e0f13fb40da238248fd75fc6c8c222937ab2ddb3816a
-Size (cliqz-1.32.1/https-everywhere@cliqz.com.xpi) = 2038441 bytes
-SHA1 (patch-cliqz__env.sh) = 128ff4f8c7c82b61d2b095be8c91af0116aa99ed
+SHA1 (cliqz-1.33.0/adult-domains.bin) = 39f8b7a881e70828fdb411eefd5a70540a3699bd
+RMD160 (cliqz-1.33.0/adult-domains.bin) = a41b8d15df385dbce6904f184552eb542161ce54
+SHA512 (cliqz-1.33.0/adult-domains.bin) = 8896a629efd0f67b98393928edda20400350938f911f7eedc05f776b2626a656dfb092714fc5cb1766e4aee4efccfed62d297f211c07b3cca57fff1cd282ced1
+Size (cliqz-1.33.0/adult-domains.bin) = 528392 bytes
+SHA1 (cliqz-1.33.0/cliqz-1.33.0.tar.gz) = ad22ac97e92460c5971d04794553091f75ee9880
+RMD160 (cliqz-1.33.0/cliqz-1.33.0.tar.gz) = 4d935f1b13ba01dbcc8832b5fa3bc3fb0f39cbb4
+SHA512 (cliqz-1.33.0/cliqz-1.33.0.tar.gz) = 29d4e64ba09165868cc9cc10ba49216785a2e4931bf37b7e2ae3c2a1124ed18144aee69d79db138b09d972e29160bd0c37d845e743960f48b998a25be59dfe82
+Size (cliqz-1.33.0/cliqz-1.33.0.tar.gz) = 499857375 bytes
+SHA1 (cliqz-1.33.0/cliqz@cliqz.com.xpi) = 9def44bf858b85236e23df8fc58bc566c6519788
+RMD160 (cliqz-1.33.0/cliqz@cliqz.com.xpi) = 35c4a440f551e680239132736c0f7d315b3fe0c7
+SHA512 (cliqz-1.33.0/cliqz@cliqz.com.xpi) = c5f867a7149f7aeb09b321d7263d8cf4089e2424d5074f9e2293145adace1b275e18ffbfe87e8d75b2276b71a3de803571bf801f15415fc4623ba5d0935f7129
+Size (cliqz-1.33.0/cliqz@cliqz.com.xpi) = 3678987 bytes
+SHA1 (cliqz-1.33.0/dat@cliqz.com.xpi) = 2e368d5d62c5d2dfe4d463b532bb2693bf3ae4f0
+RMD160 (cliqz-1.33.0/dat@cliqz.com.xpi) = 4e6d7130e984b1eeb29279b0b4901dd2b71f3fd8
+SHA512 (cliqz-1.33.0/dat@cliqz.com.xpi) = 3053acd0484adfe6fc93bf96b933c8c0427d25bd31435cd4eddfec3cd7b82c710cea2efcd8b88a784a10cb30fd5cb9de86a428c6b8baeaa93a9eeb8faec961e1
+Size (cliqz-1.33.0/dat@cliqz.com.xpi) = 986532 bytes
+SHA1 (cliqz-1.33.0/gdprtool@cliqz.com.xpi) = 1a95888fd7b49ea2b38c3d7ba2fb901115fc19aa
+RMD160 (cliqz-1.33.0/gdprtool@cliqz.com.xpi) = 02676ca33b7ef732649cc2e9c1b5e3110b45ab9c
+SHA512 (cliqz-1.33.0/gdprtool@cliqz.com.xpi) = f59850063a542436484983abfe96b93ecd6e6e90f154e117bdfaca8b0fcc8e2abde715ee1a4e75661d0cf8cf8a8840529a06186a8f133300dff287e7f74efa85
+Size (cliqz-1.33.0/gdprtool@cliqz.com.xpi) = 219684 bytes
+SHA1 (cliqz-1.33.0/https-everywhere@cliqz.com.xpi) = 6fa290bae96a80722b943aa6906101683f7a7c46
+RMD160 (cliqz-1.33.0/https-everywhere@cliqz.com.xpi) = 798bf780be5324da30e16cbd6220667df99aeb40
+SHA512 (cliqz-1.33.0/https-everywhere@cliqz.com.xpi) = 0ef92a49d8974c43478fc427a0d0e535851f4326dd15a9342d1e9f9218cf9db1217e5f0d4876e6a08b08e0f13fb40da238248fd75fc6c8c222937ab2ddb3816a
+Size (cliqz-1.33.0/https-everywhere@cliqz.com.xpi) = 2038441 bytes
+SHA1 (patch-cliqz__env.sh) = 69df75c62d887365be1ba7b8d72aa93bcbd14cc7
SHA1 (patch-mozilla-release_browser_app_profile_firefox.js) = e76a7a023a72fe9c5c621da416a8be3111ed8894
SHA1 (patch-mozilla-release_browser_config_cliqz.mozconfig) = f59e4c0405ed2f8a5fbb0f3e3ce7c62206c1bca8
SHA1 (patch-mozilla-release_build_moz.configure_rust.configure) = d94eb6cdad57d96786b82185bf91491f3fa76437
SHA1 (patch-mozilla-release_config__make_system_wrappers.py) = 4c075265de903751ee7e3275a75f31dd78881188
-SHA1 (patch-mozilla-release_config_rules.mk) = fb9313ddcf18ca6732d5c915377ab6c82b9a9aea
+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
@@ -34,9 +38,11 @@ SHA1 (patch-mozilla-release_ipc_chromium_src_base_message__pump__libevent.cc) =
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_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_xpcom_base_nscore.h) = c1a72f0ea63aacde6dbe321031e82aec99d4350f
SHA1 (patch-mozilla-release_xpcom_build_BinaryPath.h) = a351eed0681872d50193a0232e61752c223026d1
diff --git a/www/cliqz/mozilla-common.mk b/www/cliqz/mozilla-common.mk
index cf78dd3e89c..4aa9d71e5f6 100644
--- a/www/cliqz/mozilla-common.mk
+++ b/www/cliqz/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.6 2020/01/22 10:36:24 fox Exp $
+# $NetBSD: mozilla-common.mk,v 1.7 2020/02/23 00:10:40 fox Exp $
#
# Common Makefile fragment for mozilla packages based on gecko 2.0.
# derived from www/firefox
@@ -73,13 +73,15 @@ SUBST_VARS.prefix+= PREFIX
BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/libffi/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nspr+= nspr>=4.21
+BUILDLINK_API_DEPENDS.nspr+= nspr>=4.24
.include "../../devel/nspr/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nss+= nss>=3.48
+BUILDLINK_API_DEPENDS.nss+= nss>=3.49.2
.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
.include "../../multimedia/libvpx/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
diff --git a/www/cliqz/patches/patch-cliqz__env.sh b/www/cliqz/patches/patch-cliqz__env.sh
index c06db01c7bd..6a548a07647 100644
--- a/www/cliqz/patches/patch-cliqz__env.sh
+++ b/www/cliqz/patches/patch-cliqz__env.sh
@@ -1,11 +1,11 @@
-$NetBSD: patch-cliqz__env.sh,v 1.2 2019/11/17 17:32:23 fox Exp $
+$NetBSD: patch-cliqz__env.sh,v 1.3 2020/02/23 00:10:41 fox Exp $
Commented out the various wget(1) to prevent http traffic during build
phase.
---- cliqz_env.sh.orig 2018-11-16 08:40:07.000000000 +0000
+--- cliqz_env.sh.orig 2020-02-19 14:20:43.000000000 +0000
+++ cliqz_env.sh
-@@ -78,9 +78,9 @@ export S3_BUCKET=repository.cliqz.com
+@@ -110,9 +110,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,7 +18,7 @@ phase.
if [ -z $CQZ_BUILD_ID ]; then
echo "CQZ_BUILD_ID not specified and can not be obtain from "$S3_BUCKET
-@@ -103,6 +103,6 @@ OBJ_DIR=$MOZ_OBJDIR
+@@ -135,7 +135,7 @@ OBJ_DIR=$MOZ_OBJDIR
SRC_BASE=mozilla-release
# automatic forget tab - start
@@ -26,3 +26,4 @@ phase.
+#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
# automatic forget tab - end
+
diff --git a/www/cliqz/patches/patch-mozilla-release_config_rules.mk b/www/cliqz/patches/patch-mozilla-release_config_rules.mk
index c5e5eb88df7..e8a92150a45 100644
--- a/www/cliqz/patches/patch-mozilla-release_config_rules.mk
+++ b/www/cliqz/patches/patch-mozilla-release_config_rules.mk
@@ -1,11 +1,11 @@
-$NetBSD: patch-mozilla-release_config_rules.mk,v 1.2 2019/09/29 11:28:05 fox Exp $
+$NetBSD: patch-mozilla-release_config_rules.mk,v 1.3 2020/02/23 00:10:41 fox Exp $
Commented out the various wget(1) to prevent http traffic during build
phase.
---- mozilla-release/config/rules.mk.orig 2019-09-19 13:25:24.000000000 +0000
+--- mozilla-release/config/rules.mk.orig 2020-02-19 14:20:43.000000000 +0000
+++ mozilla-release/config/rules.mk
-@@ -989,20 +989,20 @@ $(EXTENSIONS_PATH):
+@@ -914,27 +914,27 @@ $(EXTENSIONS_PATH):
CLIQZ_XPI_PATH = $(EXTENSIONS_PATH)/cliqz@cliqz.com.xpi
$(CLIQZ_XPI_PATH): $(EXTENSIONS_PATH)
echo CLIQZ_XPI_PATH in `pwd`
@@ -29,3 +29,11 @@ phase.
endif
DAT_XPI_PATH = $(EXTENSIONS_PATH)/dat@cliqz.com.xpi
+ $(DAT_XPI_PATH): $(EXTENSIONS_PATH)
+ ifdef DAT_EXT_URL
+ echo DAT_XPI_PATH in `pwd`
+- wget --output-document $(DAT_XPI_PATH) $(DAT_EXT_URL)
++# wget --output-document $(DAT_XPI_PATH) $(DAT_EXT_URL)
+ endif
+
+ CLIQZ_CFG = $(DIST_RESPATH)/cliqz.cfg
diff --git a/www/cliqz/patches/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c b/www/cliqz/patches/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c
new file mode 100644
index 00000000000..d04b317d5ed
--- /dev/null
+++ b/www/cliqz/patches/patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c
@@ -0,0 +1,112 @@
+$NetBSD: patch-mozilla-release_nsprpub_pr_src_pthreads_ptsynch.c,v 1.1 2020/02/23 00:10:41 fox Exp $
+
+firefox: Workaround broken pthread_equal() usage
+
+Switch to an internal version of pthread_equal() without sanity checks.
+
+Problems detected on NetBSD 9.99.46.
+
+Taken from www/firefox
+
+--- mozilla-release/nsprpub/pr/src/pthreads/ptsynch.c.orig 2020-01-17 21:34:42.000000000 +0000
++++ mozilla-release/nsprpub/pr/src/pthreads/ptsynch.c
+@@ -25,6 +25,13 @@ static pthread_condattr_t _pt_cvar_attr;
+ extern PTDebug pt_debug; /* this is shared between several modules */
+ #endif /* defined(DEBUG) */
+
++/* XXX, pthread_equal() is misused to compare non-valid thread pointers */
++static int
++pt_pthread_equal(pthread_t t1, pthread_t t2)
++{
++ return t1 == t2;
++}
++
+ #if defined(FREEBSD)
+ /*
+ * On older versions of FreeBSD, pthread_mutex_trylock returns EDEADLK.
+@@ -197,9 +204,9 @@ PR_IMPLEMENT(PRStatus) PR_Unlock(PRLock
+ PR_ASSERT(lock != NULL);
+ PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(lock->mutex));
+ PR_ASSERT(PR_TRUE == lock->locked);
+- PR_ASSERT(pthread_equal(lock->owner, self));
++ PR_ASSERT(pt_pthread_equal(lock->owner, self));
+
+- if (!lock->locked || !pthread_equal(lock->owner, self)) {
++ if (!lock->locked || !pt_pthread_equal(lock->owner, self)) {
+ return PR_FAILURE;
+ }
+
+@@ -225,7 +232,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
+ * to the correctness of PR_AssertCurrentThreadOwnsLock(), but
+ * this particular order makes the assertion more likely to
+ * catch errors. */
+- PR_ASSERT(lock->locked && pthread_equal(lock->owner, pthread_self()));
++ PR_ASSERT(lock->locked && pt_pthread_equal(lock->owner, pthread_self()));
+ }
+
+ /**************************************************************/
+@@ -281,7 +288,7 @@ static void pt_PostNotifyToCvar(PRCondVa
+ _PT_Notified *notified = &cvar->lock->notified;
+
+ PR_ASSERT(PR_TRUE == cvar->lock->locked);
+- PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
++ PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
+ PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
+
+ while (1)
+@@ -369,7 +376,7 @@ PR_IMPLEMENT(PRStatus) PR_WaitCondVar(PR
+ PR_ASSERT(_PT_PTHREAD_MUTEX_IS_LOCKED(cvar->lock->mutex));
+ PR_ASSERT(PR_TRUE == cvar->lock->locked);
+ /* and it better be by us */
+- PR_ASSERT(pthread_equal(cvar->lock->owner, pthread_self()));
++ PR_ASSERT(pt_pthread_equal(cvar->lock->owner, pthread_self()));
+
+ if (_PT_THREAD_INTERRUPTED(thred)) {
+ goto aborted;
+@@ -582,7 +589,7 @@ PR_IMPLEMENT(PRIntn) PR_GetMonitorEntryC
+
+ rv = pthread_mutex_lock(&mon->lock);
+ PR_ASSERT(0 == rv);
+- if (pthread_equal(mon->owner, self)) {
++ if (pt_pthread_equal(mon->owner, self)) {
+ count = mon->entryCount;
+ }
+ rv = pthread_mutex_unlock(&mon->lock);
+@@ -598,7 +605,7 @@ PR_IMPLEMENT(void) PR_AssertCurrentThrea
+ rv = pthread_mutex_lock(&mon->lock);
+ PR_ASSERT(0 == rv);
+ PR_ASSERT(mon->entryCount != 0 &&
+- pthread_equal(mon->owner, pthread_self()));
++ pt_pthread_equal(mon->owner, pthread_self()));
+ rv = pthread_mutex_unlock(&mon->lock);
+ PR_ASSERT(0 == rv);
+ #endif
+@@ -614,7 +621,7 @@ PR_IMPLEMENT(void) PR_EnterMonitor(PRMon
+ PR_ASSERT(0 == rv);
+ if (mon->entryCount != 0)
+ {
+- if (pthread_equal(mon->owner, self)) {
++ if (pt_pthread_equal(mon->owner, self)) {
+ goto done;
+ }
+ while (mon->entryCount != 0)
+@@ -646,8 +653,8 @@ PR_IMPLEMENT(PRStatus) PR_ExitMonitor(PR
+ PR_ASSERT(0 == rv);
+ /* the entries should be > 0 and we'd better be the owner */
+ PR_ASSERT(mon->entryCount > 0);
+- PR_ASSERT(pthread_equal(mon->owner, self));
+- if (mon->entryCount == 0 || !pthread_equal(mon->owner, self))
++ PR_ASSERT(pt_pthread_equal(mon->owner, self));
++ if (mon->entryCount == 0 || !pt_pthread_equal(mon->owner, self))
+ {
+ rv = pthread_mutex_unlock(&mon->lock);
+ PR_ASSERT(0 == rv);
+@@ -695,7 +702,7 @@ PR_IMPLEMENT(PRStatus) PR_Wait(PRMonitor
+ /* the entries better be positive */
+ PR_ASSERT(mon->entryCount > 0);
+ /* and it better be owned by us */
+- PR_ASSERT(pthread_equal(mon->owner, pthread_self()));
++ PR_ASSERT(pt_pthread_equal(mon->owner, pthread_self()));
+
+ /* tuck these away 'till later */
+ saved_entries = mon->entryCount;
diff --git a/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk b/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk
new file mode 100644
index 00000000000..10629beba37
--- /dev/null
+++ b/www/cliqz/patches/patch-mozilla-release_toolkit_mozapps_installer_packager.mk
@@ -0,0 +1,17 @@
+$NetBSD: patch-mozilla-release_toolkit_mozapps_installer_packager.mk,v 1.1 2020/02/23 00:10:41 fox Exp $
+
+* Symbolic link to lib/firefox/firefox causes 'Couldn't load XPCOM.' error.
+
+Taken from www/firefox
+
+--- mozilla-release/toolkit/mozapps/installer/packager.mk.orig 2020-02-19 14:20:43.000000000 +0000
++++ mozilla-release/toolkit/mozapps/installer/packager.mk
+@@ -142,7 +142,7 @@ endif
+ (cd $(DESTDIR)$(installdir) && tar -xf -)
+ $(NSINSTALL) -D $(DESTDIR)$(bindir)
+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
++ #ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
+
+ upload:
+ $(PYTHON3) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 05:08:23 +0000