From owner-svn-ports-all@freebsd.org Mon Nov 25 10:37:40 2019 Return-Path: Delivered-To: svn-ports-all@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 1FD6D1CFF8C; Mon, 25 Nov 2019 10:37:40 +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 47M3QC6rMxz4H0n; Mon, 25 Nov 2019 10:37:39 +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 CEC0EB5D2; Mon, 25 Nov 2019 10:37:39 +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 xAPAbdiH038185; Mon, 25 Nov 2019 10:37:39 GMT (envelope-from fox@FreeBSD.org) Received: (from fox@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAPAbdFQ038182; Mon, 25 Nov 2019 10:37:39 GMT (envelope-from fox@FreeBSD.org) Message-Id: <201911251037.xAPAbdFQ038182@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fox set sender to fox@FreeBSD.org using -f From: Santhosh Raju Date: Mon, 25 Nov 2019 10:37:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518395 - 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: 518395 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Nov 2019 10:37:40 -0000 Author: fox Date: Mon Nov 25 10:37:38 2019 New Revision: 518395 URL: https://svnweb.freebsd.org/changeset/ports/518395 Log: www/cliqz: Fixes build failures under certain conditions. - Redo the MOZ_CONFIGURE_ARGS so that port options picks it up correctly. - Adds check for libmozwayland.so (available when x11-toolkits/gtk30 is built with WAYLAND option enabled). - Drops a patch hunk not applicable to patch-bug847568 (reported by jbeich@). Approved by: philip (mentor) Modified: head/www/cliqz/Makefile head/www/cliqz/Makefile.options head/www/cliqz/files/patch-bug847568 head/www/cliqz/pkg-plist Modified: head/www/cliqz/Makefile ============================================================================== --- head/www/cliqz/Makefile Mon Nov 25 09:49:37 2019 (r518394) +++ head/www/cliqz/Makefile Mon Nov 25 10:37:38 2019 (r518395) @@ -2,6 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.30.0 +PORTREVISION= 1 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 @@ -88,14 +89,14 @@ MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} \ 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" \ - "ac_add_options --with-system-graphite2" \ - "ac_add_options --with-system-harfbuzz" +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" @@ -126,7 +127,7 @@ post-patch: -e '/StartupWMClass/d' \ ${CLIQZ_DESKTOP} .for MOZ_CONFIGURE_ARG in ${MOZ_CONFIGURE_ARGS} - @${ECHO_CMD} ${MOZ_CONFIGURE_ARG} >> \ + @${ECHO_CMD} "ac_add_options" ${MOZ_CONFIGURE_ARG} >> \ ${WRKSRC}/mozilla-release/browser/config/cliqz.mozconfig; .endfor # This prevents linker exhausting memory in i386 builds @@ -142,6 +143,13 @@ 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} Modified: head/www/cliqz/Makefile.options ============================================================================== --- head/www/cliqz/Makefile.options Mon Nov 25 09:49:37 2019 (r518394) +++ head/www/cliqz/Makefile.options Mon Nov 25 10:37:38 2019 (r518395) @@ -7,11 +7,11 @@ OPTIONS_DEFAULT= JACK PULSEAUDIO SNDIO AUDIO_DESC= Choose your audio options JACK_BUILD_DEPENDS= ${LOCALBASE}/include/jack/jack.h:audio/jack -JACK_VARS= MOZ_CONFIGURE_ARGS+= "ac_add_options --enable-jack" +JACK_VARS= MOZ_CONFIGURE_ARGS+="--enable-jack" PULSEAUDIO_BUILD_DEPENDS= ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaudio -PULSEAUDIO_VARS= MOZ_CONFIGURE_ARGS+= "ac_add_options --enable-pulseaudio" -PULSEAUDIO_VARS_OFF= MOZ_CONFIGURE_ARGS+= "ac_add_options --disable-pulseaudio" +PULSEAUDIO_VARS= MOZ_CONFIGURE_ARGS+="--enable-pulseaudio" +PULSEAUDIO_VARS_OFF= MOZ_CONFIGURE_ARGS+="--disable-pulseaudio" SNDIO_BUILD_DEPENDS+= ${LOCALBASE}/include/sndio.h:audio/sndio SNDIO_LIB_DEPENDS+= libsndio.so:audio/sndio Modified: head/www/cliqz/files/patch-bug847568 ============================================================================== --- head/www/cliqz/files/patch-bug847568 Mon Nov 25 09:49:37 2019 (r518394) +++ head/www/cliqz/files/patch-bug847568 Mon Nov 25 10:37:38 2019 (r518395) @@ -202,15 +202,6 @@ if CONFIG['MOZ_SYSTEM_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] -@@ -274,7 +280,7 @@ OS_LIBS += CONFIG['ICONV_LIBS'] - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('cocoa', 'uikit'): - OS_LIBS += CONFIG['TK_LIBS'] - --if CONFIG['OS_ARCH'] == 'OpenBSD': -+if CONFIG['OS_ARCH'] == 'FreeBSD': - OS_LIBS += [ - 'sndio', - ] --- mozilla-release/toolkit/moz.configure.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/toolkit/moz.configure @@ -931,6 +931,25 @@ add_old_configure_assignment('FT2_LIBS', Modified: head/www/cliqz/pkg-plist ============================================================================== --- head/www/cliqz/pkg-plist Mon Nov 25 09:49:37 2019 (r518394) +++ head/www/cliqz/pkg-plist Mon Nov 25 10:37:38 2019 (r518395) @@ -28,7 +28,7 @@ lib/cliqz/libmozavcodec.so lib/cliqz/libmozavutil.so lib/cliqz/libmozgtk.so lib/cliqz/libmozsqlite3.so -lib/cliqz/libmozwayland.so +%%WAYLAND%%lib/cliqz/libmozwayland.so lib/cliqz/libnspr4.so lib/cliqz/libnss3.so lib/cliqz/libnssckbi.so