From d67d8bc63b8096dbfeb7eb7eb8f46751f51333c7 Mon Sep 17 00:00:00 2001 From: Gerben Jan Dijkman Date: Tue, 8 Jun 2021 23:33:21 +0200 Subject: [PATCH] Revert --- www-client/chromium-bin/Manifest | 12 - .../chromium-bin-90.0.4430.212.ebuild | 237 ++++++++++++++++++ .../chromium-bin-91.0.4472.69.ebuild | 5 +- 3 files changed, 241 insertions(+), 13 deletions(-) create mode 100644 www-client/chromium-bin/chromium-bin-90.0.4430.212.ebuild diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest index e69881f..e6bf16f 100644 --- a/www-client/chromium-bin/Manifest +++ b/www-client/chromium-bin/Manifest @@ -22,15 +22,3 @@ DIST chromium-bin-91.0.4472.69-1-wayland-x86_64.tar.xz 74063088 BLAKE2B aa581e15 DIST chromium-bin-91.0.4472.69-1-x11-aarch64.tar.xz 71652868 BLAKE2B 7d2d360dc07606ca8f6a53488d090e94a0ba2757e2919aa063c9d4956aa7d904ed72a9833a73bc12ef0e7dcdaa926d925bb4cc6ce939f55dd46e401dde0212e8 SHA512 70c3ea3b0c110548d2e61e0b6f8967d89fce1e6e68101d75dff0e0d0625c42ddc0895d83d53ed29ac58f5ac2a4074125eb2840c3ced1063c5008f992dd02823f DIST chromium-bin-91.0.4472.69-1-x11-i686.tar.xz 94897352 BLAKE2B 7fbb521425a419a829d24e44b3a7a369376c847eafc6fe7ddb886bfa2a1bb0a19f8c67fa8b0fd0dc47967aa5eb9e583c354741700e26d73db80a35763abb7298 SHA512 04a21a8ebe8117d36d4527745d8bc285f83f8c290f18fb38d345b9f7ed8aa0eb71e79367c8a219c7a16337c04ad322547329e05f51b4ff5ccd8d199a9db5423e DIST chromium-bin-91.0.4472.69-1-x11-x86_64.tar.xz 73897076 BLAKE2B fd6be76bc83ef33daa1f74eb04bf97987e53384faf6c6174299220b666fcc159fe3114b858ec71a295d78319e0b0121a0c653b24a1e786a242c509ac254e77c1 SHA512 724c8d8e92bfe28b9e2d65bc063cde3708dcddf1836cd46870f7ab8c673f30c1d9bd358ded1ac72141322373406e28dbe860ddfcb163ea861d3c70752de120da -DIST chromium-bin-91.0.4472.77-1-common-aarch64.tar.xz 5929860 BLAKE2B bbd873c513a4a13eaba0cf10f658c6b50ed8b9885ba3d91937ed3f37f15d8e8767ab03cc16518a0d4cc638df278ed8f6a5a827860b327ad95ca053b5870632a6 SHA512 0312dbbc8baa31f1c482a2eb291e132ec0c9f0b429b4ca14e16e6b790755c82222cb123fa927ef7a7f47d7f51c6f2e6d50c1ce1e975f501801f0606ea2bc6721 -DIST chromium-bin-91.0.4472.77-1-common-i686.tar.xz 2185520 BLAKE2B 1ae4adc1df052ff3bf4951b6288ddd2f2b60f8876b2ed884282df940d5e9e699c583c6dd3a1e83edb22d0db242057cda2f6394ccbbabe4e600cbcb346ee3e93b SHA512 76090f509ccd0ea0e3b0de317ba496104a1f6c0ffde6a403de26041d030d20a03bf4718530394302540ebda1ca1ac765806777729efb783b6a24edadcfa0afce -DIST chromium-bin-91.0.4472.77-1-common-x86_64.tar.xz 1646104 BLAKE2B f4b2d2e77c764e7eaa550d4eb3d2861d7269873b60399df1cf0b999a09b6df16607b257009424525f3c5b7b9fa0a41d55b707421d2ac5957a45c571f18654c07 SHA512 c6fa292024c53824c0460b7c8f78ea81336ce4995781b3735b21ae8a9f0691cd43e8cccf846290df0d9e8427e3ee70b429d2a4aedff646651cdc525eb169819e -DIST chromium-bin-91.0.4472.77-1-common.tar.xz 1683860 BLAKE2B c3e5cbaddda0a5eaf88d6fed6b4e2bc1e120ea1dff5c4d0e0a5f6581d3206b9e3200e603b651db347e3a92b3aadfa25df568ba6d4333bdfb29c187c3fb048e71 SHA512 f66e2587e7b8f5d83ad91b6f875d209672aee0f15b32f40130cea41db7509df662d8255071fc6059ff615bf52d0dc20f5f6c618559ce3fa81aeeb0e660e06576 -DIST chromium-bin-91.0.4472.77-1-l10n.tar.xz 3878176 BLAKE2B 991416df03589535364552bdf301ed4ad5ce27f9fc6f850e77ed4a7b9c6444f7564df8f69a1613182c84712eefaa659f4c8764cab91d5f336df10cf1622b783a SHA512 ac835bbf28420a9d46e65112c32aef8268122f6982c75b7a0a4caa2e073a66c8bdd0caa82e1a43b35a0fa51d46cffd0e6db8d654b0eb2c7ea55d64613c85877f -DIST chromium-bin-91.0.4472.77-1-resources.tar.xz 21392 BLAKE2B a4d56b147b8410cdc25b59228a990b56347e00b4f190efbc02fbc00b2dccb7ab7b0f9b68f28a2d50a541c9468d91e80fd1c1172857940d293a1a073898e986d9 SHA512 19d019d310c9daba88db644078fb6b81e836f422345f0d01e1cb6a2dbffcaf0cdce64aeea881a7f3327d29bea04d83047c6985814f4449b79ac070c1ee0f3c44 -DIST chromium-bin-91.0.4472.77-1-wayland-aarch64.tar.xz 71772808 BLAKE2B e9a0f7bb1dd92ac73e8fdfafab967089b89eca212271e3912bf70ba9bdd6ca6204d3513cfc177d457922d855f646052a583e863776ad075df6492ccb916689fd SHA512 3b4c79165b3ce2201532e821f07fb41b65cfffb4686867aa3deb3647587b2e38992067550b149a923f38a56c32a464b2576d751bedd97be884fa1d91afb5d862 -DIST chromium-bin-91.0.4472.77-1-wayland-i686.tar.xz 94992556 BLAKE2B d4db320e6a74873772b1ebb7d629289e7755a6cbf586e6648b6f9ec683b6ae448c695ab780a81f8f8cbc0489f3f2340a53bcb9f063bd4ff800862c7070f9c15e SHA512 5d2c14613d923023cebfe32d4fc5722aa72af09b78b3fef0cde848415b1820ed9f55253dc2ce1d29de51a272c8d689806f230cea59c32174827e3a150ef94813 -DIST chromium-bin-91.0.4472.77-1-wayland-x86_64.tar.xz 74068092 BLAKE2B f142ea945b02a5e612c96742844d5a531a899ea444b4622a170f7ed2f4d9e764780ba62b424288be480902276db83fab2e9dd0a63434034664971b19dda8e85d SHA512 b0aabf85b04f864e30eb010ebc1fb763b8bade944a64cb780ed4990c506ab7ee6c9470d67ae1f2c0581cff0f15622b023a457614cd692154fc9edbe16bc01705 -DIST chromium-bin-91.0.4472.77-1-x11-aarch64.tar.xz 71630320 BLAKE2B 6017496fa2b8bca14593dc09133aadac56cc441f5022dd15f0e344ace48aaaa498886e824f4e2557760d0e59ae4490c602b0be2f6122b400aaed7e728d152b73 SHA512 9c6d8fed6b4a042b71ebba183f128da7b7ca468ed1eef7885f7f0c80998957c2c248acb74c782177ce38c4b06f07e4aec0b62b25ebd755a653db6ae37af72bc0 -DIST chromium-bin-91.0.4472.77-1-x11-i686.tar.xz 94870104 BLAKE2B 49c8e337be3743430719bc7e9df6dc9b3f87a1feb3d298ad1ea5770a17e02cac59c270df11d97bcb866b3f4e6738e561964fd0d33da26d5ddf1c9477da0e5a09 SHA512 8a9f5e175c078ba87bf908bd81d2340dd4a2d42052341206b21296f562e6b01b858b8e20c2b334da93b6c1cbf68577d2b1a7e87fc04f543d930529a45ce9572c -DIST chromium-bin-91.0.4472.77-1-x11-x86_64.tar.xz 73916916 BLAKE2B 85356c68408ff572a923f354418ba4ddcb473915a7f38986ceaca36ca193fbc0f6b37791267afb9c50a5d895e665a258c667d5c89c58558a47963b89c87785d6 SHA512 7e40a21f18eebbb6b0d315f8b3b71821a5f0cbef4842acfcb1097b2561796c0b4a5f73e2853aa6fb4cc2e0e3c500ad429441378f03b2a7fd137ab8a827414d9c diff --git a/www-client/chromium-bin/chromium-bin-90.0.4430.212.ebuild b/www-client/chromium-bin/chromium-bin-90.0.4430.212.ebuild new file mode 100644 index 0000000..e983252 --- /dev/null +++ b/www-client/chromium-bin/chromium-bin-90.0.4430.212.ebuild @@ -0,0 +1,237 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he + hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr + sv sw ta te th tr uk vi zh-CN zh-TW" + +inherit chromium-2 desktop pax-utils readme.gentoo-r1 unpacker xdg-utils + +DESCRIPTION="Open-source version of Google Chrome web browser" +HOMEPAGE="https://chromium.org/" + +MY_P=${P}-1 + +SRC_URI="https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common.tar.xz + https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-l10n.tar.xz + devtools? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-resources.tar.xz ) + amd64? ( + https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-x86_64.tar.xz + wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-x86_64.tar.xz ) + !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-x86_64.tar.xz ) + ) + arm64? ( + https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-aarch64.tar.xz + wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-aarch64.tar.xz ) + !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-aarch64.tar.xz ) + ) + x86? ( + https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-common-i686.tar.xz + wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-wayland-i686.tar.xz ) + !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P}-x11-i686.tar.xz ) + )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm64 ~x86" +IUSE="cpu_flags_x86_sse2 devtools selinux suid +swiftshader wayland widevine" + +RDEPEND=" + app-accessibility/at-spi2-atk:2 + app-accessibility/at-spi2-core:2 + app-arch/snappy + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/icu:0/68.2 + dev-libs/libxml2[icu] + dev-libs/libxslt + dev-libs/nspr + >=dev-libs/nss-3.26 + dev-libs/re2:0/9 + media-libs/alsa-lib + media-libs/flac + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz[icu(-)] + media-libs/libjpeg-turbo + media-libs/libpng + media-libs/libwebp + media-libs/mesa[gbm] + media-libs/openh264 + media-libs/opus + >=media-video/ffmpeg-4.3 + || ( + >=media-video/ffmpeg-4.3[-samba] + net-fs/samba[-debug(-)] + ) + net-print/cups + sys-apps/dbus + >=sys-devel/gcc-9.3.0 + >=sys-libs/glibc-2.32 + sys-libs/zlib[minizip] + virtual/ttf-fonts + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libxcb + x11-libs/libxkbcommon + x11-libs/libxshmfence + x11-libs/pango + x11-misc/xdg-utils + amd64? ( + widevine? ( www-plugins/chrome-binary-plugins ) + ) + selinux? ( sec-policy/selinux-chromium ) + wayland? ( + dev-libs/wayland + dev-libs/libffi + x11-libs/gtk+:3[wayland,X] + x11-libs/libdrm + ) +" + +S=${WORKDIR} +QA_PREBUILT="*" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS=" +Some web pages may require additional fonts to display properly. +Try installing some of the following packages if some characters +are not displayed properly: +- media-fonts/arphicfonts +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/noto +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +To fix broken icons on the Downloads page, you should install an icon +theme that covers the appropriate MIME types, and configure this as your +GTK+ icon theme. + +For native file dialogs in KDE, install kde-apps/kdialog. + +To make password storage work with your desktop environment you may +have install one of the supported credentials management applications: +- app-crypt/libsecret (GNOME) +- kde-frameworks/kwallet (KDE) +If you have one of above packages installed, but don't want to use +them in Chromium, then add --password-store=basic to CHROMIUM_BIN_FLAGS +in /etc/chromium-bin/default. +" + +pkg_pretend() { + if use amd64 || use x86; then + if ! use cpu_flags_x86_sse2; then + eerror "This package requires a CPU supporting the SSE2 instruction set." + die "SSE2 support missing" + fi + fi +} + +pkg_setup() { + chromium_suid_sandbox_check_kernel_config + + if ! use amd64 && use widevine; then + ewarn "Widevine CDM plugin is not available for your architecture." + fi +} + +src_unpack() { + : +} + +src_install() { + dodir / + cd "${ED}" || die + unpacker + + local CHROMIUM_BIN_HOME="opt/chromium-bin" + + if ! use suid; then + rm "${CHROMIUM_BIN_HOME}/chrome-sandbox" || die + fi + + # Remove SwiftShader OpenGL libraries + if ! use swiftshader; then + rm -r "${CHROMIUM_BIN_HOME}/swiftshader" || die + fi + + # Clean unneeded languages + pushd "${CHROMIUM_BIN_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + # Install icons + local size + for size in 16 24 32 48 64 128 256 ; do + newicon -s ${size} "${CHROMIUM_BIN_HOME}/icons/hicolor/${size}x${size}/apps/chromium-browser.png" ${PN}-browser.png + done + rm -r "${CHROMIUM_BIN_HOME}/icons" + + # Allow users to override command-line options, bug #357629. + insinto /etc/chromium-bin + newins "${FILESDIR}/chromium-bin.default" "default" + + # Install desktop entry + domenu "${FILESDIR}/chromium-bin-browser-chromium.desktop" + + # Install GNOME default application entry (bug #303100). + insinto /usr/share/gnome-control-center/default-apps + newins "${FILESDIR}/chromium-bin-browser.xml" chromium-bin-browser.xml + + # Install manpage; bug #684550 + doman "${FILESDIR}/chromium-bin-browser.1" + dosym chromium-bin-browser.1 /usr/share/man/man1/chromium-bin.1 + + pax-mark m "${CHROMIUM_BIN_HOME}/chrome" + + # Symlink Widevine CDM + if use widevine && use amd64; then + dosym "../../usr/$(get_libdir)/chromium-browser/WidevineCdm" "${CHROMIUM_BIN_HOME}/WidevineCdm" + fi + + # Install launcher + exeinto "${CHROMIUM_BIN_HOME}" + doexe "${FILESDIR}/chromium-bin-launcher.sh" + + # It is important that we name the target "chromium-bin-browser", + # xdg-utils expect it; bug #355517. + dosym "../../${CHROMIUM_BIN_HOME}/chromium-bin-launcher.sh" /usr/bin/chromium-bin-browser + # keep the old symlink around for consistency + dosym "../../${CHROMIUM_BIN_HOME}/chromium-bin-launcher.sh" /usr/bin/chromium-bin + + dosym "../../${CHROMIUM_BIN_HOME}/chromedriver" /usr/bin/chromedriver-bin + + readme.gentoo_create_doc +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + readme.gentoo_print_elog + + elog "For VA-API support you need to install x11-libs/libva with" + elog "USE=X and USE=drm enabled." + elog + elog "VA-API is disabled by default at runtime. Either enable it" + elog "by navigating to chrome://flags/#enable-accelerated-video-decode" + elog "inside Chromium or add --enable-accelerated-video-decode" + elog "to CHROMIUM_BIN_FLAGS in /etc/chromium-bin/default." +} diff --git a/www-client/chromium-bin/chromium-bin-91.0.4472.69.ebuild b/www-client/chromium-bin/chromium-bin-91.0.4472.69.ebuild index dc5ca66..ecd5174 100644 --- a/www-client/chromium-bin/chromium-bin-91.0.4472.69.ebuild +++ b/www-client/chromium-bin/chromium-bin-91.0.4472.69.ebuild @@ -35,7 +35,7 @@ SRC_URI="https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/${MY_P LICENSE="BSD" SLOT="0" -KEYWORDS="-* ~amd64 ~arm64 ~x86" +#KEYWORDS="-* ~amd64 ~arm64 ~x86" IUSE="cpu_flags_x86_sse2 devtools selinux suid +swiftshader wayland widevine" RDEPEND=" @@ -115,10 +115,13 @@ are not displayed properly: - media-fonts/takao-fonts - media-fonts/wqy-microhei - media-fonts/wqy-zenhei + To fix broken icons on the Downloads page, you should install an icon theme that covers the appropriate MIME types, and configure this as your GTK+ icon theme. + For native file dialogs in KDE, install kde-apps/kdialog. + To make password storage work with your desktop environment you may have install one of the supported credentials management applications: - app-crypt/libsecret (GNOME)