From d30e99d881852f611dc3befafbc720caa471f71b Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Fri, 14 Jun 2019 13:00:55 -0400 Subject: www-client/google-chrome: automated update (75.0.3770.90) Package-Manager: Portage-2.3.67_p4, Repoman-2.3.13_p3 Signed-off-by: Mike Gilbert --- www-client/google-chrome/Manifest | 2 +- www-client/google-chrome/files/chrome-gnome.patch | 14 --- .../google-chrome-74.0.3729.169.ebuild | 133 --------------------- .../google-chrome-75.0.3770.90.ebuild | 131 ++++++++++++++++++++ 4 files changed, 132 insertions(+), 148 deletions(-) delete mode 100644 www-client/google-chrome/files/chrome-gnome.patch delete mode 100644 www-client/google-chrome/google-chrome-74.0.3729.169.ebuild create mode 100644 www-client/google-chrome/google-chrome-75.0.3770.90.ebuild (limited to 'www-client/google-chrome') diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index 71f377dc16b1..44555cd843ca 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1 +1 @@ -DIST google-chrome-stable_74.0.3729.169-1_amd64.deb 58236722 BLAKE2B 99be6e82f3782a50f6786550b67da5dbba01e3cccb9a2f2d7d40de8fb2e76fbf2e7d6ad3b48b63ff56f02fcfdd33d10fae755778409dd9d6c90e8a9ca2c3fa8f SHA512 98bb65afdc44e4b40a3d073cf7c7796eabb4dc8c8cfb02b59d573145a96f06f49a1789b6b706e29d9e9031d70a05fb7c0a1829c90a0ff1e102b280133ea95546 +DIST google-chrome-stable_75.0.3770.90-1_amd64.deb 59248396 BLAKE2B 9e196c45e6aa37550ac1fcb35f3b42eca12cad00da00ab5299b355d9d808d2a8edff75a399363fbe0638b66102ffd7ec5811573e610d836743090aab80d55771 SHA512 6d993160674ce0eef89ccd396216bcf5dfb8ff8b770aff918f13e2f0003deb5a92a9177cdb28321a54138d5f4b5a551c2282fcb986e70a3f68745c547a261bc3 diff --git a/www-client/google-chrome/files/chrome-gnome.patch b/www-client/google-chrome/files/chrome-gnome.patch deleted file mode 100644 index b32eb2142c21..000000000000 --- a/www-client/google-chrome/files/chrome-gnome.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/opt/google/chrome/google-chrome -+++ b/opt/google/chrome/google-chrome -@@ -39,6 +39,11 @@ - # We don't want bug-buddy intercepting our crashes. http://crbug.com/24120 - export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME - -+# Workaround to detect GNOME session variants until fix is backported to -+# older Chrome versions (fixed in 75.x): -+# https://chromium.googlesource.com/chromium/src/+/dd407d416fa941c04e33d81f2b1d8cab8196b633 -+[[ ${XDG_CURRENT_DESKTOP} = *"GNOME"* ]] && export XDG_CURRENT_DESKTOP="GNOME" -+ - # Sanitize std{in,out,err} because they'll be shared with untrusted child - # processes (http://crbug.com/376567). - exec < /dev/null diff --git a/www-client/google-chrome/google-chrome-74.0.3729.169.ebuild b/www-client/google-chrome/google-chrome-74.0.3729.169.ebuild deleted file mode 100644 index b8601eeffdfb..000000000000 --- a/www-client/google-chrome/google-chrome-74.0.3729.169.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 2011-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -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 eutils gnome2-utils pax-utils unpacker xdg-utils - -DESCRIPTION="The web browser from Google" -HOMEPAGE="https://www.google.com/chrome" - -if [[ ${PN} == google-chrome ]]; then - KEYWORDS="-* amd64" - MY_PN=${PN}-stable -else - KEYWORDS="-* ~amd64" - MY_PN=${PN} -fi - -MY_P="${MY_PN}_${PV}-1" - -SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" - -LICENSE="google-chrome" -SLOT="0" -RESTRICT="bindist mirror strip" - -DEPEND="" -RDEPEND=" - app-accessibility/at-spi2-atk:2 - app-arch/bzip2 - app-misc/ca-certificates - dev-libs/atk - dev-libs/expat - dev-libs/glib:2 - dev-libs/nspr - >=dev-libs/nss-3.26 - media-libs/alsa-lib - media-libs/fontconfig - media-libs/freetype:2 - net-print/cups - sys-apps/dbus - sys-libs/libcap - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[X] - >=x11-libs/libX11-1.5.0 - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libXtst - x11-libs/libxcb - x11-libs/pango - x11-misc/xdg-utils -" - -QA_PREBUILT="*" -QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop" -S=${WORKDIR} -CHROME_HOME="opt/google/chrome${PN#google-chrome}" - -pkg_nofetch() { - eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures." -} - -pkg_pretend() { - # Protect against people using autounmask overzealously - use amd64 || die "google-chrome only works on amd64" -} - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - : -} - -src_install() { - dodir / - cd "${ED}" || die - unpacker - - eapply "${FILESDIR}"/chrome-gnome.patch - - rm -r etc usr/share/menu || die - mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die - - gzip -d usr/share/doc/${PF}/changelog.gz || die - gzip -d usr/share/man/man1/${MY_PN}.1.gz || die - if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then - rm usr/share/man/man1/google-chrome.1.gz || die - dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1 - fi - - pushd "${CHROME_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - local suffix= - [[ ${PN} == google-chrome-beta ]] && suffix=_beta - [[ ${PN} == google-chrome-unstable ]] && suffix=_dev - - local size - for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png - done - - pax-mark m "${CHROME_HOME}/chrome" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/www-client/google-chrome/google-chrome-75.0.3770.90.ebuild b/www-client/google-chrome/google-chrome-75.0.3770.90.ebuild new file mode 100644 index 000000000000..e75218fcde20 --- /dev/null +++ b/www-client/google-chrome/google-chrome-75.0.3770.90.ebuild @@ -0,0 +1,131 @@ +# Copyright 2011-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +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 eutils gnome2-utils pax-utils unpacker xdg-utils + +DESCRIPTION="The web browser from Google" +HOMEPAGE="https://www.google.com/chrome" + +if [[ ${PN} == google-chrome ]]; then + KEYWORDS="-* amd64" + MY_PN=${PN}-stable +else + KEYWORDS="-* ~amd64" + MY_PN=${PN} +fi + +MY_P="${MY_PN}_${PV}-1" + +SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd64.deb" + +LICENSE="google-chrome" +SLOT="0" +RESTRICT="bindist mirror strip" + +DEPEND="" +RDEPEND=" + app-accessibility/at-spi2-atk:2 + app-arch/bzip2 + app-misc/ca-certificates + dev-libs/atk + dev-libs/expat + dev-libs/glib:2 + dev-libs/nspr + >=dev-libs/nss-3.26 + media-libs/alsa-lib + media-libs/fontconfig + media-libs/freetype:2 + net-print/cups + sys-apps/dbus + sys-libs/libcap + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3[X] + >=x11-libs/libX11-1.5.0 + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/libXScrnSaver + x11-libs/libXtst + x11-libs/libxcb + x11-libs/pango + x11-misc/xdg-utils +" + +QA_PREBUILT="*" +QA_DESKTOP_FILE="usr/share/applications/google-chrome.*\\.desktop" +S=${WORKDIR} +CHROME_HOME="opt/google/chrome${PN#google-chrome}" + +pkg_nofetch() { + eerror "Please wait 24 hours and sync your tree before reporting a bug for google-chrome fetch failures." +} + +pkg_pretend() { + # Protect against people using autounmask overzealously + use amd64 || die "google-chrome only works on amd64" +} + +pkg_setup() { + chromium_suid_sandbox_check_kernel_config +} + +src_unpack() { + : +} + +src_install() { + dodir / + cd "${ED}" || die + unpacker + + rm -r etc usr/share/menu || die + mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die + + gzip -d usr/share/doc/${PF}/changelog.gz || die + gzip -d usr/share/man/man1/${MY_PN}.1.gz || die + if [[ -L usr/share/man/man1/google-chrome.1.gz ]]; then + rm usr/share/man/man1/google-chrome.1.gz || die + dosym ${MY_PN}.1 usr/share/man/man1/google-chrome.1 + fi + + pushd "${CHROME_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + local suffix= + [[ ${PN} == google-chrome-beta ]] && suffix=_beta + [[ ${PN} == google-chrome-unstable ]] && suffix=_dev + + local size + for size in 16 22 24 32 48 64 128 256 ; do + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png + done + + pax-mark m "${CHROME_HOME}/chrome" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} -- cgit v1.2.3-65-gdbad