diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-17 12:07:57 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2022-03-18 12:52:06 -0400 |
commit | a0cade8f1d1470cf3203baae16d181eb4df8e9fe (patch) | |
tree | c19674744e7255a2fe8fbb7f111068a162170778 /mesonbuild/modules | |
parent | 041c372048130cd54a6430f33f6a927e556554dd (diff) | |
download | meson-a0cade8f1d1470cf3203baae16d181eb4df8e9fe.zip meson-a0cade8f1d1470cf3203baae16d181eb4df8e9fe.tar.gz meson-a0cade8f1d1470cf3203baae16d181eb4df8e9fe.tar.bz2 |
gnome module: fix incorrect lookup of nonexistent dependencies in post_install
While gtk+-3.0 / gtk4 do exist, they have never provided the location of
the gtk-update-icon-cache program as a pkgconfig variable. Trying to
find one anyway, resulted in two things happening:
- a useless dep lookup
- a fatal-meson-warnings error and build failure because the
get_pkgconfig_variable() in question never existed
The desktop-file-utils package is a package solely providing some
command line programs, and has never provided a pkg-config file in the
first place, so this always logged that the dependency was not found and
fell back to normal find_program_impl(), although without
fatal-meson-warnings build errors.
Fixes #10139
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r-- | mesonbuild/modules/gnome.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 8eebcbf..673a781 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -368,17 +368,17 @@ class GnomeModule(ExtensionModule): rv.append(script) if kwargs['gtk_update_icon_cache'] and not self.install_gtk_update_icon_cache: self.install_gtk_update_icon_cache = True - prog = self._get_native_binary(state, 'gtk4-update-icon-cache', 'gtk4', 'gtk4_update_icon_cache', required=False) + prog = state.find_program('gtk4-update-icon-cache', required=False) found = isinstance(prog, build.Executable) or prog.found() if not found: - prog = self._get_native_binary(state, 'gtk-update-icon-cache', 'gtk+-3.0', 'gtk_update_icon_cache') + prog = state.find_program('gtk4-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 rv.append(script) if kwargs['update_desktop_database'] and not self.install_update_desktop_database: self.install_update_desktop_database = True - prog = self._get_native_binary(state, 'update-desktop-database', 'desktop-file-utils', 'update_desktop_database') + prog = state.find_program('update-desktop-database') appdir = os.path.join(datadir_abs, 'applications') script = state.backend.get_executable_serialisation([prog, '-q', appdir]) script.skip_if_destdir = True |