diff options
| -rw-r--r-- | meson.build | 4 | ||||
| -rw-r--r-- | pango/meson.build | 2 | ||||
| -rw-r--r-- | pango/pango-context.c | 24 |
3 files changed, 2 insertions, 28 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'], diff --git a/pango/meson.build b/pango/meson.build index f344bc8b..1a4b4141 100644 --- a/pango/meson.build +++ b/pango/meson.build @@ -153,7 +153,7 @@ if build_gir symbol_prefix: 'pango', export_packages: 'pango', dependencies: pango_deps, - includes: [ 'HarfBuzz-0.0', 'GObject-2.0', 'cairo-1.0', ], + includes: [ 'HarfBuzz-0.0', 'GObject-2.0', 'Gio-2.0', 'cairo-1.0' ], header: 'pango/pango.h', install: true, extra_args: gir_args, diff --git a/pango/pango-context.c b/pango/pango-context.c index a7444865..d5e73cfe 100644 --- a/pango/pango-context.c +++ b/pango/pango-context.c @@ -23,8 +23,6 @@ #include <string.h> #include <stdlib.h> -#include <gio/gio.h> - #include "pango-context.h" #include "pango-context-private.h" #include "pango-impl-utils.h" @@ -82,33 +80,11 @@ pango_context_init (PangoContext *context) pango_font_description_set_size (context->font_desc, 12 * PANGO_SCALE); } -static gboolean -pango_has_mixed_deps (void) -{ - GModule *module; - gpointer func; - gboolean result = FALSE; - - module = g_module_open (NULL, 0); - - if (g_module_symbol (module, "pango_hb_font_new", &func)) - result = TRUE; - - g_module_close (module); - - return result; -} - static void pango_context_class_init (PangoContextClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - /* Put the check for mixed linkage here, for lack of a better place */ - if (pango_has_mixed_deps ()) - g_error ("Pango 2 symbols detected.\n" - "Using Pango 1.x and 2 in the same process is not supported."); - object_class->finalize = pango_context_finalize; } |