pidgin/purple-plugin-pack

Remove references to purple3 and pidgin3

12 months ago, Gary Kramlich
3db7d09a68bf
Parents 1d4d74c678db
Children 7c72cec5b265
Remove references to purple3 and pidgin3

Testing Done:
Compiled and greped for `purple_version_check` and `pidgin_version_check`.

Reviewed at https://reviews.imfreedom.org/r/2405/
11 files changed, 11 insertions(+), 24 deletions(-)
  • +1 -1
    enhancedhist/meson.build
  • +2 -12
    meson.build
  • +0 -3
    meson_options.txt
  • +1 -1
    mystatusbox/meson.build
  • +1 -1
    nicksaid/meson.build
  • +1 -1
    ning/meson.build
  • +1 -1
    okcupid/meson.build
  • +1 -1
    omegle/meson.build
  • +1 -1
    snpp/meson.build
  • +1 -1
    timelog/meson.build
  • +1 -1
    translate/meson.build
    • --- a/enhancedhist/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/enhancedhist/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PIDGIN.found() and IS_PURPLE_TWO
    +if TYPES.contains('default') and PIDGIN.found()
    enhancedhist = shared_module('enhancedhist',
    'enhancedhist.c',
    dependencies : [PIDGIN, GTK],
    --- a/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -24,20 +24,10 @@
    #######################################################################
    compiler = meson.get_compiler('c')
    -# this is used as the suffix below (for purple-3, pidgin-3, etc)
    -# and also as the -3 param to plugin_pack.py
    -if get_option('purple-version') == '2'
    - PURPLE_VER = ''
    - IS_PURPLE_TWO = true
    -else
    - PURPLE_VER = '-' + get_option('purple-version')
    - IS_PURPLE_TWO = false
    -endif
    -
    #######################################################################
    # Check for purple
    #######################################################################
    -PURPLE = dependency('purple@0@'.format(PURPLE_VER))
    +PURPLE = dependency('purple')
    PURPLE_LIBDIR = PURPLE.get_pkgconfig_variable('plugindir')
    PURPLE_DATADIR = PURPLE.get_pkgconfig_variable('datadir')
    @@ -48,7 +38,7 @@
    #######################################################################
    # Check for pidgin
    #######################################################################
    -PIDGIN = dependency('pidgin@0@'.format(PURPLE_VER), required : false)
    +PIDGIN = dependency('pidgin', required : false)
    conf.set('HAVE_PIDGIN', PIDGIN.found())
    if PIDGIN.found()
    --- a/meson_options.txt Thu Mar 30 22:35:34 2023 -0500
    +++ b/meson_options.txt Thu Mar 30 22:35:56 2023 -0500
    @@ -1,6 +1,3 @@
    -option('purple-version', type : 'combo', choices : ['2', '3'], value : '2',
    - description : 'set to 3 to compile against libpurple3')
    -
    option('types', type : 'string', value : 'default',
    description : 'comma-separated list of plugin types to build: default, abusive, incomplete, or all')
    --- a/mystatusbox/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/mystatusbox/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PIDGIN.found() and IS_PURPLE_TWO
    +if TYPES.contains('default') and PIDGIN.found()
    mystatusbox = shared_module('mystatusbox',
    'mystatusbox.c',
    dependencies : [PIDGIN, GTK],
    --- a/nicksaid/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/nicksaid/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PIDGIN.found() and IS_PURPLE_TWO
    +if TYPES.contains('default') and PIDGIN.found()
    nicksaid = shared_module('nicksaid',
    'nicksaid.c',
    dependencies : [PIDGIN, GTK],
    --- a/ning/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/ning/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PURPLE.found() and IS_PURPLE_TWO and JSON_GLIB.found() and ZLIB.found()
    +if TYPES.contains('default') and PURPLE.found() and JSON_GLIB.found() and ZLIB.found()
    ning = shared_library('ning',
    'ning.c',
    'ning_chat.c',
    --- a/okcupid/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/okcupid/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PURPLE.found() and IS_PURPLE_TWO and JSON_GLIB.found() and ZLIB.found()
    +if TYPES.contains('default') and PURPLE.found() and JSON_GLIB.found() and ZLIB.found()
    okcupid = shared_library('okcupid',
    'okcupid.c',
    'okcupid.h',
    --- a/omegle/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/omegle/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PURPLE.found() and IS_PURPLE_TWO and JSON_GLIB.found() and ZLIB.found()
    +if TYPES.contains('default') and PURPLE.found() and JSON_GLIB.found() and ZLIB.found()
    omegle = shared_library('omegle',
    'omegle.c',
    'omegle.h',
    --- a/snpp/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/snpp/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PURPLE.found() and IS_PURPLE_TWO
    +if TYPES.contains('default') and PURPLE.found()
    snpp = shared_library('snpp',
    'snpp.c',
    dependencies : [PURPLE, GLIB],
    --- a/timelog/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/timelog/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PIDGIN.found() and IS_PURPLE_TWO
    +if TYPES.contains('default') and PIDGIN.found()
    timelog = shared_module('timelog',
    'timelog.c',
    'timelog.h',
    --- a/translate/meson.build Thu Mar 30 22:35:34 2023 -0500
    +++ b/translate/meson.build Thu Mar 30 22:35:56 2023 -0500
    @@ -1,4 +1,4 @@
    -if TYPES.contains('default') and PURPLE.found() and IS_PURPLE_TWO
    +if TYPES.contains('default') and PURPLE.found()
    translate = shared_library('translate',
    'translate.c',
    dependencies : [PURPLE, GLIB],