pidgin/pidgin

Merged pidgin/main into default

2018-02-16, Arkadiy Illarionov
93e83c6faf87
Parents 22d4e3e9972bde9d792c0d2d
Children cf4633d588f7
Merged pidgin/main into default
4 files changed, 37 insertions(+), 33 deletions(-)
  • +1 -0
    COPYRIGHT
  • +10 -8
    finch/plugins/meson.build
  • +25 -24
    meson.build
  • +1 -1
    meson_options.txt
    • --- a/COPYRIGHT Fri Feb 02 11:34:32 2018 +0300
    +++ b/COPYRIGHT Fri Feb 16 18:30:15 2018 +0300
    @@ -458,6 +458,7 @@
    Kristian Rietveld
    Pekka Riikonen
    Tim Ringenbach
    +Lubomir Rintel
    Dennis Ristuccia
    Lee Roach
    Eion Robb
    --- a/finch/plugins/meson.build Fri Feb 02 11:34:32 2018 +0300
    +++ b/finch/plugins/meson.build Fri Feb 16 18:30:15 2018 +0300
    @@ -1,13 +1,15 @@
    if PLUGINS
    - gntclipboard = library('gntclipboard', 'gntclipboard.c',
    - dependencies : [x11, libpurple_dep, libfinch_dep, glib],
    - name_prefix : '',
    - install : true, install_dir : FINCH_PLUGINDIR)
    + if with_x
    + gntclipboard = library('gntclipboard', 'gntclipboard.c',
    + dependencies : [x11, libpurple_dep, libfinch_dep, glib],
    + name_prefix : '',
    + install : true, install_dir : FINCH_PLUGINDIR)
    - gntgf = library('gntgf', 'gntgf.c',
    - dependencies : [x11, libpurple_dep, libfinch_dep, glib],
    - name_prefix : '',
    - install : true, install_dir : FINCH_PLUGINDIR)
    + gntgf = library('gntgf', 'gntgf.c',
    + dependencies : [x11, libpurple_dep, libfinch_dep, glib],
    + name_prefix : '',
    + install : true, install_dir : FINCH_PLUGINDIR)
    + endif
    gnthistory = library('gnthistory', 'gnthistory.c',
    dependencies : [libpurple_dep, libfinch_dep, glib],
    --- a/meson.build Fri Feb 02 11:34:32 2018 +0300
    +++ b/meson.build Fri Feb 16 18:30:15 2018 +0300
    @@ -391,8 +391,6 @@
    force_deps = not get_option('missing-dependencies')
    -with_x = get_option('x') and not IS_WIN32
    -
    # #######################################################################
    # # Check for GTK+ 2.18 and other things used by the GTK UI
    # #######################################################################
    @@ -429,28 +427,6 @@
    endif
    #######################################################################
    - # Check if we should compile with X support
    - #######################################################################
    - 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
    - endif
    - if not with_x
    - enable_gestures = false
    - x11 = []
    - endif
    -
    - #######################################################################
    # Check for stuff needed by the Evolution integration plugin.
    #######################################################################
    if enable_gevolution
    @@ -508,6 +484,31 @@
    #######################################################################
    +# Check if we should compile with X support
    +#######################################################################
    +with_x = get_option('x') and not IS_WIN32
    +
    +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 = false
    +endif
    +
    +#######################################################################
    # Check for ncurses and other things used by the console UI
    #######################################################################
    ncurses_inc = []
    --- a/meson_options.txt Fri Feb 02 11:34:32 2018 +0300
    +++ b/meson_options.txt Fri Feb 16 18:30:15 2018 +0300
    @@ -59,7 +59,7 @@
    option('libgadu', type : 'boolean', value : true,
    description : 'compile with libgadu (required for GaduGadu support)')
    -option('silc', type : 'boolean', value : true,
    +option('silc', type : 'boolean', value : false,
    description : 'compile with SILC plugin')
    option('static-prpls', type : 'string',