summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www-client/chromium/Manifest4
-rw-r--r--www-client/chromium/chromium-95.0.4638.10.ebuild (renamed from www-client/chromium/chromium-95.0.4636.4.ebuild)6
-rw-r--r--www-client/chromium/files/chromium-95-maldoca-zlib.patch13
3 files changed, 20 insertions, 3 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0c20e1aaebb..8449f124851 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -3,6 +3,6 @@ DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca
DIST chromium-93.0.4577.82.tar.xz 1038808440 BLAKE2B ec6fd783b40b8e02bbf6cc48eb1ff0a99b059d64de16e91eeadf69bf3297d2e6d0430823d6d15a2a838c579f84c9f5f894da345009b126a84509781998d57ffc SHA512 730e4a316fee4a5be1bf95301cf25c0c1d192ceeb661f051c1d74b7083fe928f1c5fd24c744cbbda6ef39c9edc64607a2621644e153e5e3de2201b5ac60e4d64
DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e
DIST chromium-94.0.4606.50.tar.xz 1039765752 BLAKE2B 7bf10b9de827e96dde2d3882554f9020e0c26158a9045a3d0131ed8ef34ea241d383ec9ba161e792ce9c68fa712a4677e395a5923817d9c69d4c6c305c8fc3c6 SHA512 27128f56d4e1bab5d63dee908e60022f38693e27eb9e1d81754dc8da59dedc23897e5e962c6be125af067f181e9273a1eebd623256faba9692de667b41e85aeb
-DIST chromium-95-patchset-3.tar.xz 4040 BLAKE2B 4d3b31cf667b4a6b4ef0987d990a6e8bd5c57b3a3c0a71063360d77b0834154fff398b22e13a1de40c2b56833d33c1cb3fb364e4a47861d6fff8a311ddb64911 SHA512 7fbd1b76e28e5ebccd22fbcb735c93149702ea4c1fe4096f4e37730d97336eb84253ba2aab8a6d055d0dc0d519672608229e3b9941653594427e76c6ea07a0cc
-DIST chromium-95.0.4636.4.tar.xz 1212923072 BLAKE2B 3ae2700ef6f8dfab61baa1862f1f7c198fc6807ca64db04366631381db6630343b094f70faac737b440ba517fdb5bb1ae803f38a10f6303d282e1a71451ff33b SHA512 1839d66780746fd93f46d856dd42388b5fae54f297c637d1dfe4913deaa7e2b5cdedc64d7e82c7bd8779ee07d825aec620eae4b2927fb1b7120577f5935966a6
+DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d
+DIST chromium-95.0.4638.10.tar.xz 1212124668 BLAKE2B 74b1ca8200914768160ef9c358d1b448c4df587660b972c399b6ea456ed6519530776c6e83f3c14215ffc8476891dfe1c7e007bf8eb25a9373c1843ecd6728eb SHA512 f2007d9f93478cddfa4e6a34c2c7f0c3d21317b9cdbd48ef8f25cb81c63350c6aeec18412e73b519c5a48a306d80050ec2ecd48ed3dd9ce983979d2c97d48653
DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
diff --git a/www-client/chromium/chromium-95.0.4636.4.ebuild b/www-client/chromium/chromium-95.0.4638.10.ebuild
index bd299825d13..342045a937f 100644
--- a/www-client/chromium/chromium-95.0.4636.4.ebuild
+++ b/www-client/chromium/chromium-95.0.4638.10.ebuild
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="4"
PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
@@ -233,6 +233,7 @@ src_prepare() {
"${WORKDIR}/patches"
"${FILESDIR}/chromium-93-EnumTable-crash.patch"
"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
+ "${FILESDIR}/chromium-95-maldoca-zlib.patch"
"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
"${FILESDIR}/chromium-shim_headers.patch"
)
@@ -379,6 +380,9 @@ src_prepare() {
third_party/lss
third_party/lzma_sdk
third_party/mako
+ third_party/maldoca
+ third_party/maldoca/src/third_party/tensorflow_protos
+ third_party/maldoca/src/third_party/zlibwrapper
third_party/markupsafe
third_party/mesa
third_party/metrics_proto
diff --git a/www-client/chromium/files/chromium-95-maldoca-zlib.patch b/www-client/chromium/files/chromium-95-maldoca-zlib.patch
new file mode 100644
index 00000000000..1f64a66ddcd
--- /dev/null
+++ b/www-client/chromium/files/chromium-95-maldoca-zlib.patch
@@ -0,0 +1,13 @@
+diff --git a/third_party/maldoca/BUILD.gn b/third_party/maldoca/BUILD.gn
+index eeab205..29a0a2c 100644
+--- a/third_party/maldoca/BUILD.gn
++++ b/third_party/maldoca/BUILD.gn
+@@ -224,7 +224,7 @@ source_set("maldoca-ole") {
+ "//third_party/libxml",
+ "//third_party/protobuf:protobuf_lite",
+ "//third_party/re2",
+- "//third_party/zlib:zlib_common_headers",
++ "//third_party/zlib:zlib",
+ "//third_party/zlib/google:zip",
+ ]
+