Revert "Remove XAppKbdLayoutController class."

This reverts commit c22f968.

Even though it's gone from Cinnamon and nobody uses it, we should keep
this for another year or so.

- This gives us flexibility in tagging. We don't want xapp to have
to wait for Cinnamon to be ready to be tagged (This is  important for
rolling distros).

- This gives us flexibility in backporting. New tools might depend on
xapp 3.0. We want to be able to backport them with the lib, without
having to backport Cinnamon.

Author: clefebvre

debian/control

@@ -15,8 +15,10 @@ Build-Depends:
  libgdk-pixbuf-2.0-dev,
  libgirepository1.0-dev (>= 0.10.2-1~),
  libglib2.0-dev (>= 2.44),
+ libgnomekbd-dev,
  libgtk-3-dev (>= 3.16),
  libx11-dev,
+ libxkbfile-dev,
  meson,
  python-gi-dev,
  python3,
@@ -57,6 +59,7 @@ Depends:
  libgnomekbd-dev,
  libgtk-3-dev (>= 3.16),
  libxapp1 (= ${binary:Version}),
+ libxkbfile-dev,
  ${misc:Depends},
 Description: XApp library - development files
  This package provides the include files and static library for the XApp

debian/libxapp1.symbols

@@ -91,6 +91,24 @@ libxapp.so.1 libxapp1 #MINVER#
  xapp_icon_chooser_dialog_set_default_icon@Base 1.6.9
  xapp_icon_chooser_dialog_set_property@Base 1.4.9
  xapp_icon_size_get_type@Base 1.4.9
+ xapp_kbd_layout_controller_get_all_names@Base 1.4.9
+ xapp_kbd_layout_controller_get_current_flag_id@Base 1.4.9
+ xapp_kbd_layout_controller_get_current_group@Base 1.4.9
+ xapp_kbd_layout_controller_get_current_icon_name@Base 1.4.9
+ xapp_kbd_layout_controller_get_current_name@Base 1.4.9
+ xapp_kbd_layout_controller_get_current_short_group_label@Base 1.4.9
+ xapp_kbd_layout_controller_get_current_variant_label@Base 1.4.9
+ xapp_kbd_layout_controller_get_enabled@Base 1.4.9
+ xapp_kbd_layout_controller_get_flag_id_for_group@Base 1.4.9
+ xapp_kbd_layout_controller_get_icon_name_for_group@Base 1.4.9
+ xapp_kbd_layout_controller_get_short_group_label_for_group@Base 1.4.9
+ xapp_kbd_layout_controller_get_type@Base 1.4.9
+ xapp_kbd_layout_controller_get_variant_label_for_group@Base 1.4.9
+ xapp_kbd_layout_controller_new@Base 1.4.9
+ xapp_kbd_layout_controller_next_group@Base 1.4.9
+ xapp_kbd_layout_controller_previous_group@Base 1.4.9
+ xapp_kbd_layout_controller_render_cairo_subscript@Base 1.4.9
+ xapp_kbd_layout_controller_set_current_group@Base 1.4.9
  xapp_monitor_blanker_are_monitors_blanked@Base 1.4.9
  xapp_monitor_blanker_blank_other_monitors@Base 1.4.9
  xapp_monitor_blanker_get_type@Base 1.4.9

docs/reference/XAppKbdLayoutController.html

@@ -22,6 +22,7 @@
     <xi:include href="xml/xapp-gpu-offload-helper.xml"/>
     <xi:include href="xml/xapp-icon-chooser-button.xml"/>
     <xi:include href="xml/xapp-icon-chooser-dialog.xml"/>
+    <xi:include href="xml/xapp-kbd-layout-controller.xml"/>
     <xi:include href="xml/xapp-monitor-blanker.xml"/>
     <xi:include href="xml/xapp-preferences-window.xml"/>
     <xi:include href="xml/xapp-stack-sidebar.xml"/>

docs/xapp-docs.xml

@@ -71,6 +71,12 @@ switcheroo_sources = gnome.gdbus_codegen(
 
 xapp_sources += switcheroo_sources
 
+if not app_lib_only
+    libdeps += dependency('libgnomekbdui', required: true)
+    xapp_headers += 'xapp-kbd-layout-controller.h'
+    xapp_sources += 'xapp-kbd-layout-controller.c'
+endif
+
 xapp_statusicon_interface_sources = gnome.gdbus_codegen(
   'xapp-statusicon-interface',
   sources: 'org.x.StatusIcon.xml',
@@ -132,7 +138,8 @@ pkg.generate(
     subdirs: 'xapp',
     description: 'Utility library',
     version: meson.project_version(),
-    requires: ['gtk+-3.0', 'gobject-2.0', 'cairo']
+    requires: ['gtk+-3.0', 'gobject-2.0', 'cairo'],
+    requires_private: 'xkbfile',
 )
 
 install_data(['xapp-glade-catalog.xml'],