changeset
Fix installed Pidgin headers
Sun, 16 May 2021 12:29:20 -0500
- author
- Elliott Sales de Andrade <quantum.analyst@gmail.com>
- date
- Sun, 16 May 2021 12:29:20 -0500
- changeset 40883
- 8f377fd478c0
- parent 40882
- 77df4bdbc750
- child 40884
- ca31392953ed
Fix installed Pidgin headers
* Install Pidgin headers to the correct directory.
The main header includes subheaders as `pidgin/...`, so they need to be installed that way.
* Add libhandy to pidgin pkgconfig.
* Ensure `pidginenums.h` is installed.
* Add some variables around pidgin include install paths.
Testing Done:
Compiled a file with `#include <pidgin.h>` using `pkgconf --cflags pidgin-3`.
Reviewed at https://reviews.imfreedom.org/r/656/
| pidgin/meson.build | file | annotate | diff | comparison | revisions |
--- a/pidgin/meson.build Sun May 16 12:20:09 2021 -0500 +++ b/pidgin/meson.build Sun May 16 12:29:20 2021 -0500 @@ -159,6 +159,9 @@ c_name : 'pidgin') libpidgin_SOURCES += pidgin_resource +pidgin_filebase = 'pidgin-3' +pidgin_include_base = pidgin_filebase / 'pidgin' + if IS_WIN32 libpidgin_SOURCES += [ 'pidgin.c', @@ -190,7 +193,9 @@ endif libpidgin_enums = gnome.mkenums_simple('pidginenums', - sources: libpidgin_enum_headers) + sources: libpidgin_enum_headers, + install_header: true, + install_dir: get_option('includedir') / pidgin_include_base) libpidgin_enums_c = libpidgin_enums[0] libpidgin_enums_h = libpidgin_enums[1] @@ -204,9 +209,9 @@ output : 'pidgin.h', configuration : pidgin_h_conf, install : true, - install_dir : get_option('includedir') / 'pidgin-3') + install_dir : get_option('includedir') / pidgin_filebase) - install_headers(libpidgin_headers, subdir : 'pidgin-3') + install_headers(libpidgin_headers, subdir : pidgin_include_base) _libpidgin_dependencies = [ glib, @@ -262,10 +267,10 @@ name : 'Pidgin', description : 'Pidgin is a GTK3-based instant messenger application.', version : meson.project_version(), - filebase : 'pidgin-3', - subdirs : 'pidgin-3', + filebase : pidgin_filebase, + subdirs : pidgin_filebase, libraries : [libpidgin], - requires : ['gtk+-3.0', 'purple-3', 'talkatu', 'gplugin-gtk'], + requires : ['gtk+-3.0', 'libhandy-1', 'purple-3', 'talkatu', 'gplugin-gtk'], variables : ['plugindir=${libdir}/pidgin-@0@'.format(purple_major_version)]) PIDGIN_DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
