diff -urN gimp-2.10.34-orig/app/actions/actions.c gimp-2.10.34/app/actions/actions.c
--- gimp-2.10.34-orig/app/actions/actions.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/actions/actions.c	2023-11-05 14:59:21 +0900
@@ -195,9 +195,11 @@
   { "layers", N_("Layers"), GIMP_ICON_LAYER,
     layers_actions_setup,
     layers_actions_update },
+#if HAVE_MYPAINT
   { "mypaint-brushes", N_("MyPaint Brushes"), GIMP_ICON_MYPAINT_BRUSH,
     mypaint_brushes_actions_setup,
     mypaint_brushes_actions_update },
+#endif
   { "palette-editor", N_("Palette Editor"), GIMP_ICON_PALETTE,
     palette_editor_actions_setup,
     palette_editor_actions_update },
diff -urN gimp-2.10.34-orig/app/actions/dialogs-actions.c gimp-2.10.34/app/actions/dialogs-actions.c
--- gimp-2.10.34-orig/app/actions/dialogs-actions.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/actions/dialogs-actions.c	2023-11-05 14:59:21 +0900
@@ -157,11 +157,13 @@
     "gimp-dynamics-editor",
     GIMP_HELP_DYNAMICS_EDITOR_DIALOG },
 
+#if HAVE_MYPAINT
   { "dialogs-mypaint-brushes", GIMP_ICON_MYPAINT_BRUSH,
     NC_("dialogs-action", "_MyPaint Brushes"), NULL,
     NC_("dialogs-action", "Open the mypaint brushes dialog"),
     "gimp-mypaint-brush-grid|gimp-mapyint-brush-list",
     GIMP_HELP_MYPAINT_BRUSH_DIALOG },
+#endif
 
   { "dialogs-patterns", GIMP_ICON_PATTERN,
     NC_("dialogs-action", "P_atterns"), "<primary><shift>P",
diff -urN gimp-2.10.34-orig/app/actions/mypaint-brushes-actions.c gimp-2.10.34/app/actions/mypaint-brushes-actions.c
--- gimp-2.10.34-orig/app/actions/mypaint-brushes-actions.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/actions/mypaint-brushes-actions.c	2023-11-05 14:59:21 +0900
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#if HAVE_MYPAINT  // to end of file
+
 #include <gegl.h>
 #include <gtk/gtk.h>
 
@@ -140,3 +142,5 @@
 
 #undef SET_SENSITIVE
 }
+
+#endif  // HAVE_MYPAINT
diff -urN gimp-2.10.34-orig/app/actions/mypaint-brushes-actions.h gimp-2.10.34/app/actions/mypaint-brushes-actions.h
--- gimp-2.10.34-orig/app/actions/mypaint-brushes-actions.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/actions/mypaint-brushes-actions.h	2023-11-05 14:59:21 +0900
@@ -19,9 +19,11 @@
 #define __MYPAINT_BRUSHES_ACTIONS_H__
 
 
+#if HAVE_MYPAINT
 void   mypaint_brushes_actions_setup  (GimpActionGroup *group);
 void   mypaint_brushes_actions_update (GimpActionGroup *group,
                                        gpointer         data);
+#endif
 
 
 #endif /* __MYPAINT_BRUSHES_ACTIONS_H__ */
diff -urN gimp-2.10.34-orig/app/actions/tools-actions.c gimp-2.10.34/app/actions/tools-actions.c
--- gimp-2.10.34-orig/app/actions/tools-actions.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/actions/tools-actions.c	2023-11-05 14:59:21 +0900
@@ -216,6 +216,7 @@
     NULL }
 };
 
+#if HAVE_MYPAINT
 static const GimpEnumActionEntry tools_mybrush_radius_actions[] =
 {
   { "tools-mypaint-brush-radius-set", GIMP_ICON_TOOL_MYPAINT_BRUSH,
@@ -231,6 +232,7 @@
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
+#endif
 
 static const GimpEnumActionEntry tools_foreground_select_brush_size_actions[] =
 {
@@ -693,6 +695,7 @@
                                       G_N_ELEMENTS (tools_airbrush_flow_actions),
                                       tools_airbrush_flow_cmd_callback);
 
+#if HAVE_MYPAINT
   gimp_action_group_add_enum_actions (group, NULL,
                                       tools_mybrush_radius_actions,
                                       G_N_ELEMENTS (tools_mybrush_radius_actions),
@@ -701,6 +704,7 @@
                                       tools_mybrush_hardness_actions,
                                       G_N_ELEMENTS (tools_mybrush_hardness_actions),
                                       tools_mybrush_hardness_cmd_callback);
+#endif
 
   gimp_action_group_add_enum_actions (group, NULL,
                                       tools_foreground_select_brush_size_actions,
diff -urN gimp-2.10.34-orig/app/actions/tools-commands.c gimp-2.10.34/app/actions/tools-commands.c
--- gimp-2.10.34-orig/app/actions/tools-commands.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/actions/tools-commands.c	2023-11-05 14:59:21 +0900
@@ -442,6 +442,7 @@
     }
 }
 
+#if HAVE_MYPAINT
 void
 tools_mybrush_radius_cmd_callback (GimpAction *action,
                                    GVariant   *value,
@@ -489,6 +490,7 @@
                               0.001, 0.01, 0.1, 1.0, FALSE);
     }
 }
+#endif
 
 void
 tools_fg_select_brush_size_cmd_callback (GimpAction *action,
diff -urN gimp-2.10.34-orig/app/actions/tools-commands.h gimp-2.10.34/app/actions/tools-commands.h
--- gimp-2.10.34-orig/app/actions/tools-commands.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/actions/tools-commands.h	2023-11-05 14:59:21 +0900
@@ -65,12 +65,14 @@
                                                      GVariant   *value,
                                                      gpointer    data);
 
+#if HAVE_MYPAINT
 void   tools_mybrush_radius_cmd_callback            (GimpAction *action,
                                                      GVariant   *value,
                                                      gpointer    data);
 void   tools_mybrush_hardness_cmd_callback          (GimpAction *action,
                                                      GVariant   *value,
                                                      gpointer    data);
+#endif
 
 void   tools_fg_select_brush_size_cmd_callback      (GimpAction *action,
                                                      GVariant   *value,
diff -urN gimp-2.10.34-orig/app/core/core-enums.h gimp-2.10.34/app/core/core-enums.h
--- gimp-2.10.34-orig/app/core/core-enums.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/core-enums.h	2023-11-05 14:59:21 +0900
@@ -617,7 +617,9 @@
   GIMP_CONTEXT_PROP_PAINT_MODE  =  9,
   GIMP_CONTEXT_PROP_BRUSH       = 10,
   GIMP_CONTEXT_PROP_DYNAMICS    = 11,
+#if HAVE_MYPAINT
   GIMP_CONTEXT_PROP_MYBRUSH     = 12,
+#endif
   GIMP_CONTEXT_PROP_PATTERN     = 13,
   GIMP_CONTEXT_PROP_GRADIENT    = 14,
   GIMP_CONTEXT_PROP_PALETTE     = 15,
diff -urN gimp-2.10.34-orig/app/core/core-types.h gimp-2.10.34/app/core/core-types.h
--- gimp-2.10.34-orig/app/core/core-types.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/core-types.h	2023-11-05 14:59:21 +0900
@@ -139,7 +139,9 @@
 typedef struct _GimpDynamics                    GimpDynamics;
 typedef struct _GimpDynamicsOutput              GimpDynamicsOutput;
 typedef struct _GimpGradient                    GimpGradient;
+#if HAVE_MYPAINT
 typedef struct _GimpMybrush                     GimpMybrush;
+#endif
 typedef struct _GimpPalette                     GimpPalette;
 typedef struct _GimpPaletteMru                  GimpPaletteMru;
 typedef struct _GimpPattern                     GimpPattern;
diff -urN gimp-2.10.34-orig/app/core/gimp-data-factories.c gimp-2.10.34/app/core/gimp-data-factories.c
--- gimp-2.10.34-orig/app/core/gimp-data-factories.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimp-data-factories.c	2023-11-05 14:59:21 +0900
@@ -119,6 +119,7 @@
                                        GIMP_DYNAMICS_FILE_EXTENSION,
                                        TRUE);
 
