[gtk: 2/2] Merge branch 'wip/jtojnar/fix-pc-vulcan' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 1edbc1f1f9c2470a8a9197c57d09fac831cbf9b5
Merge: 146b4c93ba 2c9f2325e2
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 19 04:04:34 2021 +0000

    Merge branch 'wip/jtojnar/fix-pc-vulcan' into 'master'
    
    build: Use Meson’s module for building .pc files
    
    Closes #3517
    
    See merge request GNOME/gtk!3005

 gtk4-unix-print.pc.in |  14 -------
 gtk4.pc.in            |  17 --------
 meson.build           | 107 ++++++++++++++++++++++++++------------------------
 3 files changed, 56 insertions(+), 82 deletions(-)
---
diff --cc meson.build
index d546c00b91,5da3c9e41d..a1c58c7abf
--- a/meson.build
+++ b/meson.build
@@@ -731,36 -714,32 +722,32 @@@ if cairogobj_pkg_foun
  endif
  
  if vulkan_pkg_found
 -  gdk_packages += 'vulkan'
 +  gdk_packages += ' vulkan'
  endif
  
- pkgconf.set('GDK_PACKAGES', gdk_packages)
- pkgconf.set('GSK_PACKAGES',
-             ' '.join([ 'graphene-gobject-1.0', graphene_req ]))
- pkgconf.set('GTK_PACKAGES',
-             ' '.join([ 'gio-2.0', glib_req ]))
+ gsk_packages = [ 'graphene-gobject-1.0 @0@'.format(graphene_req) ]
+ gtk_packages = [ 'gio-2.0 @0@'.format(glib_req) ]
  
  gio_pkgname = os_unix ? 'gio-unix-2.0' : 'gio-2.0'
- pkgconf.set('GDK_PRIVATE_PACKAGES',
-             ' '.join([ gio_pkgname, glib_req,
-                        'epoxy', epoxy_req ] + x11_pkgs + wayland_pkgs + cairo_backends))
- pkgconf.set('GSK_PRIVATE_PACKAGES', '') # all already in GDK_PRIVATE_PACKAGES
+ gdk_private_packages = [
+   '@0@ @1@'.format(gio_pkgname, glib_req),
+   'epoxy @0@'.format(epoxy_req),
+ ] + x11_pkgs + wayland_pkgs + cairo_backends
+ gsk_private_packages = [] # all already in gdk_private_packages
  pangoft2_pkgs = (wayland_enabled or x11_enabled) ? ['pangoft2'] : []
- pkgconf.set('GTK_PRIVATE_PACKAGES', ' '.join(pangoft2_pkgs))
- 
- pkgconf.set('GDK_EXTRA_LIBS', ' '.join(pc_gdk_extra_libs))
- pkgconf.set('GSK_EXTRA_LIBS', '')
- pkgconf.set('GTK_EXTRA_LIBS', '')
+ gtk_private_packages = pangoft2_pkgs
  
- pkgconf.set('GDK_EXTRA_CFLAGS', '')
- pkgconf.set('GSK_EXTRA_CFLAGS', '')
- pkgconf.set('GTK_EXTRA_CFLAGS', '')
+ gdk_extra_libs = pc_gdk_extra_libs
+ gsk_extra_libs = []
+ gtk_extra_libs = []
  
- pkg_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
+ gdk_extra_cflags = []
+ gsk_extra_cflags = []
+ gtk_extra_cflags = []
  
- pkgs = [ 'gtk4.pc' ]
+ pkgs = [ 'gtk4' ]
  
- pkg_targets = ''
+ pkg_targets = []
  display_backends = []
  foreach backend: [ 'broadway', 'macos', 'wayland', 'win32', 'x11', ]
    if get_variable('@0@_enabled'.format(backend))