[gtk: 30/40] Fix warnings in gdk gir build
- From: Alexander Larsson <alexl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk: 30/40] Fix warnings in gdk gir build
- Date: Thu, 30 Jan 2020 17:33:40 +0000 (UTC)
commit f7cd2a782be43dda118487f41456e6c3dc42437d
Author: Alexander Larsson <alexl redhat com>
Date: Thu Jan 30 10:43:35 2020 +0100
Fix warnings in gdk gir build
We now have graphene arguments in a gdk function, so add that to the
dependencies.
gtk/meson.build | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 698235eeec..07f706c51f 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -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 ],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]