www/cliqz: Updates to 1.38.0

- Bumps versions of dependencies.

Changes since 1.36.0:

Merge with Firefox 78.0.2

8 files changed, 128 insertions, 83 deletions

diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile
index 0253c6b29ec3..b1f3e075568f 100644
--- a/www/cliqz/Makefile
+++ b/www/cliqz/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cliqz
-DISTVERSION=	1.36.0
-PORTREVISION=	2
+DISTVERSION=	1.38.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
@@ -42,9 +41,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
 		${RUST_DEFAULT}>=1.41:lang/${RUST_DEFAULT} \
 		autoconf-2.13:devel/autoconf213 \
 		bash:shells/bash \
-		graphite2>=1.3.13:graphics/graphite2 \
-		harfbuzz>=2.6.4:print/harfbuzz \
-		icu>=64.1,1:devel/icu \
+		graphite2>=1.3.14:graphics/graphite2 \
+		harfbuzz>=2.6.8:print/harfbuzz \
+		icu>=67.1,1:devel/icu \
 		libevent>=2.1.8:devel/libevent \
 		libvorbis>=1.3.6,3:audio/libvorbis \
 		libvpx>=1.8.2:multimedia/libvpx \
@@ -53,9 +52,9 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
 		nasm:devel/nasm \
 		node:www/node \
 		nspr>=4.25:devel/nspr \
-		nss>=3.51:security/nss \
+		nss>=3.54:security/nss \
 		png>=1.6.35:graphics/png \
-		rust-cbindgen>=0.13.1:devel/rust-cbindgen \
+		rust-cbindgen>=0.14.1:devel/rust-cbindgen \
 		sqlite3>=3.30.1:databases/sqlite3 \
 		v4l_compat>0:multimedia/v4l_compat \
 		yasm:devel/yasm \
@@ -64,7 +63,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \
 USES=		compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig \
 		python:2.7,build shebangfix tar:xz xorg
 
-USE_GNOME=	cairo gconf2 gdkpixbuf2 gtk20 gtk30
+USE_GNOME=	cairo gdkpixbuf2 gtk20 gtk30
 
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender xt
 
@@ -81,7 +80,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=	20200512121102
+CLIQZ_LAST_BUILD_ID=	20200721193739
 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
@@ -94,6 +93,7 @@ MAKE_ENV+=	CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \
 		PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" \
 		RUSTFLAGS=${RUSTFLAGS} \
 		MOZBUILD_STATE_PATH=${WRKDIR}
+BINARY_ALIAS+=	python3=python${PYTHON3_DEFAULT}
 
 # Configure args passed into mach build system
 MOZ_CONFIGURE_ARGS+=	"--disable-crashreporter" \
@@ -131,7 +131,8 @@ USES:=		${USES:Ncompiler\:*}
 .endif
 
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin \
+		${WRKSRC}/mozilla-release/browser/adult-domains.bin
 	${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz@cliqz.com.xpi \
 		${DISTDIR}/${DIST_SUBDIR}/https-everywhere@cliqz.com.xpi \
diff --git a/www/cliqz/distinfo b/www/cliqz/distinfo
index c377cef3a1e5..3a97ea070851 100644
--- a/www/cliqz/distinfo
+++ b/www/cliqz/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1589642956
+TIMESTAMP = 1595505538
 SHA256 (cliqz/adult-domains.bin) = f726171965328f60e2cc2a50311883e76c21b3359f2596d10be76cc33abdda88
 SIZE (cliqz/adult-domains.bin) = 528392
-SHA256 (cliqz/cliqz@cliqz.com.xpi) = 515140c6c4b7d037932169f005ad03740e16a34d8d2bba45c24c00e8f34545d4
-SIZE (cliqz/cliqz@cliqz.com.xpi) = 4275778
+SHA256 (cliqz/cliqz@cliqz.com.xpi) = 3f8a580169881c090813b2cc5cac35c7e9fdcbc1af42b576851e617b5eedbb18
+SIZE (cliqz/cliqz@cliqz.com.xpi) = 4107644
 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) = d1b7590c9541741aa0d1fada383fece7b48348f477a3f7b606e043021a42bdbb
 SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 2058305
