pidgin/pidgin

Build against libsoup3 by default

19 months ago, Elliott Sales de Andrade
96d057c6d7cb
Parents 4a85a3384851
Children 9db0b73c8fab
Build against libsoup3 by default

This follows the [recommendations from upstream](https://discourse.gnome.org/t/please-build-against-libsoup-3-by-default/10190/3). Note that this changes the option name from `soup3` to `soup2`.

Testing Done:
Compiled against libsoup3 and libsoup2.

Reviewed at https://reviews.imfreedom.org/r/2028/
5 files changed, 10 insertions(+), 6 deletions(-)
  • +4 -1
    libpurple/meson.build
  • +1 -1
    libpurple/protocols/facebook/meson.build
  • +3 -1
    meson.build
  • +2 -2
    meson_options.txt
  • +0 -1
    pidgin/meson.build
    • --- a/libpurple/meson.build Fri Nov 04 23:03:08 2022 -0500
    +++ b/libpurple/meson.build Fri Nov 04 23:06:10 2022 -0500
    @@ -339,7 +339,10 @@
    subdirs : [purple_filebase, purple_include_base],
    # NOTE: Don't use gplugin from pkgconfig, as it might be a subproject.
    requires : [glib, gdk_pixbuf, 'gplugin'],
    - variables : ['plugindir=${libdir}/@0@'.format(purple_filebase)])
    + variables : [
    + f'plugindir=${libdir}/@purple_filebase@',
    + f'soupapiversion=@soup_api_version@',
    + ])
    if enable_introspection
    introspection_sources = (purple_coresources + purple_coreheaders +
    --- a/libpurple/protocols/facebook/meson.build Fri Nov 04 23:03:08 2022 -0500
    +++ b/libpurple/protocols/facebook/meson.build Fri Nov 04 23:06:10 2022 -0500
    @@ -41,7 +41,7 @@
    if enable_introspection
    introspection_sources = FACEBOOK_SOURCES
    - facebook_gir_includes = ['GObject-2.0', 'Gio-2.0', 'Gst-1.0', 'Json-1.0', 'Soup-2.4', libpurple_gir[0]]
    + facebook_gir_includes = ['GObject-2.0', 'Gio-2.0', 'Gst-1.0', 'Json-1.0', f'Soup-@soup_api_version@', libpurple_gir[0]]
    facebook_gir = gnome.generate_gir(facebook_prpl,
    sources : introspection_sources,
    --- a/meson.build Fri Nov 04 23:03:08 2022 -0500
    +++ b/meson.build Fri Nov 04 23:06:10 2022 -0500
    @@ -277,18 +277,20 @@
    #######################################################################
    libsoup = disabler()
    -if get_option('soup3')
    +if not get_option('soup2')
    libsoup = dependency('libsoup-3.0', version : '>= 3')
    add_project_arguments(
    '-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_3_0',
    '-DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_3_0',
    language : 'c')
    + soup_api_version = '3.0'
    else
    libsoup = dependency('libsoup-2.4', version : '>= 2.42')
    add_project_arguments(
    '-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_42',
    '-DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_42',
    language : 'c')
    + soup_api_version = '2.4'
    endif
    #######################################################################
    --- a/meson_options.txt Fri Nov 04 23:03:08 2022 -0500
    +++ b/meson_options.txt Fri Nov 04 23:06:10 2022 -0500
    @@ -25,8 +25,8 @@
    option('libsecret', type : 'feature',
    description : 'enable libsecret support')
    -option('soup3', type : 'boolean', value : false,
    - description : 'compile against libsoup3')
    +option('soup2', type : 'boolean', value : false,
    + description : 'compile against libsoup2')
    ##############################################################################
    # Protocol Plugins
    --- a/pidgin/meson.build Fri Nov 04 23:03:08 2022 -0500
    +++ b/pidgin/meson.build Fri Nov 04 23:06:10 2022 -0500
    @@ -220,7 +220,6 @@
    json,
    libadwaita,
    math,
    - libsoup,
    talkatu_dep,
    libpurple_dep,
    ]