Date: Sat, 22 Feb 2020 12:38:37 +0000 (UTC) From: Santhosh Raju <fox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r526766 - in head/www/cliqz: . files Message-ID: <202002221238.01MCcbnD033130@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fox Date: Sat Feb 22 12:38:37 2020 New Revision: 526766 URL: https://svnweb.freebsd.org/changeset/ports/526766 Log: www/cliqz: Updates to 1.33.0 * Bumps version dependencies. * Disables simd in rust (for i386) to prevent build failures. * Adds pre-configure check for COMPAT_FREEBSD11. 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. Added: head/www/cliqz/files/patch-addon-search (contents, props changed) head/www/cliqz/files/patch-bug1288587 (contents, props changed) head/www/cliqz/files/patch-bug1594027 (contents, props changed) head/www/cliqz/files/patch-cubeb-sndio (contents, props changed) Deleted: head/www/cliqz/files/patch-bug1556301 Modified: head/www/cliqz/Makefile head/www/cliqz/distinfo head/www/cliqz/files/patch-bug847568 head/www/cliqz/files/patch-mozilla-release_config_rules.mk head/www/cliqz/pkg-plist Modified: head/www/cliqz/Makefile ============================================================================== --- head/www/cliqz/Makefile Sat Feb 22 12:36:29 2020 (r526765) +++ head/www/cliqz/Makefile Sat Feb 22 12:38:37 2020 (r526766) @@ -1,13 +1,13 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.32.1 -PORTREVISION= 1 +DISTVERSION= 1.33.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 DISTFILES= adult-domains.bin:amazon \ cliqz@cliqz.com.xpi:cliqz \ + dat@cliqz.com.xpi:cliqz \ gdprtool@cliqz.com.xpi:cliqz \ https-everywhere@cliqz.com.xpi:cliqz DIST_SUBDIR= ${PORTNAME} @@ -33,7 +33,7 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${RUST_DEFAULT}>=1.35:lang/${RUST_DEFAULT} \ + ${RUST_DEFAULT}>=1.39:lang/${RUST_DEFAULT} \ autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.13:graphics/graphite2 \ @@ -46,11 +46,11 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x1 llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ nasm:devel/nasm \ node:www/node \ - nspr>=4.21:devel/nspr \ - nss>=3.46.1:security/nss \ + nspr>=4.24:devel/nspr \ + nss>=3.49.2:security/nss \ png>=1.6.35:graphics/png \ - rust-cbindgen>=0.8.7:devel/rust-cbindgen \ - sqlite3>=3.29.0:databases/sqlite3 \ + rust-cbindgen>=0.12.0:devel/rust-cbindgen \ + sqlite3>=3.30.1:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ zip:archivers/zip @@ -75,7 +75,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= 20200121101408 +CLIQZ_LAST_BUILD_ID= 20200219152122 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 @@ -86,6 +86,7 @@ MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \ LLVM_CONFIG=llvm-config${LLVM_DEFAULT} \ LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump \ PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" \ + RUSTFLAGS=${RUSTFLAGS} \ MOZBUILD_STATE_PATH=${WRKDIR} # Configure args passed into mach build system @@ -102,6 +103,19 @@ MOZ_CONFIGURE_ARGS+= "--disable-crashreporter" \ .include <bsd.port.pre.mk> +# Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk +.if ${ARCH} == amd64 || ${ARCH} == i386 +RUSTFLAGS+= ${CFLAGS:M-march=*:S/-march=/-C target-cpu=/} +.else +RUSTFLAGS+= ${CFLAGS:M-mcpu=*:S/-mcpu=/-C target-cpu=/} +.endif + +.if ${ARCH:Maarch64} || ${MACHINE_CPU:Msse2} +MOZ_CONFIGURE_ARGS+= "--enable-rust-simd" +.else +MOZ_CONFIGURE_ARGS+= "--disable-rust-simd" +.endif + # Require newer Clang than what's in base system unless user opted out .if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} @@ -138,6 +152,11 @@ post-patch: # Disable vendor checksums like lang/rust @${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \ ${WRKSRC}/mozilla-release/third_party/rust/*/.cargo-checksum.json + +pre-configure-script: + # Check that the running kernel has COMPAT_FREEBSD11 required by lang/rust post-ino64 + @${SETENV} CC="${CC}" OPSYS="${OPSYS}" OSVERSION="${OSVERSION}" WRKDIR="${WRKDIR}" \ + ${SH} ${SCRIPTSDIR}/rust-compat11-canary.sh do-build: (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./magic_build_and_package.sh) Modified: head/www/cliqz/distinfo ============================================================================== --- head/www/cliqz/distinfo Sat Feb 22 12:36:29 2020 (r526765) +++ head/www/cliqz/distinfo Sat Feb 22 12:38:37 2020 (r526766) @@ -1,11 +1,13 @@ -TIMESTAMP = 1579729917 -SHA256 (cliqz/adult-domains.bin) = fcbec6811ca696bd044c0cce7f7aae45f4b822797eb6ecf657e5dc795870418f +TIMESTAMP = 1582289075 +SHA256 (cliqz/adult-domains.bin) = f726171965328f60e2cc2a50311883e76c21b3359f2596d10be76cc33abdda88 SIZE (cliqz/adult-domains.bin) = 528392 -SHA256 (cliqz/cliqz@cliqz.com.xpi) = 8ff1fd47bbaa57f32356573f8f4b530e2c0219e5a1e87ba70cabad6d77b973a1 -SIZE (cliqz/cliqz@cliqz.com.xpi) = 3669619 -SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 95ce7bd4ba1ea301246ce45bc3cdcff550acf7d8f1af1b42fd22984614cd9018 -SIZE (cliqz/gdprtool@cliqz.com.xpi) = 222247 +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/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.32.1_GH0.tar.gz) = ec69008726e60af40a86026a2252c09996770efe502279ead4f0512c5231c4ce -SIZE (cliqz/cliqz-oss-browser-f-1.32.1_GH0.tar.gz) = 495123166 +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 Added: head/www/cliqz/files/patch-addon-search ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-addon-search Sat Feb 22 12:38:37 2020 (r526766) @@ -0,0 +1,51 @@ +https://github.com/mozilla/addons/issues/708 +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 ++++ mozilla-release/browser/app/profile/firefox.js +@@ -37,8 +37,8 @@ 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/ + // .. etc .. + // + pref("extensions.update.enabled", true); +-pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); +-pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.url", "https://versioncheck.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); ++pref("extensions.update.background.url", "https://versioncheck-bg.addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=Linux&appABI=%APP_ABI%&locale=%APP_LOCALE%¤tAppVersion=%CURRENT_APP_VERSION%&updateType=%UPDATE_TYPE%&compatMode=%COMPATIBILITY_MODE%"); + #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 ++++ mozilla-release/toolkit/mozapps/extensions/internal/AddonRepository.jsm +@@ -586,7 +586,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) { +- if (file.platform == "all" || file.platform == PLATFORM) { ++ if (file.platform == "all" || file.platform == "linux" || file.platform == PLATFORM) { + 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 ++++ mozilla-release/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +@@ -484,7 +484,7 @@ class AddonInternal { + // Something is causing errors in here + try { + for (let platform of this.targetPlatforms) { +- if (platform.os == Services.appinfo.OS) { ++ if (platform.os == "Linux" || platform.os == Services.appinfo.OS) { + if (platform.abi) { + needsABI = true; + if (platform.abi === abi) { Added: head/www/cliqz/files/patch-bug1288587 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-bug1288587 Sat Feb 22 12:38:37 2020 (r526766) @@ -0,0 +1,72 @@ +Taken from www/firefox + +diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure +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') ++@imports(_from='__builtin__', _import='KeyError') + def virtualenv_python2(env_python, build_env, mozconfig, help): + if help: + return +@@ -242,6 +243,12 @@ def virtualenv_python2(env_python, build_env, mozconfi + 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) + +@@ -294,7 +301,10 @@ def virtualenv_python2(env_python, build_env, mozconfi + 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)) +@@ -430,6 +440,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre + @imports(_from='mozbuild.virtualenv', _import='PY3') + @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') + @imports(_from='mozbuild.pythonutil', _import='python_executable_version') ++@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 + python = mozconfig['vars']['added']['PYTHON3'] + elif 'PYTHON3' in mozconfig['vars']['modified']: + python = mozconfig['vars']['modified']['PYTHON3'][1] ++ for i in ('env', 'vars'): ++ for j in ('added', 'modified'): ++ try: ++ del mozconfig[i][j]['PYTHON3'] ++ except KeyError: ++ pass + + log.debug("python3: executable from configuration: %r" % python) + +@@ -545,7 +562,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'] ++ try: ++ del os.environ['PYTHON3'] ++ except KeyError: ++ pass + # One would prefer to use os.execl, but that's completely borked on + # Windows. + sys.exit(subprocess.call([python] + sys.argv)) Added: head/www/cliqz/files/patch-bug1594027 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-bug1594027 Sat Feb 22 12:38:37 2020 (r526766) @@ -0,0 +1,31 @@ +Disable STL wrappers in some places to help libc++ 9 + +Taken from www/firefox + +diff --git config/external/rlbox/moz.build config/external/rlbox/moz.build +index d216e62cad861..391bbdf566b88 100644 +--- mozilla-release/config/external/rlbox/moz.build ++++ mozilla-release/config/external/rlbox/moz.build +@@ -26,4 +26,7 @@ SOURCES += [ + 'rlbox_thread_locals.cpp' + ] + ++# bug 1594027 ++DisableStlWrapping() ++ + FINAL_LIBRARY = 'xul' +\ No newline at end of file +diff --git gfx/graphite2/src/moz.build gfx/graphite2/src/moz.build +index 447cd861126a3..8a4fcd814e6fb 100755 +--- mozilla-release/gfx/graphite2/src/moz.build ++++ mozilla-release/gfx/graphite2/src/moz.build +@@ -69,6 +69,9 @@ if CONFIG['MOZ_WASM_SANDBOXING_GRAPHITE']: + # thebes + DefineAndWasmDefine('GRAPHITE2_STATIC', True) + ++# bug 1594027 ++DisableStlWrapping() ++ + # We allow warnings for third-party code that can be updated from upstream. + AllowCompilerWarnings() + Modified: head/www/cliqz/files/patch-bug847568 ============================================================================== --- head/www/cliqz/files/patch-bug847568 Sat Feb 22 12:36:29 2020 (r526765) +++ head/www/cliqz/files/patch-bug847568 Sat Feb 22 12:38:37 2020 (r526766) @@ -1,5 +1,7 @@ # Allow building against system-wide graphite2/harfbuzz. +Taken from www/firefox + diff --git config/system-headers.mozbuild config/system-headers.mozbuild index 7620b4d00623..09d3db5ca8c0 100644 --- mozilla-release/config/system-headers.mozbuild @@ -43,7 +45,7 @@ new file mode 100644 index 0000000000000..24e8d7a03274a --- /dev/null +++ mozilla-release/gfx/graphite2/geckoextra/moz.build -@@ -0,0 +1,20 @@ +@@ -0,0 +1,21 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public @@ -52,6 +54,7 @@ index 0000000000000..24e8d7a03274a + +EXPORTS.graphite2 += [ + 'include/GraphiteExtra.h', ++ 'include/GraphiteStructsForRLBox.h', +] + +UNIFIED_SOURCES += [ @@ -226,7 +229,7 @@ index 95a58b634593..b614eef85c89 100644 + * 100 + GR2_VERSION_BUGFIX >= \ + (major) * 10000 + (minor) * 100 + (bugfix) ) + ], [ -+ #if !GR2_VERSION_REQUIRE(1,3,12) ++ #if !GR2_VERSION_REQUIRE(1,3,13) + #error "Insufficient graphite2 version." + #endif + ], [], @@ -277,7 +280,7 @@ index 9297e4d6f501..d8e273887e4b 100644 +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.2', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.4', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) Added: head/www/cliqz/files/patch-cubeb-sndio ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-cubeb-sndio Sat Feb 22 12:38:37 2020 (r526766) @@ -0,0 +1,17 @@ +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. Modified: head/www/cliqz/files/patch-mozilla-release_config_rules.mk ============================================================================== --- head/www/cliqz/files/patch-mozilla-release_config_rules.mk Sat Feb 22 12:36:29 2020 (r526765) +++ head/www/cliqz/files/patch-mozilla-release_config_rules.mk Sat Feb 22 12:38:37 2020 (r526766) @@ -1,6 +1,6 @@ ---- mozilla-release/config/rules.mk.orig 2019-11-13 13:22:25 UTC +--- mozilla-release/config/rules.mk.orig 2020-02-19 14:20:43 UTC +++ mozilla-release/config/rules.mk -@@ -960,20 +960,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` @@ -24,3 +24,11 @@ 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 Modified: head/www/cliqz/pkg-plist ============================================================================== --- head/www/cliqz/pkg-plist Sat Feb 22 12:36:29 2020 (r526765) +++ head/www/cliqz/pkg-plist Sat Feb 22 12:38:37 2020 (r526766) @@ -2,7 +2,6 @@ bin/cliqz lib/cliqz/application.ini lib/cliqz/browser/adult-domains.bin lib/cliqz/browser/blocklist.xml -lib/cliqz/browser/chrome.manifest lib/cliqz/browser/chrome/icons/default/default128.png lib/cliqz/browser/chrome/icons/default/default16.png lib/cliqz/browser/chrome/icons/default/default32.png @@ -12,7 +11,6 @@ lib/cliqz/browser/features/cliqz@cliqz.com.xpi lib/cliqz/browser/features/gdprtool@cliqz.com.xpi lib/cliqz/browser/features/https-everywhere@cliqz.com.xpi lib/cliqz/browser/omni.ja -lib/cliqz/chrome.manifest lib/cliqz/cliqz lib/cliqz/cliqz-bin lib/cliqz/cliqz.cfg @@ -32,8 +30,6 @@ lib/cliqz/libmozsqlite3.so lib/cliqz/libnspr4.so lib/cliqz/libnss3.so lib/cliqz/libnssckbi.so -lib/cliqz/libnssdbm3.chk -lib/cliqz/libnssdbm3.so lib/cliqz/libnssutil3.so lib/cliqz/libplc4.so lib/cliqz/libplds4.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002221238.01MCcbnD033130>