CVS commit: pkgsrc/www/cliqz

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/cliqz
From: "Santhosh Raju" <fox%netbsd.org@localhost>
Date: Tue, 31 Mar 2020 15:40:54 +0000

Module Name:    pkgsrc
Committed By:   fox
Date:           Tue Mar 31 15:40:54 UTC 2020

Modified Files:
        pkgsrc/www/cliqz: Makefile PLIST distinfo mozilla-common.mk
        pkgsrc/www/cliqz/patches: patch-mozilla-release_xpcom_base_nscore.h
Added Files:
        pkgsrc/www/cliqz/patches:
            patch-mozilla-release_config_gcc-stl-wrapper.template.h
            patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp
            patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h
Removed Files:
        pkgsrc/www/cliqz/patches:
            patch-mozilla-release_config__make_system_wrappers.py

Log Message:
www/cliqz: Updates to 1.34.0

* Bumps version dependencies.
* Imports aarch64 patches from Firefox.

Changes since 1.33.0:

Improvements

    * Cliqz got updated to Firefox 74.0 with various improvements and fixes.
    * Like Firefox, Cliqz now makes importing your bookmarks and history from
      the new Microsoft Edge browser on Windows and Mac really simple.
    * Add-ons installed by external applications can now be removed using the
      Add-ons Manager (about:addons) – just like in Firefox. Going forward,
      add-ons can only be installed by users, not by applications.

Fixes

    * When Cliqz automatically opened a link in a new forget mode window, it
      could happen that the browser killed the normal mode tab from which the
      link was clicked. This problem should not occur again in the future.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/cliqz/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/cliqz/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/cliqz/distinfo
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/cliqz/mozilla-common.mk
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_config__make_system_wrappers.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/cliqz/patches/patch-mozilla-release_xpcom_base_nscore.h

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.35 pkgsrc/www/cliqz/Makefile:1.36
--- pkgsrc/www/cliqz/Makefile:1.35      Tue Mar 10 22:11:09 2020
+++ pkgsrc/www/cliqz/Makefile   Tue Mar 31 15:40:54 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2020/03/10 22:11:09 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2020/03/31 15:40:54 fox Exp $
 
-DISTNAME=      cliqz-1.33.0
-PKGREVISION=   3
+DISTNAME=      cliqz-1.34.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=   20200219152122
+CLIQZ_LAST_BUILD_ID=   20200325191531
 CLIQZ_PLUGIN_SUFX=     @cliqz.com.xpi
 
 SITES.adult-domains.bin= \
@@ -45,7 +44,7 @@ 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.12.0:../../devel/cbindgen
+TOOL_DEPENDS+=                 cbindgen>=0.13.0:../../devel/cbindgen
 TOOL_DEPENDS+=                 nodejs-[0-9]*:../../lang/nodejs
 TOOL_DEPENDS+=                 ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
@@ -146,8 +145,8 @@ post-install:
 
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/compiler.mk"
-PKG_CC=                clang
-PKG_CXX=       clang++
+PKG_CC=                ${PREFIX}/bin/clang
+PKG_CXX=       ${PREFIX}/bin/clang++
 BUILDLINK_DEPMETHOD.clang=     build
 BUILDLINK_API_DEPENDS.clang+=  clang>=6.0.1nb1
 .include "../../lang/clang/buildlink3.mk"

Index: pkgsrc/www/cliqz/PLIST
diff -u pkgsrc/www/cliqz/PLIST:1.9 pkgsrc/www/cliqz/PLIST:1.10
--- pkgsrc/www/cliqz/PLIST:1.9  Sun Feb 23 00:10:40 2020
+++ pkgsrc/www/cliqz/PLIST      Tue Mar 31 15:40:54 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2020/02/23 00:10:40 fox Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/03/31 15:40:54 fox Exp $
 bin/cliqz
 lib/cliqz/actors/AudioPlaybackChild.jsm
 lib/cliqz/actors/AudioPlaybackParent.jsm
@@ -24,14 +24,17 @@ lib/cliqz/actors/InlineSpellCheckerParen
 lib/cliqz/actors/KeyPressEventModelCheckerChild.jsm
 lib/cliqz/actors/PictureInPictureChild.jsm
 lib/cliqz/actors/PopupBlockingChild.jsm
