From fd8af534aa3af90aa9e6f3674fa780ffc48f7299 Mon Sep 17 00:00:00 2001 From: Bruno Lopes Date: Thu, 2 Apr 2026 14:19:49 -0300 Subject: [PATCH] build/macos: Do not require gexiv2-0.14 on homebrew --- app/core/meson.build | 5 ++++- app/dialogs/meson.build | 5 ++++- libgimp/meson.build | 4 ++-- libgimpbase/meson.build | 1 + meson.build | 6 ++---- plug-ins/common/meson.build | 2 ++ plug-ins/file-tiff/meson.build | 1 + plug-ins/metadata/meson.build | 2 ++ 8 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/core/meson.build b/app/core/meson.build index 656d36a9c2..375eafd877 100644 --- a/app/core/meson.build +++ b/app/core/meson.build @@ -274,7 +274,10 @@ libappcore_sources = [ libappcore = static_library('appcore', libappcore_sources, include_directories: [ rootInclude, rootAppInclude, ], - c_args: '-DG_LOG_DOMAIN="Gimp-Core"', + c_args: [ + '-DG_LOG_DOMAIN="Gimp-Core"', + '-Wno-deprecated-declarations', + ], dependencies: [ cairo, gegl, diff --git a/app/dialogs/meson.build b/app/dialogs/meson.build index 672cd934eb..dc919b8bf0 100644 --- a/app/dialogs/meson.build +++ b/app/dialogs/meson.build @@ -74,7 +74,10 @@ libappdialogs_sources += [ libappdialogs = static_library('appdialogs', libappdialogs_sources, include_directories: [ rootInclude, rootAppInclude, ], - c_args: '-DG_LOG_DOMAIN="Gimp-Dialogs"', + c_args: [ + '-DG_LOG_DOMAIN="Gimp-Dialogs"', + '-Wno-deprecated-declarations', + ], dependencies: [ appstream, gegl, diff --git a/libgimp/meson.build b/libgimp/meson.build index eb1166c728..36af7e9e62 100644 --- a/libgimp/meson.build +++ b/libgimp/meson.build @@ -399,7 +399,7 @@ libgimp_deps_table = [ { 'gir': 'cairo-1.0', 'vapi': 'cairo-1.0', }, { 'gir': 'GdkPixbuf-2.0', 'vapi': 'gdk-pixbuf-2.0', }, { 'gir': 'Gegl-0.4', 'vapi': 'gegl-0.4', }, - { 'gir': 'GExiv2-0.10', 'vapi': 'gexiv2', }, + { 'gir': 'GExiv2-0.16', 'vapi': 'gexiv2-0.16', }, { 'gir': 'Gio-2.0', 'vapi': 'gio-2.0', }, { 'gir': gio_specific_gir, 'vapi': gio_specific_vapi, }, { 'gir': 'GLib-2.0', 'vapi': 'glib-2.0', }, @@ -425,7 +425,7 @@ libgimp = library('gimp-'+ gimp_api_version, sources: [ pdbgen ], - c_args: [ '-DG_LOG_DOMAIN="LibGimp"', '-DGIMP_COMPILATION', ], + c_args: [ '-DG_LOG_DOMAIN="LibGimp"', '-DGIMP_COMPILATION', '-Wno-deprecated-declarations', ], link_with: [ libgimpbase, libgimpcolor, diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build index 377a806249..c305509856 100644 --- a/libgimpbase/meson.build +++ b/libgimpbase/meson.build @@ -125,6 +125,7 @@ libgimpbase = library('gimpbase-' + gimp_api_version, c_args: [ '-DG_LOG_DOMAIN="LibGimpBase"', '-DGIMP_BASE_COMPILATION', + '-Wno-deprecated-declarations', ], vs_module_defs: 'gimpbase.def', install: true, diff --git a/meson.build b/meson.build index 3e6a324e16..d46d4b0ee5 100644 --- a/meson.build +++ b/meson.build @@ -464,9 +464,8 @@ gegl_minver = '0.4.66' gegl = dependency('gegl-0.4', version: '>='+gegl_minver) exiv2_minver = '0.27.4' exiv2 = dependency('exiv2', version: '>='+exiv2_minver) -gexiv2_minver = '0.14.0' -gexiv2_maxver = '0.15.0' -gexiv2 = dependency('gexiv2', version: ['>='+gexiv2_minver, '<'+gexiv2_maxver]) +gexiv2_minver = '0.16.0' +gexiv2 = dependency('gexiv2-0.16', version: '>='+gexiv2_minver) gio = dependency('gio-2.0') gio_specific_name = platform_windows ? 'gio-windows-2.0' : 'gio-unix-2.0' @@ -1812,7 +1811,6 @@ install_conf.set('GDK_PIXBUF_REQUIRED_VERSION', gdk_pixbuf_minver) install_conf.set('GEGL_REQUIRED_VERSION', gegl_minver) install_conf.set('EXIV2_REQUIRED_VERSION', exiv2_minver) install_conf.set('GEXIV2_REQUIRED_VERSION', gexiv2_minver) -install_conf.set('GEXIV2_MAX_VERSION', gexiv2_maxver) install_conf.set('GLIB_REQUIRED_VERSION', glib_minver) install_conf.set('GTK_REQUIRED_VERSION', gtk3_minver) install_conf.set('HARFBUZZ_REQUIRED_VERSION', harfbuzz_minver) diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build index 420e4d1cdd..faf397d64e 100644 --- a/plug-ins/common/meson.build +++ b/plug-ins/common/meson.build @@ -92,6 +92,7 @@ endif if have_heif common_plugins_list += { 'name': 'file-heif', 'deps': [ libheif, lcms, ], + 'cflags': [ '-Wno-deprecated-declarations', ], } endif @@ -105,6 +106,7 @@ if libjxl.found() and libjxl_threads.found() common_plugins_list += { 'name': 'file-jpegxl', 'deps': [ libjxl, libjxl_threads, ], + 'cflags': [ '-Wno-deprecated-declarations', ], } endif diff --git a/plug-ins/file-tiff/meson.build b/plug-ins/file-tiff/meson.build index 31b9f7df35..740e67e194 100644 --- a/plug-ins/file-tiff/meson.build +++ b/plug-ins/file-tiff/meson.build @@ -28,6 +28,7 @@ plugin_exe = executable(plugin_name, gexiv2, libtiff, ], + c_args: [ '-Wno-deprecated-declarations', ], win_subsystem: 'windows', install: true, install_dir: gimpplugindir / 'plug-ins' / plugin_name) diff --git a/plug-ins/metadata/meson.build b/plug-ins/metadata/meson.build index dfa0105276..d06a2ddcfe 100644 --- a/plug-ins/metadata/meson.build +++ b/plug-ins/metadata/meson.build @@ -33,6 +33,7 @@ plugin_exe = executable(plugin_name, libgimpui_dep, gexiv2, ], + c_args: [ '-Wno-deprecated-declarations', ], win_subsystem: 'windows', install: true, install_dir: gimpplugindir / 'plug-ins' / plugin_name) @@ -81,6 +82,7 @@ plugin_exe = executable(plugin_name, dependencies: [ gtk3, gegl, gexiv2, ], + c_args: [ '-Wno-deprecated-declarations', ], link_with: [ libgimp, libgimpbase, -- 2.50.1 (Apple Git-155)