From owner-svn-ports-head@freebsd.org Tue Oct 15 07:45:52 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 63FBC1566DC; Tue, 15 Oct 2019 07:45:52 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46snXw25Pwz3LQj; Tue, 15 Oct 2019 07:45:52 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id BE8E110A5F; Tue, 15 Oct 2019 07:45:51 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from atuin.in.mat.cc (unknown [IPv6:2a01:678:42:ffff:3e15:c2ff:fec4:452e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 43C5F942D80; Tue, 15 Oct 2019 07:45:49 +0000 (UTC) Date: Tue, 15 Oct 2019 09:45:48 +0200 From: Mathieu Arnold To: Santhosh Raju Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r514486 - in head/www/cliqz: . files Message-ID: <20191015074548.bw3qczjzynvrjycc@atuin.in.mat.cc> References: <201910150046.x9F0kP23022917@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="or3xmoozexl4uoz7" Content-Disposition: inline In-Reply-To: <201910150046.x9F0kP23022917@repo.freebsd.org> User-Agent: NeoMutt/20180716 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: Tue, 15 Oct 2019 07:45:52 -0000 --or3xmoozexl4uoz7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Oct 15, 2019 at 12:46:25AM +0000, Santhosh Raju wrote: > USE_GITHUB=3D yes > GH_ACCOUNT=3D cliqz-oss > GH_PROJECT=3D browser-f > =20 > +.include "${.CURDIR}/Makefile.options" If you want options in a separate file, it's ok, but please keep the options at the correct place in the Makefile. See https://www.freebsd.org/doc/en/books/porters-handbook/porting-order.html > USE_LDCONFIG=3D yes > =20 > bash_OLD_CMD=3D "/bin/bash" > Added: head/www/cliqz/Makefile.options > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/cliqz/Makefile.options Tue Oct 15 00:46:25 2019 (r514486) > @@ -0,0 +1,32 @@ > +# $FreeBSD$ > + > +# Audio server options > +OPTIONS_MULTI=3D AUDIO > +OPTIONS_MULTI_AUDIO=3D JACK PULSEAUDIO SNDIO > +OPTIONS_DEFAULT=3D JACK PULSEAUDIO SNDIO > +AUDIO_DESC=3D Choose your audio options > + > +.include You do not need to include bsd.port.options.mk, use options helpers as shown below: > +.if ${PORT_OPTIONS:MJACK} > +BUILD_DEPENDS+=3D ${LOCALBASE}/include/jack/jack.h:audio/jack > +MOZ_CONFIGURE_ARGS+=3D "ac_add_options --enable-jack" JACK_BUILD_DEPENDS=3D ${LOCALBASE}/include/jack/jack.h:audio/jack JACK_VARS=3D MOZ_CONFIGURE_ARGS+=3D"ac_add_options --enable-jack" > +.endif > + > +.if ${PORT_OPTIONS:MPULSEAUDIO} > +BUILD_DEPENDS+=3D ${LOCALBASE}/include/pulse/pulseaudio.h:audio/pulseaud= io > +MOZ_CONFIGURE_ARGS+=3D "ac_add_options --enable-pulseaudio" > +.else > +MOZ_CONFIGURE_ARGS+=3D "ac_add_options --disable-pulseaudio" > +.endif PULSEAUDIO_BUILD_DEPENDS=3D ${LOCALBASE}/include/pulse/pulseaudio.h:audio/p= ulseaudio PULSEAUDIO_VARS=3D MOZ_CONFIGURE_ARGS+=3D"ac_add_options --enable-pulseaudi= o" PULSEAUDIO_VARS_OFF=3D MOZ_CONFIGURE_ARGS+=3D"ac_add_options --disable-puls= eaudio" > +.if ${PORT_OPTIONS:MSNDIO} > +BUILD_DEPENDS+=3D ${LOCALBASE}/include/sndio.h:audio/sndio > +LIB_DEPENDS+=3D libsndio.so:audio/sndio SNDIO_BUILD_DEPENDS=3D ${LOCALBASE}/include/sndio.h:audio/sndio SNDIO_LIB_DEPENDS=3D libsndio.so:audio/sndio This target is already ok: > +post-patch-SNDIO-on: > + @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ > + ${WRKSRC}/mozilla-release/media/libcubeb/src/moz.build \ > + ${WRKSRC}/mozilla-release/toolkit/library/moz.build > + @${REINPLACE_CMD} -e 's|OpenBSD|${OPSYS}|g' \ > + ${WRKSRC}/mozilla-release/media/libcubeb/gtest/moz.build > +.endif >=20 > Modified: head/www/cliqz/distinfo > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/cliqz/distinfo Tue Oct 15 00:40:52 2019 (r514485) > +++ head/www/cliqz/distinfo Tue Oct 15 00:46:25 2019 (r514486) > @@ -1,11 +1,11 @@ > -TIMESTAMP =3D 1569573921 > +TIMESTAMP =3D 1570787248 > SHA256 (cliqz/adult-domains.bin) =3D 3d018d6ffa75107fdfbf39658e4adaa092d= 9b8a90c7865b21376855f7c382b65 > SIZE (cliqz/adult-domains.bin) =3D 528392 > -SHA256 (cliqz/cliqz@cliqz.com.xpi) =3D 3617f21e0ba06df20022eb95aaa87fd55= 109d346939f7eaba66a67d821540c6a > -SIZE (cliqz/cliqz@cliqz.com.xpi) =3D 5914074 > +SHA256 (cliqz/cliqz@cliqz.com.xpi) =3D c729bf22cd90c3312f0ea6f142eb6857f= 50cfe978dafc74710d9e1841cd602b8 > +SIZE (cliqz/cliqz@cliqz.com.xpi) =3D 5903170 > SHA256 (cliqz/gdprtool@cliqz.com.xpi) =3D 95ce7bd4ba1ea301246ce45bc3cdcf= f550acf7d8f1af1b42fd22984614cd9018 > SIZE (cliqz/gdprtool@cliqz.com.xpi) =3D 222247 > SHA256 (cliqz/https-everywhere@cliqz.com.xpi) =3D 094516da166aa984c83613= 0075184315c5636033899c49fe6bca5b7190f488fc > SIZE (cliqz/https-everywhere@cliqz.com.xpi) =3D 2147608 > -SHA256 (cliqz/cliqz-oss-browser-f-1.29.0_GH0.tar.gz) =3D 10850fa992b8d1c= ac92bb8f0c06148248a0fb1568d36a408768420b20248d0f6 > -SIZE (cliqz/cliqz-oss-browser-f-1.29.0_GH0.tar.gz) =3D 501511014 > +SHA256 (cliqz/cliqz-oss-browser-f-1.29.2_GH0.tar.gz) =3D dd63c2d43550161= 4ad46df7d934362284f591144cacea6b06dd1b95be1203481 > +SIZE (cliqz/cliqz-oss-browser-f-1.29.2_GH0.tar.gz) =3D 501536649 >=20 > Added: head/www/cliqz/files/patch-bug847568 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/www/cliqz/files/patch-bug847568 Tue Oct 15 00:46:25 2019 (r51448= 6) > @@ -0,0 +1,235 @@ > +Force building against system-wide graphite2/harfbuzz. > + > +This was causing cliqz build failures in 13.0-CURRENT (1300050). > + > +--- mozilla-release/config/system-headers.mozbuild.orig 2019-10-08 09:02= :23 UTC > ++++ mozilla-release/config/system-headers.mozbuild > +@@ -1304,6 +1304,19 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']: > + 'SelectSingleContentItemPage.h', > + ] > +=20 > ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: > ++ system_headers +=3D [ > ++ 'graphite2/Font.h', > ++ 'graphite2/Segment.h', > ++ ] > ++ > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ system_headers +=3D [ > ++ 'harfbuzz/hb-glib.h', > ++ 'harfbuzz/hb-ot.h', > ++ 'harfbuzz/hb.h', > ++ ] > ++ > + if CONFIG['MOZ_SYSTEM_LIBVPX']: > + system_headers +=3D [ > + 'vpx_mem/vpx_mem.h', > +--- mozilla-release/dom/base/moz.build.orig 2019-10-08 09:02:23 UTC > ++++ mozilla-release/dom/base/moz.build > +@@ -528,6 +528,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/an= dr > + if CONFIG['MOZ_X11']: > + CXXFLAGS +=3D CONFIG['TK_CFLAGS'] > +=20 > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ CXXFLAGS +=3D CONFIG['MOZ_HARFBUZZ_CFLAGS'] > ++ > + GENERATED_FILES +=3D [ > + 'PropertyUseCounterMap.inc', > + 'UseCounterList.h', > +--- mozilla-release/gfx/graphite2/moz-gr-update.sh.orig 2019-10-08 09:02= :23 UTC > ++++ mozilla-release/gfx/graphite2/moz-gr-update.sh > +@@ -1,6 +1,7 @@ > + #!/bin/bash > +=20 > + # Script used to update the Graphite2 library in the mozilla source tree > ++# and bump version for --with-system-graphite2 > +=20 > + # This script lives in gfx/graphite2, along with the library source, > + # but must be run from the top level of the mozilla-central tree. > +@@ -37,12 +38,16 @@ echo "See" $0 "for update procedure." >> gfx/graphit= e2 > + #find gfx/graphite2/ -name "*.cpp" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; > + #find gfx/graphite2/ -name "*.h" -exec perl -p -i -e "s///;s/Windows.h/windows.h/;" {} \; > +=20 > ++# chase version for --with-system-graphite2 > ++perl -p -i -e "s/[0-9]+\,[0-9]+\,[0-9]+/$RELEASE/ and tr/./,/ \ > ++ if /GR2_VERSION_REQUIRE/" old-configure.in > ++ > + # summarize what's been touched > + echo Updated to $RELEASE. > + echo Here is what changed in the gfx/graphite2 directory: > + echo > +=20 > +-hg stat gfx/graphite2 > ++hg stat old-configure.in gfx/graphite2 > +=20 > + echo > + echo If gfx/graphite2/src/files.mk has changed, please make correspondi= ng > +--- mozilla-release/gfx/harfbuzz/README-mozilla.orig 2019-10-08 09:02:23= UTC > ++++ mozilla-release/gfx/harfbuzz/README-mozilla > +@@ -15,3 +15,8 @@ from within the gfx/harfbuzz directory. > +=20 > + If the collection of source files changes, manual updates to moz.build = may be > + needed as we don't use the upstream makefiles. > ++ > ++The in-tree copy may be omitted during build by --with-system-harfbuzz. > ++Make sure to keep pkg-config version check within toolkit/moz.configure= in sync > ++with checkout version or increment latest tag by one if it's not based > ++on upstream release. > +--- mozilla-release/gfx/moz.build.orig 2019-10-08 09:02:23 UTC > ++++ mozilla-release/gfx/moz.build > +@@ -12,6 +12,12 @@ with Files('wr/**'): > + if CONFIG['MOZ_TREE_CAIRO']: > + DIRS +=3D ['cairo'] > +=20 > ++if not CONFIG['MOZ_SYSTEM_GRAPHITE2']: > ++ DIRS +=3D ['graphite2/src' ] > ++ > ++if not CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ DIRS +=3D ['harfbuzz/src'] > ++ > + DIRS +=3D [ > + '2d', > + 'ycbcr', > +@@ -20,8 +26,6 @@ DIRS +=3D [ > + 'qcms', > + 'gl', > + 'layers', > +- 'graphite2/src', > +- 'harfbuzz/src', > + 'ots/src', > + 'thebes', > + 'ipc', > +--- mozilla-release/gfx/skia/generate_mozbuild.py.orig 2019-10-08 09:02:= 23 UTC > ++++ mozilla-release/gfx/skia/generate_mozbuild.py > +@@ -117,6 +117,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): > + '-Wno-unused-private-field', > + ] > +=20 > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ CXXFLAGS +=3D CONFIG['MOZ_HARFBUZZ_CFLAGS'] > ++ > + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): > + CXXFLAGS +=3D CONFIG['MOZ_CAIRO_CFLAGS'] > + CXXFLAGS +=3D CONFIG['CAIRO_FT_CFLAGS'] > +--- mozilla-release/gfx/skia/moz.build.orig 2019-10-08 09:02:23 UTC > ++++ mozilla-release/gfx/skia/moz.build > +@@ -493,6 +493,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): > + '-Wno-unused-private-field', > + ] > +=20 > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ CXXFLAGS +=3D CONFIG['MOZ_HARFBUZZ_CFLAGS'] > ++ > + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): > + CXXFLAGS +=3D CONFIG['MOZ_CAIRO_CFLAGS'] > + CXXFLAGS +=3D CONFIG['CAIRO_FT_CFLAGS'] > +--- mozilla-release/gfx/thebes/moz.build.orig 2019-10-08 09:02:23 UTC > ++++ mozilla-release/gfx/thebes/moz.build > +@@ -284,7 +284,13 @@ if CONFIG['MOZ_WAYLAND']: > +=20 > + LOCAL_INCLUDES +=3D CONFIG['SKIA_INCLUDES'] > +=20 > +-DEFINES['GRAPHITE2_STATIC'] =3D True > ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: > ++ CXXFLAGS +=3D CONFIG['MOZ_GRAPHITE2_CFLAGS'] > ++else: > ++ DEFINES['GRAPHITE2_STATIC'] =3D True > ++ > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ CXXFLAGS +=3D CONFIG['MOZ_HARFBUZZ_CFLAGS'] > +=20 > + if CONFIG['CC_TYPE'] =3D=3D 'clang': > + # Suppress warnings from Skia header files. > +--- mozilla-release/intl/unicharutil/util/moz.build.orig 2019-10-08 09:0= 2:23 UTC > ++++ mozilla-release/intl/unicharutil/util/moz.build > +@@ -25,4 +25,7 @@ UNIFIED_SOURCES +=3D [ > + 'nsUnicodeProperties.cpp', > + ] > +=20 > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ CXXFLAGS +=3D CONFIG['MOZ_HARFBUZZ_CFLAGS'] > ++ > + FINAL_LIBRARY =3D 'xul' > +--- mozilla-release/netwerk/dns/moz.build.orig 2019-10-08 09:02:23 UTC > ++++ mozilla-release/netwerk/dns/moz.build > +@@ -83,3 +83,6 @@ USE_LIBS +=3D ['icu'] > +=20 > + if CONFIG['CC_TYPE'] in ('clang', 'gcc'): > + CXXFLAGS +=3D ['-Wno-error=3Dshadow'] > ++ > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ CXXFLAGS +=3D CONFIG['MOZ_HARFBUZZ_CFLAGS'] > +--- mozilla-release/old-configure.in.orig 2019-10-08 09:02:23 UTC > ++++ mozilla-release/old-configure.in > +@@ -2715,6 +2715,27 @@ dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > + AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) > +=20 > + dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D > ++dnl Check for graphite2 > ++dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D > ++if test -n "$MOZ_SYSTEM_GRAPHITE2"; then > ++ dnl graphite2.pc has bogus version, check manually > ++ _SAVE_CFLAGS=3D$CFLAGS > ++ CFLAGS=3D"$CFLAGS $MOZ_GRAPHITE2_CFLAGS" > ++ AC_TRY_COMPILE([ #include > ++ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \ > ++ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_= MINOR \ > ++ * 100 + GR2_VERSION_BUGFIX >=3D \ > ++ (major) * 10000 + (minor) * 100 + (bugfi= x) ) > ++ ], [ > ++ #if !GR2_VERSION_REQUIRE(1,3,12) > ++ #error "Insufficient graphite2 version." > ++ #endif > ++ ], [], > ++ [AC_MSG_ERROR([--with-system-graphite2 requested but= no working libgraphite2 found])]) > ++ CFLAGS=3D$_SAVE_CFLAGS > ++fi > ++ > ++dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D > + dnl Check for pixman and cairo > + dnl =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D > +=20 > +--- mozilla-release/toolkit/library/moz.build.orig 2019-10-08 09:02:23 U= TC > ++++ mozilla-release/toolkit/library/moz.build > +@@ -226,6 +226,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: > + if CONFIG['MOZ_SYSTEM_WEBP']: > + OS_LIBS +=3D CONFIG['MOZ_WEBP_LIBS'] > +=20 > ++if CONFIG['MOZ_SYSTEM_GRAPHITE2']: > ++ OS_LIBS +=3D CONFIG['MOZ_GRAPHITE2_LIBS'] > ++ > ++if CONFIG['MOZ_SYSTEM_HARFBUZZ']: > ++ OS_LIBS +=3D CONFIG['MOZ_HARFBUZZ_LIBS'] > ++ > + if CONFIG['MOZ_SYSTEM_LIBEVENT']: > + OS_LIBS +=3D CONFIG['MOZ_LIBEVENT_LIBS'] > +=20 > +--- mozilla-release/toolkit/moz.configure.orig 2019-10-08 09:02:23 UTC > ++++ mozilla-release/toolkit/moz.configure > +@@ -932,6 +932,26 @@ set_config('ENABLE_REMOTE_AGENT', remote) > + set_define('ENABLE_REMOTE_AGENT', remote) > +=20 > +=20 > ++# Graphite2 > ++# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > ++option('--with-system-graphite2', > ++ help=3D"Use system graphite2 (located with pkgconfig)") > ++ > ++system_graphite2 =3D pkg_check_modules('MOZ_GRAPHITE2', 'graphite2', > ++ when=3D'--with-system-graphite2') > ++ > ++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda = _: True)) > ++ > ++# HarfBuzz > ++# =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > ++option('--with-system-harfbuzz', > ++ help=3D"Use system harfbuzz (located with pkgconfig)") > ++ > ++system_harfbuzz =3D pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >=3D 2.= 5.3', > ++ when=3D'--with-system-harfbuzz') > ++ > ++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _:= True)) > ++ > + # Marionette remote protocol > + # =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > + # >=20 > Modified: head/www/cliqz/files/patch-mozilla-release_config_rules.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/www/cliqz/files/patch-mozilla-release_config_rules.mk Tue Oct 15= 00:40:52 2019 (r514485) > +++ head/www/cliqz/files/patch-mozilla-release_config_rules.mk Tue Oct 15= 00:46:25 2019 (r514486) > @@ -1,6 +1,6 @@ > ---- mozilla-release/config/rules.mk.orig 2019-05-29 12:52:42 UTC > +--- mozilla-release/config/rules.mk.orig 2019-10-08 09:02:23 UTC > +++ mozilla-release/config/rules.mk > -@@ -1003,20 +1003,20 @@ $(EXTENSIONS_PATH): > +@@ -989,20 +989,20 @@ $(EXTENSIONS_PATH): > CLIQZ_XPI_PATH =3D $(EXTENSIONS_PATH)/cliqz@cliqz.com.xpi > $(CLIQZ_XPI_PATH): $(EXTENSIONS_PATH) > echo CLIQZ_XPI_PATH in `pwd` > @@ -23,4 +23,4 @@ > +# wget --output-document $(CONSENTRICK_XPI_PATH) $(CONSENTRICK_EXT_URL) > endif > =20 > - CLIQZ_ONIONMODE_XPI_PATH =3D $(EXTENSIONS_PATH)/onionmode@cliqz.com.xpi > + DAT_XPI_PATH =3D $(EXTENSIONS_PATH)/dat@cliqz.com.xpi >=20 --=20 Mathieu Arnold --or3xmoozexl4uoz7 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAl2leSxfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zki8ERAAmp1KauukZMlgseQZ9/2njrP5HbGkh6vbJrJY50TUGSByRLe+ngJQ3xu0 YhyP881fJGYR61XLeuqsBs6JTpN4P2ldzN2nCWMr8G4o7xJFYSpT0sUK0KwsMLcl 4xrNH5nV4zgYimYRbCEla5HMD6Kxm3kOLz0z1HKQ54KcRqk9ufnMO+u1FVrfbckX WNkxMwPlAFq3NId+U0Mu4YYWg7joKFglviwOFyZhiLcopU5Wm49SP59GJEFYqceO mDP6ZIzDGudTjLtKvCT3LmF/Mbw64iKKhjAMe/B7zv4ukKM32fUqoh1Rhb3Ps0GP eYU13b5uXUZ57g0oCt4/H6NChgcrp/6CTi2ff37msfPs3PYvatdcVk9nt1UwFAhg 458A9pL9Iq7PVOGAtxRZB8KGD4+1DGHOtb345XXZeXtG7BtCbU9EK7+qe0B1ZFWm JtRf8hwQbTw9NK9biUsa/fnTqBKZgSa7PipP3iUYqNUT6s2Es8gWSRAQI8wALAn+ ovuHeNSgwAFO3VwCLOBm/oCX8ntlSCpMLVdN/D87ezhIHHipeSsmYUKPl18EAW6q 69O/KkIfCLc1aFWitkcJJLjA21pZLe6UMn5ekIst/e6mO0zJyE1iIEsMi48F++RR +aopVA4mAkGJoHEYw6CNgyxC3gtH5OndbQ6gm9dIfoIFL6O8Ucw= =uUa8 -----END PGP SIGNATURE----- --or3xmoozexl4uoz7--