+lib/cliqz/actors/PopupBlockingParent.jsm
 lib/cliqz/actors/PrintingChild.jsm
 lib/cliqz/actors/PurgeSessionHistoryChild.jsm
 lib/cliqz/actors/SelectChild.jsm
 lib/cliqz/actors/SelectParent.jsm
-lib/cliqz/actors/SelectionSourceChild.jsm
 lib/cliqz/actors/ThumbnailsChild.jsm
 lib/cliqz/actors/UAWidgetsChild.jsm
 lib/cliqz/actors/UnselectedTabHoverChild.jsm
+lib/cliqz/actors/ViewSourceChild.jsm
+lib/cliqz/actors/ViewSourcePageChild.jsm
+lib/cliqz/actors/ViewSourcePageParent.jsm
 lib/cliqz/actors/WebChannelChild.jsm
 lib/cliqz/actors/WebChannelParent.jsm
 lib/cliqz/actors/WebNavigationChild.jsm
@@ -76,6 +79,7 @@ lib/cliqz/browser/actors/SiteSpecificBro
 lib/cliqz/browser/actors/SwitchDocumentDirectionChild.jsm
 lib/cliqz/browser/actors/URIFixupChild.jsm
 lib/cliqz/browser/actors/WebRTCChild.jsm
+lib/cliqz/browser/actors/WebRTCParent.jsm
 lib/cliqz/browser/adult-domains.bin
 lib/cliqz/browser/blocklist.xml
 lib/cliqz/browser/chrome.manifest
@@ -708,7 +712,6 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/af/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/an/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/ar/messages.json
-lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/as/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/ast/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/az/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/be-tarask/messages.json
@@ -718,7 +721,6 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/br/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/bs/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/ca/messages.json
-lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/crh/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/cy/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/cz/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/da/messages.json
@@ -762,14 +764,12 @@ lib/cliqz/browser/chrome/browser/search-
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/ltg/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/lv/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/mk/messages.json
-lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/ml/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/mr/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/ms/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/my/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/ne/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/nl/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/oc/messages.json
-lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/or/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/pa/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/pl/messages.json
 lib/cliqz/browser/chrome/browser/search-extensions/wikipedia/_locales/pt/messages.json
@@ -842,7 +842,6 @@ lib/cliqz/browser/chrome/browser/skin/cl
 lib/cliqz/browser/chrome/browser/skin/classic/browser/addons/addon-install-error.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/addons/addon-install-installed.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/addons/addon-install-warning.svg
-lib/cliqz/browser/chrome/browser/skin/classic/browser/addons/addon-private-browsing.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/back-12.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/back.svg
 lib/cliqz/browser/chrome/browser/skin/classic/browser/badge-blue.svg
@@ -1156,7 +1155,7 @@ lib/cliqz/browser/chrome/devtools/conten
 lib/cliqz/browser/chrome/devtools/content/framework/browser-toolbox/window.js
 lib/cliqz/browser/chrome/devtools/content/framework/options-panel.css
 lib/cliqz/browser/chrome/devtools/content/framework/toolbox-init.js
-lib/cliqz/browser/chrome/devtools/content/framework/toolbox-options.xhtml
+lib/cliqz/browser/chrome/devtools/content/framework/toolbox-options.html
 lib/cliqz/browser/chrome/devtools/content/framework/toolbox-window.xhtml
 lib/cliqz/browser/chrome/devtools/content/framework/toolbox.xhtml
 lib/cliqz/browser/chrome/devtools/content/inspector/index.xhtml
@@ -1970,10 +1969,10 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/sidebar.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ExpressionResultView.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ExtensionPage.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ExtensionSidebar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectTreeView.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectValueGripView.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/extension-sidebar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/reducers/sidebar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/inspector/extensions/types.js
@@ -2257,6 +2256,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/StatusBar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/Toolbar.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/WebSocketsPanel.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/cbor.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/msgpack.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/HandshakeProtocol.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/IHubProtocol.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/signalr/JSONHubProtocol.js
@@ -2268,6 +2269,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/socket-io/index.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/socket-io/is-buffer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/sockjs/index.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/wamp/arrayParser.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/parsers/wamp/serializers.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-connector.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-data-provider.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/index.js
@@ -2332,6 +2335,7 @@ lib/cliqz/browser/chrome/devtools/module
 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/Presets.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
@@ -2641,6 +2645,7 @@ lib/cliqz/browser/chrome/devtools/module
 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.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/JSTerm.js
