AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-05 18:31:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ebassi/for-master' into 'master'

Browse Source 
Graphene is a dependency of Gsk, not Gdk

See merge request GNOME/gtk!3149
This commit is contained in:
Matthias Clasen 2021-02-04 01:38:09 +00:00
commit 12a540c284
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/meson.build
View File

@ -1142,12 +1142,6 @@ if build_gir
# the installed one # the installed one
gdk_gir_inc = [ 'cairo-1.0', 'Gio-2.0', ] 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' if pixbuf_dep.type_name() == 'internal'
gdk_gir_inc += subproject('gdk-pixbuf').get_variable('gdkpixbuf_gir').get(0) gdk_gir_inc += subproject('gdk-pixbuf').get_variable('gdkpixbuf_gir').get(0)
else else
@ -1211,6 +1205,12 @@ if build_gir
gsk_gir_inc = [ gdk_gir[0] ] 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 = gnome.generate_gir(libgtk, gsk_gir = gnome.generate_gir(libgtk,
sources: gsk_public_headers + gsk_public_sources + [ gskenum_h ], sources: gsk_public_headers + gsk_public_sources + [ gskenum_h ],
namespace: 'Gsk', namespace: 'Gsk',