+#if HAVE_MYPAINT
   gimp->mybrush_factory =
     gimp_data_loader_factory_new (gimp,
                                   GIMP_TYPE_MYBRUSH,
@@ -133,6 +134,7 @@
                                        gimp_mybrush_load,
                                        GIMP_MYBRUSH_FILE_EXTENSION,
                                        FALSE);
+#endif
 
   gimp->pattern_factory =
     gimp_data_loader_factory_new (gimp,
@@ -256,8 +258,10 @@
   if (gimp->dynamics_factory)
     gimp_data_factory_data_free (gimp->dynamics_factory);
 
+#if HAVE_MYPAINT
   if (gimp->mybrush_factory)
     gimp_data_factory_data_free (gimp->mybrush_factory);
+#endif
 
   if (gimp->pattern_factory)
     gimp_data_factory_data_free (gimp->pattern_factory);
@@ -282,7 +286,9 @@
 
   g_clear_object (&gimp->brush_factory);
   g_clear_object (&gimp->dynamics_factory);
+#if HAVE_MYPAINT
   g_clear_object (&gimp->mybrush_factory);
+#endif
   g_clear_object (&gimp->pattern_factory);
   g_clear_object (&gimp->gradient_factory);
   g_clear_object (&gimp->palette_factory);
@@ -305,8 +311,10 @@
                                       gui_size);
   memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->dynamics_factory),
                                       gui_size);
+#if HAVE_MYPAINT
   memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->mybrush_factory),
                                       gui_size);
+#endif
   memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->pattern_factory),
                                       gui_size);
   memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->gradient_factory),
@@ -331,7 +339,9 @@
 
   gimp_data_factory_data_clean (gimp->brush_factory);
   gimp_data_factory_data_clean (gimp->dynamics_factory);
+#if HAVE_MYPAINT
   gimp_data_factory_data_clean (gimp->mybrush_factory);
+#endif
   gimp_data_factory_data_clean (gimp->pattern_factory);
   gimp_data_factory_data_clean (gimp->gradient_factory);
   gimp_data_factory_data_clean (gimp->palette_factory);
@@ -355,10 +365,12 @@
   gimp_data_factory_data_init (gimp->dynamics_factory, gimp->user_context,
                                gimp->no_data);
 
+#if HAVE_MYPAINT
   /*  initialize the list of mypaint brushes    */
   status_callback (NULL, _("MyPaint Brushes"), 0.2);
   gimp_data_factory_data_init (gimp->mybrush_factory, gimp->user_context,
                                gimp->no_data);
+#endif
 
   /*  initialize the list of gimp patterns   */
   status_callback (NULL, _("Patterns"), 0.3);
@@ -399,8 +411,10 @@
                                 gimp_data_factory_get_container (gimp->brush_factory));
   gimp_tag_cache_add_container (gimp->tag_cache,
                                 gimp_data_factory_get_container (gimp->dynamics_factory));
+#if HAVE_MYPAINT
   gimp_tag_cache_add_container (gimp->tag_cache,
                                 gimp_data_factory_get_container (gimp->mybrush_factory));
+#endif
   gimp_tag_cache_add_container (gimp->tag_cache,
                                 gimp_data_factory_get_container (gimp->pattern_factory));
   gimp_tag_cache_add_container (gimp->tag_cache,
@@ -422,7 +436,9 @@
 
   gimp_data_factory_data_save (gimp->brush_factory);
   gimp_data_factory_data_save (gimp->dynamics_factory);
+#if HAVE_MYPAINT
   gimp_data_factory_data_save (gimp->mybrush_factory);
+#endif
   gimp_data_factory_data_save (gimp->pattern_factory);
   gimp_data_factory_data_save (gimp->gradient_factory);
   gimp_data_factory_data_save (gimp->palette_factory);
diff -urN gimp-2.10.34-orig/app/core/gimp.c gimp-2.10.34/app/core/gimp.c
--- gimp-2.10.34-orig/app/core/gimp.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimp.c	2023-11-05 14:59:21 +0900
@@ -377,8 +377,10 @@
                               gimp_brush_get_standard (gimp->user_context));
   standards = g_list_prepend (standards,
                               gimp_dynamics_get_standard (gimp->user_context));
+#if HAVE_MYPAINT
   standards = g_list_prepend (standards,
                               gimp_mybrush_get_standard (gimp->user_context));
+#endif
   standards = g_list_prepend (standards,
                               gimp_pattern_get_standard (gimp->user_context));
   standards = g_list_prepend (standards,
diff -urN gimp-2.10.34-orig/app/core/gimp.h gimp-2.10.34/app/core/gimp.h
--- gimp-2.10.34-orig/app/core/gimp.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimp.h	2023-11-05 14:59:21 +0900
@@ -97,7 +97,9 @@
 
   GimpDataFactory        *brush_factory;
   GimpDataFactory        *dynamics_factory;
+#if HAVE_MYPAINT
   GimpDataFactory        *mybrush_factory;
+#endif
   GimpDataFactory        *pattern_factory;
   GimpDataFactory        *gradient_factory;
   GimpDataFactory        *palette_factory;
diff -urN gimp-2.10.34-orig/app/core/gimpcontext.c gimp-2.10.34/app/core/gimpcontext.c
--- gimp-2.10.34-orig/app/core/gimpcontext.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpcontext.c	2023-11-05 14:59:21 +0900
@@ -187,6 +187,7 @@
 static void gimp_context_real_set_dynamics   (GimpContext      *context,
                                               GimpDynamics     *dynamics);
 
+#if HAVE_MYPAINT
 /*  mybrush  */
 static void gimp_context_mybrush_dirty       (GimpMybrush      *brush,
                                               GimpContext      *context);
@@ -197,6 +198,7 @@
                                               GimpContext      *context);
 static void gimp_context_real_set_mybrush    (GimpContext      *context,
                                               GimpMybrush      *brush);
+#endif
 
 /*  pattern  */
 static void gimp_context_pattern_dirty       (GimpPattern      *pattern,
@@ -345,7 +347,11 @@
   "paint-mode",
   "brush",
   "dynamics",
+#if HAVE_MYPAINT
   "mybrush",
+#else
+  NULL,
+#endif
   "pattern",
   "gradient",
   "palette",
@@ -370,7 +376,11 @@
   G_TYPE_NONE,
   0,
   0,
+#if HAVE_MYPAINT
   0,
+#else
+  G_TYPE_NONE,
+#endif
   0,
   0,
   0,
@@ -504,6 +514,7 @@
                   G_TYPE_NONE, 1,
                   GIMP_TYPE_DYNAMICS);
 
+#if HAVE_MYPAINT
   gimp_context_signals[MYBRUSH_CHANGED] =
     g_signal_new ("mybrush-changed",
                   G_TYPE_FROM_CLASS (klass),
@@ -513,6 +524,7 @@
                   gimp_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1,
                   GIMP_TYPE_MYBRUSH);
+#endif
 
   gimp_context_signals[PATTERN_CHANGED] =
     g_signal_new ("pattern-changed",
@@ -622,7 +634,9 @@
   klass->paint_mode_changed      = NULL;
   klass->brush_changed           = NULL;
   klass->dynamics_changed        = NULL;
+#if HAVE_MYPAINT
   klass->mybrush_changed         = NULL;
+#endif
   klass->pattern_changed         = NULL;
   klass->gradient_changed        = NULL;
   klass->palette_changed         = NULL;
@@ -638,7 +652,9 @@
   gimp_context_prop_types[GIMP_CONTEXT_PROP_PAINT_INFO]  = GIMP_TYPE_PAINT_INFO;
   gimp_context_prop_types[GIMP_CONTEXT_PROP_BRUSH]       = GIMP_TYPE_BRUSH;
   gimp_context_prop_types[GIMP_CONTEXT_PROP_DYNAMICS]    = GIMP_TYPE_DYNAMICS;
+#if HAVE_MYPAINT
   gimp_context_prop_types[GIMP_CONTEXT_PROP_MYBRUSH]     = GIMP_TYPE_MYBRUSH;
+#endif
   gimp_context_prop_types[GIMP_CONTEXT_PROP_PATTERN]     = GIMP_TYPE_PATTERN;
   gimp_context_prop_types[GIMP_CONTEXT_PROP_GRADIENT]    = GIMP_TYPE_GRADIENT;
   gimp_context_prop_types[GIMP_CONTEXT_PROP_PALETTE]     = GIMP_TYPE_PALETTE;
@@ -724,12 +740,14 @@
                            GIMP_TYPE_DYNAMICS,
                            GIMP_PARAM_STATIC_STRINGS);
 