@@ -2690,13 +2695,6 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/selectors/ui.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/service-container.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/store.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/test/browser/stub-generator-helpers.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/test/node/fixtures/stubs/consoleApi.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/test/node/fixtures/stubs/cssMessage.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/test/node/fixtures/stubs/evaluationResult.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/test/node/fixtures/stubs/index.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/test/node/fixtures/stubs/networkEvent.js
-lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/test/node/fixtures/stubs/pageError.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/types.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/client/webconsole/utils/clipboard.js
@@ -2739,7 +2737,8 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/descriptors/process.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.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/emulation/content-viewer.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/emulation/responsive.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/emulation/touch-simulator.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/environment.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/server/actors/errordocs.js
@@ -2937,6 +2936,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/animation.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/array-buffer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/changes.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/content-viewer.js
 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
@@ -2960,6 +2960,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/preference.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/property-iterator.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/reflow.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/responsive.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/root.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/screenshot.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/fronts/source.js
@@ -3010,6 +3011,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/performance-new/recording-utils.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/performance/recording-common.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/performance/recording-utils.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/picker-constants.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/platform/cache-entry.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/platform/clipboard.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/platform/stack.js
@@ -3043,6 +3045,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/animation.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/array-buffer.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/changes.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/content-viewer.js
 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
@@ -3069,6 +3072,7 @@ lib/cliqz/browser/chrome/devtools/module
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/preference.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/property-iterator.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/reflow.js
+lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/responsive.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/root.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/screenshot.js
 lib/cliqz/browser/chrome/devtools/modules/devtools/shared/specs/source.js
@@ -3363,7 +3367,6 @@ lib/cliqz/browser/chrome/en-US/locale/en
 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.dtd
 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
 lib/cliqz/browser/chrome/en-US/locale/en-US/devtools/shared/accessibility.properties
@@ -3703,6 +3706,7 @@ lib/cliqz/browser/localization/en-US/bro
 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/browserSets.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
@@ -3733,16 +3737,19 @@ lib/cliqz/browser/localization/en-US/bro
 lib/cliqz/browser/localization/en-US/browser/safeMode.ftl
 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/sync.ftl
 lib/cliqz/browser/localization/en-US/browser/syncedTabs.ftl
 lib/cliqz/browser/localization/en-US/browser/tabContextMenu.ftl
 lib/cliqz/browser/localization/en-US/browser/toolbarContextMenu.ftl
 lib/cliqz/browser/localization/en-US/browser/touchbar/touchbar.ftl
-lib/cliqz/browser/localization/en-US/devtools/aboutdebugging.ftl
-lib/cliqz/browser/localization/en-US/devtools/accessibility.ftl
-lib/cliqz/browser/localization/en-US/devtools/application.ftl
-lib/cliqz/browser/localization/en-US/devtools/tooltips.ftl
-lib/cliqz/browser/localization/en-US/startup/aboutDevTools.ftl
+lib/cliqz/browser/localization/en-US/devtools/client/aboutdebugging.ftl
+lib/cliqz/browser/localization/en-US/devtools/client/accessibility.ftl
+lib/cliqz/browser/localization/en-US/devtools/client/application.ftl
+lib/cliqz/browser/localization/en-US/devtools/client/toolbox-options.ftl
+lib/cliqz/browser/localization/en-US/devtools/client/tooltips.ftl
+lib/cliqz/browser/localization/en-US/devtools/startup/aboutDevTools.ftl
+lib/cliqz/browser/localization/en-US/preview/interventions.ftl
 lib/cliqz/browser/modules/AboutDebuggingRegistration.jsm
 lib/cliqz/browser/modules/AboutDevToolsRegistration.jsm
 lib/cliqz/browser/modules/AboutDevToolsToolboxRegistration.jsm
@@ -3802,6 +3809,7 @@ lib/cliqz/browser/modules/ShellService.j
 lib/cliqz/browser/modules/SiteDataManager.jsm
 lib/cliqz/browser/modules/SitePermissions.jsm
 lib/cliqz/browser/modules/SiteSpecificBrowserService.jsm
+lib/cliqz/browser/modules/TRRPerformance.jsm
 lib/cliqz/browser/modules/TabUnloader.jsm
 lib/cliqz/browser/modules/TabsList.jsm
 lib/cliqz/browser/modules/ThemeVariableMap.jsm
