| 1 |
commit: 402f40cd18da25d2d1d410b4aff02a020c905b6c |
| 2 |
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 11 07:46:26 2021 +0000 |
| 4 |
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 11 07:47:00 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402f40cd |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump to 95.0.4636.4 |
| 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 | 4 +- |
| 14 |
...0.4628.3.ebuild => chromium-95.0.4636.4.ebuild} | 13 +++-- |
| 15 |
www-client/chromium/files/chromium-launcher-r7.sh | 59 ++++++++++++++++++++++ |
| 16 |
3 files changed, 70 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 19 |
index 0dcf849c765..c4c52931199 100644 |
| 20 |
--- a/www-client/chromium/Manifest |
| 21 |
+++ b/www-client/chromium/Manifest |
| 22 |
@@ -3,6 +3,6 @@ DIST chromium-93-patchset-6.tar.xz 6796 BLAKE2B 2688c68becac1187668b459f9827ffca |
| 23 |
DIST chromium-93.0.4577.63.tar.xz 1038816588 BLAKE2B aa0eeea52345c7269e614ecc32710ea6c5b071d24a773040389df38159b1c60c99f5cf0e1c9e753e776aa23e9b58ef2f2e13d8ba448c3789f10fccd364babaad SHA512 b7d85dfe34d9a37e6b4f9b440ba6aaa2778d30f8bda583151dd6e5d2ab9d6136ee1ab321bfc5f59aa10b289c07f72298db11182d06ede8574ac280b2b6d8fa2f |
| 24 |
DIST chromium-94-patchset-3.tar.xz 5052 BLAKE2B 3946b555d22792023696e85dbdb02a5fc43e39819c3a1a25c782d12771a608b068a7d11f757fa6390e7d295fe9c2b3b8085c31bd79d35edcd882a3f9f66df8dd SHA512 42f7beb412a7e691f35603625cbb316223706891f2a289301e4786ab92cfd4414d2f4a365f7637ba49a28508e18523670e59ae88512bc56afdd79d22f62f407e |
| 25 |
DIST chromium-94.0.4606.41.tar.xz 1039866508 BLAKE2B b8a47fe1554966d9302127e05e1ea2ab3314c92c637985baaec849fd68420ced88231f9df1c96a6cc9a7e6c9e000ca8ad3982002b2cd62a18830f0950726096d SHA512 1f10f52680e3765056ce00e77d3463b3c84b16d3d39c5b44646499aabc1cca9ab11bd2ea65d4154768392ac4712710e9a7f99ee691ad7b402c07ea2076453141 |
| 26 |
-DIST chromium-95-patchset-2.tar.xz 4608 BLAKE2B bf3d17c1aa79b6070f64b3178d056682b61c9fa8414478379e72e346a805eb71b0e9ae649e13c51b933aa5424f038dbe350327989e3c8f237a7a4bfe1740607c SHA512 371de2fade344b230acbb19e5abdce0d30d27f8d85a862d43e97e8b6d20bd6878401df49729ebee26b93c8bbe38c8b9a0a785ef35aa93b28f53c9e4c3b4e5900 |
| 27 |
-DIST chromium-95.0.4628.3.tar.xz 1214022616 BLAKE2B 308f1f8411a8963352da4c1464152e750ee7e33d5830a7bcd76d5f9887622dafb17ee0968c27f17270d994a6946508a24cbefab27aeb1f00085236085db5b86c SHA512 32133bd50b98cd33bef6e6d6a5b3d44db8e38ce89a6961f308a656e4c27fe6056645318d1dfb6a8ed23562de76035e4d0b1a908ce0320d159bef3d27a0f19ad8 |
| 28 |
+DIST chromium-95-patchset-3.tar.xz 4040 BLAKE2B 4d3b31cf667b4a6b4ef0987d990a6e8bd5c57b3a3c0a71063360d77b0834154fff398b22e13a1de40c2b56833d33c1cb3fb364e4a47861d6fff8a311ddb64911 SHA512 7fbd1b76e28e5ebccd22fbcb735c93149702ea4c1fe4096f4e37730d97336eb84253ba2aab8a6d055d0dc0d519672608229e3b9941653594427e76c6ea07a0cc |
| 29 |
+DIST chromium-95.0.4636.4.tar.xz 1212923072 BLAKE2B 3ae2700ef6f8dfab61baa1862f1f7c198fc6807ca64db04366631381db6630343b094f70faac737b440ba517fdb5bb1ae803f38a10f6303d282e1a71451ff33b SHA512 1839d66780746fd93f46d856dd42388b5fae54f297c637d1dfe4913deaa7e2b5cdedc64d7e82c7bd8779ee07d825aec620eae4b2927fb1b7120577f5935966a6 |
| 30 |
DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb |
| 31 |
|
| 32 |
diff --git a/www-client/chromium/chromium-95.0.4628.3.ebuild b/www-client/chromium/chromium-95.0.4636.4.ebuild |
| 33 |
similarity index 98% |
| 34 |
rename from www-client/chromium/chromium-95.0.4628.3.ebuild |
| 35 |
rename to www-client/chromium/chromium-95.0.4636.4.ebuild |
| 36 |
index d2d31bd7ebe..02edb1ff604 100644 |
| 37 |
--- a/www-client/chromium/chromium-95.0.4628.3.ebuild |
| 38 |
+++ b/www-client/chromium/chromium-95.0.4636.4.ebuild |
| 39 |
@@ -13,7 +13,7 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util |
| 40 |
|
| 41 |
DESCRIPTION="Open-source version of Google Chrome web browser" |
| 42 |
HOMEPAGE="https://chromium.org/" |
| 43 |
-PATCHSET="2" |
| 44 |
+PATCHSET="3" |
| 45 |
PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" |
| 46 |
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz |
| 47 |
https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz" |
| 48 |
@@ -749,6 +749,7 @@ src_configure() { |
| 49 |
# Enable ozone wayland and/or headless support |
| 50 |
myconf_gn+=" use_ozone=true ozone_auto_platforms=false" |
| 51 |
myconf_gn+=" ozone_platform_headless=true" |
| 52 |
+ myconf_gn+=" ozone_platform_x11=$(usex headless false true)" |
| 53 |
if use wayland || use headless; then |
| 54 |
if use headless; then |
| 55 |
myconf_gn+=" ozone_platform=\"headless\"" |
| 56 |
@@ -760,6 +761,8 @@ src_configure() { |
| 57 |
myconf_gn+=" use_xkbcommon=true" |
| 58 |
myconf_gn+=" ozone_platform=\"wayland\"" |
| 59 |
fi |
| 60 |
+ else |
| 61 |
+ myconf_gn+=" ozone_platform=\"x11\"" |
| 62 |
fi |
| 63 |
|
| 64 |
# Enable official builds |
| 65 |
@@ -839,12 +842,14 @@ src_install() { |
| 66 |
doexe out/Release/chromedriver |
| 67 |
doexe out/Release/chrome_crashpad_handler |
| 68 |
|
| 69 |
+ ozone_auto_session () { |
| 70 |
+ use wayland && ! use headless && echo true || echo false |
| 71 |
+ } |
| 72 |
local sedargs=( -e |
| 73 |
"s:/usr/lib/:/usr/$(get_libdir)/:g; |
| 74 |
- s:@@OZONE_AUTO_SESSION@@:$(usex wayland true false):g; |
| 75 |
- s:@@FORCE_OZONE_PLATFORM@@:$(usex headless true false):g" |
| 76 |
+ s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g" |
| 77 |
) |
| 78 |
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r6.sh" > chromium-launcher.sh || die |
| 79 |
+ sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die |
| 80 |
doexe chromium-launcher.sh |
| 81 |
|
| 82 |
# It is important that we name the target "chromium-browser", |
| 83 |
|
| 84 |
diff --git a/www-client/chromium/files/chromium-launcher-r7.sh b/www-client/chromium/files/chromium-launcher-r7.sh |
| 85 |
new file mode 100644 |
| 86 |
index 00000000000..1163ff3ddc0 |
| 87 |
--- /dev/null |
| 88 |
+++ b/www-client/chromium/files/chromium-launcher-r7.sh |
| 89 |
@@ -0,0 +1,59 @@ |
| 90 |
+#!/bin/bash |
| 91 |
+ |
| 92 |
+# Allow the user to override command-line flags, bug #357629. |
| 93 |
+# This is based on Debian's chromium-browser package, and is intended |
| 94 |
+# to be consistent with Debian. |
| 95 |
+for f in /etc/chromium/*; do |
| 96 |
+ [[ -f ${f} ]] && source "${f}" |
| 97 |
+done |
| 98 |
+ |
| 99 |
+# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system |
| 100 |
+# default CHROMIUM_FLAGS (from /etc/chromium/default). |
| 101 |
+CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} |
| 102 |
+ |
| 103 |
+# Let the wrapped binary know that it has been run through the wrapper |
| 104 |
+export CHROME_WRAPPER=$(readlink -f "$0") |
| 105 |
+ |
| 106 |
+PROGDIR=${CHROME_WRAPPER%/*} |
| 107 |
+ |
| 108 |
+case ":$PATH:" in |
| 109 |
+ *:$PROGDIR:*) |
| 110 |
+ # $PATH already contains $PROGDIR |
| 111 |
+ ;; |
| 112 |
+ *) |
| 113 |
+ # Append $PROGDIR to $PATH |
| 114 |
+ export PATH="$PATH:$PROGDIR" |
| 115 |
+ ;; |
| 116 |
+esac |
| 117 |
+ |
| 118 |
+if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then |
| 119 |
+ # Running as root with HOME owned by root. |
| 120 |
+ # Pass --user-data-dir to work around upstream failsafe. |
| 121 |
+ CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium |
| 122 |
+ ${CHROMIUM_FLAGS}" |
| 123 |
+fi |
| 124 |
+ |
| 125 |
+# Select session type and platform |
| 126 |
+if @@OZONE_AUTO_SESSION@@; then |
| 127 |
+ platform= |
| 128 |
+ if [[ ${XDG_SESSION_TYPE} == x11 ]]; then |
| 129 |
+ platform=x11 |
| 130 |
+ elif [[ ${XDG_SESSION_TYPE} == wayland ]]; then |
| 131 |
+ platform=wayland |
| 132 |
+ else |
| 133 |
+ if [[ -n ${WAYLAND_DISPLAY} ]]; then |
| 134 |
+ platform=wayland |
| 135 |
+ else |
| 136 |
+ platform=x11 |
| 137 |
+ fi |
| 138 |
+ fi |
| 139 |
+ if ${DISABLE_OZONE_PLATFORM:-false}; then |
| 140 |
+ platform=x11 |
| 141 |
+ fi |
| 142 |
+ CHROMIUM_FLAGS="--ozone-platform=${platform} ${CHROMIUM_FLAGS}" |
| 143 |
+fi |
| 144 |
+ |
| 145 |
+# Set the .desktop file name |
| 146 |
+export CHROME_DESKTOP="chromium-browser-chromium.desktop" |
| 147 |
+ |
| 148 |
+exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@" |
Archives