Prevent a segfault due to our lack of colord (GUdev ...).

2022-11-09 12:20:45 +00:00 · 2022-11-09 12:20:45 +00:00 · b2005a6837
commit b2005a6837
parent 79f9ff8075
4 changed files with 113 additions and 1 deletions
--- a/x11/gnome/mutter/Makefile
+++ b/x11/gnome/mutter/Makefile
@ -2,7 +2,7 @@ COMMENT=		window and compositing manager based on Clutter

 GNOME_PROJECT=		mutter
 GNOME_VERSION=		43.1
-REVISION=		0
+REVISION=		1

 SHARED_LIBS += mutter-cogl-11            0.0 # 0.0.0
 SHARED_LIBS += mutter-cogl-pango-11      0.0 # 0.0.0
--- a/x11/gnome/mutter/patches/patch-src_backends_meta-backend-private_h
+++ b/x11/gnome/mutter/patches/patch-src_backends_meta-backend-private_h
@ -0,0 +1,23 @@
+No colord (needs GUdev) on OpenBSD (XXX add HAVE_COLORD to meson_options.txt
+
+Index: src/backends/meta-backend-private.h
+--- src/backends/meta-backend-private.h.orig
+++ src/backends/meta-backend-private.h
+@@ -67,7 +67,6 @@ struct _MetaBackendClass
+ 
+   MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend,
+                                                    GError     **error);
+-  MetaColorManager * (* create_color_manager) (MetaBackend *backend);
+   MetaCursorRenderer * (* get_cursor_renderer) (MetaBackend        *backend,
+                                                 ClutterInputDevice *device);
+   MetaCursorTracker * (* create_cursor_tracker) (MetaBackend *backend);
+@@ -127,9 +126,6 @@ MetaIdleMonitor * meta_backend_get_idle_monitor (MetaB
+                                                  ClutterInputDevice *device);
+ 
+ MetaIdleManager * meta_backend_get_idle_manager (MetaBackend *backend);
+-
+-META_EXPORT_TEST
+-MetaColorManager * meta_backend_get_color_manager (MetaBackend *backend);
+ 
+ META_EXPORT_TEST
+ MetaOrientationManager * meta_backend_get_orientation_manager (MetaBackend *backend);
--- a/x11/gnome/mutter/patches/patch-src_backends_meta-backend_c
+++ b/x11/gnome/mutter/patches/patch-src_backends_meta-backend_c
@ -0,0 +1,61 @@
+No colord (needs GUdev) on OpenBSD (XXX add HAVE_COLORD to meson_options.txt
+
+Index: src/backends/meta-backend.c
+--- src/backends/meta-backend.c.orig
+++ src/backends/meta-backend.c
+@@ -142,7 +142,6 @@ struct _MetaBackendPrivate
+   MetaInputMapper *input_mapper;
+   MetaIdleManager *idle_manager;
+   MetaRenderer *renderer;
+-  MetaColorManager *color_manager;
+ #ifdef HAVE_EGL
+   MetaEgl *egl;
+ #endif
+@@ -216,7 +215,6 @@ meta_backend_dispose (GObject *object)
+ 
+   g_clear_pointer (&priv->cursor_tracker, meta_cursor_tracker_destroy);
+   g_clear_object (&priv->current_device);
+-  g_clear_object (&priv->color_manager);
+   g_clear_object (&priv->monitor_manager);
+   g_clear_object (&priv->orientation_manager);
+ #ifdef HAVE_REMOTE_DESKTOP
+@@ -950,12 +948,6 @@ meta_backend_create_monitor_manager (MetaBackend *back
+                                                                    error);
+ }
+ 
+-static MetaColorManager *
+-meta_backend_create_color_manager (MetaBackend *backend)
+-{
+-  return META_BACKEND_GET_CLASS (backend)->create_color_manager (backend);
+-}
+-
+ static MetaRenderer *
+ meta_backend_create_renderer (MetaBackend *backend,
+                               GError     **error)
+@@ -1191,8 +1183,6 @@ meta_backend_initable_init (GInitable     *initable,
+   if (!priv->monitor_manager)
+     return FALSE;
+ 
+-  priv->color_manager = meta_backend_create_color_manager (backend);
+-
+   priv->renderer = meta_backend_create_renderer (backend, error);
+   if (!priv->renderer)
+     return FALSE;
+@@ -1276,17 +1266,6 @@ meta_backend_get_monitor_manager (MetaBackend *backend
+   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+ 
+   return priv->monitor_manager;
+-}
+-
+-/**
+- * meta_backend_get_color_manager: (skip)
+- */
+-MetaColorManager *
+-meta_backend_get_color_manager (MetaBackend *backend)
+-{
+-  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+-
+-  return priv->color_manager;
+ }
+ 
+ /**
--- a/x11/gnome/mutter/patches/patch-src_backends_native_meta-backend-native_c
+++ b/x11/gnome/mutter/patches/patch-src_backends_native_meta-backend-native_c
@ -0,0 +1,28 @@
+No colord (needs GUdev) on OpenBSD (XXX add HAVE_COLORD to meson_options.txt
+
+Index: src/backends/native/meta-backend-native.c
+--- src/backends/native/meta-backend-native.c.orig
+++ src/backends/native/meta-backend-native.c
+@@ -292,14 +292,6 @@ meta_backend_native_create_monitor_manager (MetaBacken
+   return manager;
+ }
+ 
+-static MetaColorManager *
+-meta_backend_native_create_color_manager (MetaBackend *backend)
+-{
+-  return g_object_new (META_TYPE_COLOR_MANAGER,
+-                       "backend", backend,
+-                       NULL);
+-}
+-
+ static MetaCursorRenderer *
+ meta_backend_native_get_cursor_renderer (MetaBackend        *backend,
+                                          ClutterInputDevice *device)
+@@ -850,7 +842,6 @@ meta_backend_native_class_init (MetaBackendNativeClass
+   backend_class->get_capabilities = meta_backend_native_get_capabilities;
+ 
+   backend_class->create_monitor_manager = meta_backend_native_create_monitor_manager;
+-  backend_class->create_color_manager = meta_backend_native_create_color_manager;
+   backend_class->get_cursor_renderer = meta_backend_native_get_cursor_renderer;
+   backend_class->create_renderer = meta_backend_native_create_renderer;
+   backend_class->get_input_settings = meta_backend_native_get_input_settings;