Date: Tue, 3 Sep 2019 02:56:40 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r510916 - in branches/2019Q3/www/cliqz: . files Message-ID: <201909030256.x832ueAH055543@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Sep 3 02:56:40 2019 New Revision: 510916 URL: https://svnweb.freebsd.org/changeset/ports/510916 Log: MFH: r507880 r507995 r508429 r510068 www/cliqz: update to 1.28.2 Changes: https://github.com/cliqz-oss/browser-f/compare/1.27.4...1.28.2 Changes: https://cliqz.com/en/magazine/cliqz-browser-release-notes-1-28-0-68-0-11-38-1 PR: 239994 Submitted by: Santhosh Raju (maintainer) Approved by: ports-secteam blanket Added: branches/2019Q3/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h - copied unchanged from r510068, head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h Deleted: branches/2019Q3/www/cliqz/files/patch-bug1530098 Modified: branches/2019Q3/www/cliqz/Makefile branches/2019Q3/www/cliqz/distinfo Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/www/cliqz/Makefile ============================================================================== --- branches/2019Q3/www/cliqz/Makefile Tue Sep 3 02:49:46 2019 (r510915) +++ branches/2019Q3/www/cliqz/Makefile Tue Sep 3 02:56:40 2019 (r510916) @@ -1,14 +1,15 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.27.4 +DISTVERSION= 1.28.2 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 \ - https-everywhere@cliqz.com.xpi:cliqz \ - gdprtool@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= santhosh.raju@gmail.com @@ -23,11 +24,15 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libnspr4.so:devel/nspr \ + libnssutil3.so:security/nss \ libplc4.so:devel/nspr \ - libplds4.so:devel/nspr \ - libnssutil3.so:security/nss + libplds4.so:devel/nspr -BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ +BUILD_DEPENDS= ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \ + ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ + ${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \ + autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.12:graphics/graphite2 \ harfbuzz>=1.8.8:print/harfbuzz \ @@ -35,29 +40,25 @@ BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ libevent>=2.1.8:devel/libevent \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ - ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt \ llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ nasm:devel/nasm \ node:www/node \ nspr>=4.19:devel/nspr \ nss>=3.39:security/nss \ png>=1.6.34:graphics/png \ - ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ - ${RUST_DEFAULT}>=1.28:lang/${RUST_DEFAULT} \ rust-cbindgen>=0.6.2:devel/rust-cbindgen \ sqlite3>=3.24.0:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ zip:archivers/zip -USES= tar:xz gmake pkgconfig gnome python desktop-file-utils \ - compiler:c11 shebangfix +USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig \ + python:2.7,build shebangfix tar:xz -USE_GNOME= gconf2 gtk20 gtk30 cairo gdkpixbuf2 +USE_GNOME= cairo gconf2 gdkpixbuf2 gtk20 gtk30 -USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender \ - xcb xt +USE_XORG= x11 xcb xcb xcomposite xcursor xdamage xext xfixes xi xrender \ + xt USE_GITHUB= yes GH_ACCOUNT= cliqz-oss @@ -72,17 +73,17 @@ 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= 20190626103837 +CLIQZ_LAST_BUILD_ID= 20190816174655 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+= LLVM_CONFIG=llvm-config${LLVM_DEFAULT} -MAKE_ENV+= LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump -MAKE_ENV+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} -MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} -MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR} +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 \ + MOZBUILD_STATE_PATH=${WRKDIR} post-extract: ${CP} ${DISTDIR}/${DIST_SUBDIR}/adult-domains.bin ${WRKSRC} Modified: branches/2019Q3/www/cliqz/distinfo ============================================================================== --- branches/2019Q3/www/cliqz/distinfo Tue Sep 3 02:49:46 2019 (r510915) +++ branches/2019Q3/www/cliqz/distinfo Tue Sep 3 02:56:40 2019 (r510916) @@ -1,11 +1,11 @@ -TIMESTAMP = 1561728726 -SHA256 (adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 -SIZE (adult-domains.bin) = 528392 -SHA256 (cliqz@cliqz.com.xpi) = ed820af4f00b0ae7a3eb3792aa98b4842f44ea2ce5583dd6cd6171aac5667234 -SIZE (cliqz@cliqz.com.xpi) = 6035731 -SHA256 (https-everywhere@cliqz.com.xpi) = 92d43d3c7313bd890cb8ded3229aa1814ca3ebaec1b74bb317154a823b35355b -SIZE (https-everywhere@cliqz.com.xpi) = 1765469 -SHA256 (gdprtool@cliqz.com.xpi) = 1b07623b967694ca0bf45a2f88c52317f90bda1436633800cf4d02b3de54fb76 -SIZE (gdprtool@cliqz.com.xpi) = 222806 -SHA256 (cliqz-oss-browser-f-1.27.4_GH0.tar.gz) = e489e563ed587384a9d0104f8516d461a31029a3f6f657912c8db9a8cb41dd58 -SIZE (cliqz-oss-browser-f-1.27.4_GH0.tar.gz) = 428371895 +TIMESTAMP = 1566401840 +SHA256 (cliqz/adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 +SIZE (cliqz/adult-domains.bin) = 528392 +SHA256 (cliqz/cliqz@cliqz.com.xpi) = 833455156987be6100e444df4cb12aa0f8a1a4df45b82198bed8f50958045a1c +SIZE (cliqz/cliqz@cliqz.com.xpi) = 7795084 +SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 1b07623b967694ca0bf45a2f88c52317f90bda1436633800cf4d02b3de54fb76 +SIZE (cliqz/gdprtool@cliqz.com.xpi) = 222806 +SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = 92d43d3c7313bd890cb8ded3229aa1814ca3ebaec1b74bb317154a823b35355b +SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 1765469 +SHA256 (cliqz/cliqz-oss-browser-f-1.28.2_GH0.tar.gz) = eb22c3c06530a78012e300cd0be28d03e386270477fee29087941ec19d093982 +SIZE (cliqz/cliqz-oss-browser-f-1.28.2_GH0.tar.gz) = 496816279 Copied: branches/2019Q3/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h (from r510068, head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q3/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h Tue Sep 3 02:56:40 2019 (r510916, copy of r510068, head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h) @@ -0,0 +1,16 @@ +Firefox pulls in if_var.h which causes "class thread" conflicts with +"struct thread" in sys/lock.h. + +https://lists.freebsd.org/pipermail/svn-src-all/2019-August/184844.html + +--- mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h.orig 2019-08-23 20:05:51 UTC ++++ mozilla-release/media/mtransport/third_party/nICEr/src/stun/stun.h +@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY O + #include <sys/socket.h> + #ifndef LINUX + #include <net/if.h> +-#if !defined(__OpenBSD__) && !defined(__NetBSD__) ++#if !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) + #include <net/if_var.h> + #endif + #include <net/if_dl.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909030256.x832ueAH055543>