Index: head/www/cliqz/Makefile =================================================================== --- head/www/cliqz/Makefile (revision 530185) +++ head/www/cliqz/Makefile (revision 530186) @@ -1,188 +1,187 @@ # $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 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} EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} MAINTAINER= fox@FreeBSD.org COMMENT= Secure browser (Mozilla based) with built-in quick search LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE DEPRECATED= Uses deprecated version of python EXPIRATION_DATE= 2020-09-15 FETCH_DEPENDS= ca_root_nss>=0:security/ca_root_nss LIB_DEPENDS= libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libgraphite2.so:graphics/graphite2 \ libharfbuzz.so:print/harfbuzz \ libnspr4.so:devel/nspr \ libnssutil3.so:security/nss \ libplc4.so:devel/nspr \ libplds4.so:devel/nspr BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ ${RUST_DEFAULT}>=1.39:lang/${RUST_DEFAULT} \ 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 \ libvpx>=1.5.0:multimedia/libvpx \ ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ 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 \ zip:archivers/zip 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_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender xt USE_GITHUB= yes GH_ACCOUNT= cliqz-oss GH_PROJECT= browser-f USE_LDCONFIG= yes bash_OLD_CMD= "/bin/bash" bash_CMD= ${LOCALBASE}/bin/bash 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 CLIQZ_DESKTOP= ${WRKSRC}/mozilla-release/toolkit/mozapps/installer/linux/rpm/cliqz.desktop MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \ CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} \ 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 MOZ_CONFIGURE_ARGS+= "--disable-crashreporter" \ "--disable-debug" \ "--disable-debug-symbols" \ "--disable-tests" \ "--disable-updater" \ "--libclang-path=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" \ "--with-system-graphite2" \ "--with-system-harfbuzz" .include "${.CURDIR}/Makefile.options" .include # 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} CC= ${LOCALBASE}/bin/clang${LLVM_DEFAULT} CXX= ${LOCALBASE}/bin/clang++${LLVM_DEFAULT} # XXX avoid warnings USES:= ${USES:Ncompiler\:*} .endif post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} ${MKDIR} ${WRKSRC}/obj/dist/bin/browser/features ${CP} ${DISTDIR}/${DIST_SUBDIR}/cliqz@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/https-everywhere@cliqz.com.xpi \ ${DISTDIR}/${DIST_SUBDIR}/gdprtool@cliqz.com.xpi \ ${WRKSRC}/obj/dist/bin/browser/features post-patch: @${CP} ${MOZ_DESKTOP} ${CLIQZ_DESKTOP} @${REINPLACE_CMD} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ -e 's/@MOZ_APP_NAME@/${PORTNAME}/g' \ -e '/Icon=${PORTNAME}/ s/${PORTNAME}/${CLIQZ_ICON}/' \ -e '/StartupWMClass/d' \ ${CLIQZ_DESKTOP} .for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS} @${ECHO_CMD} "ac_add_options" ${MOZ_CONFIGURE_ARG} >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; .endfor # This prevents linker exhausting memory in i386 builds .if ${ARCH} == "i386" @${ECHO_CMD} 'export LDFLAGS="-Wl,--no-keep-memory -Wl,--as-needed"' >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig .endif # 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) do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} (cd ${WRKSRC}/obj/dist/${PORTNAME} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME}) # Check if the wayland lib was generated, this happens if # x11-toolkits/gtk30 has WAYLAND option enabled. @if [ -f ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libmozwayland.so ]; then \ ${REINPLACE_CMD} -e 's|%%WAYLAND%%||' ${TMPPLIST}; \ else \ ${REINPLACE_CMD} -e 's|%%WAYLAND%%|@comment |' ${TMPPLIST}; \ fi @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin @${CHMOD} 755 ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME} post-install: ${RLN} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTNAME}-bin ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${INSTALL_DATA} ${CLIQZ_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps @${CP} ${CLIQZ_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${CLIQZ_ICON} .include Index: head/www/cliqz/distinfo =================================================================== --- head/www/cliqz/distinfo (revision 530185) +++ head/www/cliqz/distinfo (revision 530186) @@ -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 Index: head/www/cliqz/files/patch-cubeb-sndio =================================================================== --- head/www/cliqz/files/patch-cubeb-sndio (revision 530185) +++ head/www/cliqz/files/patch-cubeb-sndio (nonexistent) @@ -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. Property changes on: head/www/cliqz/files/patch-cubeb-sndio ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/cliqz/files/patch-bug1288587 =================================================================== --- head/www/cliqz/files/patch-bug1288587 (revision 530185) +++ head/www/cliqz/files/patch-bug1288587 (revision 530186) @@ -1,72 +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') +@@ -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] + 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 +@@ -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: - 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') +@@ -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] + 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 +@@ -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: - 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))