2019-02-18 22:41:56 +00:00
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
2020-01-05 08:26:42 +00:00
|
|
|
;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
2019-06-18 19:55:30 +00:00
|
|
|
;;; Copyright © 2019 Alex Griffin <a@ajgrf.com>
|
2019-02-18 22:41:56 +00:00
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu packages chromium)
|
|
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (guix gexp)
|
|
|
|
|
#:use-module (guix store)
|
|
|
|
|
#:use-module (guix monads)
|
|
|
|
|
#:use-module (guix download)
|
|
|
|
|
#:use-module (guix git-download)
|
|
|
|
|
#:use-module (guix utils)
|
|
|
|
|
#:use-module (guix build-system gnu)
|
2020-11-22 15:20:36 +00:00
|
|
|
#:use-module (guix build-system trivial)
|
2019-02-18 22:41:56 +00:00
|
|
|
#:use-module (gnu packages)
|
|
|
|
|
#:use-module (gnu packages assembly)
|
|
|
|
|
#:use-module (gnu packages base)
|
2020-11-22 15:20:36 +00:00
|
|
|
#:use-module (gnu packages bash)
|
2019-02-18 22:41:56 +00:00
|
|
|
#:use-module (gnu packages bison)
|
|
|
|
|
#:use-module (gnu packages build-tools)
|
|
|
|
|
#:use-module (gnu packages compression)
|
|
|
|
|
#:use-module (gnu packages cups)
|
|
|
|
|
#:use-module (gnu packages curl)
|
|
|
|
|
#:use-module (gnu packages fontutils)
|
2019-07-17 14:30:23 +00:00
|
|
|
#:use-module (gnu packages freedesktop)
|
2019-02-18 22:41:56 +00:00
|
|
|
#:use-module (gnu packages ghostscript)
|
|
|
|
|
#:use-module (gnu packages gl)
|
|
|
|
|
#:use-module (gnu packages glib)
|
|
|
|
|
#:use-module (gnu packages gnome)
|
|
|
|
|
#:use-module (gnu packages gperf)
|
|
|
|
|
#:use-module (gnu packages gtk)
|
|
|
|
|
#:use-module (gnu packages icu4c)
|
|
|
|
|
#:use-module (gnu packages image)
|
|
|
|
|
#:use-module (gnu packages libevent)
|
|
|
|
|
#:use-module (gnu packages libffi)
|
|
|
|
|
#:use-module (gnu packages linux)
|
2020-02-24 21:56:30 +00:00
|
|
|
#:use-module (gnu packages llvm)
|
2019-02-18 22:41:56 +00:00
|
|
|
#:use-module (gnu packages kerberos)
|
|
|
|
|
#:use-module (gnu packages ninja)
|
|
|
|
|
#:use-module (gnu packages node)
|
gnu: Move nss & co. to nss.scm.
* gnu/packages/gnuzilla.scm (nspr, nss): Move to...
* gnu/packages/nss.scm: ... here. New file.
* gnu/packages/chromium.scm, gnu/packages/disk.scm,
gnu/packages/freedesktop.scm, gnu/packages/gnome.scm,
gnu/packages/gnunet.scm, gnu/packages/java.scm,
gnu/packages/libreoffice.scm, gnu/packages/linux.scm,
gnu/packages/mate.scm, gnu/packages/openldap.scm,
gnu/packages/package-management.scm, gnu/packages/password-utils.scm,
gnu/packages/polkit.scm, gnu/packages/qt.scm,
gnu/packages/sssd.scm, gnu/packages/storage.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/xml.scm: Adjust
accordingly.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add nss.scm.
2019-04-04 13:14:57 +00:00
|
|
|
#:use-module (gnu packages nss)
|
2019-02-18 22:41:56 +00:00
|
|
|
#:use-module (gnu packages pciutils)
|
|
|
|
|
#:use-module (gnu packages pkg-config)
|
2020-07-19 06:59:48 +00:00
|
|
|
#:use-module (gnu packages protobuf)
|
2019-02-18 22:41:56 +00:00
|
|
|
#:use-module (gnu packages pulseaudio)
|
|
|
|
|
#:use-module (gnu packages python)
|
|
|
|
|
#:use-module (gnu packages python-web)
|
|
|
|
|
#:use-module (gnu packages python-xyz)
|
|
|
|
|
#:use-module (gnu packages regex)
|
|
|
|
|
#:use-module (gnu packages serialization)
|
|
|
|
|
#:use-module (gnu packages speech)
|
|
|
|
|
#:use-module (gnu packages tls)
|
|
|
|
|
#:use-module (gnu packages valgrind)
|
|
|
|
|
#:use-module (gnu packages vulkan)
|
|
|
|
|
#:use-module (gnu packages video)
|
|
|
|
|
#:use-module (gnu packages xiph)
|
|
|
|
|
#:use-module (gnu packages xml)
|
|
|
|
|
#:use-module (gnu packages xdisorg)
|
2020-02-05 10:32:19 +00:00
|
|
|
#:use-module (gnu packages xorg)
|
2020-02-24 21:46:03 +00:00
|
|
|
#:use-module (ice-9 match)
|
|
|
|
|
#:use-module (srfi srfi-1))
|
2019-02-18 22:41:56 +00:00
|
|
|
|
|
|
|
|
(define %preserved-third-party-files
|
2019-08-03 21:24:07 +00:00
|
|
|
'("base/third_party/cityhash" ;Expat
|
2019-11-15 16:47:02 +00:00
|
|
|
"base/third_party/double_conversion" ;BSD-3
|
2019-02-18 22:41:56 +00:00
|
|
|
"base/third_party/dynamic_annotations" ;BSD-2
|
|
|
|
|
"base/third_party/icu" ;Unicode, X11-style
|
|
|
|
|
"base/third_party/superfasthash" ;BSD-3
|
|
|
|
|
"base/third_party/symbolize" ;BSD-3
|
|
|
|
|
"base/third_party/xdg_mime" ;LGPL2.0+ or Academic 2.0
|
|
|
|
|
"base/third_party/xdg_user_dirs" ;Expat
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
;; XXX: Chromium requires a newer C++ standard library. Remove this when
|
|
|
|
|
;; the default GCC is 9 or later.
|
|
|
|
|
"buildtools/third_party/libc++" ;ASL2.0, with LLVM exceptions
|
2019-02-18 22:41:56 +00:00
|
|
|
"chrome/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
|
|
|
|
|
"courgette/third_party/bsdiff" ;BSD-2, BSD protection license
|
|
|
|
|
"courgette/third_party/divsufsort" ;Expat
|
|
|
|
|
"net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
|
|
|
|
|
"net/third_party/nss" ;MPL-2.0
|
2019-08-03 21:24:07 +00:00
|
|
|
"net/third_party/quiche" ;BSD-3
|
2019-02-18 22:41:56 +00:00
|
|
|
"net/third_party/uri_template" ;ASL2.0
|
|
|
|
|
"third_party/abseil-cpp" ;ASL2.0
|
|
|
|
|
"third_party/adobe/flash/flapper_version.h" ;no license, trivial
|
|
|
|
|
"third_party/angle" ;BSD-3
|
|
|
|
|
"third_party/angle/src/common/third_party/base" ;BSD-3
|
|
|
|
|
"third_party/angle/src/common/third_party/smhasher" ;Public domain
|
|
|
|
|
"third_party/angle/src/common/third_party/xxhash" ;BSD-2
|
|
|
|
|
"third_party/angle/src/third_party/compiler" ;BSD-2
|
|
|
|
|
"third_party/angle/src/third_party/libXNVCtrl" ;Expat
|
|
|
|
|
"third_party/angle/src/third_party/trace_event" ;BSD-3
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/angle/src/third_party/volk" ;Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/angle/third_party/vulkan-headers" ;ASL2.0
|
|
|
|
|
"third_party/angle/third_party/vulkan-loader" ;ASL2.0
|
|
|
|
|
"third_party/angle/third_party/vulkan-tools" ;ASL2.0
|
|
|
|
|
"third_party/angle/third_party/vulkan-validation-layers" ;ASL2.0
|
|
|
|
|
"third_party/apple_apsl" ;APSL2.0
|
2019-06-12 10:00:26 +00:00
|
|
|
"third_party/axe-core" ;MPL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/blink" ;BSD-3, LGPL2+
|
|
|
|
|
"third_party/boringssl" ;OpenSSL/ISC (Google additions are ISC)
|
|
|
|
|
"third_party/boringssl/src/third_party/fiat" ;Expat
|
|
|
|
|
"third_party/breakpad" ;BSD-3
|
|
|
|
|
"third_party/brotli" ;Expat
|
|
|
|
|
"third_party/catapult" ;BSD-3
|
|
|
|
|
"third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
|
|
|
|
|
"third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
|
|
|
|
|
"third_party/catapult/third_party/polymer" ;BSD-3
|
2020-02-24 21:56:30 +00:00
|
|
|
;; XXX: This is a minified version of <https://d3js.org/>.
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/catapult/tracing/third_party/d3" ;BSD-3
|
|
|
|
|
"third_party/catapult/tracing/third_party/gl-matrix" ;Expat
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/catapult/tracing/third_party/jpeg-js" ;ASL2.0
|
2020-02-24 21:56:30 +00:00
|
|
|
;; XXX: Minified version of <https://github.com/Stuk/jszip>.
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/catapult/tracing/third_party/jszip" ;Expat or GPL3
|
|
|
|
|
"third_party/catapult/tracing/third_party/mannwhitneyu" ;Expat
|
|
|
|
|
"third_party/catapult/tracing/third_party/oboe" ;BSD-2
|
2020-02-24 21:56:30 +00:00
|
|
|
;; XXX: Minified version of <https://github.com/nodeca/pako>.
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/catapult/tracing/third_party/pako" ;Expat
|
|
|
|
|
"third_party/ced" ;BSD-3
|
|
|
|
|
"third_party/cld_3" ;ASL2.0
|
2019-11-15 16:47:02 +00:00
|
|
|
"third_party/closure_compiler" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/crashpad" ;ASL2.0
|
2019-06-12 10:00:26 +00:00
|
|
|
"third_party/crashpad/crashpad/third_party/lss" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
|
|
|
|
|
"third_party/crc32c" ;BSD-3
|
|
|
|
|
"third_party/cros_system_api" ;BSD-3
|
2019-04-30 20:48:52 +00:00
|
|
|
"third_party/dav1d" ;BSD-2
|
2019-06-12 10:00:26 +00:00
|
|
|
"third_party/dawn" ;ASL2.0
|
2019-11-15 16:47:02 +00:00
|
|
|
"third_party/depot_tools/owners.py" ;BSD-3
|
2020-02-24 21:56:30 +00:00
|
|
|
"third_party/devtools-frontend" ;BSD-3
|
2020-07-19 06:59:48 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
|
2020-11-22 15:20:36 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
|
2020-07-19 06:59:48 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
|
gnu: ungoogled-chromium: Update to 81.0.4044.92-0.b484ad4 [security fixes].
This release fixes CVE-2020-6430, CVE-2020-6456, CVE-2020-6431, CVE-2020-6432,
CVE-2020-6433, CVE-2020-6434, CVE-2020-6435, CVE-2020-6436, CVE-2020-6437,
CVE-2020-6438, CVE-2020-6439, CVE-2020-6440, CVE-2020-6441, CVE-2020-6442,
CVE-2020-6443, CVE-2020-6444, CVE-2020-6445, CVE-2020-6446, CVE-2020-6447,
and CVE-2020-6448.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 81.
(%chromium-version): Set to 81.0.4044.92.
(%ungoogled-revision): Set to b484ad4c0bdb696c86d941798ae6b0e2bd0db35d.
(%debian-revision): Set to debian/81.0.4044.92-1.
(%chromium-origin, %ungoogled-origin, %debian-origin): Update hashes.
(ungoogled-chromium-source): Remove PYTHON-2 from the environment, use
PYTHON-WRAPPER instead. Call "remove_bundled_libraries.py" using PYTHON-2
directly.
(ungoogled-chromium)[arguments]: Remove "is_cfi=false" from #:configure-flags.
Adjust CXXFLAGS to ignore unknown compiler warnings.
[inputs]: Change from ICU4C to ICU4C-66.1.
2020-04-12 17:00:12 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/fabricjs" ;Expat
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
|
|
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/lit-html" ;BSD-3
|
|
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/lodash-isequal" ;Expat
|
|
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
|
2020-11-22 15:20:36 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/puppeteer" ;ASL2.0
|
gnu: ungoogled-chromium: Update to 81.0.4044.92-0.b484ad4 [security fixes].
This release fixes CVE-2020-6430, CVE-2020-6456, CVE-2020-6431, CVE-2020-6432,
CVE-2020-6433, CVE-2020-6434, CVE-2020-6435, CVE-2020-6436, CVE-2020-6437,
CVE-2020-6438, CVE-2020-6439, CVE-2020-6440, CVE-2020-6441, CVE-2020-6442,
CVE-2020-6443, CVE-2020-6444, CVE-2020-6445, CVE-2020-6446, CVE-2020-6447,
and CVE-2020-6448.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 81.
(%chromium-version): Set to 81.0.4044.92.
(%ungoogled-revision): Set to b484ad4c0bdb696c86d941798ae6b0e2bd0db35d.
(%debian-revision): Set to debian/81.0.4044.92-1.
(%chromium-origin, %ungoogled-origin, %debian-origin): Update hashes.
(ungoogled-chromium-source): Remove PYTHON-2 from the environment, use
PYTHON-WRAPPER instead. Call "remove_bundled_libraries.py" using PYTHON-2
directly.
(ungoogled-chromium)[arguments]: Remove "is_cfi=false" from #:configure-flags.
Adjust CXXFLAGS to ignore unknown compiler warnings.
[inputs]: Change from ICU4C to ICU4C-66.1.
2020-04-12 17:00:12 +00:00
|
|
|
"third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
|
2020-02-25 15:14:23 +00:00
|
|
|
"third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0
|
gnu: ungoogled-chromium: Update to 81.0.4044.92-0.b484ad4 [security fixes].
This release fixes CVE-2020-6430, CVE-2020-6456, CVE-2020-6431, CVE-2020-6432,
CVE-2020-6433, CVE-2020-6434, CVE-2020-6435, CVE-2020-6436, CVE-2020-6437,
CVE-2020-6438, CVE-2020-6439, CVE-2020-6440, CVE-2020-6441, CVE-2020-6442,
CVE-2020-6443, CVE-2020-6444, CVE-2020-6445, CVE-2020-6446, CVE-2020-6447,
and CVE-2020-6448.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 81.
(%chromium-version): Set to 81.0.4044.92.
(%ungoogled-revision): Set to b484ad4c0bdb696c86d941798ae6b0e2bd0db35d.
(%debian-revision): Set to debian/81.0.4044.92-1.
(%chromium-origin, %ungoogled-origin, %debian-origin): Update hashes.
(ungoogled-chromium-source): Remove PYTHON-2 from the environment, use
PYTHON-WRAPPER instead. Call "remove_bundled_libraries.py" using PYTHON-2
directly.
(ungoogled-chromium)[arguments]: Remove "is_cfi=false" from #:configure-flags.
Adjust CXXFLAGS to ignore unknown compiler warnings.
[inputs]: Change from ICU4C to ICU4C-66.1.
2020-04-12 17:00:12 +00:00
|
|
|
"third_party/devtools-frontend/src/third_party/typescript" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/dom_distiller_js" ;BSD-3
|
2019-04-30 20:48:52 +00:00
|
|
|
"third_party/emoji-segmenter" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/flatbuffers" ;ASL2.0
|
2019-04-30 20:48:52 +00:00
|
|
|
"third_party/glslang" ;BSD-3, Expat, ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/google_input_tools" ;ASL2.0
|
|
|
|
|
"third_party/google_input_tools/third_party/closure_library" ;ASL2.0
|
|
|
|
|
"third_party/google_input_tools/third_party/closure_library/third_party/closure" ;Expat
|
|
|
|
|
"third_party/googletest" ;BSD-3
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/harfbuzz-ng" ;Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
|
|
|
|
|
"third_party/iccjpeg" ;IJG
|
|
|
|
|
"third_party/inspector_protocol" ;BSD-3
|
|
|
|
|
"third_party/jinja2" ;BSD-3
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
;; XXX: Unbundle this when switching back to libstdc++.
|
|
|
|
|
"third_party/jsoncpp" ;Public Domain or Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/jstemplate" ;ASL2.0
|
|
|
|
|
"third_party/khronos" ;Expat, SGI
|
|
|
|
|
"third_party/leveldatabase" ;BSD-3
|
2020-07-19 06:59:48 +00:00
|
|
|
"third_party/libavif" ;BSD-2
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/libXNVCtrl" ;Expat
|
|
|
|
|
"third_party/libaddressinput" ;ASL2.0
|
|
|
|
|
"third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
|
|
|
|
|
"third_party/libaom/source/libaom/third_party/vector" ;Expat
|
|
|
|
|
"third_party/libaom/source/libaom/third_party/x86inc" ;ISC
|
2020-02-24 21:56:30 +00:00
|
|
|
"third_party/libgifcodec" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3, BSD-2
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/libjingle_xmpp" ;BSD-3
|
|
|
|
|
"third_party/libphonenumber" ;ASL2.0
|
|
|
|
|
"third_party/libsecret" ;LGPL2.1+
|
|
|
|
|
"third_party/libsrtp" ;BSD-3
|
|
|
|
|
"third_party/libsync" ;ASL2.0
|
|
|
|
|
"third_party/libudev" ;LGPL2.1+
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
|
|
|
|
|
;; FIXME: build/linux/unbundle/libvpx.gn does not work for all users.
|
|
|
|
|
"third_party/libvpx" ;BSD-3
|
|
|
|
|
"third_party/libvpx/source/libvpx/third_party/x86inc" ;Expat
|
|
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/libwebm" ;BSD-3
|
|
|
|
|
"third_party/libxml/chromium" ;BSD-3
|
|
|
|
|
"third_party/libyuv" ;BSD-3
|
2020-07-19 06:59:48 +00:00
|
|
|
"third_party/lottie" ;Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/lss" ;BSD-3
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/mako" ;Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/markupsafe" ;BSD-3
|
|
|
|
|
"third_party/mesa_headers" ;Expat, SGI
|
|
|
|
|
"third_party/metrics_proto" ;BSD-3
|
|
|
|
|
"third_party/modp_b64" ;BSD-3
|
|
|
|
|
"third_party/nasm" ;BSD-2
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/nearby" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/node" ;Expat
|
|
|
|
|
"third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2" ;BSD-2
|
2019-11-15 16:47:02 +00:00
|
|
|
"third_party/one_euro_filter" ;BSD-3
|
2019-08-03 21:24:07 +00:00
|
|
|
"third_party/openscreen" ;BSD-3
|
2019-11-15 16:47:02 +00:00
|
|
|
"third_party/openscreen/src/third_party/tinycbor" ;Expat
|
2020-07-19 06:59:48 +00:00
|
|
|
"third_party/openscreen/src/third_party/mozilla" ;MPL1.1/GPL2+/LGPL2.1+, BSD-3
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/ots" ;BSD-3
|
|
|
|
|
"third_party/pdfium" ;BSD-3
|
|
|
|
|
"third_party/pdfium/third_party/agg23" ;Expat
|
|
|
|
|
"third_party/pdfium/third_party/base" ;BSD-3
|
|
|
|
|
"third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
|
|
|
|
|
"third_party/pdfium/third_party/skia_shared" ;BSD-3
|
|
|
|
|
"third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
|
2020-02-25 15:14:23 +00:00
|
|
|
"third_party/perfetto" ;ASL2.0
|
2019-06-12 10:00:26 +00:00
|
|
|
"third_party/pffft" ;the "FFTPACK" license, similar to BSD-3
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/ply" ;BSD-3
|
|
|
|
|
"third_party/polymer" ;BSD-3
|
2020-11-22 15:20:36 +00:00
|
|
|
"third_party/private_membership" ;ASL2.0
|
2019-11-15 16:47:02 +00:00
|
|
|
"third_party/private-join-and-compute" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/protobuf" ;BSD-3
|
|
|
|
|
"third_party/protobuf/third_party/six" ;Expat
|
|
|
|
|
"third_party/pyjson5" ;ASL2.0
|
|
|
|
|
"third_party/qcms" ;Expat
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
;; XXX: System re2 cannot be used when Chromium uses libc++ because the re2
|
|
|
|
|
;; ABI relies on libstdc++ internals. See build/linux/unbundle/re2.gn.
|
|
|
|
|
"third_party/re2" ;BSD-3
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/rnnoise" ;BSD-3
|
|
|
|
|
"third_party/s2cellid" ;ASL2.0
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/schema_org" ;CC-BY-SA3.0
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/securemessage" ;ASL2.0
|
2020-11-22 15:20:36 +00:00
|
|
|
"third_party/shaka-player" ;ASL2.0
|
|
|
|
|
"third_party/shell-encryption" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/skia" ;BSD-3
|
2019-08-03 21:24:07 +00:00
|
|
|
"third_party/skia/include/third_party/skcms" ;BSD-3
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/skia/third_party/skcms" ;BSD-3
|
2019-08-03 21:24:07 +00:00
|
|
|
"third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/smhasher" ;Expat, public domain
|
|
|
|
|
"third_party/speech-dispatcher" ;GPL2+
|
|
|
|
|
"third_party/spirv-headers" ;ASL2.0
|
|
|
|
|
"third_party/SPIRV-Tools" ;ASL2.0
|
|
|
|
|
"third_party/sqlite" ;Public domain
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/swiftshader" ;ASL2.0
|
|
|
|
|
"third_party/swiftshader/third_party/astc-encoder" ;ASL2.0
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/swiftshader/third_party/llvm-10.0" ;ASL2.0, with LLVM exception
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"third_party/swiftshader/third_party/llvm-subzero" ;NCSA
|
|
|
|
|
"third_party/swiftshader/third_party/marl" ;ASL2.0
|
|
|
|
|
"third_party/swiftshader/third_party/subzero" ;NCSA
|
|
|
|
|
"third_party/swiftshader/third_party/SPIRV-Headers" ;X11-style
|
2020-07-26 11:20:14 +00:00
|
|
|
"third_party/tcmalloc/chromium" ;BSD-3
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/ukey2" ;ASL2.0
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/usb_ids" ;BSD-3
|
|
|
|
|
"third_party/usrsctp" ;BSD-2
|
2020-07-19 06:59:48 +00:00
|
|
|
"third_party/vulkan_memory_allocator" ;Expat
|
2020-11-22 15:20:36 +00:00
|
|
|
"third_party/wayland/protocol" ;Expat
|
|
|
|
|
"third_party/wayland/stubs" ;BSD-3, Expat
|
2019-07-17 14:30:23 +00:00
|
|
|
"third_party/wayland/wayland_scanner_wrapper.py" ;BSD-3
|
|
|
|
|
"third_party/wayland-protocols" ;Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/web-animations-js" ;ASL2.0
|
|
|
|
|
"third_party/webdriver" ;ASL2.0
|
|
|
|
|
"third_party/webrtc" ;BSD-3
|
2020-07-19 06:59:48 +00:00
|
|
|
"third_party/webrtc/common_audio/third_party/ooura" ;Non-copyleft
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/webrtc/common_audio/third_party/spl_sqrt_floor" ;Public domain
|
|
|
|
|
"third_party/webrtc/modules/third_party/fft" ;Non-copyleft
|
|
|
|
|
"third_party/webrtc/modules/third_party/g711" ;Public domain
|
|
|
|
|
"third_party/webrtc/modules/third_party/g722" ;Public domain
|
|
|
|
|
"third_party/webrtc/rtc_base/third_party/base64" ;Non-copyleft
|
|
|
|
|
"third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain
|
|
|
|
|
"third_party/widevine/cdm/widevine_cdm_version.h" ;BSD-3
|
|
|
|
|
"third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
|
|
|
|
|
"third_party/woff2" ;ASL2.0
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/xcbproto" ;X11
|
2019-02-18 22:41:56 +00:00
|
|
|
"third_party/xdg-utils" ;Expat
|
|
|
|
|
"third_party/zlib/google" ;BSD-3
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"third_party/zxcvbn-cpp" ;Expat
|
2019-02-18 22:41:56 +00:00
|
|
|
"url/third_party/mozilla" ;BSD-3, MPL1.1/GPL2+/LGPL2.1+
|
2019-03-31 18:55:47 +00:00
|
|
|
"v8/src/third_party/siphash" ;Public domain
|
2019-02-18 22:41:56 +00:00
|
|
|
"v8/src/third_party/utf8-decoder" ;Expat
|
|
|
|
|
"v8/src/third_party/valgrind" ;BSD-4
|
|
|
|
|
"v8/third_party/inspector_protocol" ;BSD-3
|
|
|
|
|
"v8/third_party/v8/builtins")) ;PSFL
|
|
|
|
|
|
2020-06-25 12:23:59 +00:00
|
|
|
(define %blacklisted-files
|
|
|
|
|
;; 'third_party/blink/perf_tests/resources/svg/HarveyRayner.svg' carries a
|
|
|
|
|
;; nonfree license according to LICENSES in the same directory. As we don't
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
;; run the Blink performance tests, just remove everything to save ~70MiB.
|
2020-06-25 12:23:59 +00:00
|
|
|
'("third_party/blink/perf_tests"))
|
|
|
|
|
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
(define (debian-patch name revision hash)
|
|
|
|
|
(origin
|
|
|
|
|
(method url-fetch)
|
|
|
|
|
(uri (string-append "https://salsa.debian.org/chromium-team/chromium/-/raw/"
|
|
|
|
|
revision "/debian/patches/" name))
|
|
|
|
|
(file-name (match (string-split name #\/)
|
|
|
|
|
((category name)
|
|
|
|
|
(string-append "ungoogled-chromium-" category "-" name))))
|
|
|
|
|
(sha256 (base32 hash))))
|
|
|
|
|
|
2020-11-22 15:20:36 +00:00
|
|
|
(define %chromium-version "87.0.4280.66")
|
|
|
|
|
(define %ungoogled-revision "1f7cdef6dfa8f612afde8f988131f210612333e0")
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
(define %debian-revision "debian/84.0.4147.105-1")
|
2020-07-19 06:59:48 +00:00
|
|
|
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
(define %debian-patches
|
2020-07-19 06:59:48 +00:00
|
|
|
(list (debian-patch "system/zlib.patch" %debian-revision
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"09vqgs37w9ycc7par14wa7rnvmg9bm0z9pqg6fyl3iqvpghyjyr4")
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
(debian-patch "system/openjpeg.patch" %debian-revision
|
|
|
|
|
"0zd6v5njx1pc7i0y6mslxvpx5j4cq01mmyx55qcqx8qzkm0gm48j")))
|
|
|
|
|
|
2019-06-11 08:09:24 +00:00
|
|
|
(define %ungoogled-origin
|
|
|
|
|
(origin
|
|
|
|
|
(method git-fetch)
|
2020-03-03 23:03:57 +00:00
|
|
|
(uri (git-reference (url "https://github.com/Eloston/ungoogled-chromium")
|
2019-06-11 08:09:24 +00:00
|
|
|
(commit %ungoogled-revision)))
|
|
|
|
|
(file-name (git-file-name "ungoogled-chromium"
|
|
|
|
|
(string-take %ungoogled-revision 7)))
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
2020-11-22 15:20:36 +00:00
|
|
|
"1cka9h7znkmilz9ld4s8pw1jjq2p7br03g3agcnqrk591y5h141i"))))
|
2019-08-03 21:24:07 +00:00
|
|
|
|
2020-10-23 08:17:21 +00:00
|
|
|
(define %guix-patches
|
2020-11-05 15:15:22 +00:00
|
|
|
(list (local-file
|
|
|
|
|
(assume-valid-file-name
|
|
|
|
|
(search-patch "ungoogled-chromium-system-nspr.patch")))
|
|
|
|
|
(local-file
|
|
|
|
|
(assume-valid-file-name
|
|
|
|
|
(search-patch "ungoogled-chromium-extension-search-path.patch")))))
|
2020-10-23 08:17:21 +00:00
|
|
|
|
2020-06-25 12:22:31 +00:00
|
|
|
;; This is a source 'snippet' that does the following:
|
|
|
|
|
;; *) Applies various patches for unbundling purposes and libstdc++ compatibility.
|
|
|
|
|
;; *) Runs the ungoogled patch-, domain substitution-, and scrubbing scripts.
|
2019-03-31 18:55:47 +00:00
|
|
|
;; *) Prunes all third_party directories that are not explicitly preserved.
|
|
|
|
|
;; *) Adjusts "GN" build files such that system libraries are preferred.
|
2020-06-25 12:22:31 +00:00
|
|
|
(define ungoogled-chromium-snippet
|
|
|
|
|
;; Note: delay to cope with cyclic module imports at the top level.
|
|
|
|
|
(delay
|
|
|
|
|
#~(begin
|
|
|
|
|
(let ((chromium-dir (getcwd)))
|
|
|
|
|
(set-path-environment-variable
|
|
|
|
|
"PATH" '("bin")
|
|
|
|
|
(list #+patch #+python-wrapper #+xz))
|
2019-08-03 21:24:07 +00:00
|
|
|
|
2020-06-25 12:22:31 +00:00
|
|
|
;; Apply patches before running the ungoogled scripts because
|
|
|
|
|
;; domain substitution may break some of the patches.
|
|
|
|
|
(format #t "Applying assorted build fixes...~%")
|
|
|
|
|
(force-output)
|
|
|
|
|
(for-each (lambda (patch)
|
|
|
|
|
(invoke "patch" "-p1" "--force" "--input"
|
|
|
|
|
patch "--no-backup-if-mismatch"))
|
2020-11-22 15:20:36 +00:00
|
|
|
(append '#+%debian-patches '#+%guix-patches))
|
2019-02-18 22:41:56 +00:00
|
|
|
|
2020-06-25 12:22:31 +00:00
|
|
|
(with-directory-excursion #+%ungoogled-origin
|
|
|
|
|
(format #t "Ungooglifying...~%")
|
|
|
|
|
(force-output)
|
|
|
|
|
(invoke "python" "utils/prune_binaries.py" chromium-dir
|
|
|
|
|
"pruning.list")
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
(invoke "python" "utils/patches.py" "apply" chromium-dir
|
|
|
|
|
"patches")
|
2020-06-25 12:22:31 +00:00
|
|
|
(invoke "python" "utils/domain_substitution.py" "apply" "-r"
|
|
|
|
|
"domain_regex.list" "-f" "domain_substitution.list"
|
|
|
|
|
"-c" "/tmp/domainscache.tar.gz" chromium-dir))
|
2019-02-18 22:41:56 +00:00
|
|
|
|
2020-06-25 12:23:59 +00:00
|
|
|
;; Run after the ungoogled scripts to avoid interfering with
|
|
|
|
|
;; patches or file lists.
|
|
|
|
|
(format #t "Removing blacklisted files...~%")
|
|
|
|
|
(force-output)
|
|
|
|
|
(for-each delete-file-recursively '#$%blacklisted-files)
|
|
|
|
|
|
2020-06-25 12:22:31 +00:00
|
|
|
(format #t "Pruning third party files...~%")
|
|
|
|
|
(force-output)
|
|
|
|
|
(apply invoke (string-append #+python-2 "/bin/python")
|
|
|
|
|
"build/linux/unbundle/remove_bundled_libraries.py"
|
|
|
|
|
"--do-remove" '#$%preserved-third-party-files)
|
2019-02-18 22:41:56 +00:00
|
|
|
|
2020-06-25 12:22:31 +00:00
|
|
|
(format #t "Replacing GN files...~%")
|
|
|
|
|
(force-output)
|
2020-07-21 14:51:00 +00:00
|
|
|
(substitute* "tools/generate_shim_headers/generate_shim_headers.py"
|
|
|
|
|
;; The "is_official_build" configure option enables certain
|
|
|
|
|
;; release optimizations like those used in the commercial
|
|
|
|
|
;; Chrome browser. Unfortunately it also requires using the
|
|
|
|
|
;; bundled libraries: lose that restriction.
|
|
|
|
|
(("#if defined\\(OFFICIAL_BUILD\\)")
|
|
|
|
|
"#if 0"))
|
2020-06-25 12:22:31 +00:00
|
|
|
(invoke "python" "build/linux/unbundle/replace_gn_files.py"
|
|
|
|
|
"--system-libraries" "ffmpeg" "flac" "fontconfig"
|
|
|
|
|
"freetype" "harfbuzz-ng" "icu" "libdrm" "libevent"
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"libjpeg" "libpng" "libwebp" "libxml" "libxslt"
|
|
|
|
|
"openh264" "opus" "snappy" "zlib")
|
2020-06-25 12:22:31 +00:00
|
|
|
#t))))
|
2019-02-18 22:41:56 +00:00
|
|
|
|
|
|
|
|
(define opus+custom
|
|
|
|
|
(package/inherit opus
|
|
|
|
|
(name "opus+custom")
|
|
|
|
|
(arguments
|
|
|
|
|
(substitute-keyword-arguments (package-arguments opus)
|
|
|
|
|
((#:configure-flags flags ''())
|
|
|
|
|
;; Opus Custom is an optional extension of the Opus
|
|
|
|
|
;; specification that allows for unsupported frame
|
|
|
|
|
;; sizes. Chromium requires that this is enabled.
|
|
|
|
|
`(cons "--enable-custom-modes"
|
|
|
|
|
,flags))))))
|
|
|
|
|
|
2020-07-21 14:51:00 +00:00
|
|
|
;; 'make-ld-wrapper' can only work with an 'ld' executable, so we need
|
|
|
|
|
;; this trick to make it wrap 'lld'.
|
2020-07-23 17:35:53 +00:00
|
|
|
(define (make-lld-wrapper lld)
|
|
|
|
|
(define lld-as-ld
|
|
|
|
|
(computed-file "lld-ld"
|
|
|
|
|
#~(begin
|
|
|
|
|
(mkdir #$output)
|
|
|
|
|
(mkdir (string-append #$output "/bin"))
|
|
|
|
|
(symlink #$(file-append lld "/bin/lld")
|
|
|
|
|
(string-append #$output "/bin/ld")))))
|
|
|
|
|
|
|
|
|
|
;; Create a wrapper for LLD that inserts appropriate -rpath entries.
|
|
|
|
|
(define lld-wrapper
|
|
|
|
|
(make-ld-wrapper "lld-wrapper"
|
|
|
|
|
#:binutils lld-as-ld))
|
|
|
|
|
|
|
|
|
|
;; Clang looks for an 'ld.lld' executable, so we need to symlink it back.
|
2020-07-21 14:51:00 +00:00
|
|
|
(computed-file "lld-wrapped"
|
|
|
|
|
#~(begin
|
|
|
|
|
(mkdir #$output)
|
|
|
|
|
(mkdir (string-append #$output "/bin"))
|
|
|
|
|
(symlink #$(file-append lld-wrapper "/bin/ld")
|
|
|
|
|
(string-append #$output "/bin/lld"))
|
|
|
|
|
(symlink "lld" (string-append #$output "/bin/ld.lld")))))
|
|
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
(define-public ungoogled-chromium
|
|
|
|
|
(package
|
|
|
|
|
(name "ungoogled-chromium")
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
(version (string-append %chromium-version "-0."
|
2020-06-26 11:50:20 +00:00
|
|
|
(string-take %ungoogled-revision 7)))
|
2019-02-18 22:41:56 +00:00
|
|
|
(synopsis "Graphical web browser")
|
2020-06-25 12:22:31 +00:00
|
|
|
(source (origin
|
|
|
|
|
(method url-fetch)
|
|
|
|
|
(uri (string-append "https://commondatastorage.googleapis.com"
|
|
|
|
|
"/chromium-browser-official/chromium-"
|
2020-10-21 21:55:42 +00:00
|
|
|
%chromium-version ".tar.xz"))
|
2020-06-25 12:22:31 +00:00
|
|
|
(sha256
|
|
|
|
|
(base32
|
2020-11-22 15:20:36 +00:00
|
|
|
"0hgpg31gkksqgyvycsan7l7vjypc7cr6ikjfygf2zv7dhbmf9a19"))
|
2020-06-25 12:22:31 +00:00
|
|
|
(modules '((guix build utils)))
|
|
|
|
|
(snippet (force ungoogled-chromium-snippet))))
|
2019-02-18 22:41:56 +00:00
|
|
|
(build-system gnu-build-system)
|
|
|
|
|
(arguments
|
|
|
|
|
`(#:tests? #f
|
2020-01-05 08:26:42 +00:00
|
|
|
;; FIXME: Chromiums RUNPATH lacks entries for some libraries.
|
2019-02-18 22:41:56 +00:00
|
|
|
#:validate-runpath? #f
|
|
|
|
|
#:modules ((guix build gnu-build-system)
|
|
|
|
|
(guix build utils)
|
|
|
|
|
(srfi srfi-26))
|
|
|
|
|
#:configure-flags
|
|
|
|
|
;; See tools/gn/docs/cookbook.md and
|
|
|
|
|
;; https://www.chromium.org/developers/gn-build-configuration
|
2020-11-22 15:20:36 +00:00
|
|
|
;; for usage. Run "gn args . --list" in the Release
|
2019-02-18 22:41:56 +00:00
|
|
|
;; directory for an exhaustive list of supported flags.
|
|
|
|
|
;; (Note: The 'configure' phase will do that for you.)
|
|
|
|
|
(list "is_debug=false"
|
2020-07-21 14:51:00 +00:00
|
|
|
;; Use the "official" release optimizations, as opposed to
|
|
|
|
|
;; a developer build.
|
|
|
|
|
"is_official_build=true"
|
2020-07-19 06:59:48 +00:00
|
|
|
(string-append "max_jobs_per_link="
|
2020-11-22 15:20:36 +00:00
|
|
|
;; Respect the default cap of 8 jobs.
|
|
|
|
|
(number->string (max 8 (parallel-job-count))))
|
2020-02-24 21:56:30 +00:00
|
|
|
"clang_use_chrome_plugins=false"
|
2020-11-22 15:20:36 +00:00
|
|
|
"chrome_pgo_phase=0"
|
2019-02-18 22:41:56 +00:00
|
|
|
"use_sysroot=false"
|
|
|
|
|
"goma_dir=\"\""
|
|
|
|
|
"enable_nacl=false"
|
|
|
|
|
"enable_nacl_nonsfi=false"
|
|
|
|
|
"use_unofficial_version_number=false"
|
|
|
|
|
"treat_warnings_as_errors=false"
|
|
|
|
|
"use_official_google_api_keys=false"
|
|
|
|
|
"fieldtrial_testing_like_official_build=true"
|
|
|
|
|
"safe_browsing_mode=0"
|
|
|
|
|
"enable_mdns=false"
|
|
|
|
|
"enable_one_click_signin=false"
|
|
|
|
|
"enable_reading_list=false"
|
|
|
|
|
"enable_remoting=false"
|
|
|
|
|
"enable_reporting=false"
|
|
|
|
|
"enable_service_discovery=false"
|
2019-06-12 10:00:26 +00:00
|
|
|
"enable_vr=false"
|
2019-02-21 07:43:46 +00:00
|
|
|
"enable_widevine=false"
|
2019-02-18 22:41:56 +00:00
|
|
|
;; Disable type-checking for the Web UI to avoid a Java dependency.
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"enable_js_type_check=false"
|
2019-02-18 22:41:56 +00:00
|
|
|
|
|
|
|
|
;; Define a custom toolchain that simply looks up CC, AR and
|
|
|
|
|
;; friends from the environment.
|
|
|
|
|
"custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
|
|
|
|
|
"host_toolchain=\"//build/toolchain/linux/unbundle:default\""
|
|
|
|
|
|
|
|
|
|
;; Prefer system libraries.
|
|
|
|
|
"use_system_freetype=true"
|
|
|
|
|
"use_system_harfbuzz=true"
|
|
|
|
|
"use_system_lcms2=true"
|
|
|
|
|
"use_system_libdrm=true"
|
|
|
|
|
"use_system_libjpeg=true"
|
2019-05-01 15:46:06 +00:00
|
|
|
"use_system_libopenjpeg2=true"
|
2019-02-18 22:41:56 +00:00
|
|
|
"use_system_libpng=true"
|
2020-11-22 15:20:36 +00:00
|
|
|
"use_system_wayland_scanner=true"
|
|
|
|
|
(string-append "system_wayland_scanner_path=\""
|
|
|
|
|
(assoc-ref %build-inputs "wayland-scanner")
|
|
|
|
|
"/bin/wayland-scanner\"")
|
|
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
"use_system_zlib=true"
|
|
|
|
|
"use_gnome_keyring=false" ;deprecated by libsecret
|
|
|
|
|
"use_openh264=true"
|
|
|
|
|
"use_pulseaudio=true"
|
|
|
|
|
"link_pulseaudio=true"
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
"icu_use_data_file=false"
|
2020-07-21 14:51:00 +00:00
|
|
|
|
|
|
|
|
;; FIXME: Using system protobuf with "is_official_build" causes an
|
|
|
|
|
;; invalid opcode and "protoc-gen-plugin: Plugin killed by signal 4".
|
|
|
|
|
;;"perfetto_use_system_protobuf=true"
|
2019-03-31 15:57:48 +00:00
|
|
|
|
|
|
|
|
;; VA-API acceleration is currently only supported on x86_64-linux.
|
|
|
|
|
,@(if (string-prefix? "x86_64" (or (%current-target-system)
|
|
|
|
|
(%current-system)))
|
|
|
|
|
'("use_vaapi=true")
|
|
|
|
|
'())
|
2019-02-18 22:41:56 +00:00
|
|
|
|
2019-08-03 21:24:07 +00:00
|
|
|
;; Do not artifically restrict formats supported by system ffmpeg.
|
2019-02-18 22:41:56 +00:00
|
|
|
"proprietary_codecs=true"
|
|
|
|
|
"ffmpeg_branding=\"Chrome\""
|
|
|
|
|
|
|
|
|
|
;; WebRTC stuff.
|
|
|
|
|
"rtc_use_h264=true"
|
2020-11-22 15:20:36 +00:00
|
|
|
"rtc_use_pipewire=true"
|
|
|
|
|
"rtc_link_pipewire=true"
|
2019-02-18 22:41:56 +00:00
|
|
|
;; Don't use bundled sources.
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
"rtc_build_json=true" ;FIXME: libc++ std::string ABI difference
|
2019-02-18 22:41:56 +00:00
|
|
|
"rtc_build_libevent=false"
|
|
|
|
|
"rtc_build_libvpx=false"
|
|
|
|
|
"rtc_build_opus=false"
|
|
|
|
|
"rtc_build_ssl=false"
|
|
|
|
|
"rtc_build_libsrtp=true" ;FIXME: fails to find headers
|
|
|
|
|
"rtc_build_usrsctp=true" ;TODO: package this
|
|
|
|
|
(string-append "rtc_ssl_root=\""
|
|
|
|
|
(assoc-ref %build-inputs "openssl")
|
|
|
|
|
"/include/openssl\""))
|
|
|
|
|
#:phases
|
|
|
|
|
(modify-phases %standard-phases
|
|
|
|
|
(add-after 'unpack 'patch-stuff
|
2020-01-05 08:26:42 +00:00
|
|
|
(lambda _
|
2019-02-18 22:41:56 +00:00
|
|
|
(substitute*
|
|
|
|
|
'("base/process/launch_posix.cc"
|
|
|
|
|
"base/third_party/dynamic_annotations/dynamic_annotations.c"
|
|
|
|
|
"sandbox/linux/seccomp-bpf/sandbox_bpf.cc"
|
|
|
|
|
"sandbox/linux/services/credentials.cc"
|
|
|
|
|
"sandbox/linux/services/namespace_utils.cc"
|
|
|
|
|
"sandbox/linux/services/syscall_wrappers.cc"
|
|
|
|
|
"sandbox/linux/syscall_broker/broker_host.cc")
|
|
|
|
|
(("include \"base/third_party/valgrind/") "include \"valgrind/"))
|
|
|
|
|
|
|
|
|
|
(for-each (lambda (file)
|
|
|
|
|
(substitute* file
|
|
|
|
|
;; Fix opus include path.
|
|
|
|
|
;; Do not substitute opus_private.h.
|
|
|
|
|
(("#include \"opus\\.h\"")
|
|
|
|
|
"#include \"opus/opus.h\"")
|
|
|
|
|
(("#include \"opus_custom\\.h\"")
|
|
|
|
|
"#include \"opus/opus_custom.h\"")
|
|
|
|
|
(("#include \"opus_defines\\.h\"")
|
|
|
|
|
"#include \"opus/opus_defines.h\"")
|
|
|
|
|
(("#include \"opus_multistream\\.h\"")
|
|
|
|
|
"#include \"opus/opus_multistream.h\"")
|
|
|
|
|
(("#include \"opus_types\\.h\"")
|
|
|
|
|
"#include \"opus/opus_types.h\"")))
|
|
|
|
|
(find-files (string-append "third_party/webrtc/modules"
|
|
|
|
|
"/audio_coding/codecs/opus")))
|
|
|
|
|
|
2019-11-15 16:47:02 +00:00
|
|
|
;; Many files try to include ICU headers from "third_party/icu/...".
|
|
|
|
|
;; Remove the "third_party/" prefix to use system headers instead.
|
|
|
|
|
(substitute* (find-files "chrome" "\\.cc$")
|
|
|
|
|
(("third_party/icu/source/(common|i18n)/")
|
|
|
|
|
""))
|
|
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
;; XXX: Should be unnecessary when use_system_lcms2=true.
|
2019-11-15 16:47:02 +00:00
|
|
|
(substitute* "third_party/pdfium/core/fxcodec/icc/iccmodule.h"
|
2019-02-18 22:41:56 +00:00
|
|
|
(("include \"third_party/lcms/include/lcms2\\.h\"")
|
|
|
|
|
"include \"lcms2.h\""))
|
|
|
|
|
|
|
|
|
|
(substitute*
|
|
|
|
|
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h"
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
(("include \"third_party/curl")
|
|
|
|
|
"include \"curl"))
|
2019-02-18 22:41:56 +00:00
|
|
|
|
2019-08-03 21:24:07 +00:00
|
|
|
(substitute* '("components/viz/common/gpu/vulkan_context_provider.h"
|
2020-07-19 06:59:48 +00:00
|
|
|
"components/viz/common/resources/resource_format_utils.h"
|
|
|
|
|
"gpu/config/gpu_util.cc")
|
|
|
|
|
(("third_party/vulkan_headers/include/") ""))
|
2019-02-18 22:41:56 +00:00
|
|
|
|
2019-03-31 18:55:47 +00:00
|
|
|
(substitute* "third_party/skia/include/gpu/vk/GrVkVulkan.h"
|
2019-08-03 21:24:07 +00:00
|
|
|
(("include/third_party/vulkan/") ""))
|
2019-03-31 18:55:47 +00:00
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
#t))
|
2020-01-05 08:26:42 +00:00
|
|
|
(add-after 'patch-stuff 'add-absolute-references
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(let ((cups (assoc-ref inputs "cups"))
|
|
|
|
|
(nss (assoc-ref inputs "nss"))
|
|
|
|
|
(mesa (assoc-ref inputs "mesa"))
|
|
|
|
|
(udev (assoc-ref inputs "udev")))
|
|
|
|
|
(substitute* "printing/cups_config_helper.py"
|
|
|
|
|
(("cups_config =.*")
|
|
|
|
|
(string-append "cups_config = '" cups
|
|
|
|
|
"/bin/cups-config'\n")))
|
|
|
|
|
(substitute* "crypto/nss_util.cc"
|
|
|
|
|
(("libnssckbi\\.so")
|
|
|
|
|
(string-append nss "/lib/nss/libnssckbi.so")))
|
|
|
|
|
(substitute* "device/udev_linux/udev1_loader.cc"
|
|
|
|
|
(("libudev\\.so\\.1")
|
|
|
|
|
(string-append udev "/lib/libudev.so.1")))
|
2020-10-22 16:29:26 +00:00
|
|
|
|
2020-11-03 19:51:27 +00:00
|
|
|
(substitute*
|
|
|
|
|
'("ui/ozone/platform/x11/gl_ozone_glx.cc"
|
|
|
|
|
"ui/ozone/common/egl_util.cc"
|
|
|
|
|
"ui/gl/init/gl_initializer_linux_x11.cc"
|
|
|
|
|
"third_party/angle/src/libANGLE/renderer/gl/glx/FunctionsGLX.cpp")
|
2020-10-22 16:29:26 +00:00
|
|
|
(("libGL\\.so\\.1")
|
|
|
|
|
(string-append mesa "/lib/libGL.so.1"))
|
|
|
|
|
(("libEGL\\.so\\.1")
|
|
|
|
|
(string-append mesa "/lib/libEGL.so.1"))
|
|
|
|
|
(("libGLESv2\\.so\\.2")
|
|
|
|
|
(string-append mesa "/lib/libGLESv2.so.2")))
|
2020-01-05 08:26:42 +00:00
|
|
|
#t)))
|
2019-02-18 22:41:56 +00:00
|
|
|
(add-before 'configure 'prepare-build-environment
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
;; Define the GN toolchain.
|
2020-07-21 14:51:00 +00:00
|
|
|
(setenv "AR" "llvm-ar") (setenv "NM" "llvm-nm")
|
2020-02-24 21:56:30 +00:00
|
|
|
(setenv "CC" "clang") (setenv "CXX" "clang++")
|
2019-02-18 22:41:56 +00:00
|
|
|
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
(let ((gcc (assoc-ref inputs "gcc")))
|
|
|
|
|
;; Remove the default compiler from CPLUS_INCLUDE_PATH to
|
|
|
|
|
;; prevent header conflict with the bundled libcxx.
|
|
|
|
|
(setenv "CPLUS_INCLUDE_PATH"
|
|
|
|
|
(string-join
|
|
|
|
|
(delete (string-append gcc "/include/c++")
|
|
|
|
|
(string-split (getenv "CPLUS_INCLUDE_PATH")
|
|
|
|
|
#\:))
|
|
|
|
|
":"))
|
|
|
|
|
(format #t
|
|
|
|
|
"environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%"
|
|
|
|
|
(getenv "CPLUS_INCLUDE_PATH")))
|
|
|
|
|
|
gnu: ungoogled-chromium: Update to 81.0.4044.92-0.b484ad4 [security fixes].
This release fixes CVE-2020-6430, CVE-2020-6456, CVE-2020-6431, CVE-2020-6432,
CVE-2020-6433, CVE-2020-6434, CVE-2020-6435, CVE-2020-6436, CVE-2020-6437,
CVE-2020-6438, CVE-2020-6439, CVE-2020-6440, CVE-2020-6441, CVE-2020-6442,
CVE-2020-6443, CVE-2020-6444, CVE-2020-6445, CVE-2020-6446, CVE-2020-6447,
and CVE-2020-6448.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 81.
(%chromium-version): Set to 81.0.4044.92.
(%ungoogled-revision): Set to b484ad4c0bdb696c86d941798ae6b0e2bd0db35d.
(%debian-revision): Set to debian/81.0.4044.92-1.
(%chromium-origin, %ungoogled-origin, %debian-origin): Update hashes.
(ungoogled-chromium-source): Remove PYTHON-2 from the environment, use
PYTHON-WRAPPER instead. Call "remove_bundled_libraries.py" using PYTHON-2
directly.
(ungoogled-chromium)[arguments]: Remove "is_cfi=false" from #:configure-flags.
Adjust CXXFLAGS to ignore unknown compiler warnings.
[inputs]: Change from ICU4C to ICU4C-66.1.
2020-04-12 17:00:12 +00:00
|
|
|
(setenv "CXXFLAGS"
|
|
|
|
|
(string-join
|
|
|
|
|
'(;; Do not optimize away null pointer safety checks.
|
|
|
|
|
"-fno-delete-null-pointer-checks"
|
|
|
|
|
;; Disable warnings about unknown warnings that require
|
|
|
|
|
;; Clang plugins or newer versions.
|
|
|
|
|
"-Wno-unknown-warning-option")))
|
2019-08-03 21:24:07 +00:00
|
|
|
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
(setenv "CFLAGS" "-Wno-unknown-warning-option")
|
|
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
;; TODO: pre-compile instead. Avoids a race condition.
|
|
|
|
|
(setenv "PYTHONDONTWRITEBYTECODE" "1")
|
|
|
|
|
|
|
|
|
|
;; XXX: How portable is this.
|
|
|
|
|
(mkdir-p "third_party/node/linux/node-linux-x64")
|
|
|
|
|
(symlink (string-append (assoc-ref inputs "node") "/bin")
|
|
|
|
|
"third_party/node/linux/node-linux-x64/bin")
|
|
|
|
|
|
|
|
|
|
#t))
|
|
|
|
|
(replace 'configure
|
|
|
|
|
(lambda* (#:key configure-flags #:allow-other-keys)
|
|
|
|
|
(let ((args (string-join configure-flags " ")))
|
|
|
|
|
;; Generate ninja build files.
|
|
|
|
|
(invoke "gn" "gen" "out/Release"
|
|
|
|
|
(string-append "--args=" args))
|
|
|
|
|
|
|
|
|
|
;; Print the full list of supported arguments as well as
|
|
|
|
|
;; their current status for convenience.
|
|
|
|
|
(format #t "Dumping configure flags...\n")
|
|
|
|
|
(invoke "gn" "args" "out/Release" "--list"))))
|
2019-11-18 14:25:07 +00:00
|
|
|
(add-before 'build 'increase-resource-limits
|
|
|
|
|
(lambda _
|
2019-11-15 16:47:02 +00:00
|
|
|
;; XXX: Chromiums linking step requires a lot of simultaneous file
|
|
|
|
|
;; accesses. Having a too low ulimit will result in bogus linker
|
|
|
|
|
;; errors such as "foo.a: error adding symbols: malformed archive".
|
|
|
|
|
|
2020-01-05 08:30:09 +00:00
|
|
|
;; Try increasing the soft resource limit of max open files to 2048,
|
2019-11-15 16:47:02 +00:00
|
|
|
;; or equal to the hard limit, whichever is lower.
|
|
|
|
|
(call-with-values (lambda () (getrlimit 'nofile))
|
|
|
|
|
(lambda (soft hard)
|
2020-01-05 08:30:09 +00:00
|
|
|
(when (and soft (< soft 2048))
|
2019-11-15 16:47:02 +00:00
|
|
|
(if hard
|
2020-01-05 08:30:09 +00:00
|
|
|
(setrlimit 'nofile (min hard 2048) hard)
|
|
|
|
|
(setrlimit 'nofile 2048 #f))
|
2019-11-15 16:47:02 +00:00
|
|
|
(format #t
|
|
|
|
|
"increased maximum number of open files from ~d to ~d~%"
|
2020-01-05 08:30:09 +00:00
|
|
|
soft (if hard (min hard 2048) 2048)))))
|
2019-11-18 14:25:07 +00:00
|
|
|
#t))
|
|
|
|
|
(replace 'build
|
|
|
|
|
(lambda* (#:key (parallel-build? #t) #:allow-other-keys)
|
2019-02-18 22:41:56 +00:00
|
|
|
(invoke "ninja" "-C" "out/Release"
|
2019-06-20 20:47:36 +00:00
|
|
|
"-j" (if parallel-build?
|
|
|
|
|
(number->string (parallel-job-count))
|
|
|
|
|
"1")
|
2019-02-18 22:41:56 +00:00
|
|
|
"chrome"
|
|
|
|
|
"chromedriver")))
|
|
|
|
|
(replace 'install
|
|
|
|
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
|
|
|
|
(let* ((out (assoc-ref outputs "out"))
|
|
|
|
|
(bin (string-append out "/bin"))
|
|
|
|
|
(exe (string-append bin "/chromium"))
|
|
|
|
|
(lib (string-append out "/lib"))
|
|
|
|
|
(man (string-append out "/share/man/man1"))
|
|
|
|
|
(applications (string-append out "/share/applications"))
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
(libs '("chrome_100_percent.pak"
|
|
|
|
|
"chrome_200_percent.pak"
|
|
|
|
|
"resources.pak"
|
2020-11-03 19:51:27 +00:00
|
|
|
"v8_context_snapshot.bin"
|
|
|
|
|
;; Chromium ships its own libGL
|
|
|
|
|
;; implementation called ANGLE.
|
|
|
|
|
"libEGL.so" "libGLESv2.so"))
|
2019-02-18 22:41:56 +00:00
|
|
|
(locales (string-append lib "/locales"))
|
|
|
|
|
(resources (string-append lib "/resources"))
|
|
|
|
|
(preferences (assoc-ref inputs "master-preferences"))
|
|
|
|
|
(gtk+ (assoc-ref inputs "gtk+"))
|
|
|
|
|
(sh (which "sh")))
|
|
|
|
|
|
|
|
|
|
(substitute* '("chrome/app/resources/manpage.1.in"
|
|
|
|
|
"chrome/installer/linux/common/desktop.template")
|
|
|
|
|
(("@@MENUNAME@@") "Chromium")
|
|
|
|
|
(("@@PACKAGE@@") "chromium")
|
|
|
|
|
(("/usr/bin/@@USR_BIN_SYMLINK_NAME@@") exe))
|
|
|
|
|
|
|
|
|
|
(mkdir-p man)
|
|
|
|
|
(copy-file "chrome/app/resources/manpage.1.in"
|
|
|
|
|
(string-append man "/chromium.1"))
|
|
|
|
|
|
|
|
|
|
(mkdir-p applications)
|
|
|
|
|
(copy-file "chrome/installer/linux/common/desktop.template"
|
|
|
|
|
(string-append applications "/chromium.desktop"))
|
|
|
|
|
|
|
|
|
|
(mkdir-p lib)
|
|
|
|
|
(copy-file preferences (string-append lib "/master_preferences"))
|
|
|
|
|
|
|
|
|
|
(with-directory-excursion "out/Release"
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
(for-each (cut install-file <> lib) libs)
|
2019-02-18 22:41:56 +00:00
|
|
|
(copy-file "chrome" (string-append lib "/chromium"))
|
|
|
|
|
|
|
|
|
|
(copy-recursively "locales" locales)
|
|
|
|
|
(copy-recursively "resources" resources)
|
|
|
|
|
|
|
|
|
|
(mkdir-p bin)
|
|
|
|
|
(symlink "../lib/chromium" exe)
|
|
|
|
|
(install-file "chromedriver" bin)
|
|
|
|
|
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
(for-each (lambda (so)
|
|
|
|
|
(install-file so (string-append lib "/swiftshader")))
|
|
|
|
|
(find-files "swiftshader" "\\.so$"))
|
|
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
(wrap-program exe
|
|
|
|
|
;; Avoid file manager crash. See <https://bugs.gnu.org/26593>.
|
2019-06-18 19:55:30 +00:00
|
|
|
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share")))))
|
|
|
|
|
|
|
|
|
|
(with-directory-excursion "chrome/app/theme/chromium"
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (size)
|
|
|
|
|
(let ((icons (string-append out "/share/icons/hicolor/"
|
|
|
|
|
size "x" size "/apps")))
|
|
|
|
|
(mkdir-p icons)
|
|
|
|
|
(copy-file (string-append "product_logo_" size ".png")
|
|
|
|
|
(string-append icons "/chromium.png"))))
|
2019-11-15 16:47:02 +00:00
|
|
|
'("24" "48" "64" "128" "256")))
|
2019-06-18 19:55:30 +00:00
|
|
|
#t))))))
|
2019-02-18 22:41:56 +00:00
|
|
|
(native-inputs
|
|
|
|
|
`(("bison" ,bison)
|
gnu: ungoogled-chromium: Update to 86.0.4240.75-0.c34a56d.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 86.
Include bundled libc++, jsoncpp, re2 and libvpx for now.
(gentoo-patch, chromium-gcc-patchset, %gentoo-patches, %gentoo-revision,
xcb-proto/python2): Remove variables.
(%debian-revision, %debian-patches): Update to debian/84.0.4147.105-1. Remove
jsoncpp unbundling patch.
(%ungoogled-revision, %ungoogled-origin): Update to c34a56db4c121238fface560.
(%chromium-version, arch-patch, %arch-revision): New variables.
(%arch-patches): Add more patches.
(ungoogled-chromium-snippet): Don't apply GCC or Gentoo patches. Don't
unbundle libvpx or re2.
(ungoogled-chromium): Update to 86.0.4240.75-0.c34a56d.
[arguments]: Adjust #:configure-flags and substitutions for 86. Add
workaround for building with bundled libc++. Adjust install phase to take a
hard coded list of files instead of using SCANDIR and REGEXP-EXEC.
[native-inputs]: Change from CLANG-10 to CLANG-11.
[inputs]: Remove JSONCPP, RE2 and XCB-PROTO/PYTHON2.
2020-10-18 15:39:29 +00:00
|
|
|
("clang" ,clang-11)
|
2019-02-18 22:41:56 +00:00
|
|
|
("gn" ,gn)
|
|
|
|
|
("gperf" ,gperf)
|
2020-07-23 17:35:53 +00:00
|
|
|
("ld-wrapper" ,(make-lld-wrapper lld))
|
2019-02-18 22:41:56 +00:00
|
|
|
("ninja" ,ninja)
|
|
|
|
|
("node" ,node)
|
|
|
|
|
("pkg-config" ,pkg-config)
|
|
|
|
|
("which" ,which)
|
|
|
|
|
|
|
|
|
|
;; This file contains defaults for new user profiles.
|
|
|
|
|
("master-preferences" ,(local-file "aux-files/chromium/master-preferences.json"))
|
|
|
|
|
|
|
|
|
|
("python-beautifulsoup4" ,python2-beautifulsoup4)
|
|
|
|
|
("python-html5lib" ,python2-html5lib)
|
2020-11-22 15:20:36 +00:00
|
|
|
("python" ,python-2)
|
|
|
|
|
("wayland-scanner" ,wayland)))
|
2019-02-18 22:41:56 +00:00
|
|
|
(inputs
|
|
|
|
|
`(("alsa-lib" ,alsa-lib)
|
|
|
|
|
("atk" ,atk)
|
|
|
|
|
("cups" ,cups)
|
|
|
|
|
("curl" ,curl)
|
|
|
|
|
("dbus" ,dbus)
|
|
|
|
|
("dbus-glib" ,dbus-glib)
|
|
|
|
|
("expat" ,expat)
|
|
|
|
|
("flac" ,flac)
|
2020-07-19 06:59:48 +00:00
|
|
|
("ffmpeg" ,ffmpeg)
|
2019-02-18 22:41:56 +00:00
|
|
|
("fontconfig" ,fontconfig)
|
|
|
|
|
("freetype" ,freetype)
|
|
|
|
|
("gdk-pixbuf" ,gdk-pixbuf)
|
|
|
|
|
("glib" ,glib)
|
|
|
|
|
("gtk+" ,gtk+)
|
|
|
|
|
("harfbuzz" ,harfbuzz)
|
gnu: ungoogled-chromium: Update to 83.0.4103.106-0.f08ce8b [security fixes].
This fixes CVE-2020-6465, CVE-2020-6466, CVE-2020-6467, CVE-2020-6468,
CVE-2020-6469, CVE-2020-6470, CVE-2020-6471, CVE-2020-6472, CVE-2020-6473,
CVE-2020-6474, CVE-2020-6475, CVE-2020-6476, CVE-2020-6477, CVE-2020-6478,
CVE-2020-6479, CVE-2020-6480, CVE-2020-6481, CVE-2020-6482, CVE-2020-6483,
CVE-2020-6484, CVE-2020-6485, CVE-2020-6486, CVE-2020-6487, CVE-2020-6488,
CVE-2020-6489, CVE-2020-6490, CVE-2020-6491, CVE-2020-6493, CVE-2020-6494,
CVE-2020-6495, CVE-2020-6496, CVE-2020-6497, and CVE-2020-6498.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: New files.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 83.
(%chromium-version): Set to 83.0.4103.106.
(%ungoogled-revision): Set to f08ce8b3f1300ef0750b5d6bf967b9cbbfd9a56d.
(%gentoo-revision, %gentoo-patches, %debian-patches): New variables.
(gentoo-patch, debian-patch): New procedures.
(%chromium-origin, %ungoogled-origin): Update hashes.
(ungoogled-chromium-source): Don't apply patches from %DEBIAN-ORIGIN, but take
%GENTOO-PATCHES, %DEBIAN-PATCHES, and the local patch files.
(ungoogled-chromium)[arguments]: Remove "enable_swiftshader=false" from
#:configure-flags. Add "icu_use_data_file=false". Set CFLAGS in phase.
Remove obsolete substitution. Adjust install phase to install .so files for
ANGLE and Swiftshader.
[native-inputs]: Change from CLANG-9 to CLANG-10.
[inputs]: Replace ICU4C with ICU4C-67.
(ungoogled-chromium/wayland): Remove obsolete substitution. Add
"ozone_platform_x11=true" in #:configure-flags.
2020-06-21 19:44:07 +00:00
|
|
|
("icu4c" ,icu4c-67)
|
2019-02-18 22:41:56 +00:00
|
|
|
("lcms" ,lcms)
|
|
|
|
|
("libevent" ,libevent)
|
|
|
|
|
("libffi" ,libffi)
|
|
|
|
|
("libjpeg-turbo" ,libjpeg-turbo)
|
|
|
|
|
("libpng" ,libpng)
|
|
|
|
|
("libva" ,libva)
|
2020-01-21 20:18:11 +00:00
|
|
|
("libvpx" ,libvpx)
|
2019-02-18 22:41:56 +00:00
|
|
|
("libwebp" ,libwebp)
|
|
|
|
|
("libx11" ,libx11)
|
|
|
|
|
("libxcb" ,libxcb)
|
|
|
|
|
("libxcomposite" ,libxcomposite)
|
|
|
|
|
("libxcursor" ,libxcursor)
|
|
|
|
|
("libxdamage" ,libxdamage)
|
|
|
|
|
("libxext" ,libxext)
|
|
|
|
|
("libxfixes" ,libxfixes)
|
|
|
|
|
("libxi" ,libxi)
|
|
|
|
|
("libxml2" ,libxml2)
|
|
|
|
|
("libxrandr" ,libxrandr)
|
|
|
|
|
("libxrender" ,libxrender)
|
|
|
|
|
("libxscrnsaver" ,libxscrnsaver)
|
|
|
|
|
("libxslt" ,libxslt)
|
|
|
|
|
("libxtst" ,libxtst)
|
|
|
|
|
("mesa" ,mesa)
|
|
|
|
|
("minizip" ,minizip)
|
|
|
|
|
("mit-krb5" ,mit-krb5)
|
|
|
|
|
("nss" ,nss)
|
|
|
|
|
("openh264" ,openh264)
|
|
|
|
|
("openjpeg" ,openjpeg) ;PDFium only
|
|
|
|
|
("openssl" ,openssl)
|
|
|
|
|
("opus" ,opus+custom)
|
|
|
|
|
("pango" ,pango)
|
|
|
|
|
("pciutils" ,pciutils)
|
2020-11-22 15:20:36 +00:00
|
|
|
("pipewire" ,pipewire)
|
2019-02-18 22:41:56 +00:00
|
|
|
("pulseaudio" ,pulseaudio)
|
|
|
|
|
("snappy" ,snappy)
|
|
|
|
|
("speech-dispatcher" ,speech-dispatcher)
|
|
|
|
|
("udev" ,eudev)
|
|
|
|
|
("valgrind" ,valgrind)
|
2020-11-22 15:20:36 +00:00
|
|
|
("vulkan-headers" ,vulkan-headers)
|
|
|
|
|
("wayland" ,wayland)))
|
2020-10-23 08:17:21 +00:00
|
|
|
(native-search-paths
|
|
|
|
|
(list (search-path-specification
|
|
|
|
|
(variable "CHROMIUM_EXTENSION_DIRECTORY")
|
|
|
|
|
(separator #f) ;single entry
|
|
|
|
|
(files '("share/chromium/extensions")))))
|
2019-06-21 09:05:05 +00:00
|
|
|
|
2019-07-09 22:54:29 +00:00
|
|
|
;; Building Chromium takes ... a very long time. On a single core, a busy
|
|
|
|
|
;; mid-end x86 system may need more than 24 hours to complete the build.
|
2020-03-06 13:37:39 +00:00
|
|
|
(properties '((timeout . 144000) ;40 hours
|
|
|
|
|
;; The linking step may take more than an hour on some hardware.
|
2020-06-21 19:45:21 +00:00
|
|
|
(max-silent-time . 7200)
|
|
|
|
|
(cpe-name . "chrome")))
|
2019-06-21 09:05:05 +00:00
|
|
|
|
2019-02-18 22:41:56 +00:00
|
|
|
(home-page "https://github.com/Eloston/ungoogled-chromium")
|
|
|
|
|
(description
|
|
|
|
|
"Ungoogled-Chromium is the Chromium web browser, with some functionality
|
|
|
|
|
disabled in order to protect the users privacy.")
|
|
|
|
|
;; Chromium is developed as BSD-3, but bundles a large number of third-party
|
|
|
|
|
;; components with other licenses. For full information, see chrome://credits.
|
|
|
|
|
(license (list license:bsd-3
|
|
|
|
|
license:bsd-2
|
|
|
|
|
license:expat
|
|
|
|
|
license:asl2.0
|
|
|
|
|
license:mpl1.1
|
|
|
|
|
license:mpl2.0
|
|
|
|
|
license:public-domain
|
|
|
|
|
license:isc
|
|
|
|
|
(license:non-copyleft "chrome://credits"
|
|
|
|
|
"See chrome://credits for more information.")
|
|
|
|
|
license:lgpl2.1+))))
|
2019-07-17 14:30:23 +00:00
|
|
|
|
|
|
|
|
(define-public ungoogled-chromium/wayland
|
2020-11-22 15:20:36 +00:00
|
|
|
(package
|
|
|
|
|
(inherit ungoogled-chromium)
|
2019-07-17 14:30:23 +00:00
|
|
|
(name "ungoogled-chromium-wayland")
|
2020-11-22 15:20:36 +00:00
|
|
|
(native-inputs '())
|
2019-07-17 14:30:23 +00:00
|
|
|
(inputs
|
2020-11-22 15:20:36 +00:00
|
|
|
`(("bash" ,bash-minimal)
|
|
|
|
|
("glibc-locales" ,glibc-utf8-locales)
|
|
|
|
|
("ungoogled-chromium" ,ungoogled-chromium)))
|
|
|
|
|
(build-system trivial-build-system)
|
2019-07-17 14:30:23 +00:00
|
|
|
(arguments
|
2020-11-22 15:20:36 +00:00
|
|
|
'(#:modules ((guix build utils))
|
|
|
|
|
#:builder
|
|
|
|
|
(begin
|
|
|
|
|
(use-modules (guix build utils))
|
|
|
|
|
(let* ((bash (assoc-ref %build-inputs "bash"))
|
|
|
|
|
(chromium (assoc-ref %build-inputs "ungoogled-chromium"))
|
|
|
|
|
(locales (assoc-ref %build-inputs "glibc-locales"))
|
|
|
|
|
(out (assoc-ref %outputs "out"))
|
|
|
|
|
(exe (string-append out "/bin/chromium")))
|
|
|
|
|
|
|
|
|
|
;; Use a Unicode locale so we can substitute the file below.
|
|
|
|
|
(setenv "GUIX_LOCPATH" (string-append locales "/lib/locale"))
|
|
|
|
|
(setlocale LC_ALL "en_US.utf8")
|
|
|
|
|
|
|
|
|
|
(mkdir-p (dirname exe))
|
|
|
|
|
(symlink (string-append chromium "/bin/chromedriver")
|
|
|
|
|
(string-append out "/bin/chromedriver"))
|
|
|
|
|
|
|
|
|
|
(call-with-output-file exe
|
|
|
|
|
(lambda (port)
|
|
|
|
|
(format port "#!~a
|
|
|
|
|
exec ~a --enable-features=UseOzonePlatform --ozone-platform=wayland $@"
|
|
|
|
|
(string-append bash "/bin/bash")
|
|
|
|
|
(string-append chromium "/bin/chromium"))))
|
|
|
|
|
(chmod exe #o555)
|
|
|
|
|
|
|
|
|
|
;; Provide the manual and .desktop file.
|
|
|
|
|
(copy-recursively (string-append chromium "/share")
|
|
|
|
|
(string-append out "/share"))
|
|
|
|
|
(substitute* (string-append
|
|
|
|
|
out "/share/applications/chromium.desktop")
|
|
|
|
|
((chromium) out))
|
|
|
|
|
#t))))))
|
