[pango: 55/61] Remove PangoX

From: Behdad Esfahbod <behdad src gnome org>
To: commits-list gnome org
Cc:
Subject: [pango: 55/61] Remove PangoX
Date: Sat, 18 Aug 2012 16:36:24 +0000 (UTC)
commit 194b6ee552318ec6c494f34ed9f0979d0460fe4f
Author: Behdad Esfahbod <behdad behdad org>
Date:   Thu Aug 16 21:48:50 2012 -0400

    Remove PangoX
    
    Been overdue...

 Makefile.am                    |    6 -
 configure.in                   |   22 +-
 docs/pango-sections.txt        |   34 -
 docs/tmpl/fonts.sgml           |    9 -
 docs/tmpl/glyphs.sgml          |   19 -
 docs/tmpl/layout.sgml          |    6 -
 docs/tmpl/main.sgml            |    4 -
 docs/tmpl/tab-stops.sgml       |    2 +-
 docs/tmpl/text-attributes.sgml |    3 -
 modules/basic/Makefile.am      |   18 -
 modules/basic/basic-x.c        |  720 ----------------
 pango-view/Makefile.am         |   13 +-
 pango-view/viewer-pangox.c     |  122 ---
 pango/Makefile.am              |   56 +--
 pango/pangox-fontcache.c       |  249 ------
 pango/pangox-fontmap.c         | 1628 ------------------------------------
 pango/pangox-private.h         |  127 ---
 pango/pangox.aliases           |  220 -----
 pango/pangox.c                 | 1790 ----------------------------------------
 pango/pangox.def               |   36 -
 pango/pangox.h                 |  152 ----
 pango/pangox.rc.in             |   30 -
 pangox.pc.in                   |   11 -
 23 files changed, 9 insertions(+), 5268 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b0b56ec..1ac018a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,13 +6,11 @@ EXTRA_DIST = 			\
 	autogen.sh		\
 	pango.pc.in		\
 	pangocairo.pc.in	\
-	pangox.pc.in		\
 	pangoxft.pc.in		\
 	pangoft2.pc.in		\
 	pangowin32.pc.in	\
 	pango-uninstalled.pc.in		\
 	pangocairo-uninstalled.pc.in	\
-	pangox-uninstalled.pc.in	\
 	pangoxft-uninstalled.pc.in	\
 	pangoft2-uninstalled.pc.in	\
 	pangowin32-uninstalled.pc.in	\
@@ -84,10 +82,6 @@ if HAVE_CAIRO
 pkgconfig_DATA += pangocairo.pc
 endif
 
-if HAVE_X
-pkgconfig_DATA += pangox.pc
-endif
-
 if HAVE_XFT
 pkgconfig_DATA += pangoxft.pc
 endif
diff --git a/configure.in b/configure.in
index fc5a0f7..90ed3c4 100644
--- a/configure.in
+++ b/configure.in
@@ -225,21 +225,6 @@ AC_ARG_ENABLE(rebuilds,
 
 AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes])
 
-have_x=false
-if test "x$pango_os_win32" != xyes; then
-  AC_PATH_XTRA
-
-  if test x$no_x = xyes ; then
-    AC_MSG_WARN([X development libraries not found])
-    have_x=false
-  else
-    X_LIBS="$X_LIBS -lX11"
-    have_x=true
-    AC_DEFINE(HAVE_X, 1, [Have X libraries])
-  fi
-fi
-AM_CONDITIONAL(HAVE_X, $have_x) 
-
 have_fontconfig=false
 have_freetype=false
 have_xft=false
@@ -268,7 +253,7 @@ AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
 #
 # Checks for Xft/XRender
 #
-if $have_x && $have_freetype ; then
+if $have_freetype ; then
   PKG_CHECK_MODULES(XFT, xft >= 2.0.0 xrender, have_xft=true, AC_MSG_RESULT([no]))
 fi
 if $have_xft ; then
