summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Hartmann <sultan@gentoo.org>2021-09-21 23:38:17 +0200
committerStephan Hartmann <sultan@gentoo.org>2021-09-21 23:38:46 +0200
commit8a207ee99c7b92fdb83a4c9e66dc178c8ff382e5 (patch)
tree1f4ad7a2b296e6e93190d02b6fd83aa8849d1bbd
parentdev-python/werkzeug: Keyword 2.0.1-r1 for ~m68k (diff)
downloadgentoo-8a207ee99c7b92fdb83a4c9e66dc178c8ff382e5.tar.gz
gentoo-8a207ee99c7b92fdb83a4c9e66dc178c8ff382e5.tar.bz2
gentoo-8a207ee99c7b92fdb83a4c9e66dc178c8ff382e5.zip
www-client/chromium: stable channel bump to 94.0.4606.54
Bug: https://bugs.gentoo.org/814221 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Stephan Hartmann <sultan@gentoo.org>
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-94.0.4606.54.ebuild (renamed from www-client/chromium/chromium-94.0.4606.50.ebuild)12
-rw-r--r--www-client/chromium/metadata.xml1
3 files changed, 10 insertions, 5 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 8449f124851..8f98cc26faf 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,7 +2,7 @@ DIST chromium-92-glibc-2.33-patch.tar.xz 12636 BLAKE2B 0621d2135c1a0864374010c36
DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca79de6c7ee64299dff20f91cb774af676ec3d95d809b4fc5f7bd663c3b8c904a46ac9cd3ec70a5ce248456dcd48834932 SHA512 eaf0d2bc29c53c7021ccded9c14463bbde2887926c069154c0126ee1bf513bf41a38eeb3dc21023a2e9637ce3e1e541a3b2a79a990bb8becae0da0a04e57c76a
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-94.0.4606.54.tar.xz 1039891076 BLAKE2B 2591eb0f886f08e2fad3b8ebff109f1da7336417e9be9f480a4278554dff4886def6fb52b5e3488b9f85b7f5025f9f835469484c6a4860b0d38eb3f77a627a50 SHA512 3e5e2a800decd30d0297aa9926f7d0f47ab47f930ed42131c53b9533d0245b09d8f2b404b0f84ca083817c6c55f7dce6518046fde4889e5d79be505043fdc084
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-94.0.4606.50.ebuild b/www-client/chromium/chromium-94.0.4606.54.ebuild
index 5b78ebe944a..522541bb46c 100644
--- a/www-client/chromium/chromium-94.0.4606.50.ebuild
+++ b/www-client/chromium/chromium-94.0.4606.54.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-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"
+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"
REQUIRED_USE="
component-build? ( !suid )
screencast? ( wayland )
@@ -55,7 +55,7 @@ COMMON_DEPEND="
>=media-libs/alsa-lib-1.0.19:=
media-libs/fontconfig:=
>=media-libs/freetype-2.11.0-r1:=
- >=media-libs/harfbuzz-2.9.0:0=[icu(-)]
+ system-harfbuzz? ( >=media-libs/harfbuzz-2.9.0:0=[icu(-)] )
media-libs/libjpeg-turbo:=
media-libs/libpng:=
pulseaudio? ( media-sound/pulseaudio:= )
@@ -342,7 +342,6 @@ src_prepare() {
third_party/google_input_tools/third_party/closure_library
third_party/google_input_tools/third_party/closure_library/third_party/closure
third_party/googletest
- third_party/harfbuzz-ng/utils
third_party/hunspell
third_party/iccjpeg
third_party/inspector_protocol
@@ -484,6 +483,11 @@ src_prepare() {
if ! use system-icu; then
keeplibs+=( third_party/icu )
fi
+ if use system-harfbuzz; then
+ keeplibs+=( third_party/harfbuzz-ng/utils )
+ else
+ keeplibs+=( third_party/harfbuzz-ng )
+ fi
if use wayland && ! use headless ; then
keeplibs+=( third_party/wayland )
fi
@@ -610,7 +614,7 @@ src_configure() {
build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
# See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=true"
+ myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
# Disable deprecated libgnome-keyring dependency, bug #713012
myconf_gn+=" use_gnome_keyring=false"
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 7f4499480ad..6797780530d 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -17,6 +17,7 @@
<flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
<flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag>
<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
+ <flag name="system-harfbuzz">Use system harfbuzz instead of the bundled one.</flag>
<flag name="system-icu">Use system icu instead of the bundled one</flag>
<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
</use>