@@ -3815,8 +3823,10 @@ lib/cliqz/browser/modules/UrlbarInput.js
 lib/cliqz/browser/modules/UrlbarMuxerUnifiedComplete.jsm
 lib/cliqz/browser/modules/UrlbarPrefs.jsm
 lib/cliqz/browser/modules/UrlbarProviderExtension.jsm
+lib/cliqz/browser/modules/UrlbarProviderInterventions.jsm
 lib/cliqz/browser/modules/UrlbarProviderOpenTabs.jsm
 lib/cliqz/browser/modules/UrlbarProviderPrivateSearch.jsm
+lib/cliqz/browser/modules/UrlbarProviderSearchTips.jsm
 lib/cliqz/browser/modules/UrlbarProviderTopSites.jsm
 lib/cliqz/browser/modules/UrlbarProviderUnifiedComplete.jsm
 lib/cliqz/browser/modules/UrlbarProvidersManager.jsm
@@ -4138,8 +4148,8 @@ lib/cliqz/chrome/toolkit/content/global/
 lib/cliqz/chrome/toolkit/content/global/aboutMemory.js
 lib/cliqz/chrome/toolkit/content/global/aboutMemory.xhtml
 lib/cliqz/chrome/toolkit/content/global/aboutMozilla.css
+lib/cliqz/chrome/toolkit/content/global/aboutNetworking.html
 lib/cliqz/chrome/toolkit/content/global/aboutNetworking.js
-lib/cliqz/chrome/toolkit/content/global/aboutNetworking.xhtml
 lib/cliqz/chrome/toolkit/content/global/aboutPerformance.css
 lib/cliqz/chrome/toolkit/content/global/aboutPerformance.js
 lib/cliqz/chrome/toolkit/content/global/aboutPerformance.xhtml
@@ -4277,7 +4287,6 @@ lib/cliqz/chrome/toolkit/content/global/
 lib/cliqz/chrome/toolkit/content/global/timepicker.xhtml
 lib/cliqz/chrome/toolkit/content/global/treeUtils.js
 lib/cliqz/chrome/toolkit/content/global/unifiedcomplete-top-urls.json
-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
@@ -4700,7 +4709,6 @@ lib/cliqz/modules/AppConstants.jsm
 lib/cliqz/modules/AppMenuNotifications.jsm
 lib/cliqz/modules/AsyncPrefs.jsm
 lib/cliqz/modules/AsyncShutdown.jsm
-lib/cliqz/modules/AsyncStreamReader.jsm
 lib/cliqz/modules/BSPatch.jsm
 lib/cliqz/modules/BackgroundPageThumbs.jsm
 lib/cliqz/modules/BinarySearch.jsm
@@ -4994,7 +5002,6 @@ lib/cliqz/modules/UrlClassifierLib.jsm
 lib/cliqz/modules/UrlClassifierListManager.jsm
 lib/cliqz/modules/UrlClassifierSkipListService.jsm
 lib/cliqz/modules/ValueExtractor.jsm
-lib/cliqz/modules/ViewSourceBrowser.jsm
 lib/cliqz/modules/WebChannel.jsm
 lib/cliqz/modules/WebHandlerApp.jsm
 lib/cliqz/modules/WebNavigation.jsm

Index: pkgsrc/www/cliqz/distinfo
diff -u pkgsrc/www/cliqz/distinfo:1.21 pkgsrc/www/cliqz/distinfo:1.22
--- pkgsrc/www/cliqz/distinfo:1.21      Sun Feb 23 00:10:40 2020
+++ pkgsrc/www/cliqz/distinfo   Tue Mar 31 15:40:54 2020
@@ -1,48 +1,50 @@
-$NetBSD: distinfo,v 1.21 2020/02/23 00:10:40 fox Exp $
+$NetBSD: distinfo,v 1.22 2020/03/31 15:40:54 fox Exp $
 
