summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2021-08-04 04:42:29 -0500
committerGary Kramlich <grim@reaperworld.com>2021-08-04 04:42:29 -0500
commitb367cc63a13b181151330b4de57cc980047f9654 (patch)
tree3bac31f0610a333ca9cb0209ca3112db1860155b
parente7a275df761f9449359b52d2919f4c38312de510 (diff)
downloadpidgin-b367cc63a13b181151330b4de57cc980047f9654.tar.gz
Remove the option to disable compiling plugins.
This is a niche feature at best but we can revisit it when we re-enable static protocol plugins. Testing Done: Compiled Reviewed at https://reviews.imfreedom.org/r/873/
-rw-r--r--finch/plugins/meson.build53
-rw-r--r--libpurple/plugins/keyrings/kwallet/meson.build31
-rw-r--r--libpurple/plugins/keyrings/meson.build43
-rw-r--r--libpurple/plugins/meson.build81
-rw-r--r--libpurple/plugins/notification-sound/meson.build4
-rw-r--r--meson.build3
-rw-r--r--meson_options.txt3
-rw-r--r--pidgin/plugins/disco/meson.build21
-rw-r--r--pidgin/plugins/gestures/meson.build11
-rw-r--r--pidgin/plugins/meson.build78
-rw-r--r--pidgin/plugins/xmppconsole/meson.build19
11 files changed, 163 insertions, 184 deletions
diff --git a/finch/plugins/meson.build b/finch/plugins/meson.build
index 588b5aa75e..9a2e1f7a45 100644
--- a/finch/plugins/meson.build
+++ b/finch/plugins/meson.build
@@ -1,34 +1,33 @@
-if PLUGINS
- if x11.found()
- 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',
- c_args : ncurses_header,
- dependencies : [x11, libpurple_dep, libfinch_dep, ncurses, glib],
- name_prefix : '',
- install : true, install_dir : FINCH_PLUGINDIR)
- endif
-
- gnthistory = library('gnthistory', 'gnthistory.c',
- dependencies : [libpurple_dep, libfinch_dep, glib],
+if x11.found()
+ gntclipboard = library('gntclipboard', 'gntclipboard.c',
+ dependencies : [x11, libpurple_dep, libfinch_dep, glib],
name_prefix : '',
install : true, install_dir : FINCH_PLUGINDIR)
- gntlastlog = library('gntlastlog', 'lastlog.c',
- dependencies : [libpurple_dep, libfinch_dep, ncurses, glib],
+ gntgf = library('gntgf', 'gntgf.c',
+ c_args : ncurses_header,
+ dependencies : [x11, libpurple_dep, libfinch_dep, ncurses, glib],
name_prefix : '',
install : true, install_dir : FINCH_PLUGINDIR)
+endif
- gnttinyurl = library('gnttinyurl', 'gnttinyurl.c',
- dependencies : [libpurple_dep, libfinch_dep, libsoup, glib],
- name_prefix : '',
- install : true, install_dir : FINCH_PLUGINDIR)
+gnthistory = library('gnthistory', 'gnthistory.c',
+ dependencies : [libpurple_dep, libfinch_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : FINCH_PLUGINDIR)
+
+gntlastlog = library('gntlastlog', 'lastlog.c',
+ dependencies : [libpurple_dep, libfinch_dep, ncurses, glib],
+ name_prefix : '',
+ install : true, install_dir : FINCH_PLUGINDIR)
+
+gnttinyurl = library('gnttinyurl', 'gnttinyurl.c',
+ dependencies : [libpurple_dep, libfinch_dep, libsoup, glib],
+ name_prefix : '',
+ install : true, install_dir : FINCH_PLUGINDIR)
+
+grouping = library('grouping', 'grouping.c',
+ dependencies : [libpurple_dep, libfinch_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : FINCH_PLUGINDIR)
- grouping = library('grouping', 'grouping.c',
- dependencies : [libpurple_dep, libfinch_dep, glib],
- name_prefix : '',
- install : true, install_dir : FINCH_PLUGINDIR)
-endif # PLUGINS
diff --git a/libpurple/plugins/keyrings/kwallet/meson.build b/libpurple/plugins/keyrings/kwallet/meson.build
index e3706e3805..d11db82d5e 100644
--- a/libpurple/plugins/keyrings/kwallet/meson.build
+++ b/libpurple/plugins/keyrings/kwallet/meson.build
@@ -1,19 +1,18 @@
-if PLUGINS
- if kwallet.found()
- kwallet_moc = qt5.preprocess(
- moc_headers: 'purplekwallet.h',
- dependencies: qt5_dep,
- )
+if kwallet.found()
+ kwallet_moc = qt5.preprocess(
+ moc_headers: 'purplekwallet.h',
+ dependencies: qt5_dep,
+ )
- kwallet_sources = [
- 'purplekwallet.cpp',
- 'purplekwallet.h',
- kwallet_moc,
- ]
+ kwallet_sources = [
+ 'purplekwallet.cpp',
+ 'purplekwallet.h',
+ kwallet_moc,
+ ]
- kwallet_plugin = library('purplekwallet', kwallet_sources,
- dependencies : [kwallet, qt5_dep, libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
- endif
+ kwallet_plugin = library('purplekwallet', kwallet_sources,
+ dependencies : [kwallet, qt5_dep, libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
endif
+
diff --git a/libpurple/plugins/keyrings/meson.build b/libpurple/plugins/keyrings/meson.build
index d9a76cefeb..c9fa0a1512 100644
--- a/libpurple/plugins/keyrings/meson.build
+++ b/libpurple/plugins/keyrings/meson.build
@@ -1,25 +1,24 @@
-if PLUGINS
- subdir('kwallet')
+subdir('kwallet')
- if nettle.found()
- internalkeyring_plugin = library('internalkeyring', 'internalkeyring.c',
- dependencies : [nettle, libpurple_dep],
- name_prefix : '',
- build_by_default : false,
- install : false, install_dir : PURPLE_PLUGINDIR)
- endif
+if nettle.found()
+ internalkeyring_plugin = library('internalkeyring', 'internalkeyring.c',
+ dependencies : [nettle, libpurple_dep],
+ name_prefix : '',
+ build_by_default : false,
+ install : false, install_dir : PURPLE_PLUGINDIR)
+endif
- if secretservice.found()
- secretsservice_plugin = library('secretservice', 'secretservice.c',
- dependencies : [secretservice, libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
- endif
+if secretservice.found()
+ secretsservice_plugin = library('secretservice', 'secretservice.c',
+ dependencies : [secretservice, libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+endif
+
+if IS_WIN32
+ wincred_plugin = library('wincred', 'wincred.c',
+ dependencies : [libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+endif
- if IS_WIN32
- wincred_plugin = library('wincred', 'wincred.c',
- dependencies : [libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
- endif
-endif # PLUGINS
diff --git a/libpurple/plugins/meson.build b/libpurple/plugins/meson.build
index ec52b12696..a054aecfc3 100644
--- a/libpurple/plugins/meson.build
+++ b/libpurple/plugins/meson.build
@@ -1,45 +1,42 @@
subdir('keyrings')
subdir('notification-sound')
-if PLUGINS
- autoaccept = library('autoaccept', 'autoaccept.c',
- dependencies : [libpurple_dep, glib],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
- buddynote = library('buddynote', 'buddynote.c',
- dependencies : [libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
- idle = library('idle', 'idle.c',
- dependencies : [libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
- joinpart = library('joinpart', 'joinpart.c',
- dependencies : [libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
- log_reader = library('log_reader', 'log_reader.c',
- dependencies : [libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
- psychic = library('psychic', 'psychic.c',
- dependencies : [libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
- statenotify = library('statenotify', 'statenotify.c',
- dependencies : [libpurple_dep],
- name_prefix : '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
- purple_toast = library('purple-toast', 'purple-toast.c',
- dependencies : [libpurple_dep],
- name_prefix: '',
- install : true, install_dir : PURPLE_PLUGINDIR)
-
-endif # PLUGINS
+autoaccept = library('autoaccept', 'autoaccept.c',
+ dependencies : [libpurple_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+
+buddynote = library('buddynote', 'buddynote.c',
+ dependencies : [libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+
+idle = library('idle', 'idle.c',
+ dependencies : [libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+
+joinpart = library('joinpart', 'joinpart.c',
+ dependencies : [libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+
+log_reader = library('log_reader', 'log_reader.c',
+ dependencies : [libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+
+psychic = library('psychic', 'psychic.c',
+ dependencies : [libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+
+statenotify = library('statenotify', 'statenotify.c',
+ dependencies : [libpurple_dep],
+ name_prefix : '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
+
+purple_toast = library('purple-toast', 'purple-toast.c',
+ dependencies : [libpurple_dep],
+ name_prefix: '',
+ install : true, install_dir : PURPLE_PLUGINDIR)
diff --git a/libpurple/plugins/notification-sound/meson.build b/libpurple/plugins/notification-sound/meson.build
index 9f96e83bad..d0fb719c8c 100644
--- a/libpurple/plugins/notification-sound/meson.build
+++ b/libpurple/plugins/notification-sound/meson.build
@@ -1,5 +1,3 @@
-if PLUGINS
-
if target_machine.system() != 'windows'
CANBERRA = dependency('libcanberra', version: '>= 0.30')
@@ -9,5 +7,3 @@ if target_machine.system() != 'windows'
install : true, install_dir : PURPLE_PLUGINDIR)
endif
-endif
-
diff --git a/meson.build b/meson.build
index 3a50f64b8d..e9a998da45 100644
--- a/meson.build
+++ b/meson.build
@@ -625,8 +625,6 @@ else
endif
endif
-PLUGINS = get_option('plugins')
-
#######################################################################
# Check for Nettle (Crypto Library)
#######################################################################
@@ -759,7 +757,6 @@ summary({
}, section: 'Protocol Support', bool_yn: true, list_sep: ', ')
summary({
- 'Build plugins': PLUGINS,
'Internal credential provider (via Nettle)': nettle.found(),
'KWallet credential provider': kwallet.found(),
'Secret Service credential provider': secretservice.found(),
diff --git a/meson_options.txt b/meson_options.txt
index 8524b77c18..1a7b4ecf52 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -31,9 +31,6 @@ option('gstreamer-video', type : 'feature',
option('kwallet', type : 'feature',
description : 'enable KWallet support')
-option('plugins', type : 'boolean', value : true,
- description : 'compile plugins')
-
option('secret-service', type : 'feature',
description : 'enable Secret Service support')
diff --git a/pidgin/plugins/disco/meson.build b/pidgin/plugins/disco/meson.build
index df49be8667..262dcccc74 100644
--- a/pidgin/plugins/disco/meson.build
+++ b/pidgin/plugins/disco/meson.build
@@ -5,15 +5,14 @@ xmppdisco_SOURCES = [
'xmppdisco.h'
]
-if PLUGINS
- xmppdisco_resource = gnome.compile_resources('xmppdiscoresources',
- 'resources/xmppdisco.gresource.xml',
- source_dir : 'resources',
- c_name : 'xmppdisco')
- xmppdisco_SOURCES += xmppdisco_resource
+xmppdisco_resource = gnome.compile_resources('xmppdiscoresources',
+ 'resources/xmppdisco.gresource.xml',
+ source_dir : 'resources',
+ c_name : 'xmppdisco')
+xmppdisco_SOURCES += xmppdisco_resource
+
+xmppdisco = library('xmppdisco', xmppdisco_SOURCES,
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : PIDGIN_PLUGINDIR)
- xmppdisco = library('xmppdisco', xmppdisco_SOURCES,
- dependencies : [libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- install : true, install_dir : PIDGIN_PLUGINDIR)
-endif
diff --git a/pidgin/plugins/gestures/meson.build b/pidgin/plugins/gestures/meson.build
index 9b43a58c4f..49349d4514 100644
--- a/pidgin/plugins/gestures/meson.build
+++ b/pidgin/plugins/gestures/meson.build
@@ -6,9 +6,8 @@ gestures_SOURCES = [
'stroke-draw.c'
]
-if PLUGINS
- gestures = library('gestures', gestures_SOURCES,
- dependencies : [libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- install : true, install_dir : PIDGIN_PLUGINDIR)
-endif
+gestures = library('gestures', gestures_SOURCES,
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : PIDGIN_PLUGINDIR)
+
diff --git a/pidgin/plugins/meson.build b/pidgin/plugins/meson.build
index 737af3d405..80c21330ab 100644
--- a/pidgin/plugins/meson.build
+++ b/pidgin/plugins/meson.build
@@ -2,46 +2,44 @@ subdir('disco')
subdir('gestures')
subdir('xmppconsole')
-if PLUGINS
- gtkbuddynote = library('gtkbuddynote', 'gtkbuddynote.c',
- dependencies : [libpurple_dep, libpidgin_dep, glib],
+gtkbuddynote = library('gtkbuddynote', 'gtkbuddynote.c',
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : PIDGIN_PLUGINDIR)
+
+iconaway = library('iconaway', 'iconaway.c',
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : PIDGIN_PLUGINDIR)
+
+notify = library('notify', 'notify.c',
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ build_by_default: false,
+ install : false, install_dir : PIDGIN_PLUGINDIR)
+
+relnot = library('relnot', 'relnot.c',
+ dependencies : [libpurple_dep, libpidgin_dep, libsoup, glib],
+ name_prefix : '',
+ install : true, install_dir : PIDGIN_PLUGINDIR)
+
+spellchk = library('spellchk', 'spellchk.c',
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ build_by_default: false,
+ install : false, install_dir : PIDGIN_PLUGINDIR)
+
+if IS_WIN32
+ transparency = library('transparency', 'transparency.c',
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : PIDGIN_PLUGINDIR)
+endif
+
+if enable_unity
+ unity = library('unity', 'unity.c',
+ dependencies : [UNITY, libpurple_dep, libpidgin_dep, glib],
name_prefix : '',
install : true, install_dir : PIDGIN_PLUGINDIR)
+endif
- iconaway = library('iconaway', 'iconaway.c',
- dependencies : [libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- install : true, install_dir : PIDGIN_PLUGINDIR)
-
- notify = library('notify', 'notify.c',
- dependencies : [libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- build_by_default: false,
- install : false, install_dir : PIDGIN_PLUGINDIR)
-
- relnot = library('relnot', 'relnot.c',
- dependencies : [libpurple_dep, libpidgin_dep, libsoup, glib],
- name_prefix : '',
- install : true, install_dir : PIDGIN_PLUGINDIR)
-
- spellchk = library('spellchk', 'spellchk.c',
- dependencies : [libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- build_by_default: false,
- install : false, install_dir : PIDGIN_PLUGINDIR)
-
- if IS_WIN32
- transparency = library('transparency', 'transparency.c',
- dependencies : [libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- install : true, install_dir : PIDGIN_PLUGINDIR)
- endif
-
- if enable_unity
- unity = library('unity', 'unity.c',
- dependencies : [UNITY, libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- install : true, install_dir : PIDGIN_PLUGINDIR)
- endif
-
-endif # PLUGINS
diff --git a/pidgin/plugins/xmppconsole/meson.build b/pidgin/plugins/xmppconsole/meson.build
index a2ac8ec07d..ae6433b65e 100644
--- a/pidgin/plugins/xmppconsole/meson.build
+++ b/pidgin/plugins/xmppconsole/meson.build
@@ -1,11 +1,10 @@
-if PLUGINS
- xmppconsole_resource = gnome.compile_resources('xmppconsoleresources',
- 'xmppconsole.gresource.xml',
- c_name : 'xmppconsole')
+xmppconsole_resource = gnome.compile_resources('xmppconsoleresources',
+ 'xmppconsole.gresource.xml',
+ c_name : 'xmppconsole')
+
+library('xmppconsole',
+ 'xmppconsole.c', xmppconsole_resource,
+ dependencies : [libpurple_dep, libpidgin_dep, glib],
+ name_prefix : '',
+ install : true, install_dir : PIDGIN_PLUGINDIR)
- library('xmppconsole',
- 'xmppconsole.c', xmppconsole_resource,
- dependencies : [libpurple_dep, libpidgin_dep, glib],
- name_prefix : '',
- install : true, install_dir : PIDGIN_PLUGINDIR)
-endif # PLUGINS