[pango: 29/31] Remove gmodule dependency and deprecate some more symbols
- From: Behdad Esfahbod <behdad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango: 29/31] Remove gmodule dependency and deprecate some more symbols
- Date: Sun, 5 Apr 2015 20:06:15 +0000 (UTC)
commit 6763f38c4c0de135b0839eb74d9ac7d5e7fafec6
Author: Behdad Esfahbod <behdad behdad org>
Date: Sun Apr 5 12:42:54 2015 -0700
Remove gmodule dependency and deprecate some more symbols
configure.ac | 2 +-
examples/pangowin32tobmp.c | 1 -
pango-uninstalled.pc.in | 1 -
pango.pc.in | 1 -
pango/Makefile.am | 3 ---
pango/modules.c | 10 ----------
pango/modules.h | 35 -----------------------------------
pango/pango-engine.c | 7 ++++++-
pango/pango-engine.h | 30 ++++++++++++++++++++++++++----
pango/pango-modules.h | 2 ++
pango/pangocoretext-fontmap.c | 1 -
pango/pangofc-fontmap.c | 1 -
pango/pangowin32-fontmap.c | 1 -
13 files changed, 35 insertions(+), 60 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 117edb4..5cb6e58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -439,7 +439,7 @@ fi
# Checks for GLib
#
GLIB_REQUIRED_VERSION=2.33.12
-GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gmodule-no-export-2.0 gthread-2.0"
+GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gthread-2.0"
PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :,
AC_MSG_ERROR([
diff --git a/examples/pangowin32tobmp.c b/examples/pangowin32tobmp.c
index 8d317c0..b657744 100644
--- a/examples/pangowin32tobmp.c
+++ b/examples/pangowin32tobmp.c
@@ -24,7 +24,6 @@
#include <glib.h>
#include <stdlib.h>
-#include <gmodule.h>
#include "pango.h"
#include "pango-impl-utils.h"
#include "pangowin32.h"
diff --git a/pango-uninstalled.pc.in b/pango-uninstalled.pc.in
index fa2c02a..20ad9de 100644
--- a/pango-uninstalled.pc.in
+++ b/pango-uninstalled.pc.in
@@ -2,6 +2,5 @@ Name: Pango Uninstalled
Description: Internationalized text handling, Not Installed
Version: @VERSION@
Requires: glib-2.0 gobject-2.0
-Requires.private: gmodule-no-export-2.0
Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpango- PANGO_API_VERSION@.la @PKGCONFIG_MATH_LIBS@
Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
diff --git a/pango.pc.in b/pango.pc.in
index 63e2d59..b181e48 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -7,6 +7,5 @@ Name: Pango
Description: Internationalized text handling
Version: @VERSION@
Requires: glib-2.0 gobject-2.0
-Requires.private: gmodule-no-export-2.0
Libs: -L${libdir} -lpango- PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@
Cflags: -I${includedir}/pango-1.0
diff --git a/pango/Makefile.am b/pango/Makefile.am
index be657ec..b2469ad 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -193,7 +193,6 @@ libpangoft2_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la
libpangoft2_1_0_la_SOURCES = \
$(pangoft2_public_sources) \
- modules.h \
pangofc-private.h \
pangoft2.h \
pangoft2-private.h \
@@ -335,7 +334,6 @@ endif
if HAVE_CAIRO_QUARTZ
if HAVE_CORE_TEXT
libpangocairo_1_0_la_SOURCES += \
- modules.h \
pangocoretext.h \
pangocoretext.c \
pangocoretext-private.h \
@@ -387,7 +385,6 @@ libpangowin32_1_0_la_LIBADD = \
libpangowin32_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la
libpangowin32_1_0_la_SOURCES = \
- modules.h \
pangowin32.h \
pangowin32.c \
pangowin32-private.h \
diff --git a/pango/modules.c b/pango/modules.c
index 93a4897..4705979 100644
--- a/pango/modules.c
+++ b/pango/modules.c
@@ -29,17 +29,7 @@
*/
#include "config.h"
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-
-#include <gmodule.h>
-#include <glib/gstdio.h>
-
-#include "pango-enum-types.h"
#include "pango-modules.h"
-#include "pango-impl-utils.h"
-#include "modules.h"
/**
* pango_find_map:
diff --git a/pango/pango-engine.c b/pango/pango-engine.c
index 6634ff0..777132b 100644
--- a/pango/pango-engine.c
+++ b/pango/pango-engine.c
@@ -37,6 +37,8 @@
* script_engine_create(). The latter three functions are used when
* creating engines from the module at run time, while the first
* function is used when building a catalog of all available modules.
+ *
+ * Deprecated: 1.37
*/
/**
* SECTION:pango-engine-lang
@@ -47,6 +49,8 @@
* The <firstterm>language engines</firstterm> are rendering-system independent
* engines that determine line, word, and character breaks for character strings.
* These engines are used in pango_break().
+ *
+ * Deprecated: 1.37
*/
/**
* SECTION:pango-engine-shape
@@ -57,6 +61,8 @@
* The <firstterm>shape engines</firstterm> are rendering-system dependent
* engines that convert character strings into glyph strings.
* These engines are used in pango_shape().
+ *
+ * Deprecated: 1.37
*/
#include "config.h"
@@ -97,7 +103,6 @@ pango_engine_shape_real_covers (PangoEngineShape *engine G_GNUC_UNUSED,
PangoLanguage *language,
gunichar wc)
{
-
PangoCoverage *coverage = pango_font_get_coverage (font, language);
PangoCoverageLevel result = pango_coverage_get (coverage, wc);
diff --git a/pango/pango-engine.h b/pango/pango-engine.h
index b493040..d8d262a 100644
--- a/pango/pango-engine.h
+++ b/pango/pango-engine.h
@@ -32,15 +32,13 @@ G_BEGIN_DECLS
#ifdef PANGO_ENABLE_ENGINE
-/* Module API */
-
-#include <gmodule.h>
-
/**
* PANGO_RENDER_TYPE_NONE:
*
* A string constant defining the render type
* for engines that are not rendering-system specific.
+ *
+ * Deprecated: 1.37
*/
#define PANGO_RENDER_TYPE_NONE "PangoRenderNone"
@@ -59,6 +57,8 @@ typedef struct _PangoEngineClass PangoEngineClass;
*
* #PangoEngine is the base class for all types of language and
* script specific engines. It has no functionality by itself.
+ *
+ * Deprecated: 1.37
**/
struct _PangoEngine
{
@@ -70,6 +70,8 @@ struct _PangoEngine
* PangoEngineClass:
*
* Class structure for #PangoEngine
+ *
+ * Deprecated: 1.37
**/
struct _PangoEngineClass
{
@@ -84,6 +86,8 @@ GType pango_engine_get_type (void) G_GNUC_CONST;
*
* A string constant defining the engine type for language engines.
* These engines derive from #PangoEngineLang.
+ *
+ * Deprecated: 1.37
*/
#define PANGO_ENGINE_TYPE_LANG "PangoEngineLang"
@@ -105,6 +109,8 @@ typedef struct _PangoEngineLangClass PangoEngineLangClass;
* instance, a custom #PangoEngineLang could be provided for
* Thai to implement the dictionary-based word boundary
* lookups needed for that language.
+ *
+ * Deprecated: 1.37
**/
struct _PangoEngineLang
{
@@ -122,6 +128,8 @@ struct _PangoEngineLang
* this is called after that to allow tailoring the breaking results.
*
* Class structure for #PangoEngineLang
+ *
+ * Deprecated: 1.37
**/
struct _PangoEngineLangClass
{
@@ -144,6 +152,8 @@ GType pango_engine_lang_get_type (void) G_GNUC_CONST;
*
* A string constant defining the engine type for shaping engines.
* These engines derive from #PangoEngineShape.
+ *
+ * Deprecated: 1.37
*/
#define PANGO_ENGINE_TYPE_SHAPE "PangoEngineShape"
@@ -167,6 +177,8 @@ typedef struct _PangoEngineShapeClass PangoEngineShapeClass;
* and to a particular script. For instance, there is one
* #PangoEngineShape implementation to handle shaping Arabic
* for Fontconfig-based backends.
+ *
+ * Deprecated: 1.37
**/
struct _PangoEngineShape
{
@@ -197,6 +209,8 @@ struct _PangoEngineShape
* font itself unmodified.
*
* Class structure for #PangoEngineShape
+ *
+ * Deprecated: 1.37
**/
struct _PangoEngineShapeClass
{
@@ -240,6 +254,8 @@ typedef struct _PangoEngineScriptInfo PangoEngineScriptInfo;
*
* The #PangoEngineScriptInfo structure contains
* information about how the shaper covers a particular script.
+ *
+ * Deprecated: 1.37
*/
struct _PangoEngineScriptInfo
{
@@ -257,6 +273,8 @@ struct _PangoEngineScriptInfo
*
* The #PangoEngineInfo structure contains information about a particular
* engine. It contains the following fields:
+ *
+ * Deprecated: 1.37
*/
struct _PangoEngineInfo
{
@@ -365,6 +383,8 @@ prefix ## _register_type (GTypeModule *module) \
* <informalexample><programlisting>
* PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
* </programlisting></informalexample>
+ *
+ * Deprecated: 1.37
**/
#define PANGO_ENGINE_LANG_DEFINE_TYPE(name, prefix, class_init, instance_init) \
PANGO_ENGINE_DEFINE_TYPE (name, prefix, \
@@ -395,6 +415,8 @@ prefix ## _register_type (GTypeModule *module) \
* <informalexample><programlisting>
* PangoEngine *engine = g_object_new (<replaceable>prefix</replaceable>_type, NULL);
* </programlisting></informalexample>
+ *
+ * Deprecated: 1.37
**/
#define PANGO_ENGINE_SHAPE_DEFINE_TYPE(name, prefix, class_init, instance_init) \
PANGO_ENGINE_DEFINE_TYPE (name, prefix, \
diff --git a/pango/pango-modules.h b/pango/pango-modules.h
index 344ef41..d1b2c8b 100644
--- a/pango/pango-modules.h
+++ b/pango/pango-modules.h
@@ -43,6 +43,8 @@ typedef struct _PangoIncludedModule PangoIncludedModule;
* The #PangoIncludedModule structure for a statically linked module
* contains the functions that would otherwise be loaded from a dynamically
* loaded module.
+ *
+ * Deprecated: 1.37
*/
struct _PangoIncludedModule
{
diff --git a/pango/pangocoretext-fontmap.c b/pango/pangocoretext-fontmap.c
index 6102139..159bedb 100644
--- a/pango/pangocoretext-fontmap.c
+++ b/pango/pangocoretext-fontmap.c
@@ -26,7 +26,6 @@
#include "pango-fontmap.h"
#include "pangocoretext-private.h"
#include "pango-impl-utils.h"
-#include "modules.h"
#include <Carbon/Carbon.h>
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index 026101d..3fcc0c5 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -49,7 +49,6 @@
#include "pangofc-fontmap.h"
#include "pangofc-private.h"
#include "pango-impl-utils.h"
-#include "modules.h"
#include "pango-enum-types.h"
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c
index 956e2ca..b4bfaa2 100644
--- a/pango/pangowin32-fontmap.c
+++ b/pango/pangowin32-fontmap.c
@@ -34,7 +34,6 @@
#include "pango-fontmap.h"
#include "pango-impl-utils.h"
#include "pangowin32-private.h"
-#include "modules.h"
typedef struct _PangoWin32Family PangoWin32Family;
typedef PangoFontFamilyClass PangoWin32FamilyClass;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]