diff options
author | Mike Ruprecht <cmaiku@gmail.com> | 2018-05-30 16:03:14 -0500 |
---|---|---|
committer | Mike Ruprecht <cmaiku@gmail.com> | 2018-05-30 16:03:14 -0500 |
commit | 02d517476afc4dff1b871d7f1afcd107f2a126da (patch) | |
tree | 8c9f14e85e2dd6e514d3a574ad56d15a9648e28c | |
parent | 1f6c29429bda75ecf6448707638d555db87c10b0 (diff) | |
download | pidgin-02d517476afc4dff1b871d7f1afcd107f2a126da.tar.gz |
meson: Remove GCR dependency
Now that nothing is using GCR, we can remove the dependency. This
patch does so.
-rw-r--r-- | meson.build | 19 | ||||
-rw-r--r-- | meson_options.txt | 3 | ||||
-rw-r--r-- | pidgin/meson.build | 1 |
3 files changed, 0 insertions, 23 deletions
diff --git a/meson.build b/meson.build index cad2be0f46..ccd11931d7 100644 --- a/meson.build +++ b/meson.build @@ -295,7 +295,6 @@ force_deps = not get_option('missing-dependencies') # # Check for GTK+ 2.18 and other things used by the GTK UI # ####################################################################### enable_gestures = get_option('gestures') -enable_gcr = get_option('gcr') # ####################################################################### # Check Pidgin dependencies @@ -322,24 +321,7 @@ if get_option('gtkui') else enchant = [] endif - - ####################################################################### - # Check for GCR for its certificate widgets - ####################################################################### - if enable_gcr - GCR = dependency('gcr-3', required : force_deps) - if GCR.found() - conf.set('ENABLE_GCR', true) - else - enable_gcr = false - endif - else - GCR = [] - endif - - else # GTK - enable_gcr = false enable_enchant = false endif # GTK @@ -1104,7 +1086,6 @@ message('Install translations.......... : ' + INSTALL_I18N.to_string()) message('Has you....................... : yes') message('') message('Build with Enchant support.... : ' + enable_enchant.to_string()) -message('Build with GCR widgets........ : ' + enable_gcr.to_string()) message('Build Unity integration plugin.: ' + enable_unity.to_string()) message('') message('Build with KWallet............ : ' + enable_kwallet.to_string()) diff --git a/meson_options.txt b/meson_options.txt index 9413f86384..8ab23257cd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -29,9 +29,6 @@ option('cap', type : 'boolean', value : false, option('gestures', type : 'boolean', value : true, description : 'compile with the gestures plugin') -option('gcr', type : 'boolean', value : false, - description : 'compile with GCR certificate widgets') - option('gstreamer', type : 'boolean', value : true, description : 'compile with GStreamer audio support') diff --git a/pidgin/meson.build b/pidgin/meson.build index 3c9b655dec..1e3d76c0a5 100644 --- a/pidgin/meson.build +++ b/pidgin/meson.build @@ -160,7 +160,6 @@ if ENABLE_GTK dependencies : [ dbus, enchant, - GCR, glib, gstreamer_video, gtk, |