From b31d1d6a72f3d27f400fe6c0781a620780f2627e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 May 2023 05:38:21 +0100 Subject: gentoo auto-resync : 08:05:2023 - 05:38:21 --- ...amon-control-center-5.2.1-fix-libgnomekbd.patch | 47 ----------------- .../cinnamon-control-center-5.2.1-fix-libnma.patch | 61 ---------------------- 2 files changed, 108 deletions(-) delete mode 100644 gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch delete mode 100644 gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch (limited to 'gnome-extra/cinnamon-control-center/files') diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch deleted file mode 100644 index 389c97b6085c..000000000000 --- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libgnomekbd.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/870151 -https://github.com/linuxmint/cinnamon-control-center/pull/297 - -From 8cb73375e66b93da18f7bde728d4a832c07aada4 Mon Sep 17 00:00:00 2001 -From: Eicke Herbertz -Date: Tue, 23 Aug 2022 19:28:57 +0200 -Subject: [PATCH] region panel: add keys removed from libgnomekbd's API (#297) - -in version 3.28 ---- - panels/region/cinnamon-region-panel-xkb.c | 6 ++++++ - panels/region/cinnamon-region-panel-xkb.h | 5 +++++ - 2 files changed, 11 insertions(+) - -diff --git a/panels/region/cinnamon-region-panel-xkb.c b/panels/region/cinnamon-region-panel-xkb.c -index b7417e2e..3152471b 100644 ---- a/panels/region/cinnamon-region-panel-xkb.c -+++ b/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; - -diff --git a/panels/region/cinnamon-region-panel-xkb.h b/panels/region/cinnamon-region-panel-xkb.h -index bd7b47d3..cfa396de 100644 ---- a/panels/region/cinnamon-region-panel-xkb.h -+++ b/panels/region/cinnamon-region-panel-xkb.h -@@ -36,6 +36,11 @@ extern GSettings *xkb_keyboard_settings; - extern GSettings *xkb_desktop_settings; - extern GkbdKeyboardConfig initial_config; - -+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); diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch deleted file mode 100644 index ae9caceed7f9..000000000000 --- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-5.2.1-fix-libnma.patch +++ /dev/null @@ -1,61 +0,0 @@ -https://bugs.gentoo.org/840317 -https://github.com/linuxmint/cinnamon/issues/10616 - -From 0f4d212874c4fbee18b860963d0a5c7bd54dcfd1 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Mon, 31 Jan 2022 08:56:28 -0500 -Subject: [PATCH] network: Remove old workaround for openvpn widgets. - -I can't reproduce the original issue anymore, and NMACertChooser -is removed in network-manager-openvpn 1.8.34. - -Fixes #10616 - -ref: -6db4961fd3a002182984d0e71ec364c9befdd93b ---- - meson.build | 2 -- - panels/network/cc-network-panel.c | 10 ---------- - 2 files changed, 12 deletions(-) - -diff --git a/meson.build b/meson.build -index f1f213b..c4d7d86 100644 ---- a/meson.build -+++ b/meson.build -@@ -56,8 +56,6 @@ else - libnma= dependency('', required: false) - endif - --config.set('HAVE_NMA_18', libnm.version().version_compare('>=1.8.0')) -- - if get_option('modemmanager') - if not get_option('networkmanager') - error('*** NetworkManager is required by ModemManager ***') -diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c -index a4289de..d1925e4 100644 ---- a/panels/network/cc-network-panel.c -+++ b/panels/network/cc-network-panel.c -@@ -47,10 +47,6 @@ - #include - #endif - --#ifdef HAVE_NMA_18 --#include --#endif -- - CC_PANEL_REGISTER (CcNetworkPanel, cc_network_panel) - - #define NETWORK_PANEL_PRIVATE(o) \ -@@ -1244,12 +1240,6 @@ cc_network_panel_init (CcNetworkPanel *panel) - return; - } - --#ifdef HAVE_NMA_18 -- /* some newer VPN plugins pre-require internal resources from libnma */ -- /* this solution is really ugly, but works clean */ -- gtk_widget_destroy (nma_cert_chooser_new ("dummy", NMA_CERT_CHOOSER_FLAG_NONE)); --#endif -- - panel->priv->cancellable = g_cancellable_new (); - - panel->priv->treeview = GTK_WIDGET (gtk_builder_get_object (panel->priv->builder, -- cgit v1.2.3