Date: Sun, 17 May 2020 18:12:10 +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: r535564 - in head/www/cliqz: . files Message-ID: <202005171812.04HICAJn084534@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: fox Date: Sun May 17 18:12:10 2020 New Revision: 535564 URL: https://svnweb.freebsd.org/changeset/ports/535564 Log: www/cliqz: Updates to 1.36.0 - Removes some of the obsolete patches. Changes since 1.35.0: Merge with Firefox 76.0.1 Modified: head/www/cliqz/Makefile head/www/cliqz/distinfo head/www/cliqz/files/patch-bug1288587 head/www/cliqz/files/patch-bug1550891 head/www/cliqz/pkg-plist Modified: head/www/cliqz/Makefile ============================================================================== --- head/www/cliqz/Makefile Sun May 17 18:07:23 2020 (r535563) +++ head/www/cliqz/Makefile Sun May 17 18:12:10 2020 (r535564) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cliqz -DISTVERSION= 1.35.0 -PORTREVISION= 2 +DISTVERSION= 1.36.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 @@ -81,7 +80,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= 20200414182840 +CLIQZ_LAST_BUILD_ID= 20200512121102 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 Modified: head/www/cliqz/distinfo ============================================================================== --- head/www/cliqz/distinfo Sun May 17 18:07:23 2020 (r535563) +++ head/www/cliqz/distinfo Sun May 17 18:12:10 2020 (r535564) @@ -1,13 +1,13 @@ -TIMESTAMP = 1587111982 +TIMESTAMP = 1589642956 SHA256 (cliqz/adult-domains.bin) = f726171965328f60e2cc2a50311883e76c21b3359f2596d10be76cc33abdda88 SIZE (cliqz/adult-domains.bin) = 528392 -SHA256 (cliqz/cliqz@cliqz.com.xpi) = 0b63cb9bd6c77ba089c9633fd8e363184c0c4e8c093fa66a87541e0bb0bf9a20 -SIZE (cliqz/cliqz@cliqz.com.xpi) = 4244727 +SHA256 (cliqz/cliqz@cliqz.com.xpi) = 515140c6c4b7d037932169f005ad03740e16a34d8d2bba45c24c00e8f34545d4 +SIZE (cliqz/cliqz@cliqz.com.xpi) = 4275778 SHA256 (cliqz/dat@cliqz.com.xpi) = 83dac73bd4ab16271330eb87ed5e3b088ddd69707ceb121d8ee730d07ddc9d87 SIZE (cliqz/dat@cliqz.com.xpi) = 988736 SHA256 (cliqz/gdprtool@cliqz.com.xpi) = 7d59af6529b0756e5a89cf150f781a81a1cc1284eab2de00a6a89432f65a711d SIZE (cliqz/gdprtool@cliqz.com.xpi) = 219684 SHA256 (cliqz/https-everywhere@cliqz.com.xpi) = d1b7590c9541741aa0d1fada383fece7b48348f477a3f7b606e043021a42bdbb SIZE (cliqz/https-everywhere@cliqz.com.xpi) = 2058305 -SHA256 (cliqz/cliqz-oss-browser-f-1.35.0_GH0.tar.gz) = 90b746da10e849dbe3d2dbc0736bc640759c9234c0162c25c0df43551f7382ae -SIZE (cliqz/cliqz-oss-browser-f-1.35.0_GH0.tar.gz) = 502919350 +SHA256 (cliqz/cliqz-oss-browser-f-1.36.0_GH0.tar.gz) = 712e28b767da88bb3defcab9c65b21af85c439aa2fb503161ce53b17903a048e +SIZE (cliqz/cliqz-oss-browser-f-1.36.0_GH0.tar.gz) = 505954787 Modified: head/www/cliqz/files/patch-bug1288587 ============================================================================== --- head/www/cliqz/files/patch-bug1288587 Sun May 17 18:07:23 2020 (r535563) +++ head/www/cliqz/files/patch-bug1288587 Sun May 17 18:12:10 2020 (r535564) @@ -25,7 +25,7 @@ index 855214a..1e91d51 100644 log.debug("python2: executable from configuration: %r" % python) -@@ -358,7 +365,10 @@ def virtualenv_python2(env_python, build_env, mozillab +@@ -365,7 +372,10 @@ def virtualenv_python2(env_python, build_env, mozillab sys.executable, manager.python_path)) log.info('Reexecuting in the virtualenv') if env_python: @@ -37,7 +37,7 @@ index 855214a..1e91d51 100644 # One would prefer to use os.execl, but that's completely borked on # Windows. sys.exit(subprocess.call([python] + sys.argv)) -@@ -460,6 +470,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre +@@ -468,6 +478,7 @@ option(env='PYTHON3', nargs=1, help='Python 3 interpre @imports(_from='mozbuild.pythonutil', _import='find_python3_executable') @imports(_from='mozbuild.pythonutil', _import='python_executable_version') @imports(_from='six', _import='ensure_text') @@ -45,7 +45,7 @@ index 855214a..1e91d51 100644 def virtualenv_python3(env_python, build_env, mozillabuild, mozconfig, help): if help: return -@@ -495,6 +506,12 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -503,6 +514,12 @@ def virtualenv_python3(env_python, build_env, mozillab python = mozconfig['vars']['added']['PYTHON3'] elif 'PYTHON3' in mozconfig['vars']['modified']: python = mozconfig['vars']['modified']['PYTHON3'][1] @@ -58,7 +58,7 @@ index 855214a..1e91d51 100644 log.debug("python3: executable from configuration: %r" % python) -@@ -575,7 +592,10 @@ def virtualenv_python3(env_python, build_env, mozillab +@@ -583,7 +600,10 @@ def virtualenv_python3(env_python, build_env, mozillab sys.executable, manager.python_path)) log.info('Re-executing in the virtualenv') if env_python: @@ -67,6 +67,6 @@ index 855214a..1e91d51 100644 + del os.environ['PYTHON3'] + except KeyError: + pass - # One would prefer to use os.execl, but that's completely borked on - # Windows. - sys.exit(subprocess.call([python] + sys.argv)) + # Homebrew on macOS will change Python's sys.executable to a custom + # value which messes with mach's virtualenv handling code. Override + # Homebrew's changes with the correct sys.executable value. Modified: head/www/cliqz/files/patch-bug1550891 ============================================================================== --- head/www/cliqz/files/patch-bug1550891 Sun May 17 18:07:23 2020 (r535563) +++ head/www/cliqz/files/patch-bug1550891 Sun May 17 18:12:10 2020 (r535564) @@ -3,8 +3,6 @@ Author: Greg V <greg@unrelenting.technology> Date: Wed Jan 8 15:06:00 2020 -0800 Bug 1550891 - re-add SHM_ANON support in IPC shared memory, freezing via capabilities - -Taken from www/firefox --- config/system-headers.mozbuild | 1 + ipc/chromium/src/base/shared_memory_posix.cc | 20 +++++++++++++++++--- @@ -74,10 +72,10 @@ index 0be9cce0b4bed..89e67483e4c16 100644 #else // Generic Unix: shm_open + shm_unlink do { -@@ -275,6 +282,13 @@ bool SharedMemory::Freeze() { - CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); +@@ -277,6 +284,14 @@ bool SharedMemory::ReadOnlyCopy(SharedMemory* ro_out) { return false; } + ro_file = mapped_file_; +#elif defined(__FreeBSD__) + cap_rights_t rights; + cap_rights_init(&rights, CAP_MMAP_R); @@ -85,6 +83,7 @@ index 0be9cce0b4bed..89e67483e4c16 100644 + CHROMIUM_LOG(WARNING) << "failed to freeze shm: " << strerror(errno); + return false; + } ++ ro_file = mapped_file_; #else DCHECK(frozen_file_ >= 0); DCHECK(mapped_file_ >= 0); Modified: head/www/cliqz/pkg-plist ============================================================================== --- head/www/cliqz/pkg-plist Sun May 17 18:07:23 2020 (r535563) +++ head/www/cliqz/pkg-plist Sun May 17 18:12:10 2020 (r535564) @@ -1,7 +1,6 @@ bin/cliqz lib/cliqz/application.ini lib/cliqz/browser/adult-domains.bin -lib/cliqz/browser/blocklist.xml lib/cliqz/browser/chrome/icons/default/default128.png lib/cliqz/browser/chrome/icons/default/default16.png lib/cliqz/browser/chrome/icons/default/default32.png @@ -13,7 +12,6 @@ lib/cliqz/browser/features/https-everywhere@cliqz.com. lib/cliqz/browser/omni.ja lib/cliqz/cliqz lib/cliqz/cliqz-bin -lib/cliqz/cliqz.cfg lib/cliqz/defaults/pref/channel-prefs.js lib/cliqz/dependentlibs.list lib/cliqz/fonts/TwemojiMozilla.ttf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005171812.04HICAJn084534>