+#if HAVE_MYPAINT
   GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_MYBRUSH,
                            gimp_context_prop_names[GIMP_CONTEXT_PROP_MYBRUSH],
                            _("MyPaint Brush"),
                            _("MyPaint Brush"),
                            GIMP_TYPE_MYBRUSH,
                            GIMP_PARAM_STATIC_STRINGS);
+#endif
 
   GIMP_CONFIG_PROP_OBJECT (object_class, GIMP_CONTEXT_PROP_PATTERN,
                            gimp_context_prop_names[GIMP_CONTEXT_PROP_PATTERN],
@@ -810,8 +828,10 @@
   context->dynamics        = NULL;
   context->dynamics_name   = NULL;
 
+#if HAVE_MYPAINT
   context->mybrush         = NULL;
   context->mybrush_name    = NULL;
+#endif
 
   context->pattern         = NULL;
   context->pattern_name    = NULL;
@@ -905,6 +925,7 @@
                            G_CALLBACK (gimp_context_dynamics_list_thaw),
                            object, 0);
 
+#if HAVE_MYPAINT
   container = gimp_data_factory_get_container (gimp->mybrush_factory);
   g_signal_connect_object (container, "remove",
                            G_CALLBACK (gimp_context_mybrush_removed),
@@ -912,6 +933,7 @@
   g_signal_connect_object (container, "thaw",
                            G_CALLBACK (gimp_context_mybrush_list_thaw),
                            object, 0);
+#endif
 
   container = gimp_data_factory_get_container (gimp->pattern_factory);
   g_signal_connect_object (container, "remove",
@@ -996,7 +1018,9 @@
   g_clear_object (&context->paint_info);
   g_clear_object (&context->brush);
   g_clear_object (&context->dynamics);
+#if HAVE_MYPAINT
   g_clear_object (&context->mybrush);
+#endif
   g_clear_object (&context->pattern);
   g_clear_object (&context->gradient);
   g_clear_object (&context->palette);
@@ -1022,7 +1046,9 @@
   g_clear_pointer (&context->paint_name,       g_free);
   g_clear_pointer (&context->brush_name,       g_free);
   g_clear_pointer (&context->dynamics_name,    g_free);
+#if HAVE_MYPAINT
   g_clear_pointer (&context->mybrush_name,     g_free);
+#endif
   g_clear_pointer (&context->pattern_name,     g_free);
   g_clear_pointer (&context->gradient_name,    g_free);
   g_clear_pointer (&context->palette_name,     g_free);
@@ -1078,9 +1104,11 @@
     case GIMP_CONTEXT_PROP_DYNAMICS:
       gimp_context_set_dynamics (context, g_value_get_object (value));
       break;
+#if HAVE_MYPAINT
     case GIMP_CONTEXT_PROP_MYBRUSH:
       gimp_context_set_mybrush (context, g_value_get_object (value));
       break;
+#endif
     case GIMP_CONTEXT_PROP_PATTERN:
       gimp_context_set_pattern (context, g_value_get_object (value));
       break;
@@ -1164,9 +1192,11 @@
     case GIMP_CONTEXT_PROP_DYNAMICS:
       g_value_set_object (value, gimp_context_get_dynamics (context));
       break;
+#if HAVE_MYPAINT
     case GIMP_CONTEXT_PROP_MYBRUSH:
       g_value_set_object (value, gimp_context_get_mybrush (context));
       break;
+#endif
     case GIMP_CONTEXT_PROP_PATTERN:
       g_value_set_object (value, gimp_context_get_pattern (context));
       break;
@@ -1208,7 +1238,9 @@
   memsize += gimp_string_get_memsize (context->paint_name);
   memsize += gimp_string_get_memsize (context->brush_name);
   memsize += gimp_string_get_memsize (context->dynamics_name);
+#if HAVE_MYPAINT
   memsize += gimp_string_get_memsize (context->mybrush_name);
+#endif
   memsize += gimp_string_get_memsize (context->pattern_name);
   memsize += gimp_string_get_memsize (context->palette_name);
   memsize += gimp_string_get_memsize (context->font_name);
@@ -1272,7 +1304,9 @@
     case GIMP_CONTEXT_PROP_PAINT_INFO:
     case GIMP_CONTEXT_PROP_BRUSH:
     case GIMP_CONTEXT_PROP_DYNAMICS:
+#if HAVE_MYPAINT
     case GIMP_CONTEXT_PROP_MYBRUSH:
+#endif
     case GIMP_CONTEXT_PROP_PATTERN:
     case GIMP_CONTEXT_PROP_GRADIENT:
     case GIMP_CONTEXT_PROP_PALETTE:
@@ -1337,11 +1371,13 @@
       name_loc  = &context->dynamics_name;
       break;
 
+#if HAVE_MYPAINT
     case GIMP_CONTEXT_PROP_MYBRUSH:
       container = gimp_data_factory_get_container (context->gimp->mybrush_factory);
       standard  = gimp_mybrush_get_standard (context);
       name_loc  = &context->mybrush_name;
       break;
+#endif
 
     case GIMP_CONTEXT_PROP_PATTERN:
       container = gimp_data_factory_get_container (context->gimp->pattern_factory);
@@ -1425,7 +1461,9 @@
   COPY_NAME (context, new, paint_name);
   COPY_NAME (context, new, brush_name);
   COPY_NAME (context, new, dynamics_name);
+#if HAVE_MYPAINT
   COPY_NAME (context, new, mybrush_name);
+#endif
   COPY_NAME (context, new, pattern_name);
   COPY_NAME (context, new, gradient_name);
   COPY_NAME (context, new, palette_name);
@@ -1451,7 +1489,9 @@
   COPY_NAME (src_context, dest_context, paint_name);
   COPY_NAME (src_context, dest_context, brush_name);
   COPY_NAME (src_context, dest_context, dynamics_name);
+#if HAVE_MYPAINT
   COPY_NAME (src_context, dest_context, mybrush_name);
+#endif
   COPY_NAME (src_context, dest_context, pattern_name);
   COPY_NAME (src_context, dest_context, gradient_name);
   COPY_NAME (src_context, dest_context, palette_name);
@@ -1703,10 +1743,12 @@
       COPY_NAME (src, dest, dynamics_name);
       break;
 
+#if HAVE_MYPAINT
     case GIMP_CONTEXT_PROP_MYBRUSH:
       gimp_context_real_set_mybrush (dest, src->mybrush);
       COPY_NAME (src, dest, mybrush_name);
       break;
+#endif
 
     case GIMP_CONTEXT_PROP_PATTERN:
       gimp_context_real_set_pattern (dest, src->pattern);
@@ -2750,6 +2792,8 @@
 /*****************************************************************************/
 /*  mybrush  *****************************************************************/
 
+#if HAVE_MYPAINT
+
 GimpMybrush *
 gimp_context_get_mybrush (GimpContext *context)
 {
@@ -2859,6 +2903,29 @@
   gimp_context_mybrush_changed (context);
 }
 
+#else  // !HAVE_MYBRUSH
+
+/* for ABI consistency */
+
+void *
+gimp_context_get_mybrush (GimpContext *context)
+{
+  return NULL;
+}
+
+void
+gimp_context_set_mybrush (GimpContext *context,
+                          void *brush)
+{
+}
+
+void
+gimp_context_mybrush_changed (GimpContext *context)
+{
+}
+
+#endif  // HAVE_MYBRUSH
+
 
 /*****************************************************************************/
 /*  pattern  *****************************************************************/
diff -urN gimp-2.10.34-orig/app/core/gimpcontext.h gimp-2.10.34/app/core/gimpcontext.h
--- gimp-2.10.34-orig/app/core/gimpcontext.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpcontext.h	2023-11-05 14:59:21 +0900
@@ -76,8 +76,10 @@
   GimpDynamics         *dynamics;
   gchar                *dynamics_name;
 
+#if HAVE_MYPAINT
   GimpMybrush          *mybrush;
   gchar                *mybrush_name;
+#endif
 
   GimpPattern          *pattern;
   gchar                *pattern_name;
@@ -130,8 +132,10 @@
                                GimpBrush            *brush);
   void (* dynamics_changed)   (GimpContext          *context,
                                GimpDynamics         *dynamics);
+#if HAVE_MYPAINT
   void (* mybrush_changed)    (GimpContext          *context,
                                GimpMybrush          *brush);
+#endif
   void (* pattern_changed)    (GimpContext          *context,
                                GimpPattern          *pattern);
   void (* gradient_changed)   (GimpContext          *context,
@@ -292,9 +296,15 @@
 
 
 /*  mybrush  */
+#if HAVE_MYPAINT
 GimpMybrush    * gimp_context_get_mybrush         (GimpContext     *context);
 void             gimp_context_set_mybrush         (GimpContext     *context,
                                                    GimpMybrush     *brush);
+#else
+void           * gimp_context_get_mybrush         (GimpContext     *context);
+void             gimp_context_set_mybrush         (GimpContext     *context,
+                                                   void            *brush);
+#endif
 void             gimp_context_mybrush_changed     (GimpContext     *context);
 
 
diff -urN gimp-2.10.34-orig/app/core/gimpdata.c gimp-2.10.34/app/core/gimpdata.c
--- gimp-2.10.34-orig/app/core/gimpdata.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpdata.c	2023-11-05 14:59:21 +0900
@@ -457,6 +457,7 @@
           identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
           g_free (tmp);
         }
+#if HAVE_MYPAINT
       else if (g_str_has_prefix (path, MYPAINT_BRUSHES_DIR))
         {
           tmp = g_strconcat ("${mypaint_brushes_dir}",
@@ -465,6 +466,7 @@
           identifier = g_filename_to_utf8 (tmp, -1, NULL, NULL, NULL);
           g_free (tmp);
         }
+#endif
       else
         {
           identifier = g_filename_to_utf8 (path, -1,
diff -urN gimp-2.10.34-orig/app/core/gimpmybrush-load.c gimp-2.10.34/app/core/gimpmybrush-load.c
--- gimp-2.10.34-orig/app/core/gimpmybrush-load.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpmybrush-load.c	2023-11-05 14:59:21 +0900
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#if HAVE_MYPAINT  // to end of file
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
@@ -151,3 +153,5 @@
 
   return g_list_prepend (NULL, brush);
 }
+
+#endif  // HAVE_MYPAINT
diff -urN gimp-2.10.34-orig/app/core/gimpmybrush-load.h gimp-2.10.34/app/core/gimpmybrush-load.h
--- gimp-2.10.34-orig/app/core/gimpmybrush-load.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpmybrush-load.h	2023-11-05 14:59:21 +0900
@@ -24,10 +24,12 @@
 #define GIMP_MYBRUSH_FILE_EXTENSION ".myb"
 
 
+#if HAVE_MYPAINT
 GList * gimp_mybrush_load (GimpContext   *context,
                            GFile         *file,
                            GInputStream  *input,
                            GError       **error);
+#endif
 
 
 #endif /* __GIMP_MYBRUSH_LOAD_H__ */
diff -urN gimp-2.10.34-orig/app/core/gimpmybrush-private.h gimp-2.10.34/app/core/gimpmybrush-private.h
--- gimp-2.10.34-orig/app/core/gimpmybrush-private.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpmybrush-private.h	2023-11-05 14:59:21 +0900
@@ -21,6 +21,7 @@
 #define __GIMP_MYBRUSH_PRIVATE_H__
 
 
+#if HAVE_MYPAINT
 struct _GimpMybrushPrivate
 {
   gchar   *brush_json;
@@ -30,6 +31,7 @@
   gdouble  offset_by_random;
   gboolean eraser;
 };
+#endif
 
 
 #endif /* __GIMP_MYBRUSH_PRIVATE_H__ */
diff -urN gimp-2.10.34-orig/app/core/gimpmybrush.c gimp-2.10.34/app/core/gimpmybrush.c
--- gimp-2.10.34-orig/app/core/gimpmybrush.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpmybrush.c	2023-11-05 14:59:21 +0900
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#if HAVE_MYPAINT  // to end of file
+
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
@@ -279,3 +281,5 @@
 
   return brush->priv->eraser;
 }
+
+#endif  // HAVE_MYPAINT
diff -urN gimp-2.10.34-orig/app/core/gimpmybrush.h gimp-2.10.34/app/core/gimpmybrush.h
--- gimp-2.10.34-orig/app/core/gimpmybrush.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/core/gimpmybrush.h	2023-11-05 14:59:21 +0900
@@ -20,6 +20,8 @@
 #ifndef __GIMP_MYBRUSH_H__
 #define __GIMP_MYBRUSH_H__
 
+#if HAVE_MYPAINT  // to end of file
+
 
 #include "gimpdata.h"
 
@@ -63,4 +65,5 @@
 gboolean      gimp_mybrush_get_is_eraser        (GimpMybrush *brush);
 
 
+#endif  // HAVE_MYPAINT
 #endif /* __GIMP_MYBRUSH_H__ */
diff -urN gimp-2.10.34-orig/app/dialogs/dialogs-constructors.c gimp-2.10.34/app/dialogs/dialogs-constructors.c
--- gimp-2.10.34-orig/app/dialogs/dialogs-constructors.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/dialogs/dialogs-constructors.c	2023-11-05 14:59:21 +0900
@@ -410,6 +410,7 @@
                                          gimp_dialog_factory_get_menu_factory (factory));
 }
 
