Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-control-center for
openSUSE:Factory checked in at 2022-10-03 13:46:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-control-center (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-control-center.new.2275 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-control-center"
Mon Oct 3 13:46:28 2022 rev:26 rq:1007557 version:5.2.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-control-center/cinnamon-control-center.changes
2022-03-29 18:15:40.411147916 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-control-center.new.2275/cinnamon-control-center.changes
2022-10-03 13:47:17.269682813 +0200
@@ -1,0 +2,6 @@
+Sun Oct 2 04:19:18 UTC 2022 - Marguerite Su <i...@marguerite.su>
+
+- FTBFS with libgnomekbd 3.28.1
+ * add cinnamon-control-center-5.2.1-libgnomekbd-3.28.1.patch
+
+-------------------------------------------------------------------
New:
----
cinnamon-control-center-5.2.1-libgnomekbd-3.28.1.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-control-center.spec ++++++
--- /var/tmp/diff_new_pack.Wm5EFj/_old 2022-10-03 13:47:17.857684106 +0200
+++ /var/tmp/diff_new_pack.Wm5EFj/_new 2022-10-03 13:47:17.865684124 +0200
@@ -26,6 +26,7 @@
Group: System/GUI/Other
URL: https://github.com/linuxmint/cinnamon-control-center
Source:
https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch: %{name}-%{version}-libgnomekbd-3.28.1.patch
BuildRequires: cups-devel
BuildRequires: desktop-data
BuildRequires: fdupes
@@ -116,7 +117,7 @@
needed to develop applications that require these.
%prep
-%setup -q
+%autosetup -p1
%build
%meson
++++++ cinnamon-control-center-5.2.1-libgnomekbd-3.28.1.patch ++++++
Index: cinnamon-control-center-5.2.1/panels/region/cinnamon-region-panel-xkb.c
===================================================================
--- cinnamon-control-center-5.2.1.orig/panels/region/cinnamon-region-panel-xkb.c
+++ cinnamon-control-center-5.2.1/panels/region/cinnamon-region-panel-xkb.c
@@ -36,6 +36,12 @@
#define GKBD_CONFIG_KEY_LOAD_EXTRA_ITEMS "load-extra-items"
+// These were removed from the API of libgnomekbd in version 3.28
+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;
Index: cinnamon-control-center-5.2.1/panels/region/cinnamon-region-panel-xkb.h
===================================================================
--- cinnamon-control-center-5.2.1.orig/panels/region/cinnamon-region-panel-xkb.h
+++ cinnamon-control-center-5.2.1/panels/region/cinnamon-region-panel-xkb.h
@@ -36,6 +36,12 @@ extern GSettings *xkb_keyboard_settings;
extern GSettings *xkb_desktop_settings;
extern GkbdKeyboardConfig initial_config;
+// These were removed from the API of libgnomekbd in version 3.28
+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);
