From owner-svn-ports-head@freebsd.org Sun Sep 29 03:23:32 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3BA89EF980; Sun, 29 Sep 2019 03:23:32 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46grTc0lmyz42MW; Sun, 29 Sep 2019 03:23:32 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F12FCBE1C; Sun, 29 Sep 2019 03:23:31 +0000 (UTC) (envelope-from fox@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8T3NVxd001357; Sun, 29 Sep 2019 03:23:31 GMT (envelope-from fox@FreeBSD.org) Received: (from fox@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8T3NVTU001356; Sun, 29 Sep 2019 03:23:31 GMT (envelope-from fox@FreeBSD.org) Message-Id: <201909290323.x8T3NVTU001356@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fox set sender to fox@FreeBSD.org using -f From: Santhosh Raju Date: Sun, 29 Sep 2019 03:23:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513189 - in head/www/cliqz: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fox X-SVN-Commit-Paths: in head/www/cliqz: . files X-SVN-Commit-Revision: 513189 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Sep 2019 03:23:32 -0000 Author: fox Date: Sun Sep 29 03:23:31 2019 New Revision: 513189 URL: https://svnweb.freebsd.org/changeset/ports/513189 Log: www/cliqz: update to 1.29.0 - Updates maintainer email. - Adds xorg to USES to prevent the deprecated only USES_XORG warning. - Moves the configure options to be handled in Makefile. - Forces the package to use latest LLVM (borrowed from bsd.gecko.mk). - Restricts latest LLVM to 8 for i386 arch, due to a linker error (borrowed from bsd.gecko.mk). - Removes obsolete patches no longer applicable to cliqz 1.29.0 - Minor portlint(1) and portfmt(1) improvements. Changes (since 1.28.2): https://github.com/cliqz-oss/browser-f/releases/tag/1.29.0 Approved by: philip (mentor) Deleted: head/www/cliqz/files/patch-mozilla-release_media_mtransport_third__party_nICEr_src_stun_stun.h head/www/cliqz/files/patch-mozilla-release_third__party_rust_cssparser_src_parser.rs Modified: head/www/cliqz/Makefile head/www/cliqz/distinfo Modified: head/www/cliqz/Makefile ============================================================================== --- head/www/cliqz/Makefile Sun Sep 29 01:10:29 2019 (r513188) +++ head/www/cliqz/Makefile Sun Sep 29 03:23:31 2019 (r513189) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.28.2 -PORTREVISION= 2 +DISTVERSION= 1.29.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 @@ -13,7 +12,7 @@ DISTFILES= adult-domains.bin:amazon \ DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} -MAINTAINER= santhosh.raju@gmail.com +MAINTAINER= fox@FreeBSD.org COMMENT= Secure browser (Mozilla based) with built-in quick search LICENSE= MPL20 @@ -54,7 +53,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/pulse/pulseaudio.h zip:archivers/zip USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig \ - python:2.7,build shebangfix tar:xz + python:2.7,build shebangfix tar:xz xorg USE_GNOME= cairo gconf2 gdkpixbuf2 gtk20 gtk30 @@ -74,7 +73,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= 20190816174655 +CLIQZ_LAST_BUILD_ID= 20190920100917 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 +85,30 @@ MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \ LLVM_OBJDUMP=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin/llvm-objdump \ MOZBUILD_STATE_PATH=${WRKDIR} +# Configure args passed into mach build system +MOZ_CONFIGURE_ARGS+= "ac_add_options --disable-crashreporter" \ + "ac_add_options --disable-debug" \ + "ac_add_options --disable-debug-symbols" \ + "ac_add_options --disable-tests" \ + "ac_add_options --disable-updater" \ + "ac_add_options --libclang-path=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib" + +.include + +# Default to llvm 8 for i386 +.if ${ARCH} == i386 && ${LLVM_DEFAULT:S,-devel,990,} >= 90 +LLVM_DEFAULT= 80 +.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 @@ -94,8 +117,6 @@ post-extract: ${DISTDIR}/${DIST_SUBDIR}/gdprtool@cliqz.com.xpi \ ${WRKSRC}/obj/dist/bin/browser/features -.include - post-patch: @${CP} ${MOZ_DESKTOP} ${CLIQZ_DESKTOP} @${REINPLACE_CMD} -e 's/@MOZ_APP_DISPLAYNAME@/Cliqz Internet/g' \ @@ -103,8 +124,12 @@ post-patch: -e '/Icon=${PORTNAME}/ s/${PORTNAME}/${CLIQZ_ICON}/' \ -e '/StartupWMClass/d' \ ${CLIQZ_DESKTOP} +.for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS} + @${ECHO_CMD} ${MOZ_CONFIGURE_ARG} >> \ + ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; +.endfor +# This prevents linker exhausting memory in i386 builds .if ${ARCH} == "i386" - # This prevents linker exhausting memory in i386 builds @${ECHO_CMD} 'export LDFLAGS="-Wl,--no-keep-memory -Wl,--as-needed"' >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig .endif Modified: head/www/cliqz/distinfo ============================================================================== --- head/www/cliqz/distinfo Sun Sep 29 01:10:29 2019 (r513188) +++ head/www/cliqz/distinfo Sun Sep 29 03:23:31 2019 (r513189) @@ -1,11 +1,11 @@ -TIMESTAMP = 1566401840 +TIMESTAMP = 1569573921 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 +SHA256 (cliqz/cliqz@cliqz.com.xpi) = 3617f21e0ba06df20022eb95aaa87fd55109d346939f7eaba66a67d821540c6a +SIZE (cliqz/cliqz@cliqz.com.xpi) = 5914074 +SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 95ce7bd4ba1ea301246ce45bc3cdcff550acf7d8f1af1b42fd22984614cd9018 +SIZE (cliqz/gdprtool@cliqz.com.xpi) = 222247 +SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = 094516da166aa984c836130075184315c5636033899c49fe6bca5b7190f488fc +SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 2147608 +SHA256 (cliqz/cliqz-oss-browser-f-1.29.0_GH0.tar.gz) = 10850fa992b8d1cac92bb8f0c06148248a0fb1568d36a408768420b20248d0f6 +SIZE (cliqz/cliqz-oss-browser-f-1.29.0_GH0.tar.gz) = 501511014