- added gnomekbd patch (adjust for constants removed from libgnomekbd 3.28 API);...

diff --git a/cinnamon-control-center-gnomekbd.patch b/cinnamon-control-center-gnomekbd.patch
new file mode 100644 (file)
index 0000000..69f6fc6
--- /dev/null
+++ b/cinnamon-control-center-gnomekbd.patch
@@ -0,0 +1,30 @@
+--- cinnamon-control-center-4.8.2/panels/region/cinnamon-region-panel-xkb.h.orig       2021-01-02 19:26:58.000000000 +0100
++++ cinnamon-control-center-4.8.2/panels/region/cinnamon-region-panel-xkb.h    2023-05-14 18:01:28.027956489 +0200
+@@ -36,6 +36,12 @@ extern GSettings *xkb_keyboard_settings;
+ extern GSettings *xkb_desktop_settings;
+ extern GkbdKeyboardConfig initial_config;
+ 
++/* removed from libgnomekbd 3.28+ API */
++extern const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[];
++extern const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[];
++extern const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[];
++extern const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[];
++
+ extern void setup_xkb_tabs (GtkBuilder * dialog);
+ 
+ extern void xkb_layouts_fill_selected_tree (GtkBuilder * dialog);
+--- cinnamon-control-center-4.8.2/panels/region/cinnamon-region-panel-xkb.c.orig       2021-01-02 19:26:58.000000000 +0100
++++ cinnamon-control-center-4.8.2/panels/region/cinnamon-region-panel-xkb.c    2023-05-14 18:02:02.957767258 +0200
+@@ -36,6 +36,12 @@
+ 
+ #define GKBD_CONFIG_KEY_LOAD_EXTRA_ITEMS "load-extra-items"
+ 
++/* removed from libgnomekbd 3.28+ API */
++const gchar GKBD_DESKTOP_CONFIG_KEY_DEFAULT_GROUP[] = "default-group";
++const gchar GKBD_DESKTOP_CONFIG_KEY_GROUP_PER_WINDOW[] = "group-per-window";
++const gchar GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
++const gchar GKBD_KEYBOARD_CONFIG_KEY_OPTIONS[] = "options";
++
+ XklEngine *engine;
+ XklConfigRegistry *config_registry;
+ 

diff --git a/cinnamon-control-center.spec b/cinnamon-control-center.spec
index c7c82b7d8a4efeb2d4d4ebe7348a043aeeb2f6a7..2ae46c344ca9ba0765a8d4f9da3fa4a4a4f0d5bb 100644 (file)
--- a/cinnamon-control-center.spec
+++ b/cinnamon-control-center.spec
@@ -7,7 +7,7 @@ Summary:        Utilities to configure the Cinnamon desktop
 Summary(pl.UTF-8):     Narzędzia do konfiguracji środowiska Cinnamon
 Name:          cinnamon-control-center
 Version:       4.8.2
-Release:       3
+Release:       4
 License:       GPL v2+
 Group:         X11/Applications
 #Source0Download: https://github.com/linuxmint/cinnamon-control-center/releases
@@ -16,6 +16,7 @@ Source0:      https://github.com/linuxmint/cinnamon-control-center/archive/%{version}
 #Source1Download: https://github.com/linuxmint/cinnamon-translations/releases
 Source1:       https://github.com/linuxmint/cinnamon-translations/archive/%{translations_version}/cinnamon-translations-%{translations_version}.tar.gz
 # Source1-md5: a68529f0f1a6c7f8b693a81095bece96
+Patch0:                %{name}-gnomekbd.patch
 URL:           https://github.com/linuxmint/cinnamon-control-center
 BuildRequires: ModemManager-devel >= 0.7
 BuildRequires: NetworkManager-devel >= 2:1.8.0
@@ -32,7 +33,7 @@ BuildRequires:        glib2-devel >= 1:2.44.0
 BuildRequires: gnome-online-accounts-devel >= 3.21.5
 BuildRequires: gtk+3-devel >= 3.16.0
 BuildRequires: iso-codes
-BuildRequires: libgnomekbd-devel >= 3.0
+BuildRequires: libgnomekbd-devel >= 3.28
 BuildRequires: libnotify-devel >= 0.7.3
 BuildRequires: libwacom-devel >= 0.27
 BuildRequires: libxklavier-devel >= 5.1
@@ -58,7 +59,7 @@ Requires:     gdk-pixbuf2 >= 2.23.0
 Requires:      gnome-color-manager
 Requires:      hicolor-icon-theme
 Requires:      iso-codes
-Requires:      libgnomekbd >= 3.0
+Requires:      libgnomekbd >= 3.28
 Requires:      libnotify >= 0.7.3
 Requires:      libwacom >= 0.27
 Requires:      libxklavier >= 5.1
@@ -108,6 +109,7 @@ Pliki nagłówkowe Cinnamon control center.
 
 %prep
 %setup -q -a1
+%patch0 -p1
 
 %build
 %meson build