1 |
commit: cc8b4484b9a3461e41f80d3bc0ce4d39f59ee180 |
2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 5 13:12:30 2022 +0000 |
4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 5 13:13:23 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc8b4484 |
7 |
|
8 |
www-client/chromium: dev channel bump to 104.0.5098.0 |
9 |
|
10 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
11 |
|
12 |
www-client/chromium/Manifest | 4 +- |
13 |
....5083.0.ebuild => chromium-104.0.5098.0.ebuild} | 3 +- |
14 |
.../files/chromium-104-tflite-system-zlib.patch | 70 ++++++++++++++++++++++ |
15 |
3 files changed, 74 insertions(+), 3 deletions(-) |
16 |
|
17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
18 |
index 8f4ff2d39ee3..d5b4399de3fa 100644 |
19 |
--- a/www-client/chromium/Manifest |
20 |
+++ b/www-client/chromium/Manifest |
21 |
@@ -2,6 +2,6 @@ DIST chromium-102-patchset-6.tar.xz 4780 BLAKE2B c59d23779fd769176e1cd92884dd259 |
22 |
DIST chromium-102.0.5005.61.tar.xz 1433350708 BLAKE2B 7130b2c9dbc67783499003fd98f95e050bac3580e9dd6c9f4fee320e9eed876cd8c3ec29d9e9f23c78c159b1b622fbe0511750baeb6f8117f176612e1571747f SHA512 4b5d48debafef0a38105e259f97eac6e25eae1147ce67e357c3ce1e8e7700950af63117ff104b71cfbdfcaa0b31925d1b686ab1be6c52b32dad819c7e38f1846 |
23 |
DIST chromium-103-patchset-4.tar.xz 7220 BLAKE2B 3dc9670be01d4bbfd24e8d305ea72e6bd911062a9a012c7548fca76ec34998b54ff31ef0118be5db9fdde3839365103cb06b29ff2ab167ad4313b4b64cba3a63 SHA512 54fb3600bb42ffcd6168f9741432879877bb5d206c11b3874249faaaff13288bffd4e7336f055c0c619efba02aa694de6abde394a6964c0ff6b33d9e3aed1691 |
24 |
DIST chromium-103.0.5060.33.tar.xz 1470671736 BLAKE2B e036115ff0439e2e8ab18d97ebf720e88fa48a65f99eca9bcd37d30b9c9b4e5a376242783c83e65678dbcd73764e1a10fb62c95aabca3b10e3a86ad54c79fd00 SHA512 3c03d39bc182202c3849a040951d3414e2539444fd87a8740775612c0a80cc76de9a286eadc9af97e9db35e342bed092e20ac997a059673c6c4357f73c8841f8 |
25 |
-DIST chromium-104-patchset-1.tar.xz 5792 BLAKE2B 7febe80c63c598812c86196fb0279132dfb3fec827841e51aafdc8e24e3eb04834578d351b049275688d1b0ae7e17fcbf47b5ec4905b943cbb7570f4d4c1ec3f SHA512 ff87c1150c74a97f4d08da2af4266861503df45061b57283a098225078a118e240c3ef7ad0e943d6bb56d3b73a4d839109b1344dec833d4acd0ed5f07230dff5 |
26 |
-DIST chromium-104.0.5083.0.tar.xz 1443051464 BLAKE2B 9746f6a0fb058e12507565c59b2e582efb9188bf6faeaaf17c45a1b52269b780a54f507bc6377c6790e7f37ddb8333e193ab5190352d3eb74c39cd80756ea4c3 SHA512 d8a88805710934fed80ce00a144f1e7517149a6ee495df5a2f9fa4095de6125a59d261041c72f45bd1087060899cc1afc437f32373a74ba7bb3a8c378b9d7503 |
27 |
+DIST chromium-104-patchset-2.tar.xz 6168 BLAKE2B 57e9f2090315d2fa9baa0d285e40fd7809b35a897fba7684672d04850c2b59ea1bc11383654a8178ece2d4baa9bb2e248898d2435618b9e8a995461d6e92ac53 SHA512 f23effc604051c18acfad3bfb974efd4aa675b84135f4eb95e0dd97261dcc9099f283a8015854c375499370f4155bb9fad51fca59555ec2f41f2d7ab90be7208 |
28 |
+DIST chromium-104.0.5098.0.tar.xz 1479242536 BLAKE2B 6dff915d90ef0a08b6bb31ef0b46a7cb827f8698b8443564b0f03b731d36d37cb4de9d249cab5e5a6808a0190fba5c5756feee719b4c7630bccef2024ecfcd6f SHA512 3864a2dce49e4ab984d4d30514edefcb8eef313575f07254940fe6f5974d2b7d6ebc48ab80e6a92017ce8c96bcdb5f15f7dfc048bb8457de16806f8c34db2b3f |
29 |
DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc |
30 |
|
31 |
diff --git a/www-client/chromium/chromium-104.0.5083.0.ebuild b/www-client/chromium/chromium-104.0.5098.0.ebuild |
32 |
similarity index 99% |
33 |
rename from www-client/chromium/chromium-104.0.5083.0.ebuild |
34 |
rename to www-client/chromium/chromium-104.0.5098.0.ebuild |
35 |
index 394904049912..f5937f520544 100644 |
36 |
--- a/www-client/chromium/chromium-104.0.5083.0.ebuild |
37 |
+++ b/www-client/chromium/chromium-104.0.5098.0.ebuild |
38 |
@@ -16,7 +16,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils py |
39 |
|
40 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
41 |
HOMEPAGE="https://chromium.org/" |
42 |
-PATCHSET="1" |
43 |
+PATCHSET="2" |
44 |
PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" |
45 |
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz |
46 |
https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz |
47 |
@@ -311,6 +311,7 @@ src_prepare() { |
48 |
"${FILESDIR}/chromium-93-InkDropHost-crash.patch" |
49 |
"${FILESDIR}/chromium-98-EnumTable-crash.patch" |
50 |
"${FILESDIR}/chromium-98-gtk4-build.patch" |
51 |
+ "${FILESDIR}/chromium-104-tflite-system-zlib.patch" |
52 |
"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" |
53 |
"${FILESDIR}/chromium-shim_headers.patch" |
54 |
"${FILESDIR}/chromium-cross-compile.patch" |
55 |
|
56 |
diff --git a/www-client/chromium/files/chromium-104-tflite-system-zlib.patch b/www-client/chromium/files/chromium-104-tflite-system-zlib.patch |
57 |
new file mode 100644 |
58 |
index 000000000000..91ef5726bc8d |
59 |
--- /dev/null |
60 |
+++ b/www-client/chromium/files/chromium-104-tflite-system-zlib.patch |
61 |
@@ -0,0 +1,70 @@ |
62 |
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc |
63 |
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc |
64 |
+@@ -21,8 +21,8 @@ limitations under the License. |
65 |
+ #include "absl/status/status.h" // from @com_google_absl |
66 |
+ #include "absl/strings/str_format.h" // from @com_google_absl |
67 |
+ #include "absl/strings/string_view.h" // from @com_google_absl |
68 |
+-#include "contrib/minizip/ioapi.h" |
69 |
+-#include "contrib/minizip/unzip.h" |
70 |
++#include "third_party/zlib/contrib/minizip/ioapi.h" |
71 |
++#include "third_party/zlib/contrib/minizip/unzip.h" |
72 |
+ #include "flatbuffers/flatbuffers.h" // from @flatbuffers |
73 |
+ #include "tensorflow/lite/schema/schema_generated.h" |
74 |
+ #include "tensorflow_lite_support/cc/common.h" |
75 |
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc |
76 |
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc |
77 |
+@@ -19,8 +19,8 @@ limitations under the License. |
78 |
+ #include <cstring> |
79 |
+ #include <functional> |
80 |
+ |
81 |
+-#include "contrib/minizip/ioapi.h" |
82 |
+-#include "contrib/minizip/zip.h" |
83 |
++#include "third_party/zlib/contrib/minizip/ioapi.h" |
84 |
++#include "third_party/zlib/contrib/minizip/zip.h" |
85 |
+ #include "flatbuffers/flatbuffers.h" // from @flatbuffers |
86 |
+ #include "tensorflow/lite/schema/schema_generated.h" |
87 |
+ #include "tensorflow_lite_support/cc/common.h" |
88 |
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc |
89 |
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc |
90 |
+@@ -19,7 +19,7 @@ limitations under the License. |
91 |
+ #include <cstdio> |
92 |
+ |
93 |
+ #include "absl/strings/string_view.h" // from @com_google_absl |
94 |
+-#include "contrib/minizip/ioapi.h" |
95 |
++#include "third_party/zlib/contrib/minizip/ioapi.h" |
96 |
+ |
97 |
+ namespace tflite { |
98 |
+ namespace metadata { |
99 |
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h |
100 |
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h |
101 |
+@@ -19,7 +19,7 @@ limitations under the License. |
102 |
+ #include <cstdlib> |
103 |
+ |
104 |
+ #include "absl/strings/string_view.h" // from @com_google_absl |
105 |
+-#include "contrib/minizip/ioapi.h" |
106 |
++#include "third_party/zlib/contrib/minizip/ioapi.h" |
107 |
+ |
108 |
+ namespace tflite { |
109 |
+ namespace metadata { |
110 |
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc |
111 |
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc |
112 |
+@@ -19,7 +19,7 @@ limitations under the License. |
113 |
+ #include <cstdio> |
114 |
+ |
115 |
+ #include "absl/strings/string_view.h" // from @com_google_absl |
116 |
+-#include "contrib/minizip/ioapi.h" |
117 |
++#include "third_party/zlib/contrib/minizip/ioapi.h" |
118 |
+ |
119 |
+ namespace tflite { |
120 |
+ namespace metadata { |
121 |
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h |
122 |
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h |
123 |
+@@ -19,7 +19,7 @@ limitations under the License. |
124 |
+ #include <cstdlib> |
125 |
+ |
126 |
+ #include "absl/strings/string_view.h" // from @com_google_absl |
127 |
+-#include "contrib/minizip/ioapi.h" |
128 |
++#include "third_party/zlib/contrib/minizip/ioapi.h" |
129 |
+ |
130 |
+ namespace tflite { |
131 |
+ namespace metadata { |