Merge branch 'alxsa-fixed-color-wheel' into 'master'

Draft: Issue #1147: Add option to lock color wheel rotation

See merge request GNOME/gimp!2022

.gitlab-ci.yml

@@ -532,10 +532,7 @@ gimp-snap:
         STORE_OPTION: '-Dms-store=true'
   parallel:
     matrix:
-      - RUNNER: windows-aarch64
-        MSYSTEM_PREFIX: clangarm64
-      - RUNNER: win32-ps
-        MSYSTEM_PREFIX: clang64
+      - RUNNER: [windows-aarch64, win32-ps]
   tags:
     - $RUNNER
   variables:
@@ -543,8 +540,9 @@ gimp-snap:
     #meson.build forces non-relocatable .pc. See: https://github.com/mesonbuild/meson/issues/14346
     PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
   before_script:
+    - if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }}
     # FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
-    - $GIMP_PREFIX = "$PWD\_install-$MSYSTEM_PREFIX".Replace('\', '/')
+    - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX".Replace('\', '/')
   timeout: 30m
 
 .win_environ: &WIN_ENVIRON
@@ -565,9 +563,9 @@ deps-win:
     - build\windows\1_build-deps-msys2.ps1
   artifacts:
     paths:
-      - _install-$MSYSTEM_PREFIX/
-      - babl/_build-$MSYSTEM_PREFIX/meson-logs/meson-log.txt
-      - gegl/_build-$MSYSTEM_PREFIX/meson-logs/meson-log.txt
+      - _install-*/
+      - babl/_build-*/meson-logs/meson-log.txt
+      - gegl/_build-*/meson-logs/meson-log.txt
     expire_in: 2 hours
 
 gimp-win:
@@ -583,14 +581,14 @@ gimp-win:
     - build\windows\2_build-gimp-msys2.ps1
   artifacts:
     paths:
-      - gimp-$MSYSTEM_PREFIX/
-      - _build-$MSYSTEM_PREFIX/meson-logs/meson-log.txt
-      - _build-$MSYSTEM_PREFIX/done-dll.list
+      - gimp-*/
+      - _build-*/meson-logs/meson-log.txt
+      - _build-*/done-dll.list
       # Needed by dist-installer-weekly and dist-store-weekly
-      - _build-$MSYSTEM_PREFIX/config.h
-      - _build-$MSYSTEM_PREFIX/plug-ins/file_associations.list
-      - _build-$MSYSTEM_PREFIX/build/windows/installer/
-      - _build-$MSYSTEM_PREFIX/build/windows/store/
+      - _build-*/config.h
+      - _build-*/plug-ins/file_associations.list
+      - _build-*/build/windows/installer/
+      - _build-*/build/windows/store/
     expire_in: 2 days
 
 
@@ -599,12 +597,10 @@ gimp-win:
   extends: .win
   parallel:
     matrix:
-      - RUNNER: win32-ps
-        MSYSTEM_PREFIX: mingw32
+      - RUNNER: [win32-ps]
   variables:
+    MSYSTEM_PREFIX: mingw32
     MINGW_PACKAGE_PREFIX: mingw-w64-i686
-    CC: cc
-    CXX: c++
 
 deps-win-eol:
   extends: .win-eol

app/actions/meson.build

@@ -101,6 +101,6 @@ libappactions = static_library('appactions',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Actions"',
   dependencies: [
-    gegl, gdk_pixbuf, gtk3,
+    gegl, gdk_pixbuf, gtk3, gexiv2,
   ],
 )

app/config/meson.build

@@ -44,7 +44,7 @@ libappconfig = static_library('appconfig',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Config"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf, gio, gio_specific, libmypaint,
+    cairo, gegl, gdk_pixbuf, gexiv2, gio, gio_specific, libmypaint,
   ],
 )
 

app/display/meson.build

