pidgin/pidgin

Add a wrap file for libnice that is only used if -Dbuild-dependencies=true is passed to meson

2022-04-18, Gary Kramlich
4ad6f96d2aca
Parents 411afeb78be8
Children 844484fb31aa
Add a wrap file for libnice that is only used if -Dbuild-dependencies=true is passed to meson

We can optionally use this setup for our full dependency tree, but I'm not 100%
sure that's the best idea yet, but it does seem better than having it in a
separate repository.

Testing Done:
I made sure I had `libnice-dev` installed on debian and configured and built with with `build-dependencies` set to `true` and `false`.

I think removed `libnice-dev` and verified meson failed to configure with `build-dependencies=false`. I then reconfigured to set `build-dependencies=true` and verified that meson said it was going to build the subproject, and then I built the entire repository.

Bugs closed: PIDGIN-17577

Reviewed at https://reviews.imfreedom.org/r/1334/
3 files changed, 14 insertions(+), 1 deletions(-)
  • +3 -1
    meson.build
  • +3 -0
    meson_options.txt
  • +8 -0
    subprojects/libnice.wrap
    • --- a/meson.build Mon Apr 18 22:08:30 2022 -0500
    +++ b/meson.build Mon Apr 18 22:21:59 2022 -0500
    @@ -254,7 +254,9 @@
    #######################################################################
    # Check for libnice
    #######################################################################
    -nice = dependency('nice', version : '>=0.1.13')
    +nice = dependency('nice',
    + version : '>=0.1.13',
    + allow_fallback : get_option('build-dependencies'))
    #######################################################################
    # Check Pidgin dependencies
    --- a/meson_options.txt Mon Apr 18 22:08:30 2022 -0500
    +++ b/meson_options.txt Mon Apr 18 22:21:59 2022 -0500
    @@ -22,6 +22,9 @@
    option('pixmaps-install', type : 'boolean', value : true,
    description : 'enable installation of pixmap files - Pidgin still needs them!')
    +option('build-dependencies', type : 'boolean', value : false,
    + description : 'enable the use of subprojects to build missing dependencies.')
    +
    ##############################################################################
    # Libpurple Options
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/subprojects/libnice.wrap Mon Apr 18 22:21:59 2022 -0500
    @@ -0,0 +1,8 @@
    +[wrap-git]
    +directory = libnice
    +url = https://gitlab.freedesktop.org/libnice/libnice.git
    +revision = 0.1.18
    +
    +[provide]
    +dependency_names = nice
    +nice=libnice_dep