diff options
author | Marius Bakke <marius@gnu.org> | 2020-07-19 08:59:48 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-07-19 14:23:16 +0200 |
commit | c91c132fc42c6e67140b393b963d7ced009f093e (patch) | |
tree | 1cd9a75687f00410588868d395f150ac1e668ff3 /gnu/packages/patches/ungoogled-chromium-system-zlib.patch | |
parent | ddedd2727029d0dcabf3f7a0b763f94ace5d5622 (diff) | |
download | guix-patches-c91c132fc42c6e67140b393b963d7ced009f093e.tar guix-patches-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/packages/patches/ungoogled-chromium-system-zlib.patch')
-rw-r--r-- | gnu/packages/patches/ungoogled-chromium-system-zlib.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/gnu/packages/patches/ungoogled-chromium-system-zlib.patch b/gnu/packages/patches/ungoogled-chromium-system-zlib.patch deleted file mode 100644 index b6e3c0f075..0000000000 --- a/gnu/packages/patches/ungoogled-chromium-system-zlib.patch +++ /dev/null @@ -1,47 +0,0 @@ -Use zlib instead of the bundled lzma_sdk. - -Adapted from Debian: -https://salsa.debian.org/chromium-team/chromium/-/blob/master/debian/patches/system/zlib.patch - -diff --git a/courgette/BUILD.gn b/courgette/BUILD.gn ---- a/courgette/BUILD.gn -+++ b/courgette/BUILD.gn -@@ -58,7 +58,6 @@ static_library("courgette_lib") { - - deps = [ - "//base", -- "//third_party/lzma_sdk", - ] - - public_deps = [ -@@ -79,7 +78,6 @@ source_set("courgette_common") { - ] - deps = [ - "//base", -- "//third_party/lzma_sdk", - ] - } - -diff --git a/courgette/crc.cc b/courgette/crc.cc ---- a/courgette/crc.cc -+++ b/courgette/crc.cc -@@ -7,6 +7,8 @@ - #include <stdint.h> - #include <stddef.h> - -+#define COURGETTE_USE_CRC_LIB -+ - #ifdef COURGETTE_USE_CRC_LIB - # include "zlib.h" - #else -diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn ---- a/third_party/perfetto/gn/BUILD.gn -+++ b/third_party/perfetto/gn/BUILD.gn -@@ -304,7 +304,6 @@ if (enable_perfetto_zlib) { - public_configs = [ "//buildtools:zlib_config" ] - public_deps = [ "//buildtools:zlib" ] - } else { -- public_configs = [ "//third_party/zlib:zlib_config" ] - public_deps = [ "//third_party/zlib" ] - } - } |