+#if HAVE_MYPAINT
 GtkWidget *
 dialogs_mypaint_brush_list_view_new (GimpDialogFactory *factory,
                                      GimpContext       *context,
@@ -425,6 +426,7 @@
                                      "/mypaint-brushes-popup",
                                      "mypaint-brushes");
 }
+#endif
 
 GtkWidget *
 dialogs_pattern_list_view_new (GimpDialogFactory *factory,
@@ -579,6 +581,7 @@
                                          gimp_dialog_factory_get_menu_factory (factory));
 }
 
+#if HAVE_MYPAINT
 GtkWidget *
 dialogs_mypaint_brush_grid_view_new (GimpDialogFactory *factory,
                                      GimpContext       *context,
@@ -594,6 +597,7 @@
                                      "/mypaint-brushes-popup",
                                      "mypaint-brushes");
 }
+#endif
 
 GtkWidget *
 dialogs_pattern_grid_view_new (GimpDialogFactory *factory,
diff -urN gimp-2.10.34-orig/app/dialogs/dialogs-constructors.h gimp-2.10.34/app/dialogs/dialogs-constructors.h
--- gimp-2.10.34-orig/app/dialogs/dialogs-constructors.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/dialogs/dialogs-constructors.h	2023-11-05 14:59:21 +0900
@@ -146,10 +146,12 @@
                                                  GimpContext       *context,
                                                  GimpUIManager     *ui_manager,
                                                  gint               view_size);
+#if HAVE_MYPAINT
 GtkWidget * dialogs_mypaint_brush_list_view_new (GimpDialogFactory *factory,
                                                  GimpContext       *context,
                                                  GimpUIManager     *ui_manager,
                                                  gint               view_size);
+#endif
 GtkWidget * dialogs_pattern_list_view_new       (GimpDialogFactory *factory,
                                                  GimpContext       *context,
                                                  GimpUIManager     *ui_manager,
@@ -195,10 +197,12 @@
                                                  GimpContext       *context,
                                                  GimpUIManager     *ui_manager,
                                                  gint               view_size);