@@ -122,6 +122,6 @@ libappdisplay = static_library('appdisplay',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Display"',
   dependencies: [
-    gegl, gtk3, cairo,
+    gegl, gtk3, cairo, gexiv2
   ],
 )

app/file-data/meson.build

@@ -16,6 +16,7 @@ libappfiledata = static_library('appfiledata',
     cairo,
     gdk_pixbuf,
     gegl,
+    gexiv2,
     libarchive,
   ],
 )

app/file/meson.build

@@ -11,6 +11,6 @@ libappfile = static_library('appfile',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-File"',
   dependencies: [
-    gegl, gdk_pixbuf,
+    gegl, gdk_pixbuf, gexiv2
   ],
 )

app/gegl/meson.build

@@ -56,5 +56,6 @@ libappgegl = static_library('appgegl',
     cairo,
     gegl,
     gdk_pixbuf,
+    gexiv2
   ],
 )

app/gui/meson.build

@@ -31,7 +31,7 @@ libappgui = static_library('appgui',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-GUI"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf, gio_specific, gtk3
+    cairo, gegl, gdk_pixbuf, gexiv2, gio_specific, gtk3
   ],
   install: false,
 )

app/menus/meson.build

@@ -16,6 +16,6 @@ libappmenus = static_library('appmenus',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Menus"',
   dependencies: [
-    gegl, gtk3
+    gegl, gtk3, gexiv2
   ],
 )

app/operations/layer-modes-legacy/meson.build

@@ -25,6 +25,6 @@ libapplayermodeslegacy = static_library('applayermodeslegacy',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Layer-Modes-Legacy"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf,
+    cairo, gegl, gdk_pixbuf, gexiv2
   ],
 )

app/operations/layer-modes/meson.build

@@ -50,5 +50,6 @@ libapplayermodes = static_library('applayermodes',
     cairo,
     gegl,
     gdk_pixbuf,
+    gexiv2
   ],
 )

app/operations/meson.build

@@ -66,7 +66,7 @@ libappoperations = static_library('appoperations',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Operations"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf,
+    cairo, gegl, gdk_pixbuf, gexiv2
   ],
 )
 

app/paint/meson.build

@@ -63,6 +63,6 @@ libapppaint = static_library('apppaint',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Paint"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf, libmypaint,
+    cairo, gegl, gdk_pixbuf, gexiv2, libmypaint,
   ],
 )

app/path/meson.build

@@ -22,6 +22,6 @@ libapppath = static_library('apppath',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Path"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf,
+    cairo, gegl, gdk_pixbuf, gexiv2
   ],
 )

app/pdb/meson.build

@@ -75,7 +75,7 @@ libapppdb = static_library('apppdb',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-PDB"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf,
+    cairo, gegl, gdk_pixbuf, gexiv2
   ],
 )
 
@@ -85,7 +85,7 @@ libappinternalprocs = static_library('appinternalprocs',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-PDB"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf, pangocairo, pango,
+    cairo, gegl, gdk_pixbuf, gexiv2, pangocairo, pango,
   ],
   sources: [
     pdbgen

app/plug-in/meson.build

@@ -56,6 +56,6 @@ libappplugin = static_library('appplug-in',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Plug-In"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf,
+    cairo, gegl, gdk_pixbuf, gexiv2,
   ],
 )

app/propgui/meson.build

@@ -28,6 +28,6 @@ libapppropgui = static_library('apppropgui',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-PropGUI"',
   dependencies: [
-    gegl, gtk3,
+    gegl, gtk3, gexiv2
   ],
 )

app/sanity.c

@@ -502,7 +502,7 @@ sanity_check_gegl (void)
 
 #define GEGL_REQUIRED_MAJOR 0
 #define GEGL_REQUIRED_MINOR 4
