qulogic/pidgin

meson: Remove trayicon-compat option

2018-05-13, Mike Ruprecht
6586193474f2
Parents 837015ba2923
Children ad2b0e960d3c
meson: Remove trayicon-compat option

trayicon-compat was added due to hicolor-icon-theme < 0.10 not
including the status icon directory. It looks like the distributions
we support have 0.10 or above. This patch removes this option.
3 files changed, 1 insertions(+), 17 deletions(-)
  • +0 -6
    meson.build
  • +0 -3
    meson_options.txt
  • +1 -8
    pidgin/pixmaps/tray/meson.build
    • --- a/meson.build Tue May 08 21:59:25 2018 -0500
    +++ b/meson.build Sun May 13 14:40:33 2018 -0500
    @@ -1092,11 +1092,6 @@
    #######################################################################
    INSTALL_PIXMAPS = get_option('pixmaps-install')
    -#######################################################################
    -# Tweak status tray icon installation directory
    -#######################################################################
    -ENABLE_TRAYCOMPAT = get_option('trayicon-compat')
    -
    # check for gtk-doc
    ENABLE_DOC = get_option('doc')
    if ENABLE_DOC
    @@ -1148,7 +1143,6 @@
    message('Use kerberos 4 with zephyr.... : ' + kerberos.to_string())
    message('Use external libzephyr........ : ' + zephyr.to_string())
    message('Install pixmaps............... : ' + INSTALL_PIXMAPS.to_string())
    -message('Old tray icon compatibility... : ' + ENABLE_TRAYCOMPAT.to_string())
    message('Install translations.......... : ' + INSTALL_I18N.to_string())
    message('Has you....................... : yes')
    message('')
    --- a/meson_options.txt Tue May 08 21:59:25 2018 -0500
    +++ b/meson_options.txt Sun May 13 14:40:33 2018 -0500
    @@ -109,8 +109,5 @@
    option('pixmaps-install', type : 'boolean', value : true,
    description : 'enable installation of pixmap files - Pidgin still needs them!')
    -option('trayicon-compat', type : 'boolean', value : false,
    - description : 'install tray icons in location compatible with older releases of hicolor-icon-theme')
    -
    option('debug', type : 'boolean', value : false,
    description : 'compile with debugging support')
    --- a/pidgin/pixmaps/tray/meson.build Tue May 08 21:59:25 2018 -0500
    +++ b/pidgin/pixmaps/tray/meson.build Sun May 13 14:40:33 2018 -0500
    @@ -15,19 +15,12 @@
    install_data('hicolor/index.theme',
    install_dir : pidginpixmapdir + '/tray/hicolor')
    -if ENABLE_TRAYCOMPAT
    - # Install in a location compatible with hicolor-icon-theme 0.9
    - subdir = 'actions'
    -else
    - # Install in the "correct" locations
    - subdir = 'status'
    -endif
    foreach tray : TRAY
    filename = '@0@.png'.format(tray)
    foreach size : [16, 22, 32, 48]
    size = '@0@x@0@'.format(size)
    inpath = join_paths('hicolor', size, 'status', filename)
    - outpath = join_paths(pidginpixmapdir, 'tray', 'hicolor', size, subdir)
    + outpath = join_paths(pidginpixmapdir, 'tray', 'hicolor', size, 'status')
    install_data(inpath, install_dir : outpath)
    endforeach
    endforeach