pidgin/pidgin

Clean up some issues with the desktop files and purple3-url-handler

2021-02-27, Gary Kramlich
4682777df311
Parents 88c8797ac9cc
Children 8a5a20a49e9b
Clean up some issues with the desktop files and purple3-url-handler

Testing Done:
Ran meson locally verified files were created and proper-enough.

Reviewed at https://reviews.imfreedom.org/r/532/
3 files changed, 42 insertions(+), 6 deletions(-)
  • +2 -2
    libpurple/data/purple3-url-handler.desktop.in.in
  • +23 -0
    libpurple/meson.build
  • +17 -4
    pidgin/meson.build
    • --- a/libpurple/data/purple3-url-handler.desktop.in.in Fri Feb 26 18:41:33 2021 -0600
    +++ b/libpurple/data/purple3-url-handler.desktop.in.in Sat Feb 27 12:16:39 2021 -0600
    @@ -1,7 +1,7 @@
    [Desktop Entry]
    Name=Pidgin
    GenericName=Internet Messenger
    -Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, and more
    +Comment=Chat over IM. Supports Jabber/XMPP, and more
    Exec=purple3-url-handler %u
    TryExec=purple3-url-handler
    Icon=pidgin
    @@ -10,5 +10,5 @@
    NoDisplay=true
    Type=Application
    Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
    -MimeType=x-scheme-handler/aim;x-scheme-handler/gg;x-scheme-handler/icq;x-scheme-handler/irc;x-scheme-handler/msnim;x-scheme-handler/sip;x-scheme-handler/xmpp;x-scheme-handler/ymsgr
    +MimeType=x-scheme-handler/gg;x-scheme-handler/irc;x-scheme-handler/sip;x-scheme-handler/xmpp;
    @USES_MM_CHAT_SECTION@
    --- a/libpurple/meson.build Fri Feb 26 18:41:33 2021 -0600
    +++ b/libpurple/meson.build Sat Feb 27 12:16:39 2021 -0600
    @@ -338,6 +338,29 @@
    extra_args : ['-DPURPLE_COMPILATION', '--quiet'])
    endif
    +PURPLE3_URL_HANDLER_DESKTOP = 'purple3-url-handler.desktop'
    +if get_option('nls')
    + i18n = import('i18n')
    + desktop_file_in = configure_file(
    + input : 'data' / (PURPLE3_URL_HANDLER_DESKTOP + '.in.in'),
    + output : PURPLE3_URL_HANDLER_DESKTOP + '.in',
    + configuration : conf)
    + i18n.merge_file(
    + input : desktop_file_in,
    + output : PURPLE3_URL_HANDLER_DESKTOP,
    + po_dir : meson.source_root() / 'po',
    + type : 'desktop',
    + install : true,
    + install_dir : get_option('datadir') / 'applications')
    +else
    + configure_file(
    + input : 'data' / (PURPLE3_URL_HANDLER_DESKTOP + '.in.in'),
    + output : PURPLE3_URL_HANDLER_DESKTOP,
    + configuration : conf,
    + install : true,
    + install_dir : get_option('datadir') / 'applications')
    +endif
    +
    subdir('tests')
    subdir('example')
    subdir('plugins')
    --- a/pidgin/meson.build Fri Feb 26 18:41:33 2021 -0600
    +++ b/pidgin/meson.build Sat Feb 27 12:16:39 2021 -0600
    @@ -263,16 +263,16 @@
    requires : ['gtk+-3.0', 'purple-3', 'talkatu', 'gplugin-gtk'],
    variables : ['plugindir=${libdir}/pidgin-@0@'.format(purple_major_version)])
    + PIDGIN_DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
    if get_option('nls')
    i18n = import('i18n')
    - DESKTOP_FILE = 'im.pidgin.Pidgin3.desktop'
    desktop_file_in = configure_file(
    - input : 'data' / (DESKTOP_FILE + '.in.in'),
    - output : DESKTOP_FILE + '.in',
    + input : 'data' / (PIDGIN_DESKTOP_FILE + '.in.in'),
    + output : PIDGIN_DESKTOP_FILE + '.in',
    configuration : conf)
    desktop_file = i18n.merge_file(
    input : desktop_file_in,
    - output : DESKTOP_FILE,
    + output : PIDGIN_DESKTOP_FILE,
    po_dir : meson.source_root() / 'po',
    type : 'desktop',
    install : true,
    @@ -284,6 +284,19 @@
    po_dir : meson.source_root() / 'po',
    install : true,
    install_dir : get_option('datadir') / 'metainfo')
    + else
    + configure_file(
    + input : 'data' / (PIDGIN_DESKTOP_FILE + '.in.in'),
    + output : PIDGIN_DESKTOP_FILE,
    + configuration : conf,
    + install : true,
    + install_dir : get_option('datadir') / 'applications')
    +
    + configure_file(
    + input : 'data/im.pidgin.Pidgin3.appdata.xml.in',
    + output : 'im.pidgin.Pidgin3.appdata.xml',
    + install : true,
    + install_dir : get_option('datadir') / 'metainfo')
    endif # INSTALL_I18N
    if enable_introspection