From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 16 May 2023 03:06:07 +0000 (-0400)
Subject: Only build iconcache validator if it is  used
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~255^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9463e0f56c5054fb8575e00388ca49ea0b4677b9;p=gtk4.git

Only build iconcache validator if it is  used
---

diff --git a/gtk/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c
index 7cec4d486f..8ddd24a361 100644
--- a/gtk/gtkiconcachevalidator.c
+++ b/gtk/gtkiconcachevalidator.c
@@ -20,6 +20,7 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 
+#if defined(G_ENABLE_DEBUG) || defined(BUILD_TOOLS)
 
 #define VERBOSE(x)
 
@@ -401,3 +402,4 @@ gtk_icon_cache_validate (CacheInfo *info)
   return TRUE;
 }
 
+#endif
diff --git a/tools/meson.build b/tools/meson.build
index 0e90d88945..af77a7abb6 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -31,7 +31,7 @@ gtk_tools = [
                          'gtk-builder-tool-screenshot.c',
                          'gtk-builder-tool-preview.c',
                          'fake-scope.c'], [libgtk_dep] ],
-  ['gtk4-update-icon-cache', ['updateiconcache.c'] + extra_update_icon_cache_objs, [ libgtk_static_dep ] ],
+  ['gtk4-update-icon-cache', ['updateiconcache.c', '../gtk/gtkiconcachevalidator.c' ] + extra_update_icon_cache_objs, [ libgtk_dep ] ],
   ['gtk4-encode-symbolic-svg', ['encodesymbolic.c'], [ libgtk_static_dep ] ],
 ]
 
@@ -47,7 +47,7 @@ foreach tool: gtk_tools
   exe = executable(tool_name,
     sources: tool_srcs,
     include_directories: [confinc],
-    c_args: common_cflags,
+    c_args: common_cflags + [ '-DBUILD_TOOLS' ],
     dependencies: tool_deps,
     install: true,
   )