pidgin/pidgin

remove the glib version macros from internal.h to meson and make sure everything is consistent

2021-10-28, Gary Kramlich
b60171ce4589
Parents c357390f7c22
Children e6aa2d7ccbb3
remove the glib version macros from internal.h to meson and make sure everything is consistent

Testing Done:
Compiled and ran the unit tests.

Reviewed at https://reviews.imfreedom.org/r/1111/
2 files changed, 6 insertions(+), 5 deletions(-)
  • +0 -4
    libpurple/internal.h
  • +6 -1
    meson.build
    • --- a/libpurple/internal.h Wed Oct 27 02:01:18 2021 -0500
    +++ b/libpurple/internal.h Thu Oct 28 22:11:33 2021 -0500
    @@ -32,10 +32,6 @@
    # error "only <purple.h> may be included directly"
    #endif
    -#ifndef GLIB_VERSION_MIN_REQUIRED
    -#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_52)
    -#endif
    -
    #ifdef HAVE_CONFIG_H
    # ifdef GETTEXT_PACKAGE
    # undef GETTEXT_PACKAGE
    --- a/meson.build Wed Oct 27 02:01:18 2021 -0500
    +++ b/meson.build Thu Oct 28 22:11:33 2021 -0500
    @@ -231,7 +231,7 @@
    endif
    # #######################################################################
    -# # Check for GLib 2.44 (required)
    +# # Check for GLib 2.64 (required)
    # #######################################################################
    glib = dependency('glib-2.0', version : '>= 2.64.0')
    gio = dependency('gio-2.0')
    @@ -239,6 +239,11 @@
    gthread = dependency('gthread-2.0')
    gnome = import('gnome')
    +add_project_arguments(
    + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_64',
    + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_64',
    + language : 'c',)
    +
    #######################################################################
    # Check for GObject Introspection
    #######################################################################