diff options
author | Matthias Clasen <mclasen@redhat.com> | 2022-06-27 17:52:42 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2022-06-27 17:52:42 +0000 |
commit | fd9699e032f821dbbec5d771af1be45e263001ef (patch) | |
tree | 44a4eb3a3b93668e6003c58d25fb20a1355a2e38 /meson.build | |
parent | 73e90c3ff7ad2a92cdcfe1832b687d965a76e9b1 (diff) | |
parent | df6db6a0397b7f219499596117970cf7d3a1880b (diff) | |
download | pango-fd9699e032f821dbbec5d771af1be45e263001ef.tar.gz |
Merge branch 'matthiasc/for-main' into 'main'
Revert "Add a check for mixed linkage"
See merge request GNOME/pango!630
Diffstat (limited to 'meson.build')
-rw-r--r-- | meson.build | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meson.build b/meson.build index b50e99ca..d7a1168b 100644 --- a/meson.build +++ b/meson.build @@ -240,13 +240,11 @@ pango_deps += mathlib_dep # gobject glib_dep = dependency('glib-2.0', version: glib_req_version, fallback: ['glib', 'libglib_dep']) -gmodule_dep = dependency('gmodule-2.0', version: glib_req_version, - fallback : ['glib', 'libgmodule_dep']) gobject_dep = dependency('gobject-2.0', version: glib_req_version, fallback: ['glib', 'libgobject_dep']) gio_dep = dependency('gio-2.0', version: glib_req_version, fallback: ['glib', 'libgio_dep']) -pango_deps += [glib_dep, gmodule_dep, gobject_dep, gio_dep] +pango_deps += [glib_dep, gobject_dep, gio_dep] fribidi_dep = dependency('fribidi', version: fribidi_req_version, fallback: ['fribidi', 'libfribidi_dep'], |