From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 16E8015808B for ; Mon, 28 Mar 2022 05:44:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C0AEE083D; Mon, 28 Mar 2022 05:44:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B7D29E083D for ; Mon, 28 Mar 2022 05:44:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8475C3412D2 for ; Mon, 28 Mar 2022 05:44:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBF7C287 for ; Mon, 28 Mar 2022 05:44:32 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1648446261.f97a560be2de84ac8d5f911eb77e68e3036744e3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch dev-util/meson/meson-0.61.4-r1.ebuild dev-util/meson/meson-0.61.4.ebuild X-VCS-Directories: dev-util/meson/ dev-util/meson/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f97a560be2de84ac8d5f911eb77e68e3036744e3 X-VCS-Branch: master Date: Mon, 28 Mar 2022 05:44:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7a858096-f21d-4e2e-a3cb-f170d4d593bb X-Archives-Hash: 51079d76bcfad4ede2f353b51e8f705b commit: f97a560be2de84ac8d5f911eb77e68e3036744e3 Author: Sam James gentoo org> AuthorDate: Mon Mar 28 05:43:52 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 28 05:44:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97a560b dev-util/meson: fix gtk-update-icon-cache check Was checking for gtk4* twice. Bug: https://bugs.gentoo.org/836294 Closes: https://bugs.gentoo.org/836293 Closes: https://bugs.gentoo.org/836281 Signed-off-by: Sam James gentoo.org> ...on-0.61.4-fix-gtk-update-icon-cache-check.patch | 29 ++++++++++++++++++++++ ...{meson-0.61.4.ebuild => meson-0.61.4-r1.ebuild} | 4 +++ 2 files changed, 33 insertions(+) diff --git a/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch new file mode 100644 index 000000000000..7be12b7a98ac --- /dev/null +++ b/dev-util/meson/files/meson-0.61.4-fix-gtk-update-icon-cache-check.patch @@ -0,0 +1,29 @@ +https://github.com/mesonbuild/meson/commit/dac212e1bba707b9ac67b48902d761ee7ca8fa04 + +From dac212e1bba707b9ac67b48902d761ee7ca8fa04 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Wed, 23 Mar 2022 22:15:11 +0100 +Subject: [PATCH] gnome module: properly fallback to gtk-update-icon-cache + +Commit a0cade8f introduced a typo and wrongly check for +gtk4-update-icon-cache twice. +If gtk4-update-icon-cache (gtk4) is not found, look for +gtk-update-icon-cache (gtk3) instead. +--- + mesonbuild/modules/gnome.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py +index 673a781a41d..501be9ae4da 100644 +--- a/mesonbuild/modules/gnome.py ++++ b/mesonbuild/modules/gnome.py +@@ -371,7 +371,7 @@ def post_install(self, state: 'ModuleState', args: T.List['TYPE_var'], kwargs: ' + prog = state.find_program('gtk4-update-icon-cache', required=False) + found = isinstance(prog, build.Executable) or prog.found() + if not found: +- prog = state.find_program('gtk4-update-icon-cache') ++ prog = state.find_program('gtk-update-icon-cache') + icondir = os.path.join(datadir_abs, 'icons', 'hicolor') + script = state.backend.get_executable_serialisation([prog, '-q', '-t', '-f', icondir]) + script.skip_if_destdir = True + diff --git a/dev-util/meson/meson-0.61.4.ebuild b/dev-util/meson/meson-0.61.4-r1.ebuild similarity index 97% rename from dev-util/meson/meson-0.61.4.ebuild rename to dev-util/meson/meson-0.61.4-r1.ebuild index 52bbb982abcc..bbc8938fb7ed 100644 --- a/dev-util/meson/meson-0.61.4.ebuild +++ b/dev-util/meson/meson-0.61.4-r1.ebuild @@ -35,6 +35,10 @@ DEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${P}-fix-gtk-update-icon-cache-check.patch +) + python_prepare_all() { local disable_unittests=( # ASAN and sandbox both want control over LD_PRELOAD