-#define GEGL_REQUIRED_MICRO 62
+#define GEGL_REQUIRED_MICRO 64
 
   gegl_get_version (&gegl_major_version,
                     &gegl_minor_version,

app/text/meson.build

@@ -42,6 +42,6 @@ libapptext = static_library('apptext',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Text"',
   dependencies: [
-    gegl, gdk_pixbuf, harfbuzz, pangocairo, pangoft2,
+    gegl, gdk_pixbuf, gexiv2, harfbuzz, pangocairo, pangoft2,
   ],
 )

app/tools/gimpmybrushtool.c

@@ -127,6 +127,8 @@ static void gimp_mybrush_tool_cursor_update (GimpTool         *tool,
   options->view_zoom     = (gimp_zoom_model_get_factor (shell->zoom) > 0.0f) ?
                             gimp_zoom_model_get_factor (shell->zoom) : 1.0f;
   options->view_rotation = shell->rotate_angle;
+
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
 }
 
 static void

app/tools/meson.build

@@ -143,6 +143,6 @@ libapptools = static_library('apptools',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Tools"',
   dependencies: [
-    gegl, gtk3,
+    gegl, gtk3, gexiv2,
   ],
 )

app/widgets/meson.build

@@ -280,6 +280,6 @@ libappwidgets = static_library('appwidgets',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-Widgets"',
   dependencies: [
-    gegl, gtk3,
+    gegl, gtk3, gexiv2,
   ],
 )

app/xcf/meson.build

@@ -13,6 +13,6 @@ libappxcf = static_library('appxcf',
   include_directories: [ rootInclude, rootAppInclude, ],
   c_args: '-DG_LOG_DOMAIN="Gimp-XCF"',
   dependencies: [
-    cairo, gegl, gdk_pixbuf, zlib
+    cairo, gegl, gdk_pixbuf, gexiv2, zlib
   ],
 )

extensions/goat-exercises/meson.build

@@ -48,7 +48,7 @@ if have_vala and have_gobject_introspection
     'goat-exercise-vala.vala',
     include_directories: [ rootInclude, ],
     dependencies: [
-      libgimp_vapi, libgimpui_vapi, gtk3, gegl, math,
+      libgimp_vapi, libgimpui_vapi, libgimpui_dep, math,
     ],
     c_args: [
       '-DGETTEXT_PACKAGE="@0@"'.format('org.gimp.extension.goat-exercises'),

libgimp/meson.build

@@ -421,6 +421,7 @@ libgimp_dep = declare_dependency(
     cairo,
     gdk_pixbuf,
     gegl,
+    gexiv2,
   ],
   link_with: [
     libgimp,
@@ -438,7 +439,6 @@ libgimpui = library('gimpui-'+ gimp_api_version,
   libgimpui_sources,
   dependencies: [
     libgimp_dep,
-    gexiv2,
     gtk3,
   ],
   sources: [

libgimpcolor/meson.build

@@ -36,7 +36,7 @@ libgimpcolor = library('gimpcolor-' + gimp_api_version,
   libgimpcolor_sources,
   include_directories: rootInclude,
   dependencies: [
-    cairo, gdk_pixbuf, gegl, lcms, math,
+    cairo, gdk_pixbuf, gegl, gexiv2, lcms, math,
   ],
   c_args: [ '-DG_LOG_DOMAIN="LibGimpColor"', '-DGIMP_COLOR_COMPILATION', ],
   link_with: [ libgimpbase, ],

libgimpconfig/meson.build

@@ -70,7 +70,7 @@ libgimpconfig = library('gimpconfig-' + gimp_api_version,
   libgimpconfig_sources,
   include_directories: rootInclude,
   dependencies: [
-    cairo, gdk_pixbuf, gegl, gio, gio_specific,
+    cairo, gdk_pixbuf, gegl, gexiv2, gio, gio_specific,
   ],
   c_args: [ '-DG_LOG_DOMAIN="LibGimpConfig"', '-DGIMP_CONFIG_COMPILATION', ],
   link_with: [

libgimpmodule/meson.build

@@ -19,7 +19,7 @@ libgimpmodule = library('gimpmodule-' + gimp_api_version,
   libgimpmodule_sources,
   include_directories: rootInclude,
   dependencies: [
-    gegl, gio, glib, gmodule,
+    gegl, gexiv2, gio, glib, gmodule,
   ],
   c_args: [ '-DG_LOG_DOMAIN="LibGimpModule"', '-DGIMP_MODULE_COMPILATION', ],
   link_with: [

libgimpthumb/meson.build

@@ -65,7 +65,7 @@ libgimpthumb = library('gimpthumb-'+ gimp_api_version,
   libgimpthumb_sources,
   include_directories: rootInclude,
   dependencies: [
-    gegl, glib, gobject, gdk_pixbuf, gio,
+    gegl, gexiv2, glib, gobject, gdk_pixbuf, gio,
   ],
   c_args: [ '-DG_LOG_DOMAIN="LibGimpThumb"', '-DGIMP_THUMB_COMPILATION', ],
   link_with:  [

libgimpwidgets/meson.build

@@ -207,7 +207,7 @@ libgimpwidgets = library('gimpwidgets-'+ gimp_api_version,
   libgimpwidgets_sources,
   include_directories: rootInclude,
   dependencies: [
-    gegl, gtk3, lcms, math, mscms
+    gegl, gexiv2, gtk3, lcms, math, mscms
   ],
   c_args: [ '-DG_LOG_DOMAIN="LibGimpWidgets"', '-DGIMP_WIDGETS_COMPILATION', ],
   link_with: [

meson.build

@@ -431,7 +431,7 @@ freetype2_minver  = '2.1.7'
 freetype2         = dependency('freetype2',          version: '>='+freetype2_minver)
 gdk_pixbuf_minver = '2.30.8'
 gdk_pixbuf        = dependency('gdk-pixbuf-2.0',     version: '>='+gdk_pixbuf_minver)
-gegl_minver       = '0.4.62'
+gegl_minver       = '0.4.64'
 gegl              = dependency('gegl-0.4',           version: '>='+gegl_minver)
 exiv2_minver      = '0.27.4'
 exiv2             = dependency('exiv2',              version: '>='+exiv2_minver)

modules/gimpcolorwheel.c

@@ -81,6 +81,7 @@ typedef struct
 
   /* Dragging mode */
   DragMode mode;
+  gboolean triangle_locked;
 
   guint focus_on_ring : 1;
 
@@ -234,10 +235,11 @@ gimp_color_wheel_init (GimpColorWheel *wheel)
   gtk_widget_set_has_window (GTK_WIDGET (wheel), FALSE);
   gtk_widget_set_can_focus (GTK_WIDGET (wheel), TRUE);
 
-  priv->format        = NULL;
-  priv->ring_fraction = DEFAULT_FRACTION;
-  priv->size          = DEFAULT_SIZE;
-  priv->ring_width    = DEFAULT_RING_WIDTH;
+  priv->format          = NULL;
+  priv->ring_fraction   = DEFAULT_FRACTION;
+  priv->size            = DEFAULT_SIZE;
+  priv->ring_width      = DEFAULT_RING_WIDTH;
+  priv->triangle_locked = TRUE;
 
   /* Allow the user to drag the rectangle on the preview */
   gesture = gtk_gesture_drag_new (GTK_WIDGET (wheel));
@@ -500,7 +502,11 @@ compute_triangle (GimpColorWheel *wheel,
 
   outer = priv->size / 2.0;
   inner = outer - priv->ring_width;
-  angle = priv->h * 2.0 * G_PI;
+
+  if (! priv->triangle_locked)
+    angle = priv->h * 2.0 * G_PI;
+  else
+    angle = 90 * G_PI;
 
   *hx = floor (center_x + cos (angle) * inner + 0.5);
   *hy = floor (center_y - sin (angle) * inner + 0.5);
@@ -1538,3 +1544,15 @@ gimp_color_wheel_move (GimpColorWheel   *wheel,
 
   gimp_color_wheel_set_color (wheel, hue, sat, val);
 }
+
+void
+gimp_color_wheel_set_triangle_locked (GimpColorWheel  *wheel,
+                                      gboolean         triangle_locked)
+{
+  GimpColorWheelPrivate *priv = gimp_color_wheel_get_instance_private (wheel);
+
+  g_return_if_fail (GIMP_IS_COLOR_WHEEL (wheel));
+
+  priv->triangle_locked = triangle_locked;
+}
+

modules/gimpcolorwheel.h

@@ -66,29 +66,31 @@ struct _GimpColorWheelClass
 };
 
 
-void        color_wheel_register_type          (GTypeModule     *module);
+void        color_wheel_register_type            (GTypeModule     *module);
 
-GType       gimp_color_wheel_get_type          (void) G_GNUC_CONST;
-GtkWidget * gimp_color_wheel_new               (void);
+GType       gimp_color_wheel_get_type            (void) G_GNUC_CONST;
+GtkWidget * gimp_color_wheel_new                 (void);
 
-void        gimp_color_wheel_set_color         (GimpColorWheel  *wheel,
-                                                double           h,
-                                                double           s,
-                                                double           v);
-void        gimp_color_wheel_get_color         (GimpColorWheel  *wheel,
-                                                gfloat          *h,
-                                                gfloat          *s,
-                                                gfloat          *v);
+void        gimp_color_wheel_set_color           (GimpColorWheel  *wheel,
+                                                  double           h,
+                                                  double           s,
+                                                  double           v);
+void        gimp_color_wheel_get_color           (GimpColorWheel  *wheel,
+                                                  gfloat          *h,
+                                                  gfloat          *s,
+                                                  gfloat          *v);
 
-void        gimp_color_wheel_set_ring_fraction (GimpColorWheel  *wheel,
-                                                gdouble          fraction);
-gdouble     gimp_color_wheel_get_ring_fraction (GimpColorWheel  *wheel);
+void        gimp_color_wheel_set_ring_fraction   (GimpColorWheel  *wheel,
+                                                  gdouble          fraction);
+gdouble     gimp_color_wheel_get_ring_fraction   (GimpColorWheel  *wheel);
 
-void        gimp_color_wheel_set_format        (GimpColorWheel  *wheel,
-                                                const Babl      *format);
-void        gimp_color_wheel_set_color_config  (GimpColorWheel  *wheel,
-                                                GimpColorConfig *config);
+void        gimp_color_wheel_set_format          (GimpColorWheel  *wheel,
+                                                  const Babl      *format);
+void        gimp_color_wheel_set_color_config    (GimpColorWheel  *wheel,
+                                                  GimpColorConfig *config);
+void        gimp_color_wheel_set_triangle_locked (GimpColorWheel  *wheel,
+                                                  gboolean         triangle_locked);
 
-gboolean    gimp_color_wheel_is_adjusting      (GimpColorWheel  *wheel);
+gboolean    gimp_color_wheel_is_adjusting        (GimpColorWheel  *wheel);
 
 G_END_DECLS

modules/meson.build

@@ -1,6 +1,6 @@
 
 modules_deps = [
-  gtk3, babl, gegl, math,
+  gtk3, babl, gegl, gexiv2, math,
 ]
 
 color_selector_libs = [

plug-ins/common/meson.build

@@ -10,9 +10,7 @@ common_plugins_list = [
   { 'name': 'colormap-remap', },
   { 'name': 'compose', },
   { 'name': 'contrast-retinex', },
-  { 'name': 'crop-zealous',
-    'deps': [ gtk3, gegl, gdk_pixbuf, cairo, ],
-  },
+  { 'name': 'crop-zealous' },
   { 'name': 'curve-bend', },
   { 'name': 'decompose', },
   { 'name': 'depth-merge', },
@@ -20,7 +18,7 @@ common_plugins_list = [
   { 'name': 'destripe', },
   { 'name': 'file-cel', },
   { 'name': 'file-compressor',
-    'deps': [ gegl, gdk_pixbuf, cairo, gio, libarchive, liblzma, pango, bz2, zlib, ],
+    'deps': [ gio, libarchive, liblzma, pango, bz2, zlib, ],
   },
   { 'name': 'file-csource', },
   { 'name': 'file-dicom', },
@@ -28,34 +26,32 @@ common_plugins_list = [
   { 'name': 'file-gbr', },
   { 'name': 'file-gegl', },
   { 'name': 'file-gif-load',
-    'deps': [ gtk3, gegl, gdk_pixbuf, cairo, zlib, ],
+    'deps': [ zlib, ],
   },
   { 'name': 'file-gif-export', },
   { 'name': 'file-gih', },
-  { 'name': 'file-glob',
-    'deps': [ gtk3, gegl, gdk_pixbuf, cairo,  ],
-  },
+  { 'name': 'file-glob', },
   { 'name': 'file-header', },
   { 'name': 'file-html-table', },
   { 'name': 'file-paa', },
   { 'name': 'file-pat', },
   { 'name': 'file-pcx', },
   { 'name': 'file-pdf-load',
-    'deps': [ gtk3, gegl, gdk_pixbuf, poppler ],
+    'deps': [ poppler ],
   },
   { 'name': 'file-pix', },
   { 'name': 'file-png',
-    'deps': [ gtk3, gegl, libpng, lcms ],
+    'deps': [ libpng, lcms ],
   },
   { 'name': 'file-pnm', },
   { 'name': 'file-psp',
-    'deps': [ gtk3, gegl, zlib, ],
+    'deps': [ zlib, ],
   },
   { 'name': 'file-raw-data', },
   { 'name': 'file-seattle-filmworks', },
   { 'name': 'file-sunras', },
   { 'name': 'file-svg',
-    'deps': [ gtk3, gegl, rsvg, ],
+    'deps': [ rsvg, ],
   },
   { 'name': 'file-tga', },
   { 'name': 'file-tim', },
@@ -88,26 +84,26 @@ common_plugins_list = [
 if libaa.found()
   common_plugins_list += {
     'name': 'file-aa',
-    'deps': [ gtk3, gegl, gdk_pixbuf, libaa, ],
+    'deps': [ libaa, ],
   }
 endif
 
 if have_heif
   common_plugins_list += { 'name': 'file-heif',
-    'deps': [ gtk3, gegl, libheif, gexiv2, lcms, ],
+    'deps': [ libheif, lcms, ],
   }
 endif
 
 if openjpeg.found()
   common_plugins_list += { 'name': 'file-jp2',
-    'deps': [ gtk3, gegl, gdk_pixbuf, openjpeg, ],
+    'deps': [ openjpeg, ],
   }
 endif
 
 if libjxl.found() and libjxl_threads.found()
   common_plugins_list += {
     'name': 'file-jpegxl',
-    'deps': [ gtk3, gegl, gexiv2, libjxl, libjxl_threads, ],
+    'deps': [ libjxl, libjxl_threads, ],
   }
 endif
 
@@ -117,57 +113,55 @@ if libmng.found()
     mng_cflags = [ '-DMNG_USE_DLL' ]
   endif
   common_plugins_list += { 'name': 'file-mng',
-                           'deps': [ gtk3, gegl, libmng, libpng, ],
+                           'deps': [ libmng, libpng, ],
                            'cflags': mng_cflags,
   }
 endif
 
 if cairopdf.found()
   common_plugins_list += { 'name': 'file-pdf-export',
-    'deps': [ gtk3, gegl, gdk_pixbuf, poppler, cairo, cairopdf ],
+    'deps': [ poppler, cairopdf ],
   }
 endif
 
 if ghostscript.found()
   common_plugins_list += { 'name': 'file-ps',
-    'deps': [ gtk3, gegl, gdk_pixbuf, ghostscript, ],
+    'deps': [ ghostscript, ],
   }
 endif
 
 if wmf.found()
   common_plugins_list += { 'name': 'file-wmf',
-    'deps': [ gtk3, gegl, wmf, ],
+    'deps': [ wmf, ],
   }
 endif
 
 if xmc.found()
   common_plugins_list += { 'name': 'file-xmc',
-    'deps': [ gtk3, gegl, xmc, ],
+    'deps': [ xmc, ],
   }
 endif
 
 if libxpm.found()
   common_plugins_list += { 'name': 'file-xpm',
-    'deps': [ gtk3, gegl, libxpm, ],
+    'deps': [ libxpm, ],
   }
 endif
 
 if have_qoi
   common_plugins_list += {
     'name': 'file-qoi',
-    'deps': [ gtk3, gegl, ],
   }
 endif
 
 if libiff.found() and libilbm.found()
   common_plugins_list += {
     'name': 'file-iff',
-    'deps': [ gtk3, gegl, libiff, libilbm, ],
+    'deps': [ libiff, libilbm, ],
   }
 elif have_ilbm
   common_plugins_list += {
     'name': 'file-iff',
-    'deps': [ gtk3, gegl, ],
   }
 endif
 
@@ -178,7 +172,6 @@ endif
 if platform_linux
   common_plugins_list += {
     'name': 'file-desktop-link',
-    'deps': [ gtk3, gegl, gdk_pixbuf, cairo, ],
   }
 endif
 if not platform_windows
@@ -187,7 +180,7 @@ endif
 
 if get_option('webkit-unmaintained')
   common_plugins_list += { 'name': 'web-page',
-    'deps': [ gtk3, gegl, gdk_pixbuf, webkit, ],
+    'deps': [ webkit, ],
   }
 endif
 
@@ -195,7 +188,7 @@ plugin_custom_targets = []
 foreach plugin : common_plugins_list
   plugin_name = plugin.get('name')
   plugin_sources = [ plugin.get('sources', plugin_name + '.c') ]
-  plugin_deps = plugin.get('deps', [ gtk3, gegl, gdk_pixbuf, ])
+  plugin_deps = plugin.get('deps', [])
   plugin_cflags = plugin.get('cflags', [])
 
   if platform_windows
@@ -241,7 +234,7 @@ foreach plugin : common_plugins_list
                             libgimpui,
                             libgimpwidgets,
                           ],
-                          dependencies: [ plugin_deps, math ],
+                          dependencies: [ plugin_deps, math, libgimpui_dep ],
                           c_args: plugin_cflags,
                           win_subsystem: 'windows',
                           install: true,

plug-ins/help/meson.build

@@ -28,7 +28,7 @@ help_plugin_lib = static_library('help_plugin',
   plugin_sources,
   include_directories: [ rootInclude, ],
   dependencies: [
-    gtk3, gegl, cairo, gio, gdk_pixbuf,
+    libgimpui_dep, gio,
   ],
   install: false,
 )

tools/meson.build

@@ -10,7 +10,7 @@ gimptool = executable('gimptool' + exec_ver,
   'gimptool.c',
   include_directories: rootInclude,
   dependencies: [
-    gegl, gtk3,
+    gegl, gtk3, gexiv2
   ],
   link_with: [
     libgimpbase,
@@ -25,7 +25,7 @@ gimp_test_clipboard = executable('gimp-test-clipboard' + exec_ver,
   'gimp-test-clipboard.c',
   include_directories: rootInclude,
   dependencies: [
-    gegl, gtk3,
+    gegl, gtk3, gexiv2
   ],
   install: true,
 )