+#if HAVE_MYPAINT
 GtkWidget * dialogs_mypaint_brush_grid_view_new (GimpDialogFactory *factory,
                                                  GimpContext       *context,
                                                  GimpUIManager     *ui_manager,
                                                  gint               view_size);
+#endif
 GtkWidget * dialogs_pattern_grid_view_new       (GimpDialogFactory *factory,
                                                  GimpContext       *context,
                                                  GimpUIManager     *ui_manager,
diff -urN gimp-2.10.34-orig/app/dialogs/dialogs.c gimp-2.10.34/app/dialogs/dialogs.c
--- gimp-2.10.34-orig/app/dialogs/dialogs.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/dialogs/dialogs.c	2023-11-05 14:59:21 +0900
@@ -339,9 +339,11 @@
   LISTGRID (dynamics, dynamics,
             N_("Paint Dynamics"), NULL, GIMP_ICON_DYNAMICS,
             GIMP_HELP_DYNAMICS_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
+#if HAVE_MYPAINT
   LISTGRID (mypaint-brush, mypaint_brush,
             N_("MyPaint Brushes"), NULL, GIMP_ICON_MYPAINT_BRUSH,
             GIMP_HELP_MYPAINT_BRUSH_DIALOG, GIMP_VIEW_SIZE_LARGE),
+#endif
   LISTGRID (pattern, pattern,
             N_("Patterns"), NULL, GIMP_ICON_PATTERN,
             GIMP_HELP_PATTERN_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
diff -urN gimp-2.10.34-orig/app/dialogs/preferences-dialog.c gimp-2.10.34/app/dialogs/preferences-dialog.c
--- gimp-2.10.34-orig/app/dialogs/preferences-dialog.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/dialogs/preferences-dialog.c	2023-11-05 14:59:21 +0900
@@ -3305,12 +3305,14 @@
         N_("Reset Tool Preset _Folders"),
         N_("Select Tool Preset Folders"),
         "tool-preset-path", "tool-preset-path-writable" },
+#if HAVE_MYPAINT
       { N_("MyPaint Brushes"), N_("MyPaint Brush Folders"),
         "folders-mypaint-brushes",
         GIMP_HELP_PREFS_FOLDERS_MYPAINT_BRUSHES,
         N_("Reset MyPaint Brush _Folders"),
         N_("Select MyPaint Brush Folders"),
         "mypaint-brush-path", "mypaint-brush-path-writable" },
+#endif
       { N_("Plug-ins"), N_("Plug-in Folders"),
         "folders-plug-ins",
         GIMP_HELP_PREFS_FOLDERS_PLUG_INS,
diff -urN gimp-2.10.34-orig/app/menus/menus.c gimp-2.10.34/app/menus/menus.c
--- gimp-2.10.34-orig/app/menus/menus.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/menus/menus.c	2023-11-05 14:59:21 +0900
@@ -209,6 +209,7 @@
                                       "dynamics-menu.xml", plug_in_menus_setup,
                                       NULL);
 
+#if HAVE_MYPAINT
   gimp_menu_factory_manager_register (global_menu_factory, "<MyPaintBrushes>",
                                       "mypaint-brushes",
                                       "plug-in",
@@ -216,6 +217,7 @@
                                       "/mypaint-brushes-popup",
                                       "mypaint-brushes-menu.xml", plug_in_menus_setup,
                                       NULL);
+#endif
 
   gimp_menu_factory_manager_register (global_menu_factory, "<Patterns>",
                                       "patterns",
diff -urN gimp-2.10.34-orig/app/menus/plug-in-menus.c gimp-2.10.34/app/menus/plug-in-menus.c
--- gimp-2.10.34-orig/app/menus/plug-in-menus.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/menus/plug-in-menus.c	2023-11-05 14:59:21 +0900
@@ -322,11 +322,13 @@
           plug_in_menus_add_proc (manager, "/dynamics-popup",
                                   plug_in_proc, menu_path);
         }
+#if HAVE_MYPAINT
       else if (! strcmp (manager->name, "<MyPaintBrushes>"))
         {
           plug_in_menus_add_proc (manager, "/mypaint-brushes-popup",
                                   plug_in_proc, menu_path);
         }
+#endif
       else if (! strcmp (manager->name, "<Gradients>"))
         {
           plug_in_menus_add_proc (manager, "/gradients-popup",
diff -urN gimp-2.10.34-orig/app/paint/gimp-paint.c gimp-2.10.34/app/paint/gimp-paint.c
--- gimp-2.10.34-orig/app/paint/gimp-paint.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/paint/gimp-paint.c	2023-11-05 14:59:21 +0900
@@ -65,7 +65,9 @@
     gimp_perspective_clone_register,
     gimp_heal_register,
     gimp_clone_register,
+#if HAVE_MYPAINT
     gimp_mybrush_core_register,
+#endif
     gimp_ink_register,
     gimp_airbrush_register,
     gimp_eraser_register,
diff -urN gimp-2.10.34-orig/app/paint/gimpmybrushcore.c gimp-2.10.34/app/paint/gimpmybrushcore.c
--- gimp-2.10.34-orig/app/paint/gimpmybrushcore.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/paint/gimpmybrushcore.c	2023-11-05 14:59:21 +0900
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#if HAVE_MYPAINT  // to end of file
+
 #include <string.h>
 
 #include <cairo.h>
@@ -419,3 +421,5 @@
 
   mybrush->private->brushes = g_list_reverse (mybrush->private->brushes);
 }
+
+#endif  // HAVE_MYPAINT
diff -urN gimp-2.10.34-orig/app/paint/gimpmybrushcore.h gimp-2.10.34/app/paint/gimpmybrushcore.h
--- gimp-2.10.34-orig/app/paint/gimpmybrushcore.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/paint/gimpmybrushcore.h	2023-11-05 14:59:21 +0900
@@ -18,6 +18,8 @@
 #ifndef  __GIMP_MYBRUSH_CORE_H__
 #define  __GIMP_MYBRUSH_CORE_H__
 
+#if HAVE_MYPAINT  // to end of file
+
 
 #include "gimppaintcore.h"
 
@@ -52,4 +54,5 @@
 GType   gimp_mybrush_core_get_type (void) G_GNUC_CONST;
 
 
+#endif  // HAVE_MYPAINT
 #endif  /*  __GIMP_MYBRUSH_CORE_H__  */
diff -urN gimp-2.10.34-orig/app/paint/gimpmybrushoptions.c gimp-2.10.34/app/paint/gimpmybrushoptions.c
--- gimp-2.10.34-orig/app/paint/gimpmybrushoptions.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/paint/gimpmybrushoptions.c	2023-11-05 14:59:21 +0900
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#if HAVE_MYPAINT  // to end of file
+
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
@@ -217,3 +219,5 @@
 
   gimp_mybrush_options_mybrush_changed (context, brush);
 }
+
+#endif  // HAVE_MYPAINT
diff -urN gimp-2.10.34-orig/app/paint/gimpmybrushsurface.c gimp-2.10.34/app/paint/gimpmybrushsurface.c
--- gimp-2.10.34-orig/app/paint/gimpmybrushsurface.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/paint/gimpmybrushsurface.c	2023-11-05 14:59:21 +0900
@@ -16,6 +16,7 @@
  */
 
 #include "config.h"
+#if HAVE_MYPAINT  // to end of file
 #include <gegl.h>
 
 #include <mypaint-surface.h>
@@ -558,3 +559,5 @@
 
   return surface;
 }
+
+#endif  // HAVE_MYPAINT
diff -urN gimp-2.10.34-orig/app/paint/gimpmybrushsurface.h gimp-2.10.34/app/paint/gimpmybrushsurface.h
--- gimp-2.10.34-orig/app/paint/gimpmybrushsurface.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/paint/gimpmybrushsurface.h	2023-11-05 14:59:21 +0900
@@ -19,6 +19,7 @@
 #define  __GIMP_MYBRUSH_SURFACE_H__
 
 
+#if HAVE_MYPAINT
 typedef struct _GimpMybrushSurface GimpMybrushSurface;
 
 GimpMybrushSurface *
@@ -28,6 +29,7 @@
                           gint                paint_mask_x,
                           gint                paint_mask_y,
                           GimpMybrushOptions *options);