-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@localhost) = 9def44bf858b85236e23df8fc58bc566c6519788
-RMD160 (cliqz-1.33.0/cliqz%cliqz.com.xpi@localhost) = 35c4a440f551e680239132736c0f7d315b3fe0c7
-SHA512 (cliqz-1.33.0/cliqz%cliqz.com.xpi@localhost) = c5f867a7149f7aeb09b321d7263d8cf4089e2424d5074f9e2293145adace1b275e18ffbfe87e8d75b2276b71a3de803571bf801f15415fc4623ba5d0935f7129
-Size (cliqz-1.33.0/cliqz%cliqz.com.xpi@localhost) = 3678987 bytes
-SHA1 (cliqz-1.33.0/dat%cliqz.com.xpi@localhost) = 2e368d5d62c5d2dfe4d463b532bb2693bf3ae4f0
-RMD160 (cliqz-1.33.0/dat%cliqz.com.xpi@localhost) = 4e6d7130e984b1eeb29279b0b4901dd2b71f3fd8
-SHA512 (cliqz-1.33.0/dat%cliqz.com.xpi@localhost) = 3053acd0484adfe6fc93bf96b933c8c0427d25bd31435cd4eddfec3cd7b82c710cea2efcd8b88a784a10cb30fd5cb9de86a428c6b8baeaa93a9eeb8faec961e1
-Size (cliqz-1.33.0/dat%cliqz.com.xpi@localhost) = 986532 bytes
-SHA1 (cliqz-1.33.0/gdprtool%cliqz.com.xpi@localhost) = 1a95888fd7b49ea2b38c3d7ba2fb901115fc19aa
-RMD160 (cliqz-1.33.0/gdprtool%cliqz.com.xpi@localhost) = 02676ca33b7ef732649cc2e9c1b5e3110b45ab9c
-SHA512 (cliqz-1.33.0/gdprtool%cliqz.com.xpi@localhost) = f59850063a542436484983abfe96b93ecd6e6e90f154e117bdfaca8b0fcc8e2abde715ee1a4e75661d0cf8cf8a8840529a06186a8f133300dff287e7f74efa85
-Size (cliqz-1.33.0/gdprtool%cliqz.com.xpi@localhost) = 219684 bytes
-SHA1 (cliqz-1.33.0/https-everywhere%cliqz.com.xpi@localhost) = 6fa290bae96a80722b943aa6906101683f7a7c46
-RMD160 (cliqz-1.33.0/https-everywhere%cliqz.com.xpi@localhost) = 798bf780be5324da30e16cbd6220667df99aeb40
-SHA512 (cliqz-1.33.0/https-everywhere%cliqz.com.xpi@localhost) = 0ef92a49d8974c43478fc427a0d0e535851f4326dd15a9342d1e9f9218cf9db1217e5f0d4876e6a08b08e0f13fb40da238248fd75fc6c8c222937ab2ddb3816a
-Size (cliqz-1.33.0/https-everywhere%cliqz.com.xpi@localhost) = 2038441 bytes
+SHA1 (cliqz-1.34.0/adult-domains.bin) = 39f8b7a881e70828fdb411eefd5a70540a3699bd
+RMD160 (cliqz-1.34.0/adult-domains.bin) = a41b8d15df385dbce6904f184552eb542161ce54
+SHA512 (cliqz-1.34.0/adult-domains.bin) = 8896a629efd0f67b98393928edda20400350938f911f7eedc05f776b2626a656dfb092714fc5cb1766e4aee4efccfed62d297f211c07b3cca57fff1cd282ced1
+Size (cliqz-1.34.0/adult-domains.bin) = 528392 bytes
+SHA1 (cliqz-1.34.0/cliqz-1.34.0.tar.gz) = e0098d26ba5c622a03b2eba47d25bcc964ce1272
+RMD160 (cliqz-1.34.0/cliqz-1.34.0.tar.gz) = b9b8cc7915a29ae1bbf20356abf43ede1f94e62b
+SHA512 (cliqz-1.34.0/cliqz-1.34.0.tar.gz) = f99edf86ba4f386920638fed3a3e494ddf9dda6ec6829887289e9eac57406ba0e772aac7c0da8c0ac2e3b795c74a5051989a1dcbca6e1071fdc324d7b0cbe842
+Size (cliqz-1.34.0/cliqz-1.34.0.tar.gz) = 500199408 bytes
+SHA1 (cliqz-1.34.0/cliqz%cliqz.com.xpi@localhost) = 638a2058923065382472a700103d4b741b248712
+RMD160 (cliqz-1.34.0/cliqz%cliqz.com.xpi@localhost) = 363200a026f92d3a17e94f43a77501cb96895243
+SHA512 (cliqz-1.34.0/cliqz%cliqz.com.xpi@localhost) = 2927b936f7726375c8e76104093d90910e401c24cda13542e30080c851f6a4c39e8e5db0775337b014d55e329045ff3127d9003c3966bf5951ad9a30ac43c4c2
+Size (cliqz-1.34.0/cliqz%cliqz.com.xpi@localhost) = 4075568 bytes
+SHA1 (cliqz-1.34.0/dat%cliqz.com.xpi@localhost) = ffeeb096509fb570cd9387c2c273d457be529d07
+RMD160 (cliqz-1.34.0/dat%cliqz.com.xpi@localhost) = 61e47dabb836866cf2bf63f1ff657d8b4ad67cbb
+SHA512 (cliqz-1.34.0/dat%cliqz.com.xpi@localhost) = 3e6937f8eead1d4f2c0d5efb0dfdc25e4236da22f3b66be9f418c6acc77b28c72f6b4c50e50742aca85661c880218762857d41989c786616894b53b1fd7f0098
+Size (cliqz-1.34.0/dat%cliqz.com.xpi@localhost) = 988736 bytes
+SHA1 (cliqz-1.34.0/gdprtool%cliqz.com.xpi@localhost) = 1a95888fd7b49ea2b38c3d7ba2fb901115fc19aa
+RMD160 (cliqz-1.34.0/gdprtool%cliqz.com.xpi@localhost) = 02676ca33b7ef732649cc2e9c1b5e3110b45ab9c
+SHA512 (cliqz-1.34.0/gdprtool%cliqz.com.xpi@localhost) = f59850063a542436484983abfe96b93ecd6e6e90f154e117bdfaca8b0fcc8e2abde715ee1a4e75661d0cf8cf8a8840529a06186a8f133300dff287e7f74efa85
+Size (cliqz-1.34.0/gdprtool%cliqz.com.xpi@localhost) = 219684 bytes
+SHA1 (cliqz-1.34.0/https-everywhere%cliqz.com.xpi@localhost) = 6fa290bae96a80722b943aa6906101683f7a7c46
+RMD160 (cliqz-1.34.0/https-everywhere%cliqz.com.xpi@localhost) = 798bf780be5324da30e16cbd6220667df99aeb40
+SHA512 (cliqz-1.34.0/https-everywhere%cliqz.com.xpi@localhost) = 0ef92a49d8974c43478fc427a0d0e535851f4326dd15a9342d1e9f9218cf9db1217e5f0d4876e6a08b08e0f13fb40da238248fd75fc6c8c222937ab2ddb3816a
+Size (cliqz-1.34.0/https-everywhere%cliqz.com.xpi@localhost) = 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_gcc-stl-wrapper.template.h) = f4b54934fd8b22d17b762f5567e30789280b7abc
 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_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_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_xpcom_base_nscore.h) = c1a72f0ea63aacde6dbe321031e82aec99d4350f
