Fix warnings in gdk gir build
authorAlexander Larsson <alexl@redhat.com>
Thu, 30 Jan 2020 09:43:35 +0000 (10:43 +0100)
committerAlexander Larsson <alexl@redhat.com>
Thu, 30 Jan 2020 09:53:43 +0000 (10:53 +0100)
We now have graphene arguments in a gdk function, so add that to the
dependencies.

gtk/meson.build

index 698235eeeccbac26d041a38dbb0d5df33e98ab57..07f706c51fa180e09b81cc566155626452e8b4ad 100644 (file)
@@ -1008,6 +1008,12 @@ if build_gir
   # the installed one
   gdk_gir_inc = [ 'cairo-1.0', 'Gio-2.0', ]
 
+  if graphene_dep.type_name() == 'internal'
+    gdk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0)
+  else
+    gdk_gir_inc += 'Graphene-1.0'
+  endif
+
   if pixbuf_dep.type_name() == 'internal'
     gdk_gir_inc += subproject('gdk-pixbuf').get_variable('gdkpixbuf_gir').get(0)
   else
@@ -1052,12 +1058,7 @@ if build_gir
     gtk_dep_sources += gdk_x11_gir
   endif
 
-  gsk_gir_inc = [ gdk_gir[0], ]
-  if graphene_dep.type_name() == 'internal'
-    gsk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0)
-  else
-    gsk_gir_inc += 'Graphene-1.0'
-  endif
+  gsk_gir_inc = [ gdk_gir[0] ]
 
   gsk_gir = gnome.generate_gir(libgtk,
                                sources: gsk_public_headers + gsk_public_sources + [ gskenum_h ],