linuxmint · mtwebster · Apr 9, 2025
diff --git a/debian/control b/debian/control
@@ -12,7 +12,6 @@ Build-Depends:
  libcolord-dev,
  libgdk-pixbuf-2.0-dev (>= 2.23.0),
  libglib2.0-dev (>= 2.44.0),
- libgnomekbd-dev,
  libgtk-3-dev (>= 3.16),
  libmm-glib-dev (>= 0.7) [linux-any],
  libnm-dev (>= 1.2.0) [linux-any],
@@ -23,12 +22,8 @@ Build-Depends:
  libupower-glib-dev (>= 0.99.8),
  libwacom-dev (>= 0.4) [linux-any],
  libx11-dev,
- libxkbfile-dev,
- libxklavier-dev (>= 5.1),
  libxml2-dev,
- locales,
  meson,
- tzdata,
 Standards-Version: 3.9.8
 Homepage: https://www.github.com/linuxmint/cinnamon-control-center
 
@@ -46,7 +41,6 @@ Depends:
  ${shlibs:Depends},
 Recommends:
  cinnamon-l10n,
- iso-codes,
  mesa-utils
 Suggests: x11-xserver-utils
 Description: utilities to configure the Cinnamon desktop

diff --git a/meson.build b/meson.build
@@ -29,12 +29,9 @@ gtk         = dependency('gtk+-3.0',        version: '>=3.16.0')
 glib        = dependency('glib-2.0',        version: '>=2.44.0')
 gio_unix    = dependency('gio-unix-2.0',    version: '>=2.44.0')
 gudev_dep   = dependency('gudev-1.0',       version: '>= 232')
-libgnomekbd = dependency('libgnomekbd',     version: '>=3.0.0')
-libgnomekbdui=dependency('libgnomekbdui',   version: '>=3.0.0')
 libnotify   = dependency('libnotify',       version: '>=0.7.3')
 libx11      = dependency('x11')
 polkit_gobj = dependency('polkit-gobject-1',version: '>=0.103')
-libxklavier = dependency('libxklavier',     version: '>=5.1')
 upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')
 
 config.set('HAVE_X11_EXTENSIONS_XKB_H', cc.has_header('X11/extensions/XKB.h'))

diff --git a/panels/common/cc-common-language.c b/panels/common/cc-common-language.c
diff --git a/panels/common/cc-common-language.h b/panels/common/cc-common-language.h
diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
diff --git a/panels/common/cc-language-chooser.h b/panels/common/cc-language-chooser.h
diff --git a/panels/common/gdm-languages.c b/panels/common/gdm-languages.c
diff --git a/panels/common/gdm-languages.h b/panels/common/gdm-languages.h
diff --git a/panels/common/language-chooser.ui b/panels/common/language-chooser.ui
diff --git a/panels/common/list-languages.c b/panels/common/list-languages.c
diff --git a/panels/common/locarchive.h b/panels/common/locarchive.h
diff --git a/panels/common/meson.build b/panels/common/meson.build
@@ -1,28 +1,4 @@
 
-panel_languages = static_library('language',
-  'cc-common-language.c',
-  'cc-language-chooser.c',
-  'gdm-languages.c',
-  include_directories: rootInclude,
-  dependencies: [
-    glib,
-    gtk,
-  ],
-)
-
-list_languages = executable('list-languages',
-  'list-languages.c',
-  include_directories: rootInclude,
-  link_with: panel_languages,
-  dependencies: [
-    glib,
-  ],
-)
-
-install_data('language-chooser.ui',
-  install_dir: ui_dir,
-)
-
 common_inc = include_directories('.')
 common_sources = []
 

diff --git a/panels/meson.build b/panels/meson.build
@@ -11,8 +11,6 @@ if libnm.found()
   subdir('network')
 endif
 
-subdir('region')
-
 if libwacom.found()
   subdir('wacom')
 endif
diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
diff --git a/panels/region/cc-region-panel.h b/panels/region/cc-region-panel.h
diff --git a/panels/region/cinnamon-region-panel-layout-chooser.ui b/panels/region/cinnamon-region-panel-layout-chooser.ui
diff --git a/panels/region/cinnamon-region-panel-options-dialog.ui b/panels/region/cinnamon-region-panel-options-dialog.ui
diff --git a/panels/region/cinnamon-region-panel-xkb.c b/panels/region/cinnamon-region-panel-xkb.c
diff --git a/panels/region/cinnamon-region-panel-xkb.h b/panels/region/cinnamon-region-panel-xkb.h
diff --git a/panels/region/cinnamon-region-panel-xkblt.c b/panels/region/cinnamon-region-panel-xkblt.c
diff --git a/panels/region/cinnamon-region-panel-xkbltadd.c b/panels/region/cinnamon-region-panel-xkbltadd.c
diff --git a/panels/region/cinnamon-region-panel-xkbot.c b/panels/region/cinnamon-region-panel-xkbot.c
diff --git a/panels/region/cinnamon-region-panel-xkbpv.c b/panels/region/cinnamon-region-panel-xkbpv.c
diff --git a/panels/region/cinnamon-region-panel.desktop b/panels/region/cinnamon-region-panel.desktop
diff --git a/panels/region/cinnamon-region-panel.ui b/panels/region/cinnamon-region-panel.ui
diff --git a/panels/region/meson.build b/panels/region/meson.build
diff --git a/panels/region/region-module.c b/panels/region/region-module.c
diff --git a/shell/cinnamon-control-center.h b/shell/cinnamon-control-center.h
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 #ifndef _CINNAMON_CONTROL_CENTER_H
diff --git a/shell/cinnamon-control-center.c b/shell/cinnamon-control-center.c
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 #include "config.h"
diff --git a/shell/cc-shell.h b/shell/cc-shell.h
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 #ifndef _CC_SHELL_H
diff --git a/shell/cc-shell.c b/shell/cc-shell.c
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 /**
diff --git a/shell/cc-shell-model.h b/shell/cc-shell-model.h
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */


diff --git a/shell/cc-shell-model.c b/shell/cc-shell-model.c
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 #include "cc-shell-model.h"
diff --git a/shell/cc-shell-item-view.h b/shell/cc-shell-item-view.h
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 #ifndef _CC_SHELL_ITEM_VIEW_H
diff --git a/shell/cc-shell-item-view.c b/shell/cc-shell-item-view.c
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 #include "cc-shell-item-view.h"
diff --git a/shell/cc-shell-category-view.h b/shell/cc-shell-category-view.h
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */


diff --git a/shell/cc-shell-category-view.c b/shell/cc-shell-category-view.c
 * with the Control Center; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Author: Thomas Wood <thos@gnome.org>
 */

 #include "cc-shell-category-view.h"
	* with the Control Center; if not, write to the Free Software Foundation,
	* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*
	* Author: Thomas Wood <thos@gnome.org>
Check failure on line 18 in shell/cinnamon-control-center.h GitHub Actions / build / build (mint22, linuxmintd/mint22-amd64, Mint 22, true) / Mint 22 `thos ==> those, this`
	*/

	#ifndef _CINNAMON_CONTROL_CENTER_H