[gdk-pixbuf/ebassi/older-meson: 1/2] Revert "build: Use a dict for pkg-config file variables"
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf/ebassi/older-meson: 1/2] Revert "build: Use a dict for pkg-config file variables"
- Date: Fri, 9 Apr 2021 11:35:27 +0000 (UTC)
commit 18b75833b20dbe40ca0ac869bd1ba57227d628fa
Author: Emmanuele Bassi <ebassi gnome org>
Date: Fri Apr 9 12:33:47 2021 +0100
Revert "build: Use a dict for pkg-config file variables"
This reverts commit f265a94336c17716b2dcb33198ec34ebf926f98e.
This change requires Meson ≥ 0.56, and Fedora 33 still has 0.55.3. We're
going to un-revert the change once we can depend on a newer version.
gdk-pixbuf/meson.build | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
index 49c7d4a95..8b0590b05 100644
--- a/gdk-pixbuf/meson.build
+++ b/gdk-pixbuf/meson.build
@@ -366,23 +366,21 @@ else
loaders_dep = declare_dependency()
endif
-pkg_variables = {
- 'bindir': '${prefix}/@0@'.format(get_option('bindir')),
- 'gdk_pixbuf_binary_version': gdk_pixbuf_binary_version,
- 'gdk_pixbuf_binarydir': '${libdir}/@0@/@1@'.format(gdk_pixbuf_api_name, gdk_pixbuf_binary_version),
- 'gdk_pixbuf_moduledir': '${gdk_pixbuf_binarydir}/loaders',
- 'gdk_pixbuf_cache_file': '${gdk_pixbuf_binarydir}/loaders.cache',
- 'gdk_pixbuf_csource': '${bindir}/gdk-pixbuf-csource',
- 'gdk_pixbuf_pixdata': '${bindir}/gdk-pixbuf-pixdata',
- 'gdk_pixbuf_query_loaders': '${bindir}/gdk-pixbuf-query-loaders',
-}
-
pkgconfig = import('pkgconfig')
pkgconfig.generate(
gdkpixbuf,
name: 'GdkPixbuf',
description: 'Image loading and scaling',
- variables: pkg_variables,
+ variables: [
+ 'bindir=${prefix}/@0@'.format(get_option('bindir')),
+ 'gdk_pixbuf_binary_version=@0@'.format(gdk_pixbuf_binary_version),
+ 'gdk_pixbuf_binarydir=${libdir}/@0@/@1@'.format(gdk_pixbuf_api_name, gdk_pixbuf_binary_version),
+ 'gdk_pixbuf_moduledir=${gdk_pixbuf_binarydir}/loaders',
+ 'gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache',
+ 'gdk_pixbuf_csource=${bindir}/gdk-pixbuf-csource',
+ 'gdk_pixbuf_pixdata=${bindir}/gdk-pixbuf-pixdata',
+ 'gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders',
+ ],
requires: 'gobject-2.0',
subdirs: gdk_pixbuf_api_name,
filebase: gdk_pixbuf_api_name,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]