commit: ce831cc5fbc768d7496fd92b67cdcf0afaa8344a Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Fri Jan 20 18:38:51 2023 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Fri Jan 20 18:39:41 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce831cc5
www-client/chromium: dev channel bump to 111.0.5545.6 Closes: https://bugs.gentoo.org/889374 Closes: https://bugs.gentoo.org/891401 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 4 ++-- ...-111.0.5532.2.ebuild => chromium-111.0.5545.6.ebuild} | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 9abe28977b27..d5ed1165e35f 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,8 +2,8 @@ DIST chromium-109-patchset-2.tar.xz 7280 BLAKE2B b7f86dbb6c40005df67764a7dea57c8 DIST chromium-109.0.5414.74.tar.xz 1747778008 BLAKE2B dc2893c59398caf72546c42ada961215ce1b25785da66272b72fe14ac0db00ac4282b0de5ee65cca932e273fe69f41704b4ee2aa173d21da535708e8d0aab633 SHA512 79ff744b813e833ab4f257361a2f1847a57df579b9c925bad7575484f079c4c1b0b1c59c2c48e683bcee27a79e4bfd87f96c83fa28e0209ba4d3a71340842579 DIST chromium-110-patchset-4.tar.xz 13584 BLAKE2B 8ed3d438375ceabc02552ff66874ba8f15687fefa96239866cb2f86c57db72c162daafad6e1944df6117e792ca9d992b101c17d35132d429fc6edcf49db29940 SHA512 898416453e129e83dcd70728e382a2916e741b013887e8ec9b4d2737a4ef2738d83d4a868f9260c3906c4934bb9a7b3104a50cfc3d94064eb71a341279e9fcb9 DIST chromium-110.0.5481.38.tar.xz 1703266068 BLAKE2B 8b990eef533f8469afc6ea88c9fc70f316ccf33381fbbe30b43c89cde476a0487b201d7b07e8202bfdf94b44c2c5b184627f27225bb12ad7cef9fb505e608206 SHA512 4ad20231ce1c42d30886cfa179b154f1bd09efb61b971dc55a2aa70538a39141199f9a799c09b546c3e3501cf1981b6dd850e92e44aaa8f816ddb294fc194231 -DIST chromium-111-patchset-1.tar.xz 8044 BLAKE2B bd63c8a06548a39bd448ee5f0de6e170fa3f7bb50b4c99162761e2698bda8515fbdadf2608aaf7a8738b79c7b372237553be11b9ae1fed5c58f6fc7df5adaf7e SHA512 4b35e2b70e96ac7de39617c06c8353e6442d74a20d3c65aa37d89366b452d6e00441801de11938488def8d474808e406bf758cb2202f9327b530c503eca52b12 -DIST chromium-111.0.5532.2.tar.xz 1720621720 BLAKE2B eaa86b03bdaac2c6d9bbe4846cc956d109fb803d83aba022e82c86694ac0ab4379ccc0d87cdbdbfe211169cb3c7ee374ae0068749e1fde94fdf554ad23421e48 SHA512 cc44c13d8783c3828500362e339c70baede4edd5cf144cbd45de619c09922b323e5453dd03e914c4049ca9e5a4be91334d923e92596d5e45e9783ed3ecf86cdf +DIST chromium-111-patchset-2.tar.xz 21480 BLAKE2B e59d67d261df23c110c2db0644250c20d9e1cd6b99cb9513dbd12463faad8aea8520c5b5dbbfd2187a7795f7e34ebd3379fac4c3b2b01e30ffb4451b45084866 SHA512 7a2e660a9271b9b643dce5f7522570182eb895935312446775bf7c03a4c2d50d7f95c2082cac2dd477060d03f68e5424c990f535e0b1de9f0d12ac248806d043 +DIST chromium-111.0.5545.6.tar.xz 1721481252 BLAKE2B 22f0d9386a5ea8b473e85324b448f4789f9d6365c723ef254b42db3d059b972bb3e620a4e331ce935805d2b22be867d0e6f923264268fce828fe29394f59c09c SHA512 a52a4e4ebac1cd05bbe08763e4c4cd3e48efd37f8bb60cb6e1d8119e698ddecdc96741d3d4f97ee74d87fb8f27bdc4a60dbe2d09d84c223576983c65bb9fb6b4 DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c DIST chromium_109.0.5414.74-2raptor0~deb11u1.debian.tar.xz 445284 BLAKE2B 838df6439816d36df2e9bb9224745aa0c0a3f6c3e19ec2b29b78b8e2be8c59e8df9dde7fdba49a73ee7bdd2282016f0366500f5bd1579b870a6aab25f4bb115f SHA512 6e6523d5f2aed2d931074af1dddea7312d5c8ed09d2b143dd9309db634547c37b67ba3c905fefa67097fb44c64f4d45431eedeed7b33d8b07eb2bae73bdc7f16 diff --git a/www-client/chromium/chromium-111.0.5532.2.ebuild b/www-client/chromium/chromium-111.0.5545.6.ebuild similarity index 99% rename from www-client/chromium/chromium-111.0.5532.2.ebuild rename to www-client/chromium/chromium-111.0.5545.6.ebuild index f83bac65514b..ff2e0d3567e4 100644 --- a/www-client/chromium/chromium-111.0.5532.2.ebuild +++ b/www-client/chromium/chromium-111.0.5545.6.ebuild @@ -17,7 +17,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg- DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://chromium.org/"; -PATCHSET="1" +PATCHSET="2" PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz @@ -265,10 +265,6 @@ pre_build_checks() { if ! ver_test "$(clang-major-version)" -ge 13; then die "At least clang 13 is required" fi - # bug #889374 - if ! use libcxx; then - die "Builds using clang fail with USE=-libcxx" - fi fi if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then "${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly" @@ -335,7 +331,6 @@ src_prepare() { "${FILESDIR}/chromium-108-EnumTable-crash.patch" "${FILESDIR}/chromium-109-system-zlib.patch" "${FILESDIR}/chromium-109-system-openh264.patch" - "${FILESDIR}/chromium-109-system-icu.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-cross-compile.patch" ) @@ -711,6 +706,15 @@ chromium_configure() { myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" fi + # Create dummy pkg-config file for libsystemd, only dependency of installer + mkdir "${T}/libsystemd" || die + cat <<- EOF > "${T}/libsystemd/libsystemd.pc" + Name: + Description: + Version: + EOF + local -x PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+"${PKG_CONFIG_PATH}:"}${T}/libsystemd" + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. myconf_gn+=" is_debug=false"
