Date: Mon, 18 Nov 2019 01:47:40 +0000 (UTC) From: Santhosh Raju <fox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517852 - in head/www/cliqz: . files Message-ID: <201911180147.xAI1leCF049528@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fox Date: Mon Nov 18 01:47:40 2019 New Revision: 517852 URL: https://svnweb.freebsd.org/changeset/ports/517852 Log: www/cliqz: Updates to 1.30.0 - Bumps versions of dependencies. Changes (since 1.29.3): Cliqz Browser release 1.30.0 includes all changes of Firefox's latest version 70 with additional Cliqz improvements and bug fixes. New Features * Browse undisturbed at last: Thanks to the new Cookie Pop-up Blocker, websites no longer bother you with cookie consent notices. Once activated, consent requests for data collection are automatically denied if possible. Otherwise, the cookie pop-up is simply hidden. Improvements * Cliqz got updated to Firefox 70.0.1 with various improvements and fixes. * Thanks to code optimizations, the Cliqz Browser now starts up to 20% faster (with an existing profile). * Cliqz now displays websites opened in Forget Mode in a separate browser window. Therefore, normal and private tabs are more strictly separated. This makes it easier for you to differentiate between them, and further strengthens your privacy. Forget Tabs are no longer supported. * The completely redesigned Onboarding makes the initial setup of the Cliqz Browser easier by guiding you step-by-step through the most important settings. Fixes * Various bugs with themes have been fixed. * Instead of Firefox's built-in tracking protection, the Cliqz Browser uses our superior anti-tracking technology. * Cliqz continues to use the built-in password manager instead of Firefox Lockwise to manage login data and passwords. Approved by: philip (mentor) Added: head/www/cliqz/files/patch-bug1507655 (contents, props changed) Modified: head/www/cliqz/Makefile head/www/cliqz/distinfo head/www/cliqz/files/patch-bindgen-rust1390 head/www/cliqz/files/patch-bug847568 head/www/cliqz/files/patch-cliqz__env.sh head/www/cliqz/files/patch-mozilla-release_config_rules.mk Modified: head/www/cliqz/Makefile ============================================================================== --- head/www/cliqz/Makefile Mon Nov 18 00:45:11 2019 (r517851) +++ head/www/cliqz/Makefile Mon Nov 18 01:47:40 2019 (r517852) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.29.3 -PORTREVISION= 1 +DISTVERSION= 1.30.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 @@ -37,24 +36,25 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:x1 autoconf-2.13:devel/autoconf213 \ bash:shells/bash \ graphite2>=1.3.13:graphics/graphite2 \ - harfbuzz>=2.5.3:print/harfbuzz \ - icu>=63.1,1:devel/icu \ + harfbuzz>=2.6.1:print/harfbuzz \ + icu>=64.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ libvorbis>=1.3.6,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ + ${LOCALBASE}/bin/python${PYTHON3_DEFAULT}:lang/python${PYTHON3_DEFAULT:S/.//g} \ llvm${LLVM_DEFAULT}>=0:devel/llvm${LLVM_DEFAULT} \ nasm:devel/nasm \ node:www/node \ nspr>=4.21:devel/nspr \ - nss>=3.39:security/nss \ + nss>=3.46.1:security/nss \ png>=1.6.35:graphics/png \ rust-cbindgen>=0.8.7:devel/rust-cbindgen \ - sqlite3>=3.28.0:databases/sqlite3 \ + sqlite3>=3.29.0:databases/sqlite3 \ v4l_compat>0:multimedia/v4l_compat \ yasm:devel/yasm \ zip:archivers/zip -USES= compiler:c11 desktop-file-utils gmake gnome pkgconfig \ +USES= compiler:c++17-lang desktop-file-utils gmake gnome pkgconfig \ python:2.7,build shebangfix tar:xz xorg USE_GNOME= cairo gconf2 gdkpixbuf2 gtk20 gtk30 @@ -74,7 +74,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= 20191011101006 +CLIQZ_LAST_BUILD_ID= 20191113183817 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 @@ -84,6 +84,7 @@ 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 \ + PYTHON3="${LOCALBASE}/bin/python${PYTHON3_DEFAULT}" \ MOZBUILD_STATE_PATH=${WRKDIR} # Configure args passed into mach build system Modified: head/www/cliqz/distinfo ============================================================================== --- head/www/cliqz/distinfo Mon Nov 18 00:45:11 2019 (r517851) +++ head/www/cliqz/distinfo Mon Nov 18 01:47:40 2019 (r517852) @@ -1,11 +1,11 @@ -TIMESTAMP = 1571225186 +TIMESTAMP = 1573995889 SHA256 (cliqz/adult-domains.bin) = 3d018d6ffa75107fdfbf39658e4adaa092d9b8a90c7865b21376855f7c382b65 SIZE (cliqz/adult-domains.bin) = 528392 -SHA256 (cliqz/cliqz@cliqz.com.xpi) = c729bf22cd90c3312f0ea6f142eb6857f50cfe978dafc74710d9e1841cd602b8 -SIZE (cliqz/cliqz@cliqz.com.xpi) = 5903170 +SHA256 (cliqz/cliqz@cliqz.com.xpi) = ee56b1aa803410a953903a3a052bec646a011c9d89e33c3484533be8a39ad969 +SIZE (cliqz/cliqz@cliqz.com.xpi) = 4542302 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.3_GH0.tar.gz) = 05881a2890a3248f7d9e6b38de3784a07e42b1555bd783045976ccb8f42ae24f -SIZE (cliqz/cliqz-oss-browser-f-1.29.3_GH0.tar.gz) = 501544279 +SHA256 (cliqz/cliqz-oss-browser-f-1.30.0_GH0.tar.gz) = adc64c38108cca995562528a5cce9bfe75888dbb42c1bb7d31f5ba970b9504fd +SIZE (cliqz/cliqz-oss-browser-f-1.30.0_GH0.tar.gz) = 507238773 Modified: head/www/cliqz/files/patch-bindgen-rust1390 ============================================================================== --- head/www/cliqz/files/patch-bindgen-rust1390 Mon Nov 18 00:45:11 2019 (r517851) +++ head/www/cliqz/files/patch-bindgen-rust1390 Mon Nov 18 01:47:40 2019 (r517852) @@ -10,9 +10,9 @@ Bogus implementations were introduced in 230545e7c, d3 --- mozilla-release/third_party/rust/bindgen/.cargo-checksum.json.orig 2019-11-05 18:32:47 UTC +++ mozilla-release/third_party/rust/bindgen/.cargo-checksum.json @@ -1 +1 @@ --{"files":{"Cargo.toml":"7bd5f5264fe47e6bcf50e68017053799b39b8cddaaef5c4690193cb25d70d413","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"e9203eb5a1b432efebafcd011896e35e8c9145037bf99e7bb3709dc1b8e8e783","src/codegen/bitfield_unit.rs":"87be2d7f7774327a1608c2c4d64df869e17fb34b7efdacb4030b6794d98e40f3","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"aa0daff2061c6de31acfbd113190889e0f7ca2d2b8d4f46740bfd5832c33e4d2","src/codegen/impl_debug.rs":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partial eq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"9fb48eb14ef1f97e313fe13cfbc1ca96d74262f7a229f1f94011b52079d3df5b","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"82511f1bb8cbd04d98f57b000903b0264237962af93a72a58220437213eba1ef","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17be31a5480918bc41a8a1c4832e8c61185c07f9cd","src/ir/analysis/mod.rs":"1f218e15c19f6666512908abc8 53fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src! /ir/analysis/sizedness.rs":"b73865b6689d4f3546edd91909a47c329c4ae630ea97715d29bc683ae1dc17ad","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"498dc771461f9f30db712dd5596fc959133ec5583e2ba6b75036b9afe9d28dcd","src/ir/context.rs":"599226eb04d337a1b1b13af91af91bdb02dbd5f26f274cbc0ebc4489eb144fc0","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"7658cf68c00b1732dfa599c2d6b6a93a82de8401142591c3afe5fcb27d901a66","src/ir/function.rs":"c2feb2e26d47aa96a74af9912ada26be077e2b0c36d46fa10167da7109590500","src/ir/int.rs":"07e0c7dbd2dd977177fae3acd2a14adf271c6cf9ff4b57cddc11d50734fd4801","src/ir/item.rs":"3bcdb 69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"952fb04cd6a71a2bca5c509aecacb42a1de0cae75824941541a38dc589f0993a","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"4ca6c5dd71ecac737b4710b4bc65435be11889375be564e9a080879387211247","src/log_stubs.rs":"6dfdd908b7c6453da416cf232893768f9480e551ca4add0858ef88bf71ee6ceb", "src/main.rs":"8c96cd2a051e3f09b1b87b75cd9ed! 77e82e889! c8309ebd3e4bc782960cf63e58","src/options.rs":"5b309b225cc51e665bd42ed3e7965a7cd73d984e4455a2d76987fc42ab271ff8","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"6cdac0c63ff3380328d5c427ba4ac8bca04cdd9d3a0379c6e56a43c82a364014"} +-{"files":{"Cargo.toml":"a970d1a9e47f029fe3e3ce43ae4292054ad60c4490e035b86b669fcf32015624","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","README.md":"5a1f556c6a57c0a6ccc65e19c27718e0f4b32381a8efcc80f6601b33c58c5d59","build.rs":"a9f6915c54d75f357ce32f96327bf4df53dc81a505b70831978f9dac6f43841d","csmith-fuzzing/README.md":"7107b70fedb0c0a0cadb3c439a49c1bd0119a6d38dc63b1aecc74d1942256ef2","src/callbacks.rs":"b24d7982332c6a35928f134184ddf4072fe4545a45546b97b9b0e0c1fbb77c08","src/clang.rs":"0009b8b6e3f6c33ec2776ec4cb8de2625ae8be22c9f0433c39b06bdd9fc7db4d","src/codegen/bitfield_unit.rs":"87be2d7f7774327a1608c2c4d64df869e17fb34b7efdacb4030b6794d98e40f3","src/codegen/bitfield_unit_tests.rs":"2073ac6a36e0bc9afaef5b1207966817c8fb7a1a9f6368c3b1b8f79822efbfba","src/codegen/error.rs":"2613af1d833377fd4a70719f4a09951d9d45dc9227827b9a2a938a1bcaaea2dd","src/codegen/helpers.rs":"aa0daff2061c6de31acfbd113190889e0f7ca2d2b8d4f46740bfd5832c33e4d2","src/codegen/impl_debug.rs ":"f82969461d522fb758eca552ceaf189122a404cbb47fcc16008bfe52fc62aefa","src/codegen/impl_partialeq.rs":"d40d9ee2849c4d3d557b033c4d3af5e6de4a44347f67c0f016198086338811af","src/codegen/mod.rs":"ad116e2af755219bd556e8ee00ca48562f64a161d0b2c94846ae01297446ea0d","src/codegen/struct_layout.rs":"3fa5524aff82365ce292b0cc85080514c85a6dbd31bce90f001773b995dda28e","src/extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","src/features.rs":"82511f1bb8cbd04d98f57b000903b0264237962af93a72a58220437213eba1ef","src/ir/analysis/derive.rs":"325d4c1c1e6194e743f42a2316f1501b0ef852fe309f2e9cac3434825ad235f0","src/ir/analysis/has_destructor.rs":"63644f479738df35e531d3324ff892614083c3656e0747aa34d9f20dada878ec","src/ir/analysis/has_float.rs":"76162a309e4285a806755a08c687a3e7bc894a100a63da4e88584035e215b11d","src/ir/analysis/has_type_param_in_array.rs":"fdbc0af28a144c88ea2de83e6e6da5e1ffb40e3dd63fd7a708095d085bb06f94","src/ir/analysis/has_vtable.rs":"5788372d27bdbaaf0454bc17 be31a5480918bc41a8a1c4832e8c61185c07f9cd","s! rc/ir/analysis/mod.rs":"1f218e15c19f6666512908abc853fa7ff9ca5d0fafd94f026d9e4b0ce287ec3c","src/ir/analysis/sizedness.rs":"b73865b6689d4f3546edd91909a47c329c4ae630ea97715d29bc683ae1dc17ad","src/ir/analysis/template_params.rs":"6312c008bbc80f50e72a766756c8daddea0b6eeb31ec924b83a231df931e170e","src/ir/annotations.rs":"39a5ab19f4d5dfa617577e4a0d0d2b67b5369d480c7cca4b14d172458c9843f0","src/ir/comment.rs":"c48abe01c5af0f09f583a89f1394bc6c161b40f6c8f0f600bbfe3c907b47969b","src/ir/comp.rs":"78e245835efcd22b5cc878a8a7031171116c708408bdb48b0c9284a067041e56","src/ir/context.rs":"8fd64654343295e0e4a43efe5db6f64315dcd50a5015c3d86e90aae992e2fa9f","src/ir/derive.rs":"34f9aa76b6c9c05136bb69dcd6455397faef571a567254d2c541d50a962994db","src/ir/dot.rs":"95ed2968fc3239d87892e9f1edf1ed6dd18630d949564961765967ea1d16960c","src/ir/enum_ty.rs":"7658cf68c00b1732dfa599c2d6b6a93a82de8401142591c3afe5fcb27d901a66","src/ir/function.rs":"c2feb2e26d47aa96a74af9912ada26be077e2b0c36d46fa10167da7109590500","src/ir/int. rs":"5b8d5bcedb04f39dc2d7e571bc04114b1f1e09cf294afe944c2e7879451c4378","src/ir/item.rs":"3bcdb69b793350e5744aec3577cdbb1e5068ece5220c38763cecd82dfb5e8f03","src/ir/item_kind.rs":"dbeae8c4fd0e5c9485d325aea040e056a1f2cd6d43fc927dee8fe1c0c59a7197","src/ir/layout.rs":"d49582081f5f86f7595afbe4845f38fb3b969a840b568f4a49b265e7d790bb5b","src/ir/mod.rs":"2eae90f207fad2e45957ec9287064992a419e3fc916aba84faff2ea25cbeb5ee","src/ir/module.rs":"c4d90bf38fe3672e01923734ccbdb7951ea929949d5f413a9c2aee12395a5094","src/ir/objc.rs":"758aa955a0c5d6ad82606c88a1f4cd1d93e666b71e82d43b18b1aaae96cf888a","src/ir/template.rs":"c0f8570b927dfd6a421fc4ce3094ec837a3ed936445225dbfac961e8e0842ae5","src/ir/traversal.rs":"ea751379a5aec02f93f8d2c61e18232776b1f000dbeae64b9a7195ba21a19dd6","src/ir/ty.rs":"e6771c8102b9f01b0c4b664bf1151b4773b599634a83895376ce122ca9f74f8b","src/ir/var.rs":"8bdafb6d02f2c55ae11c28d88b19fb7a65ba8466da12ff039ae4c16c790b291e","src/lib.rs":"a07ef7a3d099493555ae5a58b7b4bf9106a978e38a23b5ff445a83b927 27ab62","src/log_stubs.rs":"6dfdd908b7c6453d! a416cf232! 893768f9480e551ca4add0858ef88bf71ee6ceb","src/main.rs":"8c96cd2a051e3f09b1b87b75cd9ed77e82e889c8309ebd3e4bc782960cf63e58","src/options.rs":"5b309b225cc51e665bd42ed3e7965a7cd73d984e4455a2d76987fc42ab271ff8","src/parse.rs":"be7d13cc84fae79ec7b3aa9e77063fa475a48d74a854423e2c72d75006a25202","src/regex_set.rs":"5cb72fc3714c0d79e9e942d003349c0775fafd7cd0c9603c65f5261883bbf9cf","src/time.rs":"3b763e6fee51d0eb01228dfe28bc28a9f692aff73b2a7b90a030902e0238fca6"},"package":"18270cdd7065ec045a6bb4bdcd5144d14a78b3aedb3bc5111e688773ac8b9ad0"} \ No newline at end of file -+{"files":{},"package":"6cdac0c63ff3380328d5c427ba4ac8bca04cdd9d3a0379c6e56a43c82a364014"} ++{"files":{},"package":"18270cdd7065ec045a6bb4bdcd5144d14a78b3aedb3bc5111e688773ac8b9ad0"} --- mozilla-release/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.orig 2019-10-30 17:36:44 UTC +++ mozilla-release/third_party/rust/bindgen/src/ir/analysis/has_vtable.rs @@ -9,37 +9,22 @@ use std::ops; Added: head/www/cliqz/files/patch-bug1507655 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/cliqz/files/patch-bug1507655 Mon Nov 18 01:47:40 2019 (r517852) @@ -0,0 +1,28 @@ +Revert bug 1497976 as close_fds on Python 2 is too slow + +diff --git build/moz.configure/util.configure build/moz.configure/util.configure +index 25862fee7c32..3fc725a5124e 100644 +--- mozilla-release/build/moz.configure/util.configure 2019-11-13 13:22:25 UTC ++++ mozilla-release/build/moz.configure/util.configure +@@ -22,20 +22,13 @@ def configure_error(message): + + # A wrapper to obtain a process' output and return code. + # Returns a tuple (retcode, stdout, stderr). +-@imports('os') + @imports('subprocess') + @imports(_from='mozbuild.shellutil', _import='quote') + @imports(_from='mozbuild.util', _import='system_encoding') + def get_cmd_output(*args, **kwargs): + log.debug('Executing: `%s`', quote(*args)) + proc = subprocess.Popen(args, stdout=subprocess.PIPE, +- stderr=subprocess.PIPE, +- # On Python 2 on Windows, close_fds prevents the +- # process from inheriting stdout/stderr. +- # Elsewhere, it simply prevents it from inheriting +- # extra file descriptors, which is what we want. +- close_fds=os.name != 'nt', +- **kwargs) ++ stderr=subprocess.PIPE, **kwargs) + stdout, stderr = proc.communicate() + stdout = stdout.decode(system_encoding, 'replace') + stderr = stderr.decode(system_encoding, 'replace') Modified: head/www/cliqz/files/patch-bug847568 ============================================================================== --- head/www/cliqz/files/patch-bug847568 Mon Nov 18 00:45:11 2019 (r517851) +++ head/www/cliqz/files/patch-bug847568 Mon Nov 18 01:47:40 2019 (r517852) @@ -1,11 +1,9 @@ -Force building against system-wide graphite2/harfbuzz. +# Allow 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.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/config/system-headers.mozbuild -@@ -1304,6 +1304,19 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']: - 'SelectSingleContentItemPage.h', +@@ -1295,6 +1295,19 @@ if CONFIG['MOZ_ENABLE_LIBPROXY']: + 'proxy.h', ] +if CONFIG['MOZ_SYSTEM_GRAPHITE2']: @@ -24,9 +22,9 @@ This was causing cliqz build failures in 13.0-CURRENT if CONFIG['MOZ_SYSTEM_LIBVPX']: system_headers += [ '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.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/dom/base/moz.build -@@ -528,6 +528,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/andr +@@ -539,6 +539,9 @@ if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/andr if CONFIG['MOZ_X11']: CXXFLAGS += CONFIG['TK_CFLAGS'] @@ -34,9 +32,9 @@ This was causing cliqz build failures in 13.0-CURRENT + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + GENERATED_FILES += [ - '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.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/gfx/graphite2/moz-gr-update.sh @@ -1,6 +1,7 @@ #!/bin/bash @@ -64,7 +62,7 @@ This was causing cliqz build failures in 13.0-CURRENT echo echo If gfx/graphite2/src/files.mk has changed, please make corresponding ---- mozilla-release/gfx/harfbuzz/README-mozilla.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/gfx/harfbuzz/README-mozilla.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/gfx/harfbuzz/README-mozilla @@ -15,3 +15,8 @@ from within the gfx/harfbuzz directory. @@ -75,9 +73,9 @@ This was causing cliqz build failures in 13.0-CURRENT +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.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/gfx/moz.build -@@ -12,6 +12,12 @@ with Files('wr/**'): +@@ -13,6 +13,12 @@ with Files('wr/**'): if CONFIG['MOZ_TREE_CAIRO']: DIRS += ['cairo'] @@ -90,7 +88,7 @@ This was causing cliqz build failures in 13.0-CURRENT DIRS += [ '2d', 'ycbcr', -@@ -20,8 +26,6 @@ DIRS += [ +@@ -21,8 +27,6 @@ DIRS += [ 'qcms', 'gl', 'layers', @@ -99,7 +97,7 @@ This was causing cliqz build failures in 13.0-CURRENT '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.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/gfx/skia/generate_mozbuild.py @@ -117,6 +117,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', @@ -108,10 +106,10 @@ This was causing cliqz build failures in 13.0-CURRENT +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] ---- mozilla-release/gfx/skia/moz.build.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/gfx/skia/moz.build.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/gfx/skia/moz.build @@ -493,6 +493,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): '-Wno-unused-private-field', @@ -120,10 +118,10 @@ This was causing cliqz build failures in 13.0-CURRENT +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + - if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'android'): + if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'android'): CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS'] CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS'] ---- mozilla-release/gfx/thebes/moz.build.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/gfx/thebes/moz.build.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/gfx/thebes/moz.build @@ -284,7 +284,13 @@ if CONFIG['MOZ_WAYLAND']: @@ -140,7 +138,7 @@ This was causing cliqz build failures in 13.0-CURRENT if CONFIG['CC_TYPE'] == 'clang': # Suppress warnings from Skia header files. ---- mozilla-release/intl/unicharutil/util/moz.build.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/intl/unicharutil/util/moz.build.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/intl/unicharutil/util/moz.build @@ -25,4 +25,7 @@ UNIFIED_SOURCES += [ 'nsUnicodeProperties.cpp', @@ -150,18 +148,18 @@ This was causing cliqz build failures in 13.0-CURRENT + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] + FINAL_LIBRARY = 'xul' ---- mozilla-release/netwerk/dns/moz.build.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/netwerk/dns/moz.build.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/netwerk/dns/moz.build -@@ -83,3 +83,6 @@ USE_LIBS += ['icu'] +@@ -90,3 +90,6 @@ USE_LIBS += ['icu'] if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] + +if CONFIG['MOZ_SYSTEM_HARFBUZZ']: + CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS'] ---- mozilla-release/old-configure.in.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/old-configure.in.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/old-configure.in -@@ -2715,6 +2715,27 @@ dnl ================================================== +@@ -2674,6 +2674,27 @@ dnl ================================================== AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR) dnl ======================================================== @@ -189,9 +187,9 @@ This was causing cliqz build failures in 13.0-CURRENT dnl Check for pixman and cairo dnl ======================================================== ---- mozilla-release/toolkit/library/moz.build.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/toolkit/library/moz.build.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/toolkit/library/moz.build -@@ -226,6 +226,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: +@@ -254,6 +254,12 @@ if CONFIG['MOZ_SYSTEM_PNG']: if CONFIG['MOZ_SYSTEM_WEBP']: OS_LIBS += CONFIG['MOZ_WEBP_LIBS'] @@ -204,12 +202,21 @@ This was causing cliqz build failures in 13.0-CURRENT if CONFIG['MOZ_SYSTEM_LIBEVENT']: OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS'] ---- mozilla-release/toolkit/moz.configure.orig 2019-10-08 09:02:23 UTC +@@ -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 -@@ -932,6 +932,26 @@ set_config('ENABLE_REMOTE_AGENT', remote) - set_define('ENABLE_REMOTE_AGENT', remote) +@@ -931,6 +931,25 @@ add_old_configure_assignment('FT2_LIBS', + add_old_configure_assignment('FT2_CFLAGS', + ft2_info.cflags) - +# Graphite2 +# ============================================================== +option('--with-system-graphite2', @@ -225,11 +232,10 @@ This was causing cliqz build failures in 13.0-CURRENT +option('--with-system-harfbuzz', + help="Use system harfbuzz (located with pkgconfig)") + -+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.5.3', ++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 2.6.1', + when='--with-system-harfbuzz') + +set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True)) -+ - # Marionette remote protocol + + # Remote agent (part of CDP based remote protocol) # ============================================================== - # Modified: head/www/cliqz/files/patch-cliqz__env.sh ============================================================================== --- head/www/cliqz/files/patch-cliqz__env.sh Mon Nov 18 00:45:11 2019 (r517851) +++ head/www/cliqz/files/patch-cliqz__env.sh Mon Nov 18 01:47:40 2019 (r517852) @@ -1,9 +1,9 @@ Commented out the various wget(1) to prevent http traffic during build phase. ---- cliqz_env.sh.orig 2019-05-29 12:52:42 UTC +--- cliqz_env.sh.orig 2019-11-13 13:22:25 UTC +++ cliqz_env.sh -@@ -101,9 +101,9 @@ export S3_BUCKET=repository.cliqz.com +@@ -105,9 +105,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 @@ -16,12 +16,12 @@ phase. if [ -z $CQZ_BUILD_ID ]; then echo "CQZ_BUILD_ID not specified and can not be obtain from "$S3_BUCKET -@@ -131,7 +131,7 @@ OBJ_DIR=$MOZ_OBJDIR +@@ -135,7 +135,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 + Modified: head/www/cliqz/files/patch-mozilla-release_config_rules.mk ============================================================================== --- head/www/cliqz/files/patch-mozilla-release_config_rules.mk Mon Nov 18 00:45:11 2019 (r517851) +++ head/www/cliqz/files/patch-mozilla-release_config_rules.mk Mon Nov 18 01:47:40 2019 (r517852) @@ -1,6 +1,6 @@ ---- mozilla-release/config/rules.mk.orig 2019-10-08 09:02:23 UTC +--- mozilla-release/config/rules.mk.orig 2019-11-13 13:22:25 UTC +++ mozilla-release/config/rules.mk -@@ -989,20 +989,20 @@ $(EXTENSIONS_PATH): +@@ -960,20 +960,20 @@ $(EXTENSIONS_PATH): CLIQZ_XPI_PATH = $(EXTENSIONS_PATH)/cliqz@cliqz.com.xpi $(CLIQZ_XPI_PATH): $(EXTENSIONS_PATH) echo CLIQZ_XPI_PATH in `pwd`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911180147.xAI1leCF049528>