www/cliqz: Updates to 1.34.0

* Bumps version dependencies.

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.

4 files changed, 24 insertions, 42 deletions

diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 08af3d2801e4..7d8c2ffbdd95 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cliqz
-DISTVERSION=	1.33.0
-PORTREVISION=	4
+DISTVERSION=	1.34.0
 CATEGORIES=	www
 MASTER_SITES=	https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \
 		http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz
@@ -41,7 +40,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
 		autoconf-2.13:devel/autoconf213 \
 		bash:shells/bash \
 		graphite2>=1.3.13:graphics/graphite2 \
-		harfbuzz>=2.6.1:print/harfbuzz \
+		harfbuzz>=2.6.4:print/harfbuzz \
 		icu>=64.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		libvorbis>=1.3.6,3:audio/libvorbis \
@@ -50,10 +49,10 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
 		llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \
 		nasm:devel/nasm \
 		node:www/node \
-		nspr>=4.24:devel/nspr \
-		nss>=3.49.2:security/nss \
+		nspr>=4.25:devel/nspr \
+		nss>=3.50:security/nss \
 		png>=1.6.35:graphics/png \
-		rust-cbindgen>=0.12.0:devel/rust-cbindgen \
+		rust-cbindgen>=0.13.0:devel/rust-cbindgen \
 		sqlite3>=3.30.1:databases/sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		yasm:devel/yasm \
@@ -79,7 +78,7 @@ SHEBANG_FILES=	magic_build_and_package.sh
 CLIQZ_CHANNEL=		release
 # If the DISTVERSION is updated, make sure to update the last build id from
 # fetch -qo - https://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/lastbuildid