+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.8 pkgsrc/www/cliqz/mozilla-common.mk:1.9
--- pkgsrc/www/cliqz/mozilla-common.mk:1.8      Mon Mar 30 19:46:02 2020
+++ pkgsrc/www/cliqz/mozilla-common.mk  Tue Mar 31 15:40:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.8 2020/03/30 19:46:02 joerg Exp $
+# $NetBSD: mozilla-common.mk,v 1.9 2020/03/31 15:40:54 fox Exp $
 #
 # Common Makefile fragment for mozilla packages based on gecko 2.0.
 # derived from www/firefox
@@ -71,10 +71,10 @@ 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.24
+BUILDLINK_API_DEPENDS.nspr+=   nspr>=4.25
 .include "../../devel/nspr/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
-BUILDLINK_API_DEPENDS.nss+=     nss>=3.49.2
+BUILDLINK_API_DEPENDS.nss+=     nss>=3.50
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"

Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_xpcom_base_nscore.h
diff -u pkgsrc/www/cliqz/patches/patch-mozilla-release_xpcom_base_nscore.h:1.1 pkgsrc/www/cliqz/patches/patch-mozilla-release_xpcom_base_nscore.h:1.2
--- pkgsrc/www/cliqz/patches/patch-mozilla-release_xpcom_base_nscore.h:1.1      Fri Apr 19 14:02:03 2019
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_xpcom_base_nscore.h  Tue Mar 31 15:40:54 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-mozilla-release_xpcom_base_nscore.h,v 1.1 2019/04/19 14:02:03 fox Exp $
+$NetBSD: patch-mozilla-release_xpcom_base_nscore.h,v 1.2 2020/03/31 15:40:54 fox Exp $
 
 * Support llvm/clang
 