+#endif
 
 
 #endif  /*  __GIMP_MYBRUSH_SURFACE_H__  */
diff -urN gimp-2.10.34-orig/app/paint/paint-types.h gimp-2.10.34/app/paint/paint-types.h
--- gimp-2.10.34-orig/app/paint/paint-types.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/paint/paint-types.h	2023-11-05 14:59:21 +0900
@@ -36,7 +36,9 @@
 typedef struct _GimpEraser           GimpEraser;
 typedef struct _GimpHeal             GimpHeal;
 typedef struct _GimpInk              GimpInk;
+#if HAVE_MYPAINT
 typedef struct _GimpMybrushCore      GimpMybrushCore;
+#endif
 typedef struct _GimpPaintbrush       GimpPaintbrush;
 typedef struct _GimpPencil           GimpPencil;
 typedef struct _GimpPerspectiveClone GimpPerspectiveClone;
@@ -54,7 +56,9 @@
 typedef struct _GimpDodgeBurnOptions        GimpDodgeBurnOptions;
 typedef struct _GimpEraserOptions           GimpEraserOptions;
 typedef struct _GimpInkOptions              GimpInkOptions;
+#if HAVE_MYPAINT
 typedef struct _GimpMybrushOptions          GimpMybrushOptions;
+#endif
 typedef struct _GimpPencilOptions           GimpPencilOptions;
 typedef struct _GimpPerspectiveCloneOptions GimpPerspectiveCloneOptions;
 typedef struct _GimpSmudgeOptions           GimpSmudgeOptions;
diff -urN gimp-2.10.34-orig/app/pdb/context-cmds.c gimp-2.10.34/app/pdb/context-cmds.c
--- gimp-2.10.34-orig/app/pdb/context-cmds.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/pdb/context-cmds.c	2023-11-05 14:59:21 +0900
@@ -1398,6 +1398,7 @@
                                            error ? *error : NULL);
 }
 
+#if HAVE_MYPAINT
 static GimpValueArray *
 context_get_mypaint_brush_invoker (GimpProcedure         *procedure,
                                    Gimp                  *gimp,
@@ -1452,6 +1453,7 @@
   return gimp_procedure_get_return_values (procedure, success,
                                            error ? *error : NULL);
 }
+#endif
 
 static GimpValueArray *
 context_get_pattern_invoker (GimpProcedure         *procedure,
@@ -4240,6 +4242,7 @@
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
+#if HAVE_MYPAINT
   /*
    * gimp-context-get-mypaint-brush
    */
@@ -4287,6 +4290,7 @@
                                                        GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
+#endif
 
   /*
    * gimp-context-get-pattern
diff -urN gimp-2.10.34-orig/app/pdb/gimppdb-utils.c gimp-2.10.34/app/pdb/gimppdb-utils.c
--- gimp-2.10.34-orig/app/pdb/gimppdb-utils.c	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/pdb/gimppdb-utils.c	2023-11-05 14:59:21 +0900
@@ -181,6 +181,7 @@
   return dynamics;
 }
 
+#if HAVE_MYPAINT
 GimpMybrush *
 gimp_pdb_get_mybrush (Gimp               *gimp,
                       const gchar        *name,
@@ -223,6 +224,16 @@
 
   return brush;
 }
+#else  // !HAVE_MYPAINT
+void *
+gimp_pdb_get_mybrush (Gimp               *gimp,
+                      const gchar        *name,
+                      GimpPDBDataAccess   access,
+                      GError            **error)
+{
+  return NULL;
+}
+#endif
 
 GimpPattern *
 gimp_pdb_get_pattern (Gimp         *gimp,
diff -urN gimp-2.10.34-orig/app/pdb/gimppdb-utils.h gimp-2.10.34/app/pdb/gimppdb-utils.h
--- gimp-2.10.34-orig/app/pdb/gimppdb-utils.h	2023-02-22 04:56:15 +0900
+++ gimp-2.10.34/app/pdb/gimppdb-utils.h	2023-11-05 14:59:21 +0900
@@ -31,10 +31,17 @@
                                                  const gchar        *name,
                                                  GimpPDBDataAccess   access,
                                                  GError            **error);
+#if HAVE_MYPAINT
 GimpMybrush   * gimp_pdb_get_mybrush            (Gimp               *gimp,
                                                  const gchar        *name,
                                                  GimpPDBDataAccess   access,
                                                  GError            **error);
+#else
+void          * gimp_pdb_get_mybrush            (Gimp               *gimp,
+                                                 const gchar        *name,
+                                                 GimpPDBDataAccess   access,
+                                                 GError            **error);
+#endif
 GimpPattern   * gimp_pdb_get_pattern            (Gimp               *gimp,
                                                  const gchar        *name,
                                                  GError            **error);
diff -urN gimp-2.10.34-orig/app/tools/gimp-tools.c gimp-2.10.34/app/tools/gimp-tools.c
--- gimp-2.10.34-orig/app/tools/gimp-tools.c	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/tools/gimp-tools.c	2023-11-05 14:59:21 +0900
@@ -179,7 +179,9 @@
     gimp_eraser_tool_register,
     gimp_airbrush_tool_register,
     gimp_ink_tool_register,
+#if HAVE_MYPAINT
     gimp_mybrush_tool_register,
+#endif
     gimp_clone_tool_register,
     gimp_heal_tool_register,
     gimp_perspective_clone_tool_register,
@@ -718,10 +720,12 @@
     {
       paint_core_name = "gimp-ink";
     }
+#if HAVE_MYPAINT
   else if (tool_type == GIMP_TYPE_MYBRUSH_TOOL)
     {
       paint_core_name = "gimp-mybrush";
     }
+#endif
   else
     {
       paint_core_name = "gimp-paintbrush";
diff -urN gimp-2.10.34-orig/app/tools/gimpmybrushoptions-gui.c gimp-2.10.34/app/tools/gimpmybrushoptions-gui.c
--- gimp-2.10.34-orig/app/tools/gimpmybrushoptions-gui.c	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/tools/gimpmybrushoptions-gui.c	2023-11-05 14:59:21 +0900
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#if HAVE_MYPAINT  // to end of file
+
 #include <gegl.h>
 #include <gtk/gtk.h>
 
@@ -86,3 +88,5 @@
 
   return vbox;
 }
+
+#endif  // HAVE_MYBRUSH
diff -urN gimp-2.10.34-orig/app/tools/gimpmybrushoptions-gui.h gimp-2.10.34/app/tools/gimpmybrushoptions-gui.h
--- gimp-2.10.34-orig/app/tools/gimpmybrushoptions-gui.h	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/tools/gimpmybrushoptions-gui.h	2023-11-05 14:59:21 +0900
@@ -19,7 +19,9 @@
 #define  __GIMP_MYBRUSH_OPTIONS_GUI_H__
 
 
+#if HAVE_MYPAINT
 GtkWidget * gimp_mybrush_options_gui (GimpToolOptions *tool_options);
+#endif
 
 
 #endif  /*  __GIMP_MYBRUSH_OPTIONS_GUI_H__  */
diff -urN gimp-2.10.34-orig/app/tools/gimpmybrushtool.c gimp-2.10.34/app/tools/gimpmybrushtool.c
--- gimp-2.10.34-orig/app/tools/gimpmybrushtool.c	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/tools/gimpmybrushtool.c	2023-11-05 14:59:21 +0900
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#if HAVE_MYPAINT  // to end of file
+
 #include <gegl.h>
 #include <gtk/gtk.h>
 
@@ -167,3 +169,5 @@
 
   return NULL;
 }
+
+#endif  // HAVE_MYBRUSH
diff -urN gimp-2.10.34-orig/app/tools/gimpmybrushtool.h gimp-2.10.34/app/tools/gimpmybrushtool.h
--- gimp-2.10.34-orig/app/tools/gimpmybrushtool.h	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/tools/gimpmybrushtool.h	2023-11-05 14:59:21 +0900
@@ -18,6 +18,7 @@
 #ifndef  __GIMP_MYBRUSH_TOOL_H__
 #define  __GIMP_MYBRUSH_TOOL_H__
 
