changeset
Add a purple_api_minor version to complement purple_api_major_version
Fri, 27 Sep 2024 00:21:49 -0500
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 27 Sep 2024 00:21:49 -0500
- changeset 42980
- 6781522ea5f3
- parent 42979
- d9f973ac3afd
- child 42981
- c512d4a3eda0
Add a purple_api_minor version to complement purple_api_major_version
The GIR namespace versions were showing up as 3.90 which is obviously wrong.
This allows us to override the minor version as well which fixes that problem.
Testing Done:
Called in the turtles and verified the gir files manually.
Reviewed at https://reviews.imfreedom.org/r/3540/
| libpurple/meson.build | file | annotate | diff | comparison | revisions | |
| meson.build | file | annotate | diff | comparison | revisions | |
| pidgin/meson.build | file | annotate | diff | comparison | revisions |
--- a/libpurple/meson.build Fri Sep 27 00:06:19 2024 -0500 +++ b/libpurple/meson.build Fri Sep 27 00:21:49 2024 -0500 @@ -332,7 +332,7 @@ symbol_prefix : 'purple', identifier_prefix : 'Purple', export_packages : purple_filebase, - nsversion : f'@purple_api_major_version@.@purple_minor_version@', + nsversion : f'@purple_api_major_version@.@purple_api_minor_version@', dependencies: [birb_dep, gplugin_dep], install : true, extra_args : ['-DPURPLE_COMPILATION', '--quiet'])
--- a/meson.build Fri Sep 27 00:06:19 2024 -0500 +++ b/meson.build Fri Sep 27 00:21:49 2024 -0500 @@ -38,12 +38,14 @@ purple_minor_version = parts[1] purple_micro_version = parts[2] -# purple_api_major_version should generally match purple_major_version. -# However, when working towards a new major version, this number should be set -# to that new major version while the meson project version should be something +# purple_api_major_version and purple_api_minor_version should generally match +# purple_major_version and purple_minor_version. However, when working towards +# a new major version, these numbers should be set to the new major and new +# minor versions while the meson project version should be something # like 2.90.0. This allows us to get the versioning sane, while changing the # major version. purple_api_major_version = '3' +purple_api_minor_version = '0' GETTEXT_PACKAGE='pidgin3' find_program('gettext')
--- a/pidgin/meson.build Fri Sep 27 00:06:19 2024 -0500 +++ b/pidgin/meson.build Fri Sep 27 00:21:49 2024 -0500 @@ -235,7 +235,7 @@ symbol_prefix : 'pidgin', identifier_prefix : 'Pidgin', export_packages : f'pidgin-@purple_api_major_version@', - nsversion : f'@purple_api_major_version@.@purple_minor_version@', + nsversion : f'@purple_api_major_version@.@purple_api_minor_version@', dependencies : [gplugin_dep, gplugin_gtk_dep, libpurple_dep], install : true, extra_args : ['-DPIDGIN_COMPILATION', '--quiet'])
