[pango/matthiasc/for-main: 9/9] Revert "Add a check for mixed linkage"
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango/matthiasc/for-main: 9/9] Revert "Add a check for mixed linkage"
- Date: Mon, 27 Jun 2022 17:23:11 +0000 (UTC)
commit df6db6a0397b7f219499596117970cf7d3a1880b
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Jun 27 13:18:03 2022 -0400
Revert "Add a check for mixed linkage"
This reverts commit e5b62c8c27599699fa583a18e5346138799d9f50.
No longer needed. We've renamed everything to avoid
conflicts, instead.
meson.build | 4 +---
pango/pango-context.c | 24 ------------------------
2 files changed, 1 insertion(+), 27 deletions(-)
---
diff --git a/meson.build b/meson.build
index b50e99cae..d7a1168b9 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/pango-context.c b/pango/pango-context.c
index a74448650..d5e73cfe5 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]