diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2022-11-04 23:06:10 -0500 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2022-11-04 23:06:10 -0500 |
| commit | a8c72117c69d2d6083dd346a3488b9edf7620729 (patch) | |
| tree | e7506fa2daac49f01c45b7380252566dbc49a3e8 | |
| parent | 7c4cb268569953fb3bd967056ebb3835595b9f7e (diff) | |
| download | pidgin-a8c72117c69d2d6083dd346a3488b9edf7620729.tar.gz | |
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/
| -rw-r--r-- | libpurple/meson.build | 5 | ||||
| -rw-r--r-- | libpurple/protocols/facebook/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 4 | ||||
| -rw-r--r-- | pidgin/meson.build | 1 |
5 files changed, 10 insertions, 6 deletions
diff --git a/libpurple/meson.build b/libpurple/meson.build index 9c2df2169b..09957b019e 100644 --- a/libpurple/meson.build +++ b/libpurple/meson.build @@ -339,7 +339,10 @@ pkgconfig.generate( 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 + diff --git a/libpurple/protocols/facebook/meson.build b/libpurple/protocols/facebook/meson.build index ec997833da..d4758dceda 100644 --- a/libpurple/protocols/facebook/meson.build +++ b/libpurple/protocols/facebook/meson.build @@ -41,7 +41,7 @@ if DYNAMIC_FACEBOOK 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, diff --git a/meson.build b/meson.build index 0f03ec66fb..94595b8872 100644 --- a/meson.build +++ b/meson.build @@ -277,18 +277,20 @@ json = dependency('json-glib-1.0', version : '>= 0.14.0') ####################################################################### 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 ####################################################################### diff --git a/meson_options.txt b/meson_options.txt index 00d48a108a..ec034e4ca2 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -25,8 +25,8 @@ option('kwallet', type : 'feature', 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 diff --git a/pidgin/meson.build b/pidgin/meson.build index 5b6560c53f..b9327c9344 100644 --- a/pidgin/meson.build +++ b/pidgin/meson.build @@ -220,7 +220,6 @@ _libpidgin_dependencies = [ json, libadwaita, math, - libsoup, talkatu_dep, libpurple_dep, ] |