summary refs log tree commit diff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-07-19 08:59:48 +0200
committerMarius Bakke <marius@gnu.org>2020-07-19 14:23:16 +0200
commitc91c132fc42c6e67140b393b963d7ced009f093e (patch)
tree1cd9a75687f00410588868d395f150ac1e668ff3 /gnu/local.mk
parentddedd2727029d0dcabf3f7a0b763f94ace5d5622 (diff)
downloadguix-c91c132fc42c6e67140b393b963d7ced009f093e.tar.gz
gnu: ungoogled-chromium: Update to 84.0.4147.89-0.df199c0.
* gnu/packages/patches/ungoogled-chromium-system-jsoncpp.patch,
gnu/packages/patches/ungoogled-chromium-system-zlib.patch: Delete files.
* gnu/packages/patches/ungoogled-chromium-system-nspr.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/chromium.scm (%preserved-third-party-files): Adjust for 84.
(%ungoogled-revision): Set to df199c04ff367da59ce52a23a3f3b305dd3b00c3.
(%debian-revision): Set to debian/83.0.4103.116-3.
(%gentoo-revision): Set to f3f649046d31ebdbc8c4a302b2384504eff78027.
(chromium-gcc-patchset, %chromium-gcc-patches): New variables.
(%gentoo-patches): Remove GCC patches, which have been moved to the above
repo.  Add ffmpeg compatibility patch.
(%debian-patches): Add zlib and jsoncpp patch; remove nspr patch.
(%ungoogled-origin): Update hash.
(ungoogled-chromium-snippet): Add the new GCC patches.  Remove obsolete local
patches, add new.
(xcb-proto/python2): New variable.
(ungoogled-chromium): Update to 84.0.4147.89-0..df199c0.
[arguments]: Add "is_unsafe_developer_build", "max_jobs_per_link",
"exclude_unwind_tables", "xcbproto_path", "perfetto_use_system_protobuf" to
 #:configure-flags.  Remove "linux_use_bundled_binutils".  Adjust vulkan
header substitutions.
[native-inputs]: Remove YASM.
[inputs]: Change from FFMPEG-4.2 to FFMPEG.  Add PROTOBUF and XCB-PROTO/PYTHON2.
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index e8915990bc..0eac01d72d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1594,8 +1594,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch	\
   %D%/packages/patches/ucx-tcp-iface-ioctl.patch		\
   %D%/packages/patches/udiskie-no-appindicator.patch		\
-  %D%/packages/patches/ungoogled-chromium-system-jsoncpp.patch	\
-  %D%/packages/patches/ungoogled-chromium-system-zlib.patch	\
+  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
   %D%/packages/patches/unzip-CVE-2014-8139.patch		\
   %D%/packages/patches/unzip-CVE-2014-8140.patch		\
   %D%/packages/patches/unzip-CVE-2014-8141.patch		\