-Original patch from ryoon, imported from www/firefox
+Imported from www/firefox
 
 --- mozilla-release/xpcom/base/nscore.h.orig   2018-11-16 08:40:07.000000000 +0000
 +++ mozilla-release/xpcom/base/nscore.h

Added files:

Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h:1.1
--- /dev/null   Tue Mar 31 15:40:54 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_config_gcc-stl-wrapper.template.h    Tue Mar 31 15:40:54 2020
@@ -0,0 +1,31 @@
+$NetBSD: patch-mozilla-release_config_gcc-stl-wrapper.template.h,v 1.1 2020/03/31 15:40:54 fox Exp $
+
+Imported 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
+@@ -28,14 +28,14 @@
+ #endif
+ 
+ // Don't include mozalloc for cstdlib. See bug 1245076.
+-#ifndef moz_dont_include_mozalloc_for_cstdlib
+-#  define moz_dont_include_mozalloc_for_cstdlib
++#ifndef moz_dont_include_mozalloc_for_${HEADER}
++#  define moz_dont_include_mozalloc_for_${HEADER}
+ #endif
+ 
+ // Include mozalloc after the STL header and all other headers it includes
+ // have been preprocessed.
+ #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \
+-    !defined(moz_dont_include_mozalloc_for_${HEADER})
++    !defined(moz_dont_include_mozalloc_for_cstdlib)
+ #  define MOZ_INCLUDE_MOZALLOC_H
+ #  define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
+ #endif
+@@ -64,4 +64,6 @@
+ #  include "mozilla/throw_gcc.h"
+ #endif
+ 
++#undef moz_dont_include_mzalloc_for_${HEADER}
++
+ #endif  // if mozilla_${HEADER}_h
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp:1.1
--- /dev/null   Tue Mar 31 15:40:54 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp     Tue Mar 31 15:40:54 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-mozilla-release_gfx_skia_skia_src_core_SkCpu.cpp,v 1.1 2020/03/31 15:40:54 fox Exp $
+
+NetBSD/aarch64 doesn't have <sys/auxv.h>.
+
+Taken from www/firefox
+
+--- mozilla-release/gfx/skia/skia/src/core/SkCpu.cpp.orig      2019-03-05 00:32:47.658232017 +0900
++++ mozilla-release/gfx/skia/skia/src/core/SkCpu.cpp   2019-03-05 00:33:10.203589997 +0900
+@@ -70,7 +70,7 @@
+         return features;
+     }
+ 
+-#elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>)
++#elif defined(SK_CPU_ARM64) && __has_include(<sys/auxv.h>) && !defined(__NetBSD__)
+     #include <sys/auxv.h>
+ 
+     static uint32_t read_cpu_features() {
Index: pkgsrc/www/cliqz/patches/patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h
diff -u /dev/null pkgsrc/www/cliqz/patches/patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h:1.1
--- /dev/null   Tue Mar 31 15:40:54 2020
+++ pkgsrc/www/cliqz/patches/patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h    Tue Mar 31 15:40:54 2020
@@ -0,0 +1,24 @@
+$NetBSD: patch-mozilla-release_media_ffvpx_libavutil_arm_bswap.h,v 1.1 2020/03/31 15:40:54 fox Exp $
+
+Fix NetBSD aarch64 build.
+
+Taken from www/firefox
+
+--- mozilla-release/media/ffvpx/libavutil/arm/bswap.h.orig     2019-10-30 17:35:56.000000000 +0000
++++ mozilla-release/media/ffvpx/libavutil/arm/bswap.h
+@@ -23,6 +23,8 @@
+ #include "config.h"
+ #include "libavutil/attributes.h"
+ 
++#ifndef __aarch64__
++
+ #ifdef __ARMCC_VERSION
+ 
+ #if HAVE_ARMV6
+@@ -64,4 +66,6 @@ static av_always_inline av_const uint32_
+ 
+ #endif /* __ARMCC_VERSION */
+ 
++#endif /* __aarch64__ */
++
+ #endif /* AVUTIL_ARM_BSWAP_H */

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index