media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch

   1 https://bugs.gentoo.org/586828
   2
   3 Backported from:
   4 https://git.gnome.org/browse/gimp/commit/?id=2e4685013123c584354bc38612527593a815c38b
   5
   6 --- gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
   7 +++ gimp-2.9.2/app/core/gimpparamspecs-duplicate.c
   8 @@ -66,23 +66,11 @@
   9          }
  10        else
  11          {
  12 -
  13            copy = g_param_spec_string (pspec->name,
  14                                        g_param_spec_get_nick (pspec),
  15                                        g_param_spec_get_blurb (pspec),
  16                                        spec->default_value,
  17                                        flags);
  18 -
  19 -          if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
  20 -            {
  21 -              static GQuark multiline_quark = 0;
  22 -
  23 -              if (! multiline_quark)
  24 -                multiline_quark = g_quark_from_static_string ("multiline");
  25 -
  26 -              g_param_spec_set_qdata (copy, multiline_quark,
  27 -                                      GINT_TO_POINTER (TRUE));
  28 -            }
  29          }
  30      }
  31    else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
  32 --- gimp-2.9.2/app/widgets/gimppropgui.c
  33 +++ gimp-2.9.2/app/widgets/gimppropgui.c
  34 @@ -227,11 +227,6 @@
  35      }
  36    else if (G_IS_PARAM_SPEC_STRING (pspec))
  37      {
  38 -      static GQuark multiline_quark = 0;
  39 -
  40 -      if (! multiline_quark)
  41 -        multiline_quark = g_quark_from_static_string ("multiline");
  42 -
  43        if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec))
  44          {
  45            widget =
  46 @@ -239,7 +234,7 @@
  47                                                 g_param_spec_get_nick (pspec),
  48                                                 GTK_FILE_CHOOSER_ACTION_OPEN);
  49          }
  50 -      else if (g_param_spec_get_qdata (pspec, multiline_quark))
  51 +      else if (HAS_KEY (pspec, "multiline", "true"))
  52          {
  53            GtkTextBuffer *buffer;
  54            GtkWidget     *view;