pidgin/pidgin

Switch join_paths and + to /.

2020-09-16, Elliott Sales de Andrade
c0ea70247280
Parents af3eb87ac757
Children fbf29150c28c
Switch join_paths and + to /.

Testing Done:
Ran `ninja install`, though didn't actually check the results.

Reviewed at https://reviews.imfreedom.org/r/121/
12 files changed, 41 insertions(+), 50 deletions(-)
  • +2 -2
    doc/meson.build
  • +3 -4
    finch/meson.build
  • +5 -7
    libpurple/meson.build
  • +14 -20
    meson.build
  • +5 -5
    pidgin/data/icons/meson.build
  • +1 -1
    pidgin/glade/meson.build
  • +5 -5
    pidgin/meson.build
  • +1 -1
    pidgin/pixmaps/emotes/default/24/meson.build
  • +1 -1
    pidgin/pixmaps/emotes/small/16/meson.build
  • +2 -2
    pidgin/pixmaps/meson.build
  • +1 -1
    pidgin/pixmaps/tray/meson.build
  • +1 -1
    pidgin/plugins/musicmessaging/meson.build
    • --- a/doc/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/doc/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -8,7 +8,7 @@
    output : 'pidgin3.1',
    configuration : man_conf,
    install : true,
    - install_dir : get_option('mandir') + '/man1')
    + install_dir : get_option('mandir') / 'man1')
    endif
    if enable_consoleui
    @@ -17,5 +17,5 @@
    output : 'finch3.1',
    configuration : man_conf,
    install : true,
    - install_dir : get_option('mandir') + '/man1')
    + install_dir : get_option('mandir') / 'man1')
    endif
    --- a/finch/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/finch/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -32,7 +32,7 @@
    ncurses = dependency('ncursesw', required : false)
    if ncurses.found()
    foreach location : ncursesw_header_paths
    - f = location + 'ncurses.h'
    + f = location / 'ncurses.h'
    if compiler.has_header_symbol(f, 'get_wch',
    prefix : '#define _XOPEN_SOURCE_EXTENDED')
    ncurses_header = f
    @@ -44,7 +44,7 @@
    ncurses_libs = compiler.find_library('ncursesw', required : false)
    if ncurses_libs.found()
    foreach location : ncursesw_header_paths
    - f = location + 'ncurses.h'
    + f = location / 'ncurses.h'
    if compiler.has_header_symbol(f, 'get_wch',
    prefix : '#define _XOPEN_SOURCE_EXTENDED')
    ncurses_available = true
    @@ -176,8 +176,7 @@
    output : 'finch.h',
    configuration : finch_h_conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'),
    - 'finch-3'))
    + install_dir : get_option('includedir') / 'finch-3')
    install_headers(libfinch_headers, subdir : 'finch-3')
    --- a/libpurple/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/libpurple/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -168,7 +168,7 @@
    ]
    purple_filebase = 'purple-@0@'.format(purple_major_version)
    -purple_include_base = join_paths(purple_filebase, 'libpurple')
    +purple_include_base = purple_filebase / 'libpurple'
    if enable_vv
    purple_coreheaders += 'media-gst.h'
    @@ -227,7 +227,7 @@
    h_template : 'enums.h.in',
    c_template : 'enums.c.in',
    install_header : true,
    - install_dir : join_paths(get_option('includedir'), purple_include_base))
    + install_dir : get_option('includedir') / purple_include_base)
    enums_c = enums[0]
    enums_h = enums[1]
    @@ -242,14 +242,12 @@
    output : 'purple.h',
    configuration : purple_h_conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'),
    - purple_filebase))
    + install_dir : get_option('includedir') / purple_filebase)
    version_h = configure_file(input : 'version.h.in',
    output : 'version.h',
    configuration : version_conf,
    install : true,
    - install_dir : join_paths(get_option('includedir'),
    - purple_include_base))
    + install_dir : get_option('includedir') / purple_include_base)
    purple_builtsources = [
    enums_c,
    @@ -286,7 +284,7 @@
    subdir : purple_include_base)
    install_headers(purple_mediaheaders,
    - subdir : join_paths(purple_include_base, 'media'))
    + subdir : purple_include_base / 'media')
    pkgconfig.generate(
    name : 'libpurple',
    --- a/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -136,7 +136,7 @@
    # Check for directories
    if IS_WIN32
    foreach dir : ['bin', 'lib', 'data', 'sysconf', 'locale']
    - path = join_paths(get_option('prefix'), get_option(dir + 'dir'))
    + path = get_option('prefix') / get_option(dir + 'dir')
    conf.set_quoted('WIN32_FHS_@0@DIR'.format(dir.to_upper()), path)
    endforeach
    @@ -152,28 +152,25 @@
    conf.set('PURPLE_LOCALEDIR', 'wpurple_locale_dir()')
    else
    foreach dir : ['data', 'sysconf', 'locale']
    - path = join_paths(get_option('prefix'), get_option(dir + 'dir'))
    + path = get_option('prefix') / get_option(dir + 'dir')
    conf.set_quoted('PURPLE_@0@DIR'.format(dir.to_upper()), path)
    endforeach
    - common_libdir = join_paths(get_option('prefix'), get_option('libdir'))
    + common_libdir = get_option('prefix') / get_option('libdir')
    conf.set_quoted('PURPLE_LIBDIR',
    - join_paths(common_libdir,
    - 'purple-@0@'.format(purple_major_version)))
    + common_libdir / 'purple-@0@'.format(purple_major_version))
    conf.set_quoted('PIDGIN_LIBDIR',
    - join_paths(common_libdir,
    - 'pidgin-@0@'.format(purple_major_version)))
    + common_libdir / 'pidgin-@0@'.format(purple_major_version))
    conf.set_quoted('FINCH_LIBDIR',
    - join_paths(common_libdir,
    - 'finch-@0@'.format(purple_major_version)))
    + common_libdir / 'finch-@0@'.format(purple_major_version))
    endif
    -abslibdir = join_paths(get_option('prefix'), get_option('libdir'))
    -PURPLE_PLUGINDIR = join_paths(abslibdir, 'purple-@0@'.format(purple_major_version))
    +abslibdir = get_option('prefix') / get_option('libdir')
    +PURPLE_PLUGINDIR = abslibdir / 'purple-@0@'.format(purple_major_version)
    conf.set_quoted('PURPLE_PLUGINDIR', PURPLE_PLUGINDIR)
    -PIDGIN_PLUGINDIR = join_paths(abslibdir, 'pidgin-@0@'.format(purple_major_version))
    +PIDGIN_PLUGINDIR = abslibdir / 'pidgin-@0@'.format(purple_major_version)
    conf.set_quoted('PIDGIN_PLUGINDIR', PIDGIN_PLUGINDIR)
    -FINCH_PLUGINDIR = join_paths(abslibdir, 'finch-@0@'.format(purple_major_version))
    +FINCH_PLUGINDIR = abslibdir / 'finch-@0@'.format(purple_major_version)
    conf.set_quoted('FINCH_PLUGINDIR', FINCH_PLUGINDIR)
    # Check for inet_aton
    @@ -297,8 +294,7 @@
    if enable_introspection
    talkatu_gir = 'Talkatu-0.0'
    talkatu_include_directories = include_directories(
    - join_paths(talkatu_dep.get_pkgconfig_variable('prefix'),
    - 'share/gir-1.0'))
    + talkatu_dep.get_pkgconfig_variable('prefix') / 'share/gir-1.0')
    else
    talkatu_include_directories = []
    endif
    @@ -615,8 +611,7 @@
    if enable_introspection
    gplugin_gir = 'GPlugin-1.0'
    gplugin_include_directories = include_directories(
    - join_paths(gplugin_dep.get_pkgconfig_variable('prefix'),
    - 'share/gir-1.0'))
    + gplugin_dep.get_pkgconfig_variable('prefix') / 'share/gir-1.0')
    else
    gplugin_include_directories = []
    endif
    @@ -627,8 +622,7 @@
    if enable_introspection
    gplugin_gtk_gir = 'GPluginGtk-1.0'
    gplugin_gtk_include_directories = include_directories(
    - join_paths(gplugin_gtk_dep.get_pkgconfig_variable('prefix'),
    - 'share/gir-1.0'))
    + gplugin_gtk_dep.get_pkgconfig_variable('prefix') / 'share/gir-1.0')
    else
    gplugin_gtk_include_directories = []
    endif
    @@ -803,7 +797,7 @@
    message('Print debugging messages...... : ' + enable_debug.to_string())
    message('Generate documentation........ : ' + ENABLE_DOC.to_string())
    message('')
    -bindir = join_paths(get_option('prefix'), get_option('bindir'))
    +bindir = get_option('prefix') / get_option('bindir')
    message('Pidgin will be installed in @0@.'.format(bindir))
    if pidginpath.found()
    message('Warning: You have an old copy of Pidgin at @0@.'.format(pidginpath.path()))
    --- a/pidgin/data/icons/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/data/icons/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -5,12 +5,12 @@
    foreach icon : ICONS
    foreach size : [16, 22, 24, 32, 48]
    path = 'hicolor/@0@x@0@/apps'.format(size)
    - install_data(join_paths(path, '@0@.png'.format(icon)),
    - install_dir : join_paths(get_option('datadir'), 'icons', path))
    + install_data(path / '@0@.png'.format(icon),
    + install_dir : get_option('datadir') / 'icons' / path)
    endforeach
    path = 'hicolor/scalable/apps'
    - install_data(join_paths(path, '@0@.svg'.format(icon)),
    - install_dir : join_paths(get_option('datadir'), 'icons', path))
    + install_data(path / '@0@.svg'.format(icon),
    + install_dir : get_option('datadir') / 'icons' / path)
    endforeach
    EXCLUDE_FILES = [
    @@ -35,4 +35,4 @@
    install_subdir('hicolor',
    exclude_files : EXCLUDE_FILES,
    exclude_directories : EXCLUDE_DIRS,
    - install_dir : get_option('datadir') + '/pidgin/icons')
    + install_dir : get_option('datadir') / 'pidgin/icons')
    --- a/pidgin/glade/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/glade/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -3,4 +3,4 @@
    output : 'pidgin3.xml',
    configuration : version_conf,
    install : true,
    - install_dir : join_paths(get_option('datadir'), 'glade', 'catalogs'))
    + install_dir : get_option('datadir') / 'glade/catalogs')
    --- a/pidgin/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -245,23 +245,23 @@
    i18n = import('i18n')
    DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
    desktop_file_in = configure_file(
    - input : 'data/' + DESKTOP_FILE + '.in.in',
    + input : 'data' / (DESKTOP_FILE + '.in.in'),
    output : DESKTOP_FILE + '.in',
    configuration : conf)
    desktop_file = i18n.merge_file(
    input : desktop_file_in,
    output : DESKTOP_FILE,
    - po_dir : meson.source_root() + '/po',
    + po_dir : meson.source_root() / 'po',
    type : 'desktop',
    install : true,
    - install_dir : get_option('datadir') + '/applications')
    + install_dir : get_option('datadir') / 'applications')
    appdata = i18n.merge_file(
    input : 'data/im.pidgin.Pidgin3.appdata.xml.in',
    output : 'im.pidgin.Pidgin3.appdata.xml',
    - po_dir : meson.source_root() + '/po',
    + po_dir : meson.source_root() / 'po',
    install : true,
    - install_dir : get_option('datadir') + '/metainfo')
    + install_dir : get_option('datadir') / 'metainfo')
    endif # INSTALL_I18N
    if enable_introspection
    --- a/pidgin/pixmaps/emotes/default/24/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/pixmaps/emotes/default/24/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -186,7 +186,7 @@
    ]
    if INSTALL_PIXMAPS
    - pidginsmileypixdir = pidginpixmapdir + '/emotes/default'
    + pidginsmileypixdir = pidginpixmapdir / 'emotes/default'
    custom_target('default-theme',
    input : 'default.theme.in',
    --- a/pidgin/pixmaps/emotes/small/16/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/pixmaps/emotes/small/16/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -86,7 +86,7 @@
    ]
    if INSTALL_PIXMAPS
    - pidginsmileypixdir = pidginpixmapdir + '/emotes/small'
    + pidginsmileypixdir = pidginpixmapdir / 'emotes/small'
    custom_target('small-theme',
    input : 'small.theme.in',
    --- a/pidgin/pixmaps/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/pixmaps/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -1,4 +1,4 @@
    -pidginpixmapdir = get_option('datadir') + '/pixmaps/pidgin'
    +pidginpixmapdir = get_option('datadir') / 'pixmaps/pidgin'
    subdir('emotes/default/24')
    subdir('emotes/small/16')
    @@ -12,6 +12,6 @@
    # installing somewhere with existing stuff. Additionally, we have
    # extra stuff in our directories we don't want to install.
    install_data('edit.png', 'info.png', 'pause.png',
    - install_dir : join_paths(pidginpixmapdir, 'buttons'))
    + install_dir : pidginpixmapdir / 'buttons')
    subdir('tray')
    endif
    --- a/pidgin/pixmaps/tray/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/pixmaps/tray/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -1,2 +1,2 @@
    install_subdir('16',
    - install_dir : pidginpixmapdir + '/tray')
    + install_dir : pidginpixmapdir / 'tray')
    --- a/pidgin/plugins/musicmessaging/meson.build Wed Sep 16 01:58:44 2020 -0500
    +++ b/pidgin/plugins/musicmessaging/meson.build Wed Sep 16 02:04:11 2020 -0500
    @@ -1,6 +1,6 @@
    if PLUGINS and enable_dbus
    install_data('music.png',
    - install_dir : get_option('datadir') + '/pixmaps/pidgin/buttons')
    + install_dir : get_option('datadir') / 'pixmaps/pidgin/buttons')
    music_messaging_bindings = custom_target('music_messaging_bindings.c',
    command : [python, dbus_analyze_functions, '--export-only', '-o', '@OUTPUT@', '@INPUT@'],