callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Replace deprecated get_pkgconfig_variable()

Browse Source 
Use get_variable(pkgconfig:...) instead.
This commit is contained in:
Emmanuele Bassi 2022-12-06 20:45:58 +00:00
parent e95f0aa73b
commit ca1dfc7092
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/meson.build
View File

@ -1,11 +1,11 @@
if get_option('gtk_doc') if get_option('gtk_doc')
glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix')
glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix') cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix')
cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo') cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix') gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix')
gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf') gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
docpath = join_paths(gtk_datadir, 'gtk-doc', 'html') docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')

2
gdk/wayland/meson.build
View File

@ -38,7 +38,7 @@ gdk_wayland_deps = [
# wayland protocols # wayland protocols
wlprotocolsdep = dependency('wayland-protocols') wlprotocolsdep = dependency('wayland-protocols')
proto_dir = wlprotocolsdep.get_pkgconfig_variable('pkgdatadir') proto_dir = wlprotocolsdep.get_variable(pkgconfig: 'pkgdatadir')
assert(proto_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc') assert(proto_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc')
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')

2
gtk/meson.build
View File

@ -847,7 +847,7 @@ gtk_deps = [
] ]
if x11_enabled if x11_enabled
x11_data_prefix = dependency('x11').get_pkgconfig_variable('prefix') x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix')
gtk_cargs += [ '-DX11_DATA_PREFIX="@0@"'.format(x11_data_prefix), ] gtk_cargs += [ '-DX11_DATA_PREFIX="@0@"'.format(x11_data_prefix), ]
gtk_sources += gtk_use_x11_sources gtk_sources += gtk_use_x11_sources

2
meson.build
View File

@ -497,7 +497,7 @@ if tracker3_enabled
endif endif
if iso_codes_dep.found() if iso_codes_dep.found()
cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix')) cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix'))
else else
cdata.set_quoted('ISO_CODES_PREFIX', get_option('prefix')) cdata.set_quoted('ISO_CODES_PREFIX', get_option('prefix'))
endif endif