public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/
Date: Mon, 28 Mar 2022 05:44:32 +0000 (UTC)	[thread overview]
Message-ID: <1648446261.f97a560be2de84ac8d5f911eb77e68e3036744e3.sam@gentoo> (raw)

commit:     f97a560be2de84ac8d5f911eb77e68e3036744e3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 05:43:52 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <ajacoutot@gnome.org>
+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


             reply	other threads:[~2022-03-28  5:44 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-28  5:44 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-13 16:24 [gentoo-commits] repo/gentoo:master commit in: dev-util/meson/, dev-util/meson/files/ Fabian Groffen
2023-12-03  1:09 Sam James
2022-07-14  0:40 Mike Gilbert
2021-12-27  3:41 Mike Gilbert
2021-08-27 17:06 Mike Gilbert
2020-07-04 23:45 Mike Gilbert
2020-06-19 18:38 Fabian Groffen
2020-05-24 16:46 Mike Gilbert
2019-08-22 15:52 William Hubbs
2018-10-07  2:27 Mike Gilbert
2018-10-07  0:26 Mike Gilbert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1648446261.f97a560be2de84ac8d5f911eb77e68e3036744e3.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox