pidgin/pidgin

Convert optional dependencies into Meson features.

2019-10-08, Elliott Sales de Andrade
e9eaaff671c9
Parents 139863d2434b
Children b13b5a9a337d
Convert optional dependencies into Meson features.
12 files changed, 129 insertions(+), 248 deletions(-)
  • +1 -1
    bitbucket-pipelines.yml
  • +1 -1
    finch/meson.build
  • +1 -1
    finch/plugins/meson.build
  • +2 -2
    libpurple/meson.build
  • +1 -1
    libpurple/plugins/keyrings/kwallet/meson.build
  • +2 -2
    libpurple/plugins/keyrings/meson.build
  • +3 -4
    libpurple/protocols/jabber/meson.build
  • +83 -197
    meson.build
  • +17 -20
    meson_options.txt
  • +5 -5
    pidgin/plugins/cap/meson.build
  • +12 -11
    pidgin/plugins/gevolution/meson.build
  • +1 -3
    pidgin/plugins/meson.build
    • --- a/bitbucket-pipelines.yml Mon Oct 07 21:57:38 2019 -0400
    +++ b/bitbucket-pipelines.yml Tue Oct 08 15:53:19 2019 -0400
    @@ -5,7 +5,7 @@
    - step:
    script:
    - set -ex
    - - meson -Dsilc=false -Ddoc=true -Dconsole-logging=true build-pipelines
    + - meson -Ddoc=true -Dconsole-logging=true build-pipelines
    - ninja -C build-pipelines
    - ninja -C build-pipelines test
    - "ninja -C build-pipelines $(ninja -C build-pipelines -t targets | grep -E '[a-z]+-doc:' | cut -d: -f1)"
    --- a/finch/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/finch/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -6,7 +6,7 @@
    else
    libgnt_proj = subproject('libgnt',
    default_options : [
    - 'introspection=' + get_option('introspection').to_string(),
    + 'introspection=' + enable_introspection.to_string(),
    ]
    )
    libgnt_dep = libgnt_proj.get_variable('libgnt_dep')
    --- a/finch/plugins/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/finch/plugins/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -1,5 +1,5 @@
    if PLUGINS
    - if with_x
    + if x11.found()
    gntclipboard = library('gntclipboard', 'gntclipboard.c',
    dependencies : [x11, libpurple_dep, libfinch_dep, glib],
    name_prefix : '',
    --- a/libpurple/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/libpurple/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -161,7 +161,7 @@
    purple_filebase = 'purple-@0@'.format(purple_major_version)
    purple_include_base = join_paths(purple_filebase, 'libpurple')
    -if enable_gst
    +if gstreamer.found()
    purple_coresources += 'media/backend-fs2.c'
    endif
    if enable_vv
    @@ -295,7 +295,7 @@
    purple_mediaheaders)
    Purple_gir_includes = ['GObject-2.0', 'Gio-2.0', gplugin_gir]
    - if enable_gst
    + if gstreamer.found()
    Purple_gir_includes += ['Gst-1.0']
    endif
    --- a/libpurple/plugins/keyrings/kwallet/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/libpurple/plugins/keyrings/kwallet/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -1,5 +1,5 @@
    if PLUGINS
    - if enable_kwallet
    + if kwallet.found()
    kwallet_moc = qt5.preprocess(
    moc_headers: 'purplekwallet.h',
    dependencies: qt5_dep,
    --- a/libpurple/plugins/keyrings/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/libpurple/plugins/keyrings/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -1,14 +1,14 @@
    if PLUGINS
    subdir('kwallet')
    - if enable_nettle
    + if nettle.found()
    internalkeyring_plugin = library('internalkeyring', 'internalkeyring.c',
    dependencies : [nettle, libpurple_dep],
    name_prefix : '',
    install : true, install_dir : PURPLE_PLUGINDIR)
    endif
    - if enable_secret_service
    + if secretservice.found()
    secretsservice_plugin = library('secretservice', 'secretservice.c',
    dependencies : [secretservice, libpurple_dep],
    name_prefix : '',
    --- a/libpurple/protocols/jabber/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/libpurple/protocols/jabber/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -2,11 +2,10 @@
    # Check for Internationalized Domain Name support
    #######################################################################
    -if get_option('idn')
    - idn = dependency('libidn', version : '>= 0.0.0', required : force_deps)
    +idn = dependency('libidn', version : '>= 0.0.0', required : get_option('idn'))
    +if idn.found()
    use_idn = [ '-DUSE_IDN' ]
    else
    - idn = []
    use_idn = []
    endif
    @@ -104,7 +103,7 @@
    'xmpp.h'
    ]
    -if enable_cyrus_sasl
    +if sasl.found()
    JABBERSOURCES += ['auth_cyrus.c']
    endif
    --- a/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -288,13 +288,17 @@
    endif
    conf.set_quoted('DISPLAY_VERSION', DISPLAY_VERSION)
    -force_deps = not get_option('missing-dependencies')
    +#######################################################################
    +# Check for GObject Introspection
    +#######################################################################
    +
    +enable_introspection = dependency('gobject-introspection-1.0', version : '>= 1.30.0',
    + required : get_option('introspection')).found()
    +conf.set('ENABLE_INTROSPECTION', enable_introspection)
    # #######################################################################
    # # Check for GTK+ 2.18 and other things used by the GTK UI
    # #######################################################################
    -enable_gestures = get_option('gestures')
    -
    # #######################################################################
    # Check Pidgin dependencies
    # #######################################################################
    @@ -311,7 +315,7 @@
    talkatu_proj = subproject('talkatu',
    default_options : [
    'doc=' + get_option('doc').to_string(),
    - 'gobject-introspection=' + get_option('introspection').to_string(),
    + 'gobject-introspection=' + enable_introspection.to_string(),
    'nls=' + get_option('nls').to_string(),
    ]
    )
    @@ -327,25 +331,15 @@
    #######################################################################
    # Check if we should compile with X support
    #######################################################################
    -with_x = get_option('x') and not IS_WIN32
    +if IS_WIN32
    + x11 = disabler()
    +else
    + x11 = dependency('x11', required : get_option('x'))
    +endif
    +conf.set('HAVE_X11', x11.found())
    -if with_x
    - x11 = dependency('x11')
    - if x11.found()
    - conf.set('HAVE_X11', true)
    - else
    - with_x = false
    - if force_deps
    - error('''
    -X11 development headers not found.
    -Use -Dx=false if you do not need X11 support.
    -''')
    - endif
    - endif
    -else
    - x11 = []
    -endif
    -if not get_option('gtkui') or not with_x
    +enable_gestures = get_option('gestures')
    +if not get_option('gtkui') or not x11.found()
    enable_gestures = false
    endif
    @@ -367,59 +361,39 @@
    # Check for GStreamer
    #######################################################################
    -enable_gst = get_option('gstreamer')
    -if enable_gst
    - gstreamer = dependency('gstreamer-1.0', required : force_deps)
    - if gstreamer.found()
    - conf.set('USE_GSTREAMER', true)
    - else
    - enable_gst = false
    - endif
    -else
    - gstreamer = []
    -endif
    +gstreamer = dependency('gstreamer-1.0', required : get_option('gstreamer'))
    +conf.set('USE_GSTREAMER', gstreamer.found())
    #######################################################################
    # Check for GStreamer Video
    #######################################################################
    -enable_gstvideo = enable_gst and get_option('gstreamer-video')
    -if enable_gstvideo
    +if gstreamer.found()
    gstreamer_video = dependency('gstreamer-video-1.0',
    - required : false)
    - if gstreamer_video.found()
    - conf.set('USE_GSTVIDEO', true)
    - else
    - enable_gstvideo = false
    - endif
    + required : get_option('gstreamer-video'))
    + conf.set('USE_GSTVIDEO', gstreamer_video.found())
    else
    - gstreamer_video = []
    + gstreamer_video = disabler()
    endif
    #######################################################################
    # Check for Farstream
    #######################################################################
    -if get_option('farstream')
    - farstream = dependency('farstream-0.2', version : '>= 0.2.7',
    - required : false)
    - enable_farstream = farstream.found()
    -else
    - farstream = []
    - enable_farstream = false
    -endif
    +farstream = dependency('farstream-0.2', version : '>= 0.2.7',
    + required : get_option('farstream'))
    #######################################################################
    # Check for Voice and Video support
    #######################################################################
    -if get_option('vv')
    - if enable_gst and enable_gstvideo and enable_farstream
    +if get_option('vv').enabled() or get_option('vv').auto()
    + if gstreamer.found() and gstreamer_video.found() and farstream.found()
    conf.set('USE_VV', true)
    enable_vv = true
    else
    - if force_deps
    + if get_option('vv').enabled()
    error('''
    Dependencies for voice/video were not met.
    Install the necessary gstreamer and farstream packages first.
    -Or use -Dvv=false if you do not need voice/video support.
    +Or use -Dvv=disabled if you do not need voice/video support.
    ''')
    endif
    enable_vv = false
    @@ -445,73 +419,43 @@
    #######################################################################
    # Check for Meanwhile headers (for Sametime)
    #######################################################################
    -if get_option('meanwhile')
    - meanwhile = dependency('meanwhile', version : ['>= 1.0.0', '< 2.0.0'], required : force_deps)
    - gmime = dependency('gmime-3.0', version : '>= 3.0.0', required : force_deps)
    - enable_meanwhile = meanwhile.found() and gmime.found()
    -else
    - enable_meanwhile = false
    - meanwhile = []
    -endif
    +meanwhile = dependency('meanwhile', version : ['>= 1.0.0', '< 2.0.0'], required : get_option('meanwhile'))
    +gmime = dependency('gmime-3.0', version : '>= 3.0.0', required : get_option('meanwhile'))
    +enable_meanwhile = meanwhile.found() and gmime.found()
    #######################################################################
    # Check for Native Avahi headers (for Bonjour)
    #######################################################################
    -enable_avahi = get_option('avahi')
    -avahi = []
    -if enable_avahi and IS_WIN32
    +if IS_WIN32
    # Just keep enabled.
    -elif enable_avahi
    + enable_avahi = get_option('avahi').enabled() or get_option('avahi').auto()
    + avahi = []
    +else
    # Attempt to autodetect Avahi
    - avahi_client = dependency('avahi-client', required : false)
    - avahi_glib = dependency('avahi-glib', required : false)
    - if avahi_client.found() and avahi_glib.found()
    - avahi = [avahi_client, avahi_glib]
    - else
    - enable_avahi = false
    - if force_deps
    - error('''
    -avahi development package not found.
    -Use -Davahi=false if you do not need avahi (Bonjour) support.
    -''')
    - endif
    - endif
    + avahi_client = dependency('avahi-client', required : get_option('avahi'))
    + avahi_glib = dependency('avahi-glib', required : get_option('avahi'))
    + avahi = [avahi_client, avahi_glib]
    + enable_avahi = avahi_client.found() and avahi_glib.found()
    endif
    #######################################################################
    # Check for SILC client includes and libraries
    #######################################################################
    -have_silc = false
    -if get_option('silc')
    - silc = dependency('silcclient', version : '>= 1.1', required : false)
    - if silc.found()
    - have_silc = true
    - # SILC Toolkit >= 1.0.1 has a new MIME API
    - conf.set('HAVE_SILCMIME_H', true)
    - else
    - if force_deps
    - error('''
    -SILC development package not found.
    -Use -Dsilc=false if you do not need SILC support.
    -''')
    - endif
    - endif
    -endif
    +silc = dependency('silcclient', version : '>= 1.1', required : get_option('silc'))
    #######################################################################
    # Check for Gadu-Gadu protocol library (libgadu)
    #######################################################################
    -enable_libgadu = get_option('libgadu')
    -if enable_libgadu
    - libgadu = dependency('libgadu', version : '>= 1.12.0', required : false)
    - have_libgadu = libgadu.found()
    +libgadu = dependency('libgadu', version : '>= 1.12.0', required : get_option('libgadu'))
    - if have_libgadu
    - if not compiler.has_function('gg_is_gpl_compliant', dependencies : libgadu)
    - have_libgadu = false
    +if libgadu.found()
    + if not compiler.has_function('gg_is_gpl_compliant', dependencies : libgadu)
    + if get_option('libgadu').auto()
    + libgadu = disabler()
    + else
    message('''
    libgadu is not compatible with the GPL when compiled with OpenSSL support.
    @@ -521,15 +465,6 @@
    ''')
    endif
    endif
    -
    - if not have_libgadu and force_deps
    - error('''
    -Libgadu development headers not found.
    -Use -Dlibgadu=false if you do not need GG (GaduGadu) support.
    -''')
    - endif
    -else
    - have_libgadu = false
    endif
    @@ -549,9 +484,9 @@
    # Do nothing.
    elif prpl == 'bonjour' and not enable_avahi
    # Do nothing.
    - elif prpl == 'silc' and not have_silc
    + elif prpl == 'silc' and not silc.found()
    # Do nothing.
    - elif prpl == 'gg' and not have_libgadu
    + elif prpl == 'gg' and not libgadu.found()
    # Do nothing.
    elif prpl == 'zephyr' and IS_WIN32
    # Do nothing.
    @@ -639,12 +574,12 @@
    # Check for Unity and Messaging Menu
    # Remove when Ubuntu 16.04 is EOL
    #######################################################################
    -enable_unity = get_option('unity-integration')
    +UNITY = [
    + dependency('unity', version : '>= 6.8', required : get_option('unity-integration')),
    + dependency('messaging-menu', version : '>= 12.10', required : get_option('unity-integration'))
    +]
    +enable_unity = UNITY[0].found() and UNITY[1].found()
    if enable_unity
    - UNITY = [
    - dependency('unity', version : '>= 6.8'),
    - dependency('messaging-menu', version : '>= 12.10')
    - ]
    conf.set('USES_MM_CHAT_SECTION', 'X-MessagingMenu-UsesChatSection=true')
    else
    conf.set('USES_MM_CHAT_SECTION', '')
    @@ -654,22 +589,19 @@
    # Check for Secret Service headers
    #######################################################################
    -enable_secret_service = get_option('secret-service') and not IS_WIN32
    -if enable_secret_service
    - secretservice = dependency('libsecret-1', required : force_deps)
    - if secretservice.found()
    - else
    - enable_secret_service = false
    - endif
    +if IS_WIN32
    + secretservice = disabler()
    +else
    + secretservice = dependency('libsecret-1', required : get_option('secret-service'))
    endif
    #######################################################################
    # Check for KWallet headers
    #######################################################################
    -enable_kwallet = get_option('kwallet') and not IS_WIN32
    -
    -if enable_kwallet
    +if IS_WIN32
    + kwallet = disabler()
    +else
    # Ensure C++ compiler works
    add_languages('cpp')
    cxx_compiler = meson.get_compiler('cpp')
    @@ -677,9 +609,9 @@
    qt5 = import('qt5')
    - qt5_dep = dependency('qt5', modules: ['Core'])
    + qt5_dep = dependency('qt5', modules: ['Core'], required : get_option('kwallet'))
    - kwallet = dependency('KF5Wallet')
    + kwallet = dependency('KF5Wallet', required : get_option('kwallet'))
    endif
    #######################################################################
    @@ -695,7 +627,7 @@
    gplugin_proj = subproject('gplugin',
    default_options : [
    'doc=' + get_option('doc').to_string(),
    - 'gobject-introspection=' + get_option('introspection').to_string(),
    + 'gobject-introspection=' + enable_introspection.to_string(),
    'nls=' + get_option('nls').to_string(),
    ]
    )
    @@ -704,42 +636,14 @@
    gplugin_include_directories = []
    endif
    -#######################################################################
    -# Check for GObject Introspection
    -#######################################################################
    -
    -enable_introspection = get_option('introspection')
    -if enable_introspection
    - if dependency('gobject-introspection-1.0', version : '>= 1.30.0',
    - required : force_deps).found()
    - conf.set('ENABLE_INTROSPECTION', true)
    - else
    - enable_introspection = false
    - endif
    -endif
    -
    PLUGINS = get_option('plugins')
    #######################################################################
    # Check for Nettle (Crypto Library)
    #######################################################################
    -enable_nettle = get_option('nettle')
    -
    -if enable_nettle
    - nettle = dependency('nettle', version : '>= 3.0', required : false)
    - enable_nettle = nettle.found()
    - conf.set('HAVE_NETTLE', enable_nettle)
    -
    - if not enable_nettle and force_deps
    - error('''
    -Nettle development headers not found
    -Use -Dnettle=false if you do not need it.
    -''')
    - endif
    -else
    - nettle = []
    -endif
    +nettle = dependency('nettle', version : '>= 3.0', required : get_option('nettle'))
    +conf.set('HAVE_NETTLE', nettle.found())
    #######################################################################
    # Check for Cyrus-SASL (for xmpp/irc)
    @@ -748,22 +652,15 @@
    conf.set('HAVE_' + func.to_upper(),
    compiler.has_function(func))
    endforeach
    -enable_cyrus_sasl = get_option('cyrus-sasl')
    -if enable_cyrus_sasl
    - sasl = dependency('libsasl2', version : '>= 2.0', required : false)
    - enable_cyrus_sasl = sasl.found()
    - conf.set('HAVE_CYRUS_SASL', enable_cyrus_sasl)
    +sasl = dependency('libsasl2', version : '>= 2.0', required : get_option('cyrus-sasl'))
    +conf.set('HAVE_CYRUS_SASL', sasl.found())
    - if not enable_cyrus_sasl and force_deps
    - error('''
    -Cyrus SASL library not found
    -Use -Dcyrus-sasl=false if you do not need it.
    -''')
    - endif
    -else
    - enable_cyrus_sasl = false
    - sasl = []
    -endif
    +#######################################################################
    +# Check for external libzephyr
    +#######################################################################
    +ext_zephyr = dependency('zephyr', required : get_option('zephyr'))
    +EXTERNAL_LIBZEPHYR = ext_zephyr.found()
    +conf.set('LIBZEPHYR_EXT', EXTERNAL_LIBZEPHYR)
    #######################################################################
    # Check for Kerberos (for Zephyr)
    @@ -802,19 +699,6 @@
    krb4 = []
    endif
    -#######################################################################
    -# Check for external libzephyr
    -#######################################################################
    -zephyr = get_option('zephyr')
    -if zephyr
    - ext_zephyr = dependency('zephyr', required : force_deps)
    - zephyr = ext_zephyr.found()
    -else
    - ext_zephyr = []
    -endif
    -EXTERNAL_LIBZEPHYR = zephyr
    -conf.set('LIBZEPHYR_EXT', EXTERNAL_LIBZEPHYR)
    -
    #AC_MSG_CHECKING(for me pot o' gold)
    #AC_MSG_RESULT(no)
    foreach func : ['timegm']
    @@ -873,26 +757,28 @@
    message('')
    message('Build GTK+ UI................. : ' + get_option('gtkui').to_string())
    message('Build console UI.............. : ' + enable_consoleui.to_string())
    -message('Build for X11................. : ' + with_x.to_string())
    +message('Build for X11................. : ' + x11.found().to_string())
    message('')
    message('Enable Gestures............... : ' + enable_gestures.to_string())
    message('Protocols to build dynamically : @0@'.format(DYNAMIC_PRPLS))
    message('')
    -message('Build with GStreamer support.. : ' + enable_gst.to_string())
    +message('Build with GStreamer support.. : ' + gstreamer.found().to_string())
    message('Build with voice and video.... : ' + enable_vv.to_string())
    -message('Build with GNU Libidn......... : ' + get_option('idn').to_string())
    -message('Build with Nettle support..... : ' + enable_nettle.to_string())
    -message('Build with Cyrus SASL support. : ' + enable_cyrus_sasl.to_string())
    +message('Build with GNU Libidn......... : ' + idn.found().to_string())
    +message('Build with Nettle support..... : ' + nettle.found().to_string())
    +message('Build with Cyrus SASL support. : ' + sasl.found().to_string())
    +message('Use external libzephyr........ : ' + EXTERNAL_LIBZEPHYR.to_string())
    +if not EXTERNAL_LIBZEPHYR
    message('Use kerberos 4 with zephyr.... : ' + kerberos.to_string())
    -message('Use external libzephyr........ : ' + zephyr.to_string())
    +endif
    message('Install pixmaps............... : ' + INSTALL_PIXMAPS.to_string())
    message('Install translations.......... : ' + INSTALL_I18N.to_string())
    message('Has you....................... : yes')
    message('')
    message('Build Unity integration plugin.: ' + enable_unity.to_string())
    message('')
    -message('Build with KWallet............ : ' + enable_kwallet.to_string())
    -message('Build with Secret Service..... : ' + enable_secret_service.to_string())
    +message('Build with KWallet............ : ' + kwallet.found().to_string())
    +message('Build with Secret Service..... : ' + secretservice.found().to_string())
    message('')
    message('Build plugins................. : ' + PLUGINS.to_string())
    message('Enable Introspection...........: ' + enable_introspection.to_string())
    --- a/meson_options.txt Mon Oct 07 21:57:38 2019 -0400
    +++ b/meson_options.txt Tue Oct 08 15:53:19 2019 -0400
    @@ -10,13 +10,10 @@
    option('glib-errors-trace', type : 'boolean', value : false,
    description : 'print backtraces for glib errors')
    -option('introspection', type : 'boolean', value : true,
    +option('introspection', type : 'feature',
    description : 'build introspection data')
    -option('missing-dependencies', type : 'boolean', value : false,
    - description : 'skip missing dependencies instead of aborting configuration')
    -
    -option('nettle', type : 'boolean', value : true,
    +option('nettle', type : 'feature',
    description : 'enable Nettle support')
    option('nls', type : 'boolean', value : true,
    @@ -28,25 +25,25 @@
    ##############################################################################
    # Libpurple Options
    -option('farstream', type : 'boolean', value : true,
    +option('farstream', type : 'feature',
    description : 'compile with farstream support')
    -option('gstreamer', type : 'boolean', value : true,
    +option('gstreamer', type : 'feature',
    description : 'compile with GStreamer audio support')
    -option('gstreamer-video', type : 'boolean', value : true,
    +option('gstreamer-video', type : 'feature',
    description : 'compile with GStreamer 1.0 Video Overlay support')
    -option('kwallet', type : 'boolean', value : true,
    +option('kwallet', type : 'feature',
    description : 'enable KWallet support')
    option('plugins', type : 'boolean', value : true,
    description : 'compile plugins')
    -option('secret-service', type : 'boolean', value : true,
    +option('secret-service', type : 'feature',
    description : 'enable Secret Service support')
    -option('vv', type : 'boolean', value : true,
    +option('vv', type : 'feature',
    description : 'compile with voice and video support')
    ##############################################################################
    @@ -55,28 +52,28 @@
    option('dynamic-prpls', type : 'string', value: 'all',
    description : 'specify which protocols to build dynamically')
    -option('avahi', type : 'boolean', value : true,
    +option('avahi', type : 'feature',
    description : 'compile with avahi (required for Bonjour support)')
    -option('cyrus-sasl', type : 'boolean', value : false,
    +option('cyrus-sasl', type : 'feature',
    description : 'enable Cyrus SASL support for XMPP/IRC')
    -option('idn', type : 'boolean', value : true,
    +option('idn', type : 'feature',
    description : 'compile with IDN support')
    option('krb4', type : 'boolean', value : false,
    description : 'compile Zephyr plugin with Kerberos 4 support')
    -option('libgadu', type : 'boolean', value : true,
    +option('libgadu', type : 'feature',
    description : 'compile with libgadu (required for GaduGadu support)')
    -option('meanwhile', type : 'boolean', value : true,
    +option('meanwhile', type : 'feature',
    description : 'compile with meanwhile')
    -option('silc', type : 'boolean', value : false,
    +option('silc', type : 'feature',
    description : 'compile with SILC plugin')
    -option('zephyr', type : 'boolean', value : false,
    +option('zephyr', type : 'feature',
    description : 'compile Zephyr plugin against external libzephyr')
    ##############################################################################
    @@ -94,10 +91,10 @@
    option('gestures', type : 'boolean', value : true,
    description : 'compile with the gestures plugin')
    -option('gevolution', type : 'boolean', value : false,
    +option('gevolution', type : 'feature',
    description : 'compile with the Evolution plugin')
    -option('unity-integration', type : 'boolean', value : false,
    +option('unity-integration', type : 'feature',
    description : 'compile with support for unity integration plugin')
    ##############################################################################
    --- a/pidgin/plugins/cap/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/pidgin/plugins/cap/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -1,9 +1,9 @@
    -#######################################################################
    -# Check for libsqlite3 (for the Contact Availability Prediction plugin)
    -#######################################################################
    -SQLITE3 = dependency('sqlite3', version : '>= 3.3', required : force_deps)
    +if PLUGINS
    + #######################################################################
    + # Check for libsqlite3 (for the Contact Availability Prediction plugin)
    + #######################################################################
    + SQLITE3 = dependency('sqlite3', version : '>= 3.3')
    -if PLUGINS and SQLITE3.found()
    cap = library('cap', 'cap.c', 'cap.h', 'cap_statistics.h',
    dependencies : [SQLITE3, libpurple_dep, libpidgin_dep, glib],
    name_prefix : '',
    --- a/pidgin/plugins/gevolution/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/pidgin/plugins/gevolution/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -1,14 +1,16 @@
    +if PLUGINS
    #######################################################################
    # Check for stuff needed by the Evolution integration plugin.
    #######################################################################
    EVOLUTION_ADDRESSBOOK = [
    - dependency('libebook-1.2', required : force_deps),
    - dependency('libedata-book-1.2', required : force_deps),
    - dependency('evolution-data-server-1.2', version : '>= 3.6', required : force_deps),
    + dependency('libebook-1.2', required : get_option('gevolution')),
    + dependency('libedata-book-1.2', required : get_option('gevolution')),
    + dependency('evolution-data-server-1.2', version : '>= 3.6', required : get_option('gevolution')),
    ]
    -enable_gevolution = true
    foreach dep : EVOLUTION_ADDRESSBOOK
    - enable_gevolution = enable_gevolution and dep.found()
    + if not dep.found()
    + EVOLUTION_ADDRESSBOOK += [disabler()]
    + endif
    endforeach
    gevolution_SOURCES = [
    @@ -21,11 +23,10 @@
    'eds-utils.c'
    ]
    -if PLUGINS and enable_gevolution
    - gmodule = dependency('gmodule-2.0')
    +gmodule = dependency('gmodule-2.0', required : get_option('gevolution'))
    - gevolution = library('gevolution', gevolution_SOURCES,
    - dependencies : EVOLUTION_ADDRESSBOOK + [libpurple_dep, libpidgin_dep, glib, gmodule],
    - name_prefix : '',
    - install : true, install_dir : PIDGIN_PLUGINDIR)
    +gevolution = library('gevolution', gevolution_SOURCES,
    + dependencies : EVOLUTION_ADDRESSBOOK + [libpurple_dep, libpidgin_dep, glib, gmodule],
    + name_prefix : '',
    + install : true, install_dir : PIDGIN_PLUGINDIR)
    endif
    --- a/pidgin/plugins/meson.build Mon Oct 07 21:57:38 2019 -0400
    +++ b/pidgin/plugins/meson.build Tue Oct 08 15:53:19 2019 -0400
    @@ -1,6 +1,4 @@
    -if get_option('gevolution')
    - subdir('gevolution')
    -endif
    +subdir('gevolution')
    if false
    subdir('musicmessaging')