[gtk] Drop non-backend immodules
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk] Drop non-backend immodules
- Date: Thu, 15 Feb 2018 23:11:34 +0000 (UTC)
commit c481a773af9b66b6c6efddc89234f2c8bcfdcf52
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Nov 10 20:02:43 2017 -0500
Drop non-backend immodules
These are not well integrated, and have not seen any
maintenance in many years.
modules/input/README.multipress | 43 ---
modules/input/gtkimcontextmultipress.c | 442 -----------------------------
modules/input/gtkimcontextmultipress.h | 80 ------
modules/input/gtkimcontextthai.c | 347 -----------------------
modules/input/gtkimcontextthai.h | 75 -----
modules/input/im-multipress.conf | 22 --
modules/input/imam-et.c | 490 ---------------------------------
modules/input/imcedilla.c | 128 ---------
modules/input/imcyrillic-translit.c | 253 -----------------
modules/input/iminuktitut.c | 163 -----------
modules/input/imipa.c | 181 ------------
modules/input/immultipress.c | 71 -----
modules/input/imthai.c | 71 -----
modules/input/imti-er.c | 489 --------------------------------
modules/input/imti-et.c | 489 --------------------------------
modules/input/imviqr.c | 280 -------------------
modules/input/meson.build | 44 +--
modules/input/thai-charprop.c | 138 ----------
modules/input/thai-charprop.h | 96 -------
19 files changed, 1 insertion(+), 3901 deletions(-)
---
diff --git a/modules/input/meson.build b/modules/input/meson.build
index 176830b323..eb026f4705 100644
--- a/modules/input/meson.build
+++ b/modules/input/meson.build
@@ -16,21 +16,7 @@ if dynamic_modules
endif
endif
-all_immodules = [
- 'am-et',
- 'cedilla',
- 'cyrillic-translit',
- 'inuktitut',
- 'ipa',
- 'multipress',
- 'thai',
- 'ti-er',
- 'ti-et',
- 'viqr',
- 'wayland',
-]
-
-all_immodules += backend_immodules
+all_immodules = backend_immodules
# Allow building some or all immodules included
included_immodules = get_option('included-immodules').split(',')
@@ -51,23 +37,6 @@ endforeach
immodules_subdir = 'gtk-4.0/@0@/immodules'.format(gtk_binary_version)
immodules_install_dir = join_paths(gtk_libdir, immodules_subdir)
-mp_confdir = join_paths(gtk_sysconfdir, 'gtk-4.0')
-mp_cargs = [
- '-DMULTIPRESS_LOCALEDIR=""', # FIXME: where is $(mplocaledir) ever set?
- '-DMULTIPRESS_CONFDIR="@0@"'.format(mp_confdir),
- '-DGDK_DISABLE_DEPRECATION_WARNINGS',
-]
-
-install_data('im-multipress.conf', install_dir : mp_confdir)
-
-# Format:
-# - protocol name
-# - protocol stability ('stable' or 'unstable')
-# - protocol version (if stability is 'unstable')
-proto_sources = [
- ['gtk-text-input', 'stable', ],
-]
-
im_wayland_gen_headers = []
im_wayland_sources = files('imwayland.c')
wayland_scanner = find_program('wayland-scanner')
@@ -108,18 +77,7 @@ foreach p: proto_sources
endforeach
method_defs = [
- ['am-et', files('imam-et.c')],
- ['cedilla', files('imcedilla.c')],
- ['cyrillic-translit', files('imcyrillic-translit.c')],
- ['ti-er', files('imti-er.c')],
- ['ti-et', files('imti-et.c')],
- ['thai', files('thai-charprop.c', 'gtkimcontextthai.c', 'imthai.c')],
- ['viqr', files('imviqr.c')],
- ['inuktitut', files('iminuktitut.c')],
- ['ipa', files('imipa.c')],
- # backend modules
['broadway', files('imbroadway.c')],
- ['multipress', files('gtkimcontextmultipress.c', 'immultipress.c'), [], mp_cargs],
['quartz', ('imquartz.c'), [], ('-xobjective-c')],
['xim', files('gtkimcontextxim.c', 'imxim.c')],
['ime', files('gtkimcontextime.c', 'imime.c'), ['imm32']],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]