-CLIQZ_LAST_BUILD_ID=	20200219152122
+CLIQZ_LAST_BUILD_ID=	20200325191531
 CLIQZ_ICON=		${PORTNAME}.png
 CLIQZ_ICON_SRC=		${WRKSRC}/mozilla-release/browser/branding/${PORTNAME}/default48.png
 MOZ_DESKTOP=		${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/mozilla.desktop
diff --git a/www/cliqz/distinfo b/www/cliqz/distinfo
index d7d0cfcc1422..2ad65c31497c 100644
--- a/www/cliqz/distinfo
+++ b/www/cliqz/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1582289075
+TIMESTAMP = 1585619756
 SHA256 (cliqz/adult-domains.bin) = f726171965328f60e2cc2a50311883e76c21b3359f2596d10be76cc33abdda88
 SIZE (cliqz/adult-domains.bin) = 528392
-SHA256 (cliqz/cliqz@cliqz.com.xpi) = 0c2d2b36a6d5a37465453cef53ce22183177ef1ecebfbd759ab56dfc50deabe0
-SIZE (cliqz/cliqz@cliqz.com.xpi) = 3678987
-SHA256 (cliqz/dat@cliqz.com.xpi) = 1916b65b6f5d21e2c539afd6918c2b5b264bf82b4a987d9677eae28e528eb33f
-SIZE (cliqz/dat@cliqz.com.xpi) = 986532
+SHA256 (cliqz/cliqz@cliqz.com.xpi) = 79cfc4a69a61642183b07e8ad196920c03affe7bdc4a546d162d2e5803ee97cd
+SIZE (cliqz/cliqz@cliqz.com.xpi) = 4075568
+SHA256 (cliqz/dat@cliqz.com.xpi) = 83dac73bd4ab16271330eb87ed5e3b088ddd69707ceb121d8ee730d07ddc9d87
+SIZE (cliqz/dat@cliqz.com.xpi) = 988736
 SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 7d59af6529b0756e5a89cf150f781a81a1cc1284eab2de00a6a89432f65a711d
 SIZE (cliqz/gdprtool@cliqz.com.xpi) = 219684
 SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = 8b743d319cc2bc08eef90c564a6fca725eb2fe0e35c6caa441826c3408244346
 SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 2038441
-SHA256 (cliqz/cliqz-oss-browser-f-1.33.0_GH0.tar.gz) = 25305a1f331f9f96a9bb5a2d3ea811926d3fa1428bbc718091a40b81a1e456fe
-SIZE (cliqz/cliqz-oss-browser-f-1.33.0_GH0.tar.gz) = 499857375
+SHA256 (cliqz/cliqz-oss-browser-f-1.34.0_GH0.tar.gz) = 58f8e18c4d72f8726afa10c8a91fdf00de8d410c7894443a0180cd2ea5898f3d
+SIZE (cliqz/cliqz-oss-browser-f-1.34.0_GH0.tar.gz) = 500199408
diff --git a/www/cliqz/files/patch-bug1288587 b/www/cliqz/files/patch-bug1288587
index 86518645dc1a..1c25ebf72ce0 100644
--- a/www/cliqz/files/patch-bug1288587
+++ b/www/cliqz/files/patch-bug1288587
@@ -4,15 +4,15 @@ diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.confi
 index 855214a..1e91d51 100644
 --- mozilla-release/build/moz.configure/init.configure
 +++ mozilla-release/build/moz.configure/init.configure
-@@ -211,6 +211,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr
- @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
- @imports(_from='mozbuild.virtualenv', _import='verify_python_version')
- @imports(_from='mozbuild.virtualenv', _import='PY2')
+@@ -252,6 +252,7 @@ option(env='PYTHON', nargs=1, help='Python 2.7 interpr
+ @imports(_from='mozbuild.pythonutil', _import='find_python2_executable')
+ @imports(_from='mozbuild.pythonutil', _import='python_executable_version')
+ @imports(_from='six', _import='ensure_text')
 +@imports(_from='__builtin__', _import='KeyError')
- def virtualenv_python2(env_python, build_env, mozconfig, help):
+ def virtualenv_python2(env_python, build_env, mozillabuild, mozconfig, help):
      if help:
          return
-@@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi
+@@ -283,6 +284,12 @@ def virtualenv_python2(env_python, build_env, mozillab
              python = mozconfig['vars']['added']['PYTHON']
          elif 'PYTHON' in mozconfig['vars']['modified']:
              python = mozconfig['vars']['modified']['PYTHON'][1]
@@ -25,7 +25,7 @@ index 855214a..1e91d51 100644
  
      log.debug("python2: executable from configuration: %r" % python)
  
-@@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi
+@@ -358,7 +365,10 @@ def virtualenv_python2(env_python, build_env, mozillab
                  sys.executable, manager.python_path))
              log.info('Reexecuting in the virtualenv')
              if env_python:
@@ -37,15 +37,15 @@ index 855214a..1e91d51 100644
              # One would prefer to use os.execl, but that's completely borked on
              # Windows.
              sys.exit(subprocess.call([python] + sys.argv))
-@@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
- @imports(_from='mozbuild.virtualenv', _import='PY3')
+@@ -460,6 +470,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
  @imports(_from='mozbuild.pythonutil', _import='find_python3_executable')
  @imports(_from='mozbuild.pythonutil', _import='python_executable_version')
+ @imports(_from='six', _import='ensure_text')
 +@imports(_from='__builtin__', _import='KeyError')
  def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help):
      if help:
          return
-@@ -465,6 +476,12 @@ def virtualenv_python3(env_python, build_env, mozillab
+@@ -495,6 +506,12 @@ def virtualenv_python3(env_python, build_env, mozillab
              python = mozconfig['vars']['added']['PYTHON3']
          elif 'PYTHON3' in mozconfig['vars']['modified']:
              python = mozconfig['vars']['modified']['PYTHON3'][1]
@@ -58,7 +58,7 @@ index 855214a..1e91d51 100644
  
      log.debug("python3: executable from configuration: %r" % python)
  
-@@ -545,7 +562,10 @@ def virtualenv_python3(env_python, build_env, mozillab
+@@ -575,7 +592,10 @@ def virtualenv_python3(env_python, build_env, mozillab
                  sys.executable, manager.python_path))
              log.info('Re-executing in the virtualenv')
              if env_python:
diff --git a/www/cliqz/files/patch-cubeb-sndio b/www/cliqz/files/patch-cubeb-sndio
deleted file mode 100644
index d0e00e0c9488..000000000000
--- a/www/cliqz/files/patch-cubeb-sndio
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/kinetiknz/cubeb/commit/3ab507569153
-
-Taken from www/firefox
-
-diff --git a/src/cubeb_sndio.c b/src/cubeb_sndio.c
-index 4a05bd84..34b3513d 100644
---- mozilla-release/media/libcubeb/src/cubeb_sndio.c
-+++ mozilla-release/media/libcubeb/src/cubeb_sndio.c
-@@ -128,7 +128,7 @@ s16_to_float(void *ptr, long nsamp)
- static const char *
- sndio_get_device()
- {
--#ifndef __OpenBSD__
-+#ifdef __linux__
-   /*
-    * On other platforms default to sndio devices,
-    * so cubebs other backends can be used instead.