summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'gnome-extra/cinnamon-control-center/files')
-rw-r--r--gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch21
-rw-r--r--gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch48
2 files changed, 0 insertions, 69 deletions
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
deleted file mode 100644
index b5a73ae3186d..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-c99.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/919085
-https://github.com/linuxmint/cinnamon-control-center/commit/0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59
-
-From 0361ff2974eb4741f3cd8b6db00dbe1ab56c8a59 Mon Sep 17 00:00:00 2001
-From: Leigh Scott <leigh123linux@gmail.com>
-Date: Thu, 18 Jan 2024 21:30:28 +0000
-Subject: [PATCH] network: Fix warning about missing cast to GtkWidget* (#324)
-
-Based on https://github.com/GNOME/gnome-control-center/commit/167d11e2107e46b4621cf6fc370c5b191b4b7732
---- a/panels/network/connection-editor/net-connection-editor.c
-+++ b/panels/network/connection-editor/net-connection-editor.c
-@@ -845,7 +845,7 @@ net_connection_editor_new (GtkWindow *parent_window,
- editor = g_object_new (NET_TYPE_CONNECTION_EDITOR, NULL);
-
- if (parent_window) {
-- editor->parent_window = g_object_ref (parent_window);
-+ editor->parent_window = GTK_WIDGET (g_object_ref (parent_window));
- gtk_window_set_transient_for (GTK_WINDOW (editor->window),
- parent_window);
- }
-
diff --git a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch b/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
deleted file mode 100644
index 2aab3af02146..000000000000
--- a/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-6.0.0-fix-optional-wayland.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1f90a561e4ba0e7431aeb64602e293b05a09be15 Mon Sep 17 00:00:00 2001
-From: Sparky Bluefang <sparky@bluefang-logic.com>
-Date: Sun, 7 Jan 2024 21:46:36 -0500
-Subject: [PATCH] Fix optional wayland handling in cc-display-panel
-
----
- meson.build | 1 +
- panels/display/cc-display-panel.c | 6 ++++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index 6c3d5e3..11aafd5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -196,6 +196,7 @@ final_message = [ '',
- '** Colord support (Color management panel) : @0@'.format(colord.found()),
- '** Wacom support (Wacom panel) : @0@'.format(libwacom.found()),
- '** Online-Accounts support (Online-Accounts panel) : @0@'.format(goa.found()),
-+ '** Wayland support : @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
- '',
- ]
- message('\n'.join(final_message))
-diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
-index 5a513b4..0676f66 100644
---- a/panels/display/cc-display-panel.c
-+++ b/panels/display/cc-display-panel.c
-@@ -28,7 +28,9 @@
-
- #include <libcinnamon-desktop/cdesktop-enums.h>
- #include <math.h>
-+#ifdef GDK_WINDOWING_WAYLAND
- #include <gdk/gdkwayland.h>
-+#endif
-
- #include <libupower-glib/upower.h>
-
-@@ -114,7 +116,11 @@ struct _CcDisplayPanel
-
- CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel)
-
-+#ifdef GDK_WINDOWING_WAYLAND
- #define WAYLAND_SESSION() (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default()))
-+#else
-+#define WAYLAND_SESSION() (FALSE)
-+#endif
-
- static void update_bottom_buttons (CcDisplayPanel *panel);
- static void apply_current_configuration (CcDisplayPanel *self);