From da6a52f691ef980bab92d003d5df8f463c623af8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Mar 2018 19:15:28 +0000 Subject: gentoo resync : 10.03.2018 --- www-client/Manifest.gz | Bin 7050 -> 7053 bytes www-client/chromium/Manifest | 5 +- www-client/chromium/chromium-65.0.3325.146.ebuild | 1 + www-client/chromium/chromium-66.0.3355.0.ebuild | 1 + .../chromium/files/chromium-ffmpeg-clang.patch | 21 +++ www-client/google-chrome-unstable/Manifest | 4 +- .../google-chrome-unstable-66.0.3355.0.ebuild | 156 --------------------- .../google-chrome-unstable-66.0.3359.22.ebuild | 156 +++++++++++++++++++++ 8 files changed, 184 insertions(+), 160 deletions(-) create mode 100644 www-client/chromium/files/chromium-ffmpeg-clang.patch delete mode 100644 www-client/google-chrome-unstable/google-chrome-unstable-66.0.3355.0.ebuild create mode 100644 www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.22.ebuild (limited to 'www-client') diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz index 6f139bf6ed7e..59d407746429 100644 Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index bf7234c3f241..c674a5405db4 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -5,6 +5,7 @@ AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1 AUX chromium-clang-r3.patch 361 BLAKE2B b0f833153a11a15b498bb5892119e1978573ba250ff10e555a7b7393bad5d00959611702beca58f88453a933eb66a8a456048aaf1e934876af40a601a4f7b2c8 SHA512 ed5ad35dbd43eabe5fdca518975c5c775d1698f2c8d5b2c74e52616532f62c83e60001bffa02cdea536af31f29021db6ada7e037e2c8f92cbdf1dc500090f070 AUX chromium-clang-r4.patch 363 BLAKE2B 4c776d4823eef90f69bb42b1fc2ed5c314fcb60cdc2da44d90bd3faf6d9a9d3fdf8367a85f6e735b59fe440f7de5582a974b3e04f4ff46683242f368e68b1503 SHA512 78fa7d69b2b8bdd5a755baff7d5474943ad373d2cc9673db61f501b0f8150bbdf795b3c2afa557d637564276dd5b4edda282daa7cbb7b5ea9366bd81f8989ab0 AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005 +AUX chromium-ffmpeg-clang.patch 840 BLAKE2B cd0af6414462be4ee0cbb46e0c43b705f6883ed42a536747a5ab5a9a6c52727c521aca92bce61b55cf68be6dbac665a41846fd8907335e1dd34b452f973b624e SHA512 e02bc169ef60af8f48b67ed36a7f0e1232fcfc2c59fd48de5cc6c0a267fe29eccd7971a2692ce07c34cf07d5bf416389e10442bf2658822b3fbd27dd623ea91a AUX chromium-ffmpeg-r0.patch 830 BLAKE2B be12eb6ce7aa66667122ebd7abe31dc18d3997c309b034c46771158848c9f7472731e3e0e66ccc4d7ff029c9295bedeabc82ce05c21e5f8944b6d8e5e037436e SHA512 7cdd79d04447029ac4981df06c2c16a3674420925ba9e210a676fe32e9424ea4d475a73d4d3e265bdfc10a36936124764315b11fb4efae22e9dffc39ffdbceb5 AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0 AUX chromium-gn-r0.patch 1233 BLAKE2B 53c0a3cd692d19eac60be0f5aa61f9cbda7d473e42adc0cd95fc78dd44c39ead9825b862347314351133b5c80f9b2fd58daacdc9568efeccefb1dd0ec6526d85 SHA512 de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd @@ -21,6 +22,6 @@ DIST chromium-65.0.3325.146.tar.xz 570305180 BLAKE2B b4ac28ea267a673e0c8d22abb41 DIST chromium-66.0.3355.0.tar.xz 582642152 BLAKE2B 16a89cc99984b566741770f9081a738596ac0b031e916073df417ac42406a96a8f874278720f3462fba827218dff141eddd614cf2ca494ec3d38577744e7c441 SHA512 324902e3e8ec7c22dbb95f2d8f97069dac97f702f528130c06eb7a246e495e51b069f4ce09a7ca875ff511e0bf992207b55b1f887aaa3a438179618c206df436 EBUILD chromium-64.0.3282.167.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4 EBUILD chromium-64.0.3282.186.ebuild 20382 BLAKE2B fd9418350769258f0d509656bf529ffd748707b45d176d1a341c4b8572c77b9437e02713b0af65f57e9448df0aa16c9a724a2530036306f2e9583da89ed08b66 SHA512 2eb14c821275918b9fc8233ccddbd1a3ec53b559162e2283cd93afc1b111a8d1320f81933c1aae4f0efe55c5b08a90eceb74e4d7dca0c7d1a404496e392f02a4 -EBUILD chromium-65.0.3325.146.ebuild 20857 BLAKE2B b81cb7ecf903bd45ab8d73525cc44a2c2df73f556b219da09f0c15228bb3e643a5ebedf04aa7aecbf1f5e000c72f2349e6c0aa8e665417eb08532333e1d8d965 SHA512 d0b579df26079e450df39d4ae50995b8cd2e4359203c352cfe35e13f837e265e71af01eebafe8331237247d1c32c82ffd2cd28ce86e76f79ec2475f723ea258e -EBUILD chromium-66.0.3355.0.ebuild 21037 BLAKE2B a94ffccec8d31d6e495fd72864b93f8004f969c6c156de432ed9d9011c9fe6df849c4de9bf555063d2d47d021e42e8bb510bf6c983bdb42edbe2e1733d2b5aea SHA512 0d474c45afe1695ebf464c7aed5640ce8a7b4bc50a49dc1d04b5f972908839bba82e0439cbf2de15e3af3c8a4c9cac89a92192287b80135106ce324630f6a8c0 +EBUILD chromium-65.0.3325.146.ebuild 20900 BLAKE2B d93ddc7aa2b11928b47fb508950642f89b4f0b94bb6f6ad6e516cdce42e68b7346cd6095337632e8a15d946d1da6af10be36ac0b23766d04b02fe78de5747a3c SHA512 06453fef8284858d4273f20c30142cc78fd2d047ffb4b9a4444ef93caee07918eb0d6f4b64c95ad71a20228ee561d1256c7b7a9c66e2e49dfeecbeeed5ea4b02 +EBUILD chromium-66.0.3355.0.ebuild 21080 BLAKE2B 00612a5d736a8b06719079cc21dd5c34dc78876c1481a429cc87cc83c0548af9abcb28a67aa74c19f49da2b4ae07dc81cfde78462c3927278e96ebfe27c60f3b SHA512 85277baa3ed4f287798228ce0ed554ba90f92ea7a2d464358ff8fad88da17be6bd8de4a718b90c9121f775431141ad6ba4edb3624ddaedc78e21206ecd5813b5 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039 diff --git a/www-client/chromium/chromium-65.0.3325.146.ebuild b/www-client/chromium/chromium-65.0.3325.146.ebuild index 11bbb4b77805..3ca4d45a0ba9 100644 --- a/www-client/chromium/chromium-65.0.3325.146.ebuild +++ b/www-client/chromium/chromium-65.0.3325.146.ebuild @@ -154,6 +154,7 @@ PATCHES=( "${FILESDIR}/chromium-math.h-r0.patch" "${FILESDIR}/chromium-clang-r3.patch" "${FILESDIR}/chromium-stdint.patch" + "${FILESDIR}/chromium-ffmpeg-clang.patch" ) pre_build_checks() { diff --git a/www-client/chromium/chromium-66.0.3355.0.ebuild b/www-client/chromium/chromium-66.0.3355.0.ebuild index 4c8e080b09ee..72c8738a74f3 100644 --- a/www-client/chromium/chromium-66.0.3355.0.ebuild +++ b/www-client/chromium/chromium-66.0.3355.0.ebuild @@ -154,6 +154,7 @@ PATCHES=( "${FILESDIR}/chromium-stdint.patch" "${FILESDIR}/chromium-clang-r4.patch" "${FILESDIR}/chromium-ffmpeg-r1.patch" + "${FILESDIR}/chromium-ffmpeg-clang.patch" ) pre_build_checks() { diff --git a/www-client/chromium/files/chromium-ffmpeg-clang.patch b/www-client/chromium/files/chromium-ffmpeg-clang.patch new file mode 100644 index 000000000000..6c5ac71323b4 --- /dev/null +++ b/www-client/chromium/files/chromium-ffmpeg-clang.patch @@ -0,0 +1,21 @@ +--- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py ++++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py +@@ -639,18 +639,8 @@ + if 'win' not in target_os: + configure_flags['Common'].extend([ + '--enable-pic', +- '--cc=clang', +- '--cxx=clang++', +- '--ld=clang', + ]) + +- # Clang Linux will use the first 'ld' it finds on the path, which will +- # typically be the system one, so explicitly configure use of Clang's +- # ld.lld, to ensure that things like cross-compilation and LTO work. +- # This does not work for arm64, ia32 and is always used on mac. +- if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac': +- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld') +- + # Should be run on Mac. + if target_os == 'mac': + if host_os != 'mac': diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest index 9b8bb6e7cfab..ecba410d02c2 100644 --- a/www-client/google-chrome-unstable/Manifest +++ b/www-client/google-chrome-unstable/Manifest @@ -1,3 +1,3 @@ -DIST google-chrome-unstable_66.0.3355.0-1_amd64.deb 53407588 BLAKE2B 75d00854f3e0157ee5c298bd858cfcdb4499230be6ffb6e8af784e422a7670e6d31ad1893ab3f714a5d07bf8d503378cea3b8333d6903bc2182f17f92a2f6cc1 SHA512 fd4485ad561356b8aa4392726eeea8fb427adf7bd0f36fa7fb72e188afeb5485413e31fe394007f8316cc2c406e7ff6a8bd6f738bd6bd11817b56b6a108ebf9f -EBUILD google-chrome-unstable-66.0.3355.0.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15 +DIST google-chrome-unstable_66.0.3359.22-1_amd64.deb 53240502 BLAKE2B 3abc0a3d0b717effe3af983852ef898c79afecb833e7b1b813363f9aae4d6d0690e46a28f1248f86a4f201a43933d434e1fb2f1b8bb33c25965dad3eca10e759 SHA512 e9c9686c8c2b984d5f419fec10b165a8cf324f4ec773291027f233a678945ac0e3756c46a956ed821c31e4a51bf578559e613a49e8753799b45a20924a199914 +EBUILD google-chrome-unstable-66.0.3359.22.ebuild 3594 BLAKE2B 986a1dbf1a1b81e808d01dbbbd6f20608e2ca9754cd5803926b3282470924ecc59e039193461d9cc1f7a9b0d658a5eff355bdd3ae1fb7b651f698f4a25c79cd2 SHA512 a2bb023df0e47ebda044842afcdc4669957a740913441c4c468af85592d93060ae1c84d9e661a4ffd0f85942c370cc9c43f443a392763a00fab6c66de975bf15 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3355.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3355.0.ebuild deleted file mode 100644 index 43d5352b4dd5..000000000000 --- a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3355.0.ebuild +++ /dev/null @@ -1,156 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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 readme.gentoo-r1 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 - MY_PN=${PN}-stable -else - 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" -KEYWORDS="-* ~amd64" -IUSE="+plugins" -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 - >=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}" - -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/bitstream-cyberbit -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -Depending on your desktop environment, you may need -to install additional packages to get icons on the Downloads page. - -For KDE, the required package is kde-frameworks/oxygen-icons. - -For other desktop environments, try one of the following: -- x11-themes/adwaita-icon-theme -- x11-themes/tango-icon-theme - -Please notice the bundled flash player (PepperFlash). -You can (de)activate all flash plugins via chrome://plugins -" - -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 - - pushd "${CHROME_HOME}/locales" > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - if use plugins ; then - local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" - sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ - -i "${CHROME_HOME}/${PN}" || die - fi - - local size - for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png - done - - pax-mark m "${CHROME_HOME}/chrome" - - readme.gentoo_create_doc -} - -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 - readme.gentoo_print_elog -} diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.22.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.22.ebuild new file mode 100644 index 000000000000..43d5352b4dd5 --- /dev/null +++ b/www-client/google-chrome-unstable/google-chrome-unstable-66.0.3359.22.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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 readme.gentoo-r1 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 + MY_PN=${PN}-stable +else + 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" +KEYWORDS="-* ~amd64" +IUSE="+plugins" +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 + >=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}" + +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/bitstream-cyberbit +- media-fonts/droid +- media-fonts/ipamonafont +- media-fonts/ja-ipafonts +- media-fonts/takao-fonts +- media-fonts/wqy-microhei +- media-fonts/wqy-zenhei + +Depending on your desktop environment, you may need +to install additional packages to get icons on the Downloads page. + +For KDE, the required package is kde-frameworks/oxygen-icons. + +For other desktop environments, try one of the following: +- x11-themes/adwaita-icon-theme +- x11-themes/tango-icon-theme + +Please notice the bundled flash player (PepperFlash). +You can (de)activate all flash plugins via chrome://plugins +" + +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 + + pushd "${CHROME_HOME}/locales" > /dev/null || die + chromium_remove_language_paks + popd > /dev/null || die + + if use plugins ; then + local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins" + sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \ + -i "${CHROME_HOME}/${PN}" || die + fi + + local size + for size in 16 22 24 32 48 64 128 256 ; do + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png + done + + pax-mark m "${CHROME_HOME}/chrome" + + readme.gentoo_create_doc +} + +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 + readme.gentoo_print_elog +} -- cgit v1.2.3