-SHA256 (cliqz/cliqz-oss-browser-f-1.36.0_GH0.tar.gz) = 712e28b767da88bb3defcab9c65b21af85c439aa2fb503161ce53b17903a048e
-SIZE (cliqz/cliqz-oss-browser-f-1.36.0_GH0.tar.gz) = 505954787
+SHA256 (cliqz/cliqz-oss-browser-f-1.38.0_GH0.tar.gz) = d9e8ecaa99f753828ae63ab83b27a3b3cb4e6d6d51ca0a9f6ed246d2391f23bd
+SIZE (cliqz/cliqz-oss-browser-f-1.38.0_GH0.tar.gz) = 519049842
diff --git a/www/cliqz/files/patch-addon-search b/www/cliqz/files/patch-addon-search
index b61cf637fc1c..928c52c0aad8 100644
--- a/www/cliqz/files/patch-addon-search
+++ b/www/cliqz/files/patch-addon-search
@@ -3,20 +3,20 @@ https://github.com/mozilla/addons-frontend/issues/4610
 
 Taken from www/firefox
 
---- mozilla-release/browser/app/profile/firefox.js.orig	2020-02-19 14:20:43 UTC
+diff --git browser/app/profile/firefox.js browser/app/profile/firefox.js
+index 75c2c5e435e35..4d8c09c02759b 100644
+--- mozilla-release/browser/app/profile/firefox.js.orig	2020-07-17 14:00:07 UTC
 +++ mozilla-release/browser/app/profile/firefox.js
