Index: head/www/cliqz/Makefile =================================================================== --- head/www/cliqz/Makefile (revision 498804) +++ head/www/cliqz/Makefile (revision 498805) @@ -1,121 +1,120 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.25.3 -PORTREVISION= 3 +DISTVERSION= 1.26.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 \ https-everywhere@cliqz.com.xpi:cliqz \ gdprtool@cliqz.com.xpi:cliqz EXTRACT_ONLY= ${DISTNAME}${_GITHUB_EXTRACT_SUFX} MAINTAINER= santhosh.raju@gmail.com COMMENT= Secure browser (Mozilla based) with built-in quick search LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE 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 \ libnspr4.so:devel/nspr \ libplc4.so:devel/nspr \ libplds4.so:devel/nspr \ libnssutil3.so:security/nss BUILD_DEPENDS= autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.12:graphics/graphite2 \ harfbuzz>=1.8.8:print/harfbuzz \ icu>=59.1,1:devel/icu \ 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} \ 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 USE_GNOME= gconf2 gtk20 gtk30 cairo gdkpixbuf2 USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrender \ xcb xt USE_GITHUB= yes GH_ACCOUNT= cliqz-oss GH_PROJECT= browser-f USE_LDCONFIG= yes 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= 20190311160606 +CLIQZ_LAST_BUILD_ID= 20190403105019 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+= CQZ_RELEASE_CHANNEL=${CLIQZ_CHANNEL} MAKE_ENV+= CQZ_BUILD_ID=${CLIQZ_LAST_BUILD_ID} MAKE_ENV+= MOZBUILD_STATE_PATH=${WRKDIR} 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 .include 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} .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 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}) @${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 498804) +++ head/www/cliqz/distinfo (revision 498805) @@ -1,11 +1,11 @@ -TIMESTAMP = 1552563326 +TIMESTAMP = 1554860786 SHA256 (adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 SIZE (adult-domains.bin) = 528392 SHA256 (cliqz@cliqz.com.xpi) = ee29f40e79b4b14f60b5c41fbb3fe16c8778c50f80e01d2e3c78202a373db745 SIZE (cliqz@cliqz.com.xpi) = 6332852 SHA256 (https-everywhere@cliqz.com.xpi) = f5d85cd29b8e1261fd62c3037c41ae3d457e17abf836c292418694b6b2f9683e SIZE (https-everywhere@cliqz.com.xpi) = 2055381 SHA256 (gdprtool@cliqz.com.xpi) = 8b9199e32f5bcd6acea83df36f815ad25683143b717988693deec9a6d02c71a9 SIZE (gdprtool@cliqz.com.xpi) = 222207 -SHA256 (cliqz-oss-browser-f-1.25.3_GH0.tar.gz) = 9069fbe2ac32a8ac356656ab083ebdd27a0d92fb25a8d309247c719568f0f472 -SIZE (cliqz-oss-browser-f-1.25.3_GH0.tar.gz) = 419545179 +SHA256 (cliqz-oss-browser-f-1.26.0_GH0.tar.gz) = 6fbfd93b57ae1273b9a169d0271992426f4f1786352719b3757b5d1a3efbe0e7 +SIZE (cliqz-oss-browser-f-1.26.0_GH0.tar.gz) = 424869042 Index: head/www/cliqz/files/patch-bug1532851 =================================================================== --- head/www/cliqz/files/patch-bug1532851 (revision 498804) +++ head/www/cliqz/files/patch-bug1532851 (nonexistent) @@ -1,40 +0,0 @@ -diff --git js/src/wasm/WasmSignalHandlers.cpp js/src/wasm/WasmSignalHandlers.cpp -index fc49f361d82a..636537f84786 100644 ---- mozilla-release/js/src/wasm/WasmSignalHandlers.cpp -+++ mozilla-release/js/src/wasm/WasmSignalHandlers.cpp -@@ -102,6 +102,11 @@ using mozilla::DebugOnly; - #define EPC_sig(p) ((p)->sc_pc) - #define RFP_sig(p) ((p)->sc_regs[30]) - #endif -+#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ -+ defined(__PPC64LE__) -+#define R01_sig(p) ((p)->sc_frame.fixreg[1]) -+#define R32_sig(p) ((p)->sc_frame.srr0) -+#endif - #elif defined(__linux__) || defined(__sun) - #if defined(__linux__) - #define EIP_sig(p) ((p)->uc_mcontext.gregs[REG_EIP]) -@@ -169,6 +174,11 @@ using mozilla::DebugOnly; - #define EPC_sig(p) ((p)->uc_mcontext.__gregs[_REG_EPC]) - #define RFP_sig(p) ((p)->uc_mcontext.__gregs[_REG_S8]) - #endif -+#if defined(__ppc64__) || defined(__PPC64__) || defined(__ppc64le__) || \ -+ defined(__PPC64LE__) -+#define R01_sig(p) ((p)->uc_mcontext.__gregs[_REG_R1]) -+#define R32_sig(p) ((p)->uc_mcontext.__gregs[_REG_PC]) -+#endif - #elif defined(__DragonFly__) || defined(__FreeBSD__) || \ - defined(__FreeBSD_kernel__) - #define EIP_sig(p) ((p)->uc_mcontext.mc_eip) -@@ -197,6 +207,11 @@ using mozilla::DebugOnly; - #if defined(__FreeBSD__) && defined(__mips__) - #define EPC_sig(p) ((p)->uc_mcontext.mc_pc) - #define RFP_sig(p) ((p)->uc_mcontext.mc_regs[30]) -+#endif -+#if defined(__FreeBSD__) && (defined(__ppc64__) || defined(__PPC64__) || \ -+ defined(__ppc64le__) || defined(__PPC64LE__)) -+#define R01_sig(p) ((p)->uc_mcontext.mc_gpr[1]) -+#define R32_sig(p) ((p)->uc_mcontext.mc_srr0) - #endif - #elif defined(XP_DARWIN) - #define EIP_sig(p) ((p)->thread.uts.ts32.__eip) Property changes on: head/www/cliqz/files/patch-bug1532851 ___________________________________________________________________ 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-bug1519629 =================================================================== --- head/www/cliqz/files/patch-bug1519629 (revision 498804) +++ head/www/cliqz/files/patch-bug1519629 (nonexistent) @@ -1,35 +0,0 @@ -commit f8f381bf03b5 -Author: Emilio Cobos Álvarez -Date: Sun Jan 13 21:42:38 2019 +0100 - - Bug 1519629 - Document a few more macros. ---- - servo/components/style/gecko/regen_atoms.py | 1 + - servo/components/style/gecko_string_cache/namespace.rs | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git servo/components/style/gecko/regen_atoms.py servo/components/style/gecko/regen_atoms.py -index dfc2252aa899..b6f68fceb7d5 100755 ---- mozilla-release/servo/components/style/gecko/regen_atoms.py -+++ mozilla-release/servo/components/style/gecko/regen_atoms.py -@@ -203,6 +203,7 @@ RULE_TEMPLATE = ('("{atom}") =>\n ' - - MACRO = ''' - #[macro_export] -+/// Returns a static atom by passing the literal string it represents. - macro_rules! atom {{ - {} - }} -diff --git servo/components/style/gecko_string_cache/namespace.rs servo/components/style/gecko_string_cache/namespace.rs -index 4aa4accaf1d4..725e1da21692 100644 ---- mozilla-release/servo/components/style/gecko_string_cache/namespace.rs -+++ mozilla-release/servo/components/style/gecko_string_cache/namespace.rs -@@ -11,6 +11,8 @@ use std::borrow::Borrow; - use std::fmt; - use std::ops::Deref; - -+/// In Gecko namespaces are just regular atoms, so this is a simple macro to -+/// forward one macro to the other. - #[macro_export] - macro_rules! ns { - () => { Property changes on: head/www/cliqz/files/patch-bug1519629 ___________________________________________________________________ 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-bug1519729 =================================================================== --- head/www/cliqz/files/patch-bug1519729 (revision 498804) +++ head/www/cliqz/files/patch-bug1519729 (nonexistent) @@ -1,131 +0,0 @@ -commit 9bdfa9fecaf1 -Author: Simon Sapin -Date: Fri Jan 11 14:02:28 2019 +0100 - - Bug 1519729 - Remove unused macro. r=emilio - - Cherry-picks a commit from https://github.com/servo/servo/pull/22674 ---- - servo/components/style_traits/values.rs | 18 ------------------ - 1 file changed, 18 deletions(-) - -diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs -index 6da235c07b64..2851082c22e0 100644 ---- mozilla-release/servo/components/style_traits/values.rs -+++ mozilla-release/servo/components/style_traits/values.rs -@@ -158,24 +158,6 @@ where - } - } - --#[macro_export] --macro_rules! serialize_function { -- ($dest: expr, $name: ident($( $arg: expr, )+)) => { -- serialize_function!($dest, $name($($arg),+)) -- }; -- ($dest: expr, $name: ident($first_arg: expr $( , $arg: expr )*)) => { -- { -- $dest.write_str(concat!(stringify!($name), "("))?; -- $first_arg.to_css($dest)?; -- $( -- $dest.write_str(", ")?; -- $arg.to_css($dest)?; -- )* -- $dest.write_char(')') -- } -- } --} -- - /// Convenience wrapper to serialise CSS values separated by a given string. - pub struct SequenceWriter<'a, 'b: 'a, W: 'b> { - inner: &'a mut CssWriter<'b, W>, - -commit 9d5e559547d0 -Author: Simon Sapin -Date: Fri Jan 11 14:03:44 2019 +0100 - - Bug 1519729 - Document public macros. r=emilio - - Undocumented public macros emit warnings in nightly-2019-01-11, - and we #![deny] that warning. - - Cherry-picks a commit from https://github.com/servo/servo/pull/22674 ---- - servo/components/style/properties/properties.mako.rs | 17 ++++++++++++++++- - servo/components/style_traits/values.rs | 2 +- - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git servo/components/style/properties/properties.mako.rs servo/components/style/properties/properties.mako.rs -index 2d91273be15a..9220c3b1a665 100644 ---- mozilla-release/servo/components/style/properties/properties.mako.rs -+++ mozilla-release/servo/components/style/properties/properties.mako.rs -@@ -3821,7 +3821,14 @@ impl AliasId { - } - } - --// NOTE(emilio): Callers are responsible to deal with prefs. -+/// Call the given macro with tokens like this for each longhand and shorthand properties -+/// that is enabled in content: -+/// -+/// ``` -+/// [CamelCaseName, SetCamelCaseName, PropertyId::Longhand(LonghandId::CamelCaseName)], -+/// ``` -+/// -+/// NOTE(emilio): Callers are responsible to deal with prefs. - #[macro_export] - macro_rules! css_properties_accessors { - ($macro_name: ident) => { -@@ -3844,6 +3851,14 @@ macro_rules! css_properties_accessors { - } - } - -+/// Call the given macro with tokens like this for each longhand properties: -+/// -+/// ``` -+/// { snake_case_ident, true } -+/// ``` -+/// -+/// … where the boolean indicates whether the property value type -+/// is wrapped in a `Box<_>` in the corresponding `PropertyDeclaration` variant. - #[macro_export] - macro_rules! longhand_properties_idents { - ($macro_name: ident) => { -diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs -index 2851082c22e0..0d7ee3f506ce 100644 ---- mozilla-release/servo/components/style_traits/values.rs -+++ mozilla-release/servo/components/style_traits/values.rs -@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - --#[macro_export] -+/// Define an enum type with unit variants that each corrsepond to a CSS keyword. - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { - #[allow(missing_docs)] - -commit 2b08ae08b260 -Author: lqd -Date: Fri Jan 11 16:35:26 2019 +0100 - - Bug 1519729 - Typo fix in new doc-comment. r=emilio - - Cherry-picks a commit from https://github.com/servo/servo/pull/22674 - - Co-Authored-By: SimonSapin ---- - servo/components/style_traits/values.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git servo/components/style_traits/values.rs servo/components/style_traits/values.rs -index 0d7ee3f506ce..582e34eb3db0 100644 ---- mozilla-release/servo/components/style_traits/values.rs -+++ mozilla-release/servo/components/style_traits/values.rs -@@ -432,7 +432,7 @@ impl_to_css_for_predefined_type!(::cssparser::RGBA); - impl_to_css_for_predefined_type!(::cssparser::Color); - impl_to_css_for_predefined_type!(::cssparser::UnicodeRange); - --/// Define an enum type with unit variants that each corrsepond to a CSS keyword. -+/// Define an enum type with unit variants that each correspond to a CSS keyword. - macro_rules! define_css_keyword_enum { - (pub enum $name:ident { $($variant:ident = $css:expr,)+ }) => { - #[allow(missing_docs)] Property changes on: head/www/cliqz/files/patch-bug1519729 ___________________________________________________________________ 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-cliqz__env.sh =================================================================== --- head/www/cliqz/files/patch-cliqz__env.sh (revision 498804) +++ head/www/cliqz/files/patch-cliqz__env.sh (revision 498805) @@ -1,24 +1,27 @@ +Commented out the various wget(1) to prevent http traffic during build +phase. + --- cliqz_env.sh.orig 2018-11-16 13:55:29 UTC +++ cliqz_env.sh @@ -78,9 +78,9 @@ export S3_BUCKET=repository.cliqz.com export S3_BUCKET_SERVICE=cliqz-browser-data # check CQZ_BUILD_ID and try to obtain, if not specified -if [ -z $CQZ_BUILD_ID ]; then - export CQZ_BUILD_ID="`wget -qO- https://$S3_BUCKET/dist/$CQZ_RELEASE_CHANNEL/$CQZ_VERSION/lastbuildid`" -fi +#if [ -z $CQZ_BUILD_ID ]; then +# export CQZ_BUILD_ID="`wget -qO- https://$S3_BUCKET/dist/$CQZ_RELEASE_CHANNEL/$CQZ_VERSION/lastbuildid`" +#fi if [ -z $CQZ_BUILD_ID ]; then echo "CQZ_BUILD_ID not specified and can not be obtain from "$S3_BUCKET @@ -103,7 +103,7 @@ OBJ_DIR=$MOZ_OBJDIR SRC_BASE=mozilla-release # automatic forget tab - start -wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin +#wget -O adult-domains.bin https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/adult-domains.bin export CQZ_AUTO_PRIVATE_TAB=1 export CQZ_ADULT_DOMAINS_BF=../adult-domains.bin # automatic forget tab - end Property changes on: head/www/cliqz/files/patch-cliqz__env.sh ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property Index: head/www/cliqz/files/patch-magic__build__and__package.sh =================================================================== --- head/www/cliqz/files/patch-magic__build__and__package.sh (revision 498804) +++ head/www/cliqz/files/patch-magic__build__and__package.sh (revision 498805) @@ -1,8 +1,21 @@ ---- magic_build_and_package.sh.orig 2018-11-12 05:40:39 UTC +Disable build and packaging of tests. + +--- magic_build_and_package.sh.orig 2019-04-03 08:46:52 UTC +++ magic_build_and_package.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/local/bin/bash # Optional ENVs: # CQZ_BUILD_ID - specify special build timestamp or use latest one (depend on channel) +@@ -43,8 +43,8 @@ fi + echo '***** Building *****' + ./mach build + +-echo '***** Building tests *****' +-./mach build package-tests ++#echo '***** Building tests *****' ++#./mach build package-tests + + echo '***** Packaging *****' + ./mach package Property changes on: head/www/cliqz/files/patch-magic__build__and__package.sh ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property