+#if HAVE_MYPAINT  // to end of file
 
 #include "gimppainttool.h"
 
@@ -57,4 +58,6 @@
                                                   gdouble        y,
                                                   gdouble        radius);
 
+#endif  // HAVE_MYBRUSH
+
 #endif  /*  __GIMP_MYBRUSH_TOOL_H__  */
diff -urN gimp-2.10.34-orig/app/tools/gimppaintoptions-gui.c gimp-2.10.34/app/tools/gimppaintoptions-gui.c
--- gimp-2.10.34-orig/app/tools/gimppaintoptions-gui.c	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/tools/gimppaintoptions-gui.c	2023-11-05 14:59:21 +0900
@@ -121,7 +121,9 @@
       tool_type == GIMP_TYPE_CONVOLVE_TOOL   ||
       tool_type == GIMP_TYPE_DODGE_BURN_TOOL ||
       tool_type == GIMP_TYPE_HEAL_TOOL       ||
+#if HAVE_MYPAINT
       tool_type == GIMP_TYPE_MYBRUSH_TOOL    ||
+#endif
       tool_type == GIMP_TYPE_SMUDGE_TOOL)
     {
       gtk_widget_set_sensitive (menu, FALSE);
@@ -136,8 +138,11 @@
 
   /*  temp debug foo, disabled in stable  */
   if (FALSE &&
-      g_type_is_a (tool_type, GIMP_TYPE_PAINT_TOOL) &&
-      tool_type != GIMP_TYPE_MYBRUSH_TOOL)
+      g_type_is_a (tool_type, GIMP_TYPE_PAINT_TOOL)
+#if HAVE_MYPAINT
+      && tool_type != GIMP_TYPE_MYBRUSH_TOOL
+#endif
+  )
     {
       GtkWidget *button;
 
diff -urN gimp-2.10.34-orig/app/widgets/gimpdeviceinfo.c gimp-2.10.34/app/widgets/gimpdeviceinfo.c
--- gimp-2.10.34-orig/app/widgets/gimpdeviceinfo.c	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/widgets/gimpdeviceinfo.c	2023-11-05 14:59:21 +0900
@@ -674,7 +674,11 @@
                 (serialize_props & GIMP_CONTEXT_PROP_MASK_DYNAMICS) != 0,
 
                 "use-mypaint-brush",
+#if HAVE_MYPAINT
                 (serialize_props & GIMP_CONTEXT_PROP_MASK_MYBRUSH) != 0,
+#else
+                FALSE,
+#endif
 
                 "use-gradient",
                 (serialize_props & GIMP_CONTEXT_PROP_MASK_GRADIENT) != 0,
diff -urN gimp-2.10.34-orig/app/widgets/gimptoolpreseteditor.c gimp-2.10.34/app/widgets/gimptoolpreseteditor.c
--- gimp-2.10.34-orig/app/widgets/gimptoolpreseteditor.c	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/widgets/gimptoolpreseteditor.c	2023-11-05 14:59:21 +0900
@@ -324,9 +324,13 @@
   gtk_widget_set_sensitive (priv->dynamics_toggle,
                             (serialize_props &
                              GIMP_CONTEXT_PROP_MASK_DYNAMICS) != 0);
+#if HAVE_MYPAINT
   gtk_widget_set_sensitive (priv->mybrush_toggle,
                             (serialize_props &
                              GIMP_CONTEXT_PROP_MASK_MYBRUSH) != 0);
+#else
+  gtk_widget_set_sensitive (priv->mybrush_toggle, FALSE);
+#endif
   gtk_widget_set_sensitive (priv->gradient_toggle,
                             (serialize_props &
                              GIMP_CONTEXT_PROP_MASK_GRADIENT) != 0);
diff -urN gimp-2.10.34-orig/app/widgets/gimpviewablebox.c gimp-2.10.34/app/widgets/gimpviewablebox.c
--- gimp-2.10.34-orig/app/widgets/gimpviewablebox.c	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/widgets/gimpviewablebox.c	2023-11-05 14:59:21 +0900
@@ -209,6 +209,8 @@
 }
 
 
+#if HAVE_MYPAINT
+
 /*  brush boxes  */
 
 static GtkWidget *
@@ -271,6 +273,8 @@
                              view_type_prop, view_size_prop);
 }
 
+#endif  // HAVE_MYPAINT
+
 
 /*  pattern boxes  */
 
diff -urN gimp-2.10.34-orig/app/widgets/gimpviewablebox.h gimp-2.10.34/app/widgets/gimpviewablebox.h
--- gimp-2.10.34-orig/app/widgets/gimpviewablebox.h	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/app/widgets/gimpviewablebox.h	2023-11-05 14:59:21 +0900
@@ -44,6 +44,7 @@
                                         const gchar   *editor_id,
                                         const gchar   *editor_tooltip);
 
+#if HAVE_MYPAINT
 GtkWidget * gimp_mybrush_box_new       (GimpContainer *container,
                                         GimpContext   *context,
                                         const gchar   *label,
@@ -54,6 +55,7 @@
                                         gint           spacing,
                                         const gchar   *view_type_prop,
                                         const gchar   *view_size_prop);
+#endif
 
 GtkWidget * gimp_pattern_box_new       (GimpContainer *container,
                                         GimpContext   *context,
diff -urN gimp-2.10.34-orig/config.h.in gimp-2.10.34/config.h.in
--- gimp-2.10.34-orig/config.h.in	2023-02-22 05:03:29 +0900
+++ gimp-2.10.34/config.h.in	2023-11-05 14:59:21 +0900
@@ -182,6 +182,9 @@
 /* Define to 1 if you have the `jpeg' library (-ljpeg). */
 #undef HAVE_LIBJPEG
 
+/* Define to 1 if libmypaint is available. */
+#undef HAVE_MYPAINT
+
 /* Define to 1 if you have the `nsl' library (-lnsl). */
 #undef HAVE_LIBNSL
 
@@ -287,6 +290,8 @@
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
+#undef MYPAINT_BRUSHES_DIR
+
 /* Define to 1 if you don't have the fd_set typedef. */
 #undef NO_FD_SET
 
diff -urN gimp-2.10.34-orig/configure gimp-2.10.34/configure
--- gimp-2.10.34-orig/configure	2023-02-22 05:03:39 +0900
+++ gimp-2.10.34/configure	2023-11-05 14:59:21 +0900
@@ -30857,93 +30857,13 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBMYPAINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmypaint >= 1.4.0" 2>&1`
-        else
-	        LIBMYPAINT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmypaint >= 1.4.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBMYPAINT_PKG_ERRORS" >&5
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmypaint >= 1.3.0" >&5
-$as_echo_n "checking for libmypaint >= 1.3.0... " >&6; }
-
-if test -n "$LIBMYPAINT_CFLAGS"; then
-    pkg_cv_LIBMYPAINT_CFLAGS="$LIBMYPAINT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmypaint >= 1.3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmypaint >= 1.3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBMYPAINT_CFLAGS=`$PKG_CONFIG --cflags "libmypaint >= 1.3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBMYPAINT_LIBS"; then
-    pkg_cv_LIBMYPAINT_LIBS="$LIBMYPAINT_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmypaint >= 1.3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmypaint >= 1.3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBMYPAINT_LIBS=`$PKG_CONFIG --libs "libmypaint >= 1.3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBMYPAINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmypaint >= 1.3.0" 2>&1`
-        else
-	        LIBMYPAINT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmypaint >= 1.3.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBMYPAINT_PKG_ERRORS" >&5
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&6;}
-  required_deps="$required_deps
-  - Error: missing dependency libmypaint >= 1.3.0"
+mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes'
 
 elif test $pkg_failed = untried; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&6;}
-  required_deps="$required_deps
-  - Error: missing dependency libmypaint >= 1.3.0"
+mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes'
 
 else
 	LIBMYPAINT_CFLAGS=$pkg_cv_LIBMYPAINT_CFLAGS