@@ -983,14 +968,13 @@ _EOF
 ])
 
 AC_CONFIG_FILES([
-Makefile 
+Makefile
 pango/Makefile
 pango/mini-fribidi/Makefile
 pango/pango.rc
 pango/pangoft2.rc
 pango/pangowin32.rc
 pango/pangocairo.rc
-pango/pangox.rc
 pango/pangoxft.rc
 pango-view/Makefile
 modules/Makefile
@@ -1008,13 +992,11 @@ build/win32/Makefile
 build/win32/vs9/Makefile
 build/win32/vs10/Makefile
 pango.pc
-pangox.pc
 pangowin32.pc
 pangoft2.pc
 pangoxft.pc
 pangocairo.pc
 pango-uninstalled.pc
-pangox-uninstalled.pc
 pangowin32-uninstalled.pc
 pangoft2-uninstalled.pc
 pangoxft-uninstalled.pc
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index d8f2c05..51b69bc 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -692,40 +692,6 @@ PangoRendererPrivate
 </SECTION>
 
 <SECTION>
-<TITLE>X Fonts and Rendering</TITLE>
-<FILE>x-fonts</FILE>
-PANGO_RENDER_TYPE_X
-pango_x_get_context
-pango_x_context_set_funcs
-PangoGetGCFunc
-PangoFreeGCFunc
-pango_x_render
-pango_x_render_layout_line
-pango_x_render_layout
-PangoXSubfont
-PANGO_X_MAKE_GLYPH
-PANGO_X_GLYPH_SUBFONT
-PANGO_X_GLYPH_INDEX
-pango_x_load_font
-pango_x_get_unknown_glyph
-pango_x_has_glyph
-pango_x_list_subfonts
-pango_x_font_map_for_display
-pango_x_shutdown_display
-pango_x_font_map_get_font_cache
-pango_x_font_subfont_xlfd
-pango_x_find_first_subfont
-pango_x_font_get_unknown_glyph
-pango_x_apply_ligatures
-pango_x_fallback_shape
-PangoXFontCache
-pango_x_font_cache_new
-pango_x_font_cache_free
-pango_x_font_cache_load
-pango_x_font_cache_unload
-</SECTION>
-
-<SECTION>
 <TITLE>Win32 Fonts and Rendering</TITLE>
 <FILE>win32-fonts</FILE>
 PANGO_RENDER_TYPE_WIN32
diff --git a/docs/tmpl/fonts.sgml b/docs/tmpl/fonts.sgml
index d4ce316..5e7402d 100644
--- a/docs/tmpl/fonts.sgml
+++ b/docs/tmpl/fonts.sgml
@@ -442,15 +442,6 @@ the documentation of the corresponding getters for documentation
 of their meaning.
 </para>
 
- ref_count: 
- ascent: 
- descent: 
- approximate_char_width: 
- approximate_digit_width: 
- underline_position: 
- underline_thickness: 
- strikethrough_position: 
- strikethrough_thickness: 
 
 <!-- ##### MACRO PANGO_TYPE_FONT_METRICS ##### -->
 <para>
diff --git a/docs/tmpl/glyphs.sgml b/docs/tmpl/glyphs.sgml
index 5d4be35..926bf53 100644
--- a/docs/tmpl/glyphs.sgml
+++ b/docs/tmpl/glyphs.sgml
@@ -168,12 +168,6 @@ horizontal origin.
 
 </para>
 
- xx: 
- xy: 
- yx: 
- yy: 
- x0: 
- y0: 
 
 <!-- ##### MACRO PANGO_TYPE_MATRIX ##### -->
 <para>
@@ -395,9 +389,6 @@ The storage for the glyph information is owned
 by the structure which simplifies memory management.
 </para>
 
- num_glyphs: 
- glyphs: 
- log_clusters: 
 
 <!-- ##### STRUCT PangoGlyphItem ##### -->
 <para>
@@ -408,8 +399,6 @@ of shaping text with #PangoLayout is a list of #PangoLayoutLine,
 each of which contains a list of #PangoGlyphItem.
 </para>
 
- item: 
- glyphs: 
 
 <!-- ##### STRUCT PangoGlyphItemIter ##### -->
 <para>
@@ -453,14 +442,6 @@ None of the members of a #PangoGlyphItemIter should be modified manually.
 
 </para>
 
- glyph_item: 
- text: 
- start_glyph: 
- start_index: 
- start_char: 
- end_glyph: 
- end_index: 
- end_char: 
 @Since: 1.22
 
 <!-- ##### MACRO PANGO_TYPE_GLYPH_STRING ##### -->
diff --git a/docs/tmpl/layout.sgml b/docs/tmpl/layout.sgml
index a3f22a0..997507d 100644
--- a/docs/tmpl/layout.sgml
+++ b/docs/tmpl/layout.sgml
@@ -845,12 +845,6 @@ Routines for rendering PangoLayout objects are provided in
 code specific to each rendering system.
 </para>
 
- layout: 
- start_index: 
- length: 
- runs: 
- is_paragraph_start: 
- resolved_dir: 
 
 <!-- ##### TYPEDEF PangoLayoutRun ##### -->
 <para>
diff --git a/docs/tmpl/main.sgml b/docs/tmpl/main.sgml
index f3759ce..112baaa 100644
--- a/docs/tmpl/main.sgml
+++ b/docs/tmpl/main.sgml
@@ -36,10 +36,6 @@ The #PangoItem structure stores information about
 a segment of text. It contains the following fields:
 </para>
 
- offset: 
- length: 
- num_chars: 
- analysis: 
 
 <!-- ##### STRUCT PangoAnalysis ##### -->
 <para>
diff --git a/docs/tmpl/tab-stops.sgml b/docs/tmpl/tab-stops.sgml
index 62b0202..0e28a72 100644
--- a/docs/tmpl/tab-stops.sgml
+++ b/docs/tmpl/tab-stops.sgml
@@ -68,7 +68,7 @@ The #GObject type for #PangoTabAlign.
 @positions_in_pixels: 
 @first_alignment: 
 @first_position: 
- Varargs: 
+    : 
 @Returns: 
 
 
diff --git a/docs/tmpl/text-attributes.sgml b/docs/tmpl/text-attributes.sgml
index edcd3ec..1f58e0d 100644
--- a/docs/tmpl/text-attributes.sgml
+++ b/docs/tmpl/text-attributes.sgml
@@ -580,9 +580,6 @@ The #PangoColor structure is used to
 represent a color in an uncalibrated RGB color-space.
 </para>
 
- red: 
- green: 
- blue: 
 
 <!-- ##### MACRO PANGO_TYPE_COLOR ##### -->
 <para>
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 70e4b6b..306b9ec 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -1,23 +1,5 @@
 include $(top_srcdir)/modules/Module.mk
 
-if HAVE_X
-INCLUDES += $(X_CFLAGS)
-if INCLUDE_BASIC_X
-noinst_LTLIBRARIES += libpango-basic-x.la
-else
-if DYNAMIC_BASIC_X
-module_LTLIBRARIES += pango-basic-x.la
-endif
-endif
-endif
-
-pango_basic_x_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_basic_x_la_LIBADD = $(pangoxlibs)
-pango_basic_x_la_SOURCES = basic-x.c
-libpango_basic_x_la_SOURCES = basic-x.c
-libpango_basic_x_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_x
-
-
 if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS)
 if INCLUDE_BASIC_FC
diff --git a/pango-view/Makefile.am b/pango-view/Makefile.am
index dbfd81a..51f5861 100644
--- a/pango-view/Makefile.am
+++ b/pango-view/Makefile.am
@@ -48,15 +48,6 @@ pango_view_SOURCES =					\
 pango_view_LDADD =					\
 	../pango/libpango-$(PANGO_API_VERSION).la	\
 	$(GLIB_LIBS)
-if HAVE_X
-pango_view_SOURCES +=					\
-	viewer-x.h					\
-	viewer-x.c					\
-	viewer-pangox.c
-pango_view_LDADD +=					\
-	../pango/libpangox-$(PANGO_API_VERSION).la	\
-	$(X_LIBS)
-endif
 if HAVE_FREETYPE
 pango_view_SOURCES +=					\
 	viewer-pangoft2.c
@@ -66,7 +57,9 @@ pango_view_LDADD +=					\
 endif
 if HAVE_XFT
 pango_view_SOURCES +=					\
-	viewer-pangoxft.c
+	viewer-pangoxft.c				\
+	viewer-x.h					\
+	viewer-x.c
 pango_view_LDADD +=					\
 	../pango/libpangoft2-$(PANGO_API_VERSION).la	\
 	../pango/libpangoxft-$(PANGO_API_VERSION).la	\
diff --git a/pango/Makefile.am b/pango/Makefile.am
index c08b5cc..4e9592a 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -169,45 +169,6 @@ Pango_1_0_gir_CFLAGS = -I$(top_builddir) -I$(top_srcdir) $(PANGO_CFLAGS)
 Pango_1_0_gir_FILES = $(filter-out %-private.h pango-color-table.h, $(pango_introspection_files))
 Pango_1_0_gir_SCANNERFLAGS = --c-include "pango/pango.h"
 
-# ------------------- libpangox -------------------
-
-if HAVE_X
-pangoinclude_HEADERS += $(pangox_headers)
-lib_LTLIBRARIES += libpangox-1.0.la
-aliasdir = $(sysconfdir)/pango
-alias_DATA = pangox.aliases
-endif
-
-pangox_headers = pangox.h
-pangox_public_sources = pangox.c
-
-libpangox_1_0_la_LDFLAGS = $(LIBRARY_LIBTOOL_OPTIONS)
-libpangox_1_0_la_LIBADD = 			\
-	libpango-$(PANGO_API_VERSION).la	\
-	$(INCLUDED_X_MODULES)			\
-	$(GLIB_LIBS)				\
-	$(X_LIBS)				\
-	$(X_EXTRA_LIBS)
-libpangox_1_0_la_DEPENDENCIES =			\
-	libpango-$(PANGO_API_VERSION).la	\
-	$(INCLUDED_X_MODULES)
-
-if PLATFORM_WIN32
-libpangox_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangox.def -Wl,pangox-win32-res.o
-libpangox_1_0_la_DEPENDENCIES += pangox-win32-res.o pangox.def
-endif
-
-pangox-win32-res.o: pangox.rc
-	$(WINDRES) $< $@
-
-libpangox_1_0_la_SOURCES = 			\
-	$(pangox_public_sources) 		\
-	modules.h 	   			\
-	module-defs-x.c	   			\
-	pangox-private.h   			\
-	pangox-fontcache.c 			\
-	pangox-fontmap.c
-
 # ------------------- libpangoft2 -------------------
 
 if HAVE_FREETYPE
@@ -483,8 +444,7 @@ if HAVE_FREETYPE
 endif
 	$(INSTALL) $(srcdir)/pangowin32.def $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
 	$(INSTALL) $(srcdir)/pangocairo.def $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
-if HAVE_X
-	$(INSTALL) $(srcdir)/pangox.def $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
+if HAVE_XFT
 	$(INSTALL) $(srcdir)/pangoxft.def $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
 endif
 uninstall-def-files:
@@ -494,8 +454,7 @@ if HAVE_FREETYPE
 endif
 	-$(RM) $(DESTDIR)$(libdir)/pangowin32-$(PANGO_API_VERSION).def
 	-$(RM) $(DESTDIR)$(libdir)/pangocairo-$(PANGO_API_VERSION).def
-if HAVE_X
-	-$(RM) $(DESTDIR)$(libdir)/pangox-$(PANGO_API_VERSION).def
+if HAVE_XFT
 	-$(RM) $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
 endif
 else
@@ -560,16 +519,10 @@ endif # HAVE_INTROSPECTION
 
 bin_PROGRAMS = pango-querymodules
 
-#
-# As a temporary hack, we pull in libpangox here so that we can link
-#
 pango_querymodules_SOURCES = \
 	querymodules.c
 
 pango_querymodules_LDADD =
-if HAVE_X
-pango_querymodules_LDADD += libpangox-$(PANGO_API_VERSION).la
-endif
 if HAVE_XFT
 pango_querymodules_LDADD += libpangoxft-$(PANGO_API_VERSION).la
 endif
@@ -595,15 +548,12 @@ EXTRA_DIST =					\
 	makefile.msc				\
 	pango.rc				\
 	pango.rc.in				\
-	pangox.aliases				\
 	pangoft2.rc				\
 	pangoft2.rc.in				\
 	pangowin32.rc				\
 	pangowin32.rc.in			\
 	pangocairo.rc				\
 	pangocairo.rc.in			\
-	pangox.rc				\
-	pangox.rc.in				\
 	pangoxft.rc				\
 	pangoxft.rc.in				\
 	check.defs
@@ -651,7 +601,7 @@ install-data-local: install-ms-lib install-def-files
 
 install-exec-hook: 
 if DISABLE_EXPLICIT_DEPS
-	-for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la libpangox-$(PANGO_API_VERSION).la libpangowin32-$(PANGO_API_VERSION).la; do \
+	-for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la libpangowin32-$(PANGO_API_VERSION).la; do \
 	  test -f $(DESTDIR)$(libdir)/$$i && $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$$i ; \
 	done
 endif
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]