changeset
Use libraries when generating pkgconfig files
Mon, 13 Nov 2023 21:40:33 -0600
- author
- Elliott Sales de Andrade <quantum.analyst@gmail.com>
- date
- Mon, 13 Nov 2023 21:40:33 -0600
- changeset 42489
- 0edea2beaa95
- parent 42488
- 3912538a53b8
- child 42490
- f864332b13ef
Use libraries when generating pkgconfig files
This argument magically Does The Right Thing for both external and subproject
requirements, [though the docs are missing that](https://github.com/mesonbuild/meson/issues/6037#issuecomment-543938956).
Testing Done:
Compiled and checked the `meson-private/*.pc` files seemed alright still.
Reviewed at https://reviews.imfreedom.org/r/2804/
--- a/finch/meson.build Mon Nov 13 21:37:52 2023 -0600 +++ b/finch/meson.build Mon Nov 13 21:40:33 2023 -0600 @@ -231,8 +231,7 @@ version : meson.project_version(), filebase : 'finch-3', subdirs : 'finch-3', - # NOTE: Don't use gnt from pkgconfig, as it might be a subproject. - requires : ['gnt', libpurple], + libraries : [libgnt_dep, libpurple_dep], variables : [f'plugindir=${libdir}/finch-@purple_major_version@']) subdir('plugins')
--- a/libpurple/meson.build Mon Nov 13 21:37:52 2023 -0600 +++ b/libpurple/meson.build Mon Nov 13 21:40:33 2023 -0600 @@ -406,8 +406,7 @@ filebase : purple_filebase, # TODO: Only use purple_filebase once everything is ported to only use purple.h subdirs : [purple_filebase, purple_include_base], - # NOTE: Don't use gplugin from pkgconfig, as it might be a subproject. - requires : [glib, gdk_pixbuf, 'gplugin'], + libraries : [glib, gdk_pixbuf, gplugin_dep], variables : [ f'plugindir=${libdir}/@purple_filebase@', ])
--- a/libpurple/protocols/ircv3/meson.build Mon Nov 13 21:37:52 2023 -0600 +++ b/libpurple/protocols/ircv3/meson.build Mon Nov 13 21:40:33 2023 -0600 @@ -76,7 +76,7 @@ version : meson.project_version(), subdirs : [ircv3_include_base], filebase : ircv3_filebase, - requires : [gio, glib, 'gplugin', 'hasl', libpurple]) + libraries : [gio, glib, hasl, libpurple]) meson.override_dependency(ircv3_filebase, ircv3_dep)
--- a/pidgin/meson.build Mon Nov 13 21:37:52 2023 -0600 +++ b/pidgin/meson.build Mon Nov 13 21:40:33 2023 -0600 @@ -258,8 +258,7 @@ version : meson.project_version(), filebase : pidgin_filebase, subdirs : pidgin_filebase, - # NOTE: Don't use dependencies from subprojects. - requires : [gtk, libadwaita, libpurple, 'gplugin-gtk4'], + libraries : [gtk, libadwaita, libpurple_dep, gplugin_gtk_dep], variables : [f'plugindir=${libdir}/pidgin-@purple_major_version@']) if host_machine.system() != 'windows'