@@ -30951,107 +30871,7 @@
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-fi
-    warning_libmypaint="
-WARNING: libmypaint lower than version 1.4.0 is known to crash when
-         parsing MyPaint 2 brushes. Please update."
-
-elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libmypaint >= 1.3.0" >&5
-$as_echo_n "checking for libmypaint >= 1.3.0... " >&6; }
-
-if test -n "$LIBMYPAINT_CFLAGS"; then
-    pkg_cv_LIBMYPAINT_CFLAGS="$LIBMYPAINT_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmypaint >= 1.3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmypaint >= 1.3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBMYPAINT_CFLAGS=`$PKG_CONFIG --cflags "libmypaint >= 1.3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBMYPAINT_LIBS"; then
-    pkg_cv_LIBMYPAINT_LIBS="$LIBMYPAINT_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmypaint >= 1.3.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libmypaint >= 1.3.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBMYPAINT_LIBS=`$PKG_CONFIG --libs "libmypaint >= 1.3.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBMYPAINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmypaint >= 1.3.0" 2>&1`
-        else
-	        LIBMYPAINT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmypaint >= 1.3.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBMYPAINT_PKG_ERRORS" >&5
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&6;}
-  required_deps="$required_deps
-  - Error: missing dependency libmypaint >= 1.3.0"
-
-elif test $pkg_failed = untried; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&5
-$as_echo "$as_me: Eeeeeeeeeeeeeeeeeeeeek! Missing dep: libmypaint >= 1.3.0" >&6;}
-  required_deps="$required_deps
-  - Error: missing dependency libmypaint >= 1.3.0"
-
-else
-	LIBMYPAINT_CFLAGS=$pkg_cv_LIBMYPAINT_CFLAGS
-	LIBMYPAINT_LIBS=$pkg_cv_LIBMYPAINT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-    warning_libmypaint="
-WARNING: libmypaint lower than version 1.4.0 is known to crash when
-         parsing MyPaint 2 brushes. Please update."
-
-else
-	LIBMYPAINT_CFLAGS=$pkg_cv_LIBMYPAINT_CFLAGS
-	LIBMYPAINT_LIBS=$pkg_cv_LIBMYPAINT_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
+$as_echo "#define HAVE_MYPAINT 1" >>confdefs.h
 
 
 pkg_failed=no
@@ -31141,6 +30961,10 @@
   mypaint_brushes_dir=`$PKG_CONFIG --variable=brushesdir mypaint-brushes-1.0`
 fi
 
+fi
+
+$as_echo "#define MYPAINT_BRUSHES_DIR \"${mypaint_brushes_dir}\"" >>confdefs.h
+
 
 
 ##################
diff -urN gimp-2.10.34-orig/configure.ac gimp-2.10.34/configure.ac
--- gimp-2.10.34-orig/configure.ac	2023-02-22 04:56:16 +0900
+++ gimp-2.10.34/configure.ac	2023-11-05 14:59:21 +0900
@@ -1986,24 +1986,23 @@
 # Check for libmypaint
 ######################
 
-PKG_CHECK_MODULES(LIBMYPAINT, libmypaint >= 1.4.0,,
+PKG_CHECK_MODULES(LIBMYPAINT, libmypaint >= 1.4.0,
   [
-    PKG_CHECK_MODULES(LIBMYPAINT, libmypaint >= libmypaint_required_version,,
-                      [add_deps_error([libmypaint >= libmypaint_required_version])])
-    warning_libmypaint="
-WARNING: libmypaint lower than version 1.4.0 is known to crash when
-         parsing MyPaint 2 brushes. Please update."
+    AC_DEFINE(HAVE_MYPAINT, 1, [Define to 1 if libmypaint is available.])
+    PKG_CHECK_MODULES(MYPAINT_BRUSHES, mypaint-brushes-1.0,,
+                      [add_deps_error([mypaint-brushes-1.0])])
+    if test "x$enable_relocatable_bundle" != xno; then
+      mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes'
+    else
+      mypaint_brushes_dir=`$PKG_CONFIG --variable=brushesdir mypaint-brushes-1.0`
+    fi
+  ],
+  [
+    mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes'
   ])
 
-PKG_CHECK_MODULES(MYPAINT_BRUSHES, mypaint-brushes-1.0,,
-                  [add_deps_error([mypaint-brushes-1.0])])
-
-if test "x$enable_relocatable_bundle" != xno; then
-  mypaint_brushes_dir='${gimp_installation_dir}/share/mypaint-data/1.0/brushes'
-else
-  mypaint_brushes_dir=`$PKG_CONFIG --variable=brushesdir mypaint-brushes-1.0`
-fi
 AC_SUBST(mypaint_brushes_dir)
+AC_DEFINE(MYPAINT_BRUSHES_DIR, ["${mypaint_brushes_dir}"])
 
 
 ##################
diff -urN gimp-2.10.34-orig/menus/dialogs-menuitems.xml gimp-2.10.34/menus/dialogs-menuitems.xml
--- gimp-2.10.34-orig/menus/dialogs-menuitems.xml	2023-02-22 04:56:19 +0900
+++ gimp-2.10.34/menus/dialogs-menuitems.xml	2023-11-05 15:00:27 +0900
@@ -19,7 +19,6 @@
   <menuitem action="dialogs-colors" />
   <menuitem action="dialogs-brushes" />
   <menuitem action="dialogs-dynamics" />
-  <menuitem action="dialogs-mypaint-brushes" />
   <menuitem action="dialogs-patterns" />
   <menuitem action="dialogs-gradients" />
   <menuitem action="dialogs-palettes" />
diff -urN gimp-2.10.34-orig/menus/image-menu.xml gimp-2.10.34/menus/image-menu.xml
--- gimp-2.10.34-orig/menus/image-menu.xml	2023-02-22 05:04:28 +0900
+++ gimp-2.10.34/menus/image-menu.xml	2023-11-05 15:00:36 +0900
@@ -649,7 +649,6 @@
         <menuitem action="tools-eraser"/>
         <menuitem action="tools-airbrush"/>
         <menuitem action="tools-ink"/>
-        <menuitem action="tools-mypaint-brush"/>
         <menuitem action="tools-clone"/>
         <menuitem action="tools-heal"/>
         <menuitem action="tools-perspective-clone"/>
@@ -864,7 +863,6 @@
   <menuitem action="dialogs-colors"/>
   <menuitem action="dialogs-brushes"/>
   <menuitem action="dialogs-dynamics"/>
-  <menuitem action="dialogs-mypaint-brushes"/>
   <menuitem action="dialogs-patterns"/>
   <menuitem action="dialogs-gradients"/>
   <menuitem action="dialogs-palettes"/>
@@ -1556,7 +1554,6 @@
         <menuitem action="tools-eraser"/>
         <menuitem action="tools-airbrush"/>
         <menuitem action="tools-ink"/>
-        <menuitem action="tools-mypaint-brush"/>
         <menuitem action="tools-clone"/>
         <menuitem action="tools-heal"/>
         <menuitem action="tools-perspective-clone"/>
@@ -1771,7 +1768,6 @@
   <menuitem action="dialogs-colors"/>
   <menuitem action="dialogs-brushes"/>
   <menuitem action="dialogs-dynamics"/>
-  <menuitem action="dialogs-mypaint-brushes"/>
   <menuitem action="dialogs-patterns"/>
   <menuitem action="dialogs-gradients"/>
   <menuitem action="dialogs-palettes"/>
diff -urN gimp-2.10.34-orig/menus/image-menu.xml.in gimp-2.10.34/menus/image-menu.xml.in
--- gimp-2.10.34-orig/menus/image-menu.xml.in	2023-02-22 04:56:19 +0900
+++ gimp-2.10.34/menus/image-menu.xml.in	2023-11-05 15:00:33 +0900
@@ -648,7 +648,6 @@
         <menuitem action="tools-eraser" />
         <menuitem action="tools-airbrush" />
         <menuitem action="tools-ink" />
-        <menuitem action="tools-mypaint-brush" />
         <menuitem action="tools-clone" />
         <menuitem action="tools-heal" />
         <menuitem action="tools-perspective-clone" />
