| 1 |
commit: 132bcec3313ca0a46c29c9bfce4b2da232f35598 |
| 2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 23 06:11:15 2021 +0000 |
| 4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 23 06:11:36 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132bcec3 |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump to 95.0.4638.17 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 11 |
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/chromium/Manifest | 2 +- |
| 14 |
...mium-95.0.4638.10.ebuild => chromium-95.0.4638.17.ebuild} | 12 ++++++++---- |
| 15 |
2 files changed, 9 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 18 |
index 8f98cc26faf..c116cc24cfa 100644 |
| 19 |
--- a/www-client/chromium/Manifest |
| 20 |
+++ b/www-client/chromium/Manifest |
| 21 |
@@ -4,5 +4,5 @@ DIST chromium-93.0.4577.82.tar.xz 1038808440 BLAKE2B ec6fd783b40b8e02bbf6cc48eb1 |
| 22 |
DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e |
| 23 |
DIST chromium-94.0.4606.54.tar.xz 1039891076 BLAKE2B 2591eb0f886f08e2fad3b8ebff109f1da7336417e9be9f480a4278554dff4886def6fb52b5e3488b9f85b7f5025f9f835469484c6a4860b0d38eb3f77a627a50 SHA512 3e5e2a800decd30d0297aa9926f7d0f47ab47f930ed42131c53b9533d0245b09d8f2b404b0f84ca083817c6c55f7dce6518046fde4889e5d79be505043fdc084 |
| 24 |
DIST chromium-95-patchset-4.tar.xz 4308 BLAKE2B e91cb78d2357af8c0dfc66e4d148c5e6ef20cf9a811bcebf411e07cc5af73f30760d889842923afb2945e57b0f67330deac3f9068b6ce7c487482a6434e5c672 SHA512 152657e13afab3caca6a9ff6c0b51203f5bc8b0a4075a4396794d7a85caddce1b26f989c7dede5fa9a54316334099d21889e6767885fbf974260a6e9bd90df9d |
| 25 |
-DIST chromium-95.0.4638.10.tar.xz 1212124668 BLAKE2B 74b1ca8200914768160ef9c358d1b448c4df587660b972c399b6ea456ed6519530776c6e83f3c14215ffc8476891dfe1c7e007bf8eb25a9373c1843ecd6728eb SHA512 f2007d9f93478cddfa4e6a34c2c7f0c3d21317b9cdbd48ef8f25cb81c63350c6aeec18412e73b519c5a48a306d80050ec2ecd48ed3dd9ce983979d2c97d48653 |
| 26 |
+DIST chromium-95.0.4638.17.tar.xz 1212354740 BLAKE2B 5f4d65a3c21814cebe10134e73ec6c546beef92a5c3dbfa4798dd42141c0705cabee9f3b11a22c01422cf7e41e197ff7d249d84422728eb5411f691f7029f1ff SHA512 1e730e2855343d86d30a21e2d2cd7687b72f247e9e443c26f91aca3326bb70bacf525f23eea4b047ed441a6134774c1b0d931c601ff8125df226a1caff5989b7 |
| 27 |
DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb |
| 28 |
|
| 29 |
diff --git a/www-client/chromium/chromium-95.0.4638.10.ebuild b/www-client/chromium/chromium-95.0.4638.17.ebuild |
| 30 |
similarity index 98% |
| 31 |
rename from www-client/chromium/chromium-95.0.4638.10.ebuild |
| 32 |
rename to www-client/chromium/chromium-95.0.4638.17.ebuild |
| 33 |
index 342045a937f..ec95c0b0bed 100644 |
| 34 |
--- a/www-client/chromium/chromium-95.0.4638.10.ebuild |
| 35 |
+++ b/www-client/chromium/chromium-95.0.4638.17.ebuild |
| 36 |
@@ -21,7 +21,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} |
| 37 |
LICENSE="BSD" |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="~amd64 ~arm64 ~x86" |
| 40 |
-IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-icu vaapi wayland widevine" |
| 41 |
+IUSE="component-build cups cpu_flags_arm_neon debug +hangouts headless +js-type-check kerberos official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu vaapi wayland widevine" |
| 42 |
REQUIRED_USE=" |
| 43 |
component-build? ( !suid ) |
| 44 |
screencast? ( wayland ) |
| 45 |
@@ -55,7 +55,7 @@ COMMON_DEPEND=" |
| 46 |
>=media-libs/alsa-lib-1.0.19:= |
| 47 |
media-libs/fontconfig:= |
| 48 |
>=media-libs/freetype-2.11.0-r1:= |
| 49 |
- >=media-libs/harfbuzz-2.9.0:0=[icu(-)] |
| 50 |
+ system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] ) |
| 51 |
media-libs/libjpeg-turbo:= |
| 52 |
media-libs/libpng:= |
| 53 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 54 |
@@ -343,7 +343,6 @@ src_prepare() { |
| 55 |
third_party/google_input_tools/third_party/closure_library |
| 56 |
third_party/google_input_tools/third_party/closure_library/third_party/closure |
| 57 |
third_party/googletest |
| 58 |
- third_party/harfbuzz-ng/utils |
| 59 |
third_party/hunspell |
| 60 |
third_party/iccjpeg |
| 61 |
third_party/inspector_protocol |
| 62 |
@@ -488,6 +487,11 @@ src_prepare() { |
| 63 |
if ! use system-icu; then |
| 64 |
keeplibs+=( third_party/icu ) |
| 65 |
fi |
| 66 |
+ if use system-harfbuzz; then |
| 67 |
+ keeplibs+=( third_party/harfbuzz-ng/utils ) |
| 68 |
+ else |
| 69 |
+ keeplibs+=( third_party/harfbuzz-ng ) |
| 70 |
+ fi |
| 71 |
if use wayland && ! use headless ; then |
| 72 |
keeplibs+=( third_party/wayland ) |
| 73 |
fi |
| 74 |
@@ -612,7 +616,7 @@ src_configure() { |
| 75 |
build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die |
| 76 |
|
| 77 |
# See dependency logic in third_party/BUILD.gn |
| 78 |
- myconf_gn+=" use_system_harfbuzz=true" |
| 79 |
+ myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)" |
| 80 |
|
| 81 |
# Disable deprecated libgnome-keyring dependency, bug #713012 |
| 82 |
myconf_gn+=" use_gnome_keyring=false" |
Archives