-@@ -37,8 +37,8 @@ pref("extensions.webextOptionalPermissionPrompts", tru
+@@ -37,7 +37,7 @@ pref("extensions.webextOptionalPermissionPrompts", tru
  // Preferences for AMO integration
  pref("extensions.getAddons.cache.enabled", true);
  pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/api/v3/addons/search/?guid=%IDS%&lang=%LOCALE%");
 -pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%");
--pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%");
 +pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=Linux&appver=%VERSION%");
-+pref("extensions.webservice.discoverURL", "https://discovery.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/Linux/%COMPATIBILITY_MODE%");
  pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firefox/");
  pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firefox&type=language&appversion=%VERSION%");
  pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition=%DISTRIBUTION%");
-@@ -174,8 +174,8 @@ pref("app.update.url", "https://updatecheck.cliqz.com/
+@@ -172,8 +172,8 @@ pref("app.update.staging.enabled", true);
  //  .. etc ..
  //
  pref("extensions.update.enabled", true);
@@ -27,9 +27,12 @@ Taken from www/firefox
  #if MOZ_UPDATE_CHANNEL == beta
  // CLIQZ-SPECIAL: force addons update in every 30 min on beta
  pref("extensions.update.interval", 1800);
---- mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm.orig	2020-02-19 14:20:43 UTC
+ 
+diff --git toolkit/mozapps/extensions/internal/AddonRepository.jsm toolkit/mozapps/extensions/internal/AddonRepository.jsm
+index f70fd8d7e3bd8..81e8cd7764fdf 100644
+--- mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm
 +++ mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm
-@@ -586,7 +586,7 @@ var AddonRepository = {
+@@ -602,7 +602,7 @@ var AddonRepository = {
        addon.version = String(aEntry.current_version.version);
        if (Array.isArray(aEntry.current_version.files)) {
          for (let file of aEntry.current_version.files) {
@@ -38,9 +41,11 @@ Taken from www/firefox
              if (file.url) {
                addon.sourceURI = NetUtil.newURI(file.url);
              }
---- mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm.orig	2020-02-19 14:20:43 UTC
+diff --git toolkit/mozapps/extensions/internal/XPIDatabase.jsm toolkit/mozapps/extensions/internal/XPIDatabase.jsm
+index f70fd8d7e3bd8..81e8cd7764fdf 100644
+--- mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
 +++ mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
-@@ -484,7 +484,7 @@ class AddonInternal {
+@@ -355,7 +355,7 @@ class AddonInternal {
      // Something is causing errors in here
      try {
        for (let platform of this.targetPlatforms) {
@@ -48,4 +53,4 @@ Taken from www/firefox
 +        if (platform.os == "Linux" || platform.os == Services.appinfo.OS) {
            if (platform.abi) {
              needsABI = true;
-             if (platform.abi === abi) {
+             if (platform.abi === abi)
diff --git a/www/cliqz/files/patch-bug1288587 b/www/cliqz/files/patch-bug1288587
index cd8d2449d80e..941946bc8899 100644
--- a/www/cliqz/files/patch-bug1288587
+++ b/www/cliqz/files/patch-bug1288587
@@ -4,48 +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
-@@ -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, mozillabuild, mozconfig, help):
-     if help:
-         return
-@@ -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]
-+        for i in ('env', 'vars'):
-+            for j in ('added', 'modified'):
-+                try:
-+                    del mozconfig[i][j]['PYTHON']
-+                except KeyError:
-+                    pass
- 
-     log.debug("python2: executable from configuration: %r" % python)
- 
-@@ -365,7 +372,10 @@ def virtualenv_python2(env_python, build_env, mozillab
-                 sys.executable, manager.python_path))
-             log.info('Reexecuting in the virtualenv')
-             if env_python:
--                del os.environ['PYTHON']
-+                try:
-+                    del os.environ['PYTHON']
-+                except KeyError:
-+                    pass
-             # One would prefer to use os.execl, but that's completely borked on
-             # Windows.
-             sys.exit(subprocess.call([python] + sys.argv))
-@@ -468,6 +478,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre
+@@ -251,6 +251,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):
+ def virtualenv_python3(env_python, build_env, mozconfig, help):
+     # Avoid re-executing python when running configure --help.
      if help:
-         return
-@@ -503,6 +514,12 @@ def virtualenv_python3(env_python, build_env, mozillab
+@@ -283,6 +284,12 @@ def virtualenv_python3(env_python, build_env, mozconfi
              python = mozconfig['vars']['added']['PYTHON3']
          elif 'PYTHON3' in mozconfig['vars']['modified']:
              python = mozconfig['vars']['modified']['PYTHON3'][1]
@@ -58,15 +25,15 @@ index 855214a..1e91d51 100644
  
      log.debug("python3: executable from configuration: %r" % python)
  
-@@ -583,7 +600,10 @@ def virtualenv_python3(env_python, build_env, mozillab
-                 sys.executable, manager.python_path))
-             log.info('Re-executing in the virtualenv')
-             if env_python:
--                del os.environ['PYTHON3']
+@@ -365,7 +372,10 @@ def virtualenv_python3(env_python, build_env, mozconfi
+             sys.executable, manager.python_path))
+         log.info('Re-executing in the virtualenv')
+         if env_python:
+-            del os.environ['PYTHON3']
 +                try:
 +                    del os.environ['PYTHON3']
 +                except KeyError:
 +                    pass
-             # Homebrew on macOS will change Python's sys.executable to a custom
-             # value which messes with mach's virtualenv handling code. Override
-             # Homebrew's changes with the correct sys.executable value.
+         # Homebrew on macOS will change Python's sys.executable to a custom
+         # value which messes with mach's virtualenv handling code. Override
+         # Homebrew's changes with the correct sys.executable value.
diff --git a/www/cliqz/files/patch-bug1618914 b/www/cliqz/files/patch-bug1618914
index 40ace3669a04..42f909514118 100644
--- a/www/cliqz/files/patch-bug1618914
+++ b/www/cliqz/files/patch-bug1618914
@@ -1,10 +1,12 @@
 [Wayland] Fall back to ftruncate if posix_fallocate isn't supported by filesystem.
 
+Taken from www/firefox
+
 diff --git widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.cpp
 index 9a73326399bd5..9e42a7f1c5d18 100644
 --- mozilla-release/widget/gtk/WindowSurfaceWayland.cpp
 +++ mozilla-release/widget/gtk/WindowSurfaceWayland.cpp
-@@ -235,23 +235,24 @@
+@@ -222,20 +222,21 @@ static int WaylandAllocateShmMemory(int aSize) {
  #ifdef HAVE_POSIX_FALLOCATE
    do {
      ret = posix_fallocate(fd, 0, aSize);
@@ -12,11 +14,9 @@ index 9a73326399bd5..9e42a7f1c5d18 100644
 -  if (ret != 0) {
 +  if (ret == 0) {
 +    return fd;
-+  } else if (ret != EINVAL && ret != EOPNOTSUPP) {
++  } else if (ret != ENODEV && ret != EINVAL && ret != EOPNOTSUPP) {
      close(fd);
-     MOZ_CRASH_UNSAFE_PRINTF(
-         "posix_fallocate() fails on %s size %d error code %d\n", filename,
-         aSize, ret);
+     MOZ_CRASH("posix_fallocate() fails to allocate shm memory");
    }
 -#else
 +#endif
@@ -25,10 +25,19 @@ index 9a73326399bd5..9e42a7f1c5d18 100644
    } while (ret < 0 && errno == EINTR);
    if (ret < 0) {
      close(fd);
-     MOZ_CRASH_UNSAFE_PRINTF("ftruncate() fails on %s size %d error code %d\n",
-                             filename, aSize, ret);
+     MOZ_CRASH("ftruncate() fails to allocate shm memory");
    }
 -#endif
  
    return fd;
  }
+@@ -265,8 +266,8 @@ bool WaylandShmPool::Resize(int aSize) {
+ #ifdef HAVE_POSIX_FALLOCATE
+   do {
+     errno = posix_fallocate(mShmPoolFd, 0, aSize);
+   } while (errno == EINTR);
+-  if (errno != 0) return false;
++  if (errno != 0 && errno != ENODEV && errno != EINVAL && errno != EOPNOTSUPP) return false;
+ #endif
+ 
+   wl_shm_pool_resize(mShmPool, aSize);
diff --git a/www/cliqz/files/patch-bug1640982 b/www/cliqz/files/patch-bug1640982
index ec672ade7c58..9a8d8e6e5700 100644
--- a/www/cliqz/files/patch-bug1640982
+++ b/www/cliqz/files/patch-bug1640982
@@ -2,6 +2,8 @@ Unbreak build with Rust 1.45.0
 
 error: options `-C embed-bitcode=no` and `-C lto` are incompatible
 
+Taken from www/firefox
+
 --- mozilla-release/config/makefiles/rust.mk.orig	2020-05-12 09:36:22 UTC
 +++ mozilla-release/config/makefiles/rust.mk
 @@ -61,7 +61,7 @@ ifndef MOZ_DEBUG_RUST
diff --git a/www/cliqz/files/patch-cliqz__env.sh b/www/cliqz/files/patch-cliqz__env.sh
index 65f1379bcda0..7b3c4f2c6d8c 100644
--- a/www/cliqz/files/patch-cliqz__env.sh
+++ b/www/cliqz/files/patch-cliqz__env.sh
@@ -1,9 +1,9 @@
 Commented out the various wget(1) to prevent http traffic during build
 phase.
 
---- cliqz_env.sh.orig	2019-11-13 13:22:25 UTC
+--- cliqz_env.sh.orig	2020-07-17 14:00:07 UTC
 +++ cliqz_env.sh
-@@ -105,9 +105,9 @@ export S3_BUCKET=repository.cliqz.com
+@@ -109,9 +109,9 @@ export S3_BUCKET=repository.cliqz.com
  export S3_BUCKET_SERVICE=cliqz-browser-data
  
  # check CQZ_BUILD_ID and try to obtain, if not specified
@@ -16,12 +16,12 @@ phase.
  
  if [ -z $CQZ_BUILD_ID ]; then
    echo "CQZ_BUILD_ID not specified and can not be obtain from "$S3_BUCKET
-@@ -135,7 +135,7 @@ OBJ_DIR=$MOZ_OBJDIR
+@@ -134,7 +134,7 @@ OBJ_DIR=$MOZ_OBJDIR
  SRC_BASE=mozilla-release
  
  # automatic forget tab - start
--wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
-+#wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
- export CQZ_ADULT_DOMAINS_BF=../adult-domains.bin
+-wget -O mozilla-release/browser/adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
++#wget -O mozilla-release/browser/adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin
+ export CQZ_ADULT_DOMAINS_BF="adult-domains.bin"
  # automatic forget tab - end
  
diff --git a/www/cliqz/files/patch-freebsd11.3 b/www/cliqz/files/patch-freebsd11.3
new file mode 100644
index 000000000000..68855f1178b6
--- /dev/null
+++ b/www/cliqz/files/patch-freebsd11.3
@@ -0,0 +1,61 @@
+Drop after FreeBSD 11.3 EOL around 2020-09-20.
+https://svnweb.freebsd.org/changeset/base/351766
+
+mozglue/baseprofiler/core/shared-libraries-linux.cc:374:34: error: use of undeclared
+      identifier 'NT_GNU_BUILD_ID'
+      if (note_header->n_type == NT_GNU_BUILD_ID) break;
+                                 ^
+In file included from Unified_cpp_mozglue_baseprofiler0.cpp:137:
+mozglue/baseprofiler/lul/LulElf.cpp:762:32: error: use of undeclared identifier
+      'NT_GNU_BUILD_ID'
+    if (note_header->n_type == NT_GNU_BUILD_ID) break;
+                               ^
+In file included from Unified_cpp_tools_profiler1.cpp:38:
+tools/profiler/lul/LulElf.cpp:776:32: error: use of undeclared identifier
+      'NT_GNU_BUILD_ID'
+    if (note_header->n_type == NT_GNU_BUILD_ID) break;
+                               ^
+Taken from www/firefox
+
+--- mozilla-release/mozglue/baseprofiler/core/shared-libraries-linux.cc.orig	2020-06-25 17:04:48 UTC
++++ mozilla-release/mozglue/baseprofiler/core/shared-libraries-linux.cc
+@@ -50,6 +50,11 @@ extern "C" MOZ_EXPORT __attribute__((weak)) int dl_ite
+ #  define ElfW(type) Elf_##type
+ #endif
+ 
++#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
++// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
++#  define NT_GNU_BUILD_ID 3
++#endif
++
+ // ----------------------------------------------------------------------------
+ // Starting imports from toolkit/crashreporter/google-breakpad/, as needed by
+ // this file when moved to mozglue.
+--- mozilla-release/mozglue/baseprofiler/lul/LulElf.cpp.orig	2020-06-25 17:04:48 UTC
++++ mozilla-release/mozglue/baseprofiler/lul/LulElf.cpp
+@@ -79,6 +79,11 @@
+ #  define EM_AARCH64 183
+ #endif
+ 
++#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
++// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
++#  define NT_GNU_BUILD_ID 3
++#endif
++
+ // This namespace contains helper functions.
+ namespace {
+ 
+--- mozilla-release/tools/profiler/lul/LulElf.cpp.orig	2020-06-25 17:05:05 UTC
++++ mozilla-release/tools/profiler/lul/LulElf.cpp
+@@ -84,6 +84,11 @@
+ #  define EM_AARCH64 183
+ #endif
+ 
++#if defined(GP_OS_freebsd) && !defined(NT_GNU_BUILD_ID)
++// FreeBSD < 11.4 doesn't define NT_GNU_BUILD_ID
++#  define NT_GNU_BUILD_ID 3
++#endif
++
+ // This namespace contains helper functions.
+ namespace {
+