GNOME.org
 

[pango: 56/61] Remove Atsui Module

commit 7c6c11cd8392d483f0de7bba434faccdb9c068fa
Author: Behdad Esfahbod <behdad behdad org>
Date:   Thu Aug 16 21:58:44 2012 -0400

    Remove Atsui Module
    
    CoreText for the win.

 configure.in                |   56 +---
 docs/pango-sections.txt     |   27 --
 modules/basic/Makefile.am   |   17 -
 modules/basic/basic-atsui.c |  211 -----------
 pango/Makefile.am           |   25 +--
 pango/pangoatsui-fontmap.c  |  825 -------------------------------------------
 pango/pangoatsui-private.h  |  105 ------
 pango/pangoatsui.c          |  231 ------------
 pango/pangoatsui.h          |   80 -----
 9 files changed, 8 insertions(+), 1569 deletions(-)
---
diff --git a/configure.in b/configure.in
index 90ed3c4..9e26921 100644
--- a/configure.in
+++ b/configure.in
@@ -317,11 +317,6 @@ if test "$pango_os_win32" = "yes"; then
 fi
 
 #
-# Checks for ATSUI
-#
-AC_CHECK_HEADER(Carbon/Carbon.h, [have_atsui=true], [have_atsui=false])
-
-#
 # Checks for CoreText
 #
 
@@ -350,7 +345,7 @@ have_cairo_pdf=false
 have_cairo_xlib=false
 have_cairo_freetype=false
 have_cairo_win32=false
-have_cairo_atsui=false
+have_cairo_quartz=false
 cairo_required=1.7.6
 
 PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no]))
@@ -382,11 +377,11 @@ if $have_cairo ; then
     have_cairo=true
   fi
 
-  if test $have_atsui -o $have_core_text; then
-    PKG_CHECK_EXISTS(cairo-quartz-font >= $cairo_required, have_cairo_atsui=true, :)
+  if test $have_core_text; then
+    PKG_CHECK_EXISTS(cairo-quartz-font >= $cairo_required, have_cairo_quartz=true, :)
   fi
-  if $have_cairo_atsui; then
-    AC_DEFINE(HAVE_CAIRO_ATSUI, 1, [Whether Cairo can use ATSUI for fonts])
+  if $have_cairo_quartz; then
+    AC_DEFINE(HAVE_CAIRO_QUARTZ, 1, [Whether Cairo can use Quartz for fonts])
     cairo_font_backends="quartz $cairo_font_backends"
     have_cairo=true
   fi
@@ -434,7 +429,7 @@ AM_CONDITIONAL(HAVE_CAIRO_PDF, $have_cairo_pdf)
 AM_CONDITIONAL(HAVE_CAIRO_XLIB, $have_cairo_xlib)
 AM_CONDITIONAL(HAVE_CAIRO_WIN32, $have_cairo_win32)
 AM_CONDITIONAL(HAVE_CAIRO_FREETYPE, $have_cairo_freetype)
-AM_CONDITIONAL(HAVE_CAIRO_ATSUI, $have_cairo_atsui)
+AM_CONDITIONAL(HAVE_CAIRO_QUARTZ, $have_cairo_quartz)
 
 
 harfbuzz_required=0.9
@@ -489,7 +484,7 @@ GOBJECT_INTROSPECTION_CHECK([0.9.5])
 # Modules to build
 #
 arabic_modules="arabic-lang"
-basic_modules="basic-fc,basic-win32,basic-x,basic-atsui,basic-coretext"
+basic_modules="basic-fc,basic-win32,basic-x,basic-coretext"
 indic_modules="indic-lang"
 thai_modules=""
 
@@ -536,17 +531,13 @@ AC_MSG_RESULT([$dynamic_modules (those built into Pango will be excluded)])
 AM_CONDITIONAL(HAVE_DYNAMIC_MODULES, test "x$dynamic_modules" != x)
 
 
-INCLUDED_X_MODULES=
 INCLUDED_FC_MODULES=
 INCLUDED_WIN32_MODULES=
-INCLUDED_ATSUI_MODULES=
 INCLUDED_CORE_TEXT_MODULES=
 INCLUDED_LANG_MODULES=
 
-AC_SUBST(INCLUDED_X_MODULES)
 AC_SUBST(INCLUDED_FC_MODULES)
 AC_SUBST(INCLUDED_WIN32_MODULES)
-AC_SUBST(INCLUDED_ATSUI_MODULES)
 AC_SUBST(INCLUDED_CORE_TEXT_MODULES)
 AC_SUBST(INCLUDED_LANG_MODULES)
 
@@ -556,10 +547,8 @@ for module in $included_modules; do
   included_path="\$(top_builddir)/modules/$dir/libpango-$module.la"
 
   case $module in
-    *-x)	INCLUDED_X_MODULES="$INCLUDED_X_MODULES $included_path" ;;
     *-fc)	INCLUDED_FC_MODULES="$INCLUDED_FC_MODULES $included_path" ;;
     *-win32)	INCLUDED_WIN32_MODULES="$INCLUDED_WIN32_MODULES $included_path" ;;
-    *-atsui)	INCLUDED_ATSUI_MODULES="$INCLUDED_ATSUI_MODULES $included_path" ;;
     *-coretext) INCLUDED_CORE_TEXT_MODULES="$INCLUDED_CORE_TEXT_MODULES $included_path" ;;
     *-lang)	INCLUDED_LANG_MODULES="$INCLUDED_LANG_MODULES $included_path" ;;
     *)		IFS="$pango_save_ifs"; AC_MSG_ERROR([specified module $module not recognized]) ;;
@@ -571,7 +560,6 @@ AM_CONDITIONAL(INCLUDE_ARABIC_LANG,	echo $included_modules | egrep '(^|,)arabic-
 AM_CONDITIONAL(INCLUDE_BASIC_FC,	echo $included_modules | egrep '(^|,)basic-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_WIN32,	echo $included_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_X,		echo $included_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
-AM_CONDITIONAL(INCLUDE_BASIC_ATSUI,	echo $included_modules | egrep '(^|,)basic-atsui($|,)' 	> /dev/null)
 AM_CONDITIONAL(INCLUDE_BASIC_CORE_TEXT,	echo $included_modules | egrep '(^|,)basic-coretext($|,)'	> /dev/null)
 AM_CONDITIONAL(INCLUDE_INDIC_LANG,	echo $included_modules | egrep '(^|,)indic-lang($|,)'	> /dev/null)
 AM_CONDITIONAL(INCLUDE_THAI_LANG,	echo $included_modules | egrep '(^|,)thai-lang($|,)' 	> /dev/null)
@@ -580,7 +568,6 @@ AM_CONDITIONAL(DYNAMIC_ARABIC_LANG,	echo $dynamic_modules | egrep '(^|,)arabic-l
 AM_CONDITIONAL(DYNAMIC_BASIC_FC,	echo $dynamic_modules | egrep '(^|,)basic-fc($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_WIN32,	echo $dynamic_modules | egrep '(^|,)basic-win32($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_X,		echo $dynamic_modules | egrep '(^|,)basic-x($|,)' 	> /dev/null)
-AM_CONDITIONAL(DYNAMIC_BASIC_ATSUI,	echo $dynamic_modules | egrep '(^|,)basic-atsui($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_BASIC_CORE_TEXT,	echo $dynamic_modules | egrep '(^|,)basic-coretext($|,)' 	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_INDIC_LANG,	echo $dynamic_modules | egrep '(^|,)indic-lang($|,)'	> /dev/null)
 AM_CONDITIONAL(DYNAMIC_THAI_LANG,	echo $dynamic_modules | egrep '(^|,)thai-lang($|,)' 	> /dev/null)
@@ -840,35 +827,6 @@ cat >> pango/module-defs-win32.c <<EOTEXT
 EOTEXT
 ])
 
-AC_CONFIG_COMMANDS([pango/module-defs-atsui.c],
-[
-### ATSUI modules
-cat > pango/module-defs-atsui.c <<EOTEXT
-/* Autogenerated by configure. Do not edit */
-
-#include "module-defs.h"
-
-PangoIncludedModule _pango_included_atsui_modules@<:@@:>@ = {
-EOTEXT
-
-IFS="${IFS= 	}"; pango_save_ifs="$IFS"; IFS=","
-for module in $included_modules; do
-  if echo $module | egrep -- "-atsui($|,)" > /dev/null; then
-    module_c=`echo $module | sed s/-/_/`
-    cat >> pango/module-defs-atsui.c <<EOTEXT
- { _pango_${module_c}_script_engine_list, _pango_${module_c}_script_engine_init, _pango_${module_c}_script_engine_exit, _pango_${module_c}_script_engine_create },
-EOTEXT
-  fi
-done
-
-IFS="$pango_save_ifs"
-
-cat >> pango/module-defs-atsui.c <<EOTEXT
- { NULL, NULL, NULL, NULL },
-};
-EOTEXT
-])
-
 AC_CONFIG_COMMANDS([pango/module-defs-coretext.c],
 [
 ### CoreText modules
diff --git a/docs/pango-sections.txt b/docs/pango-sections.txt
index 51b69bc..bb08992 100644
--- a/docs/pango-sections.txt
+++ b/docs/pango-sections.txt
@@ -855,33 +855,6 @@ pango_cairo_font_map_get_type
 </SECTION>
 
 <SECTION>
-<TITLE>ATSUI Fonts</TITLE>
-<FILE>atsui-fonts</FILE>
-PANGO_RENDER_TYPE_ATSUI
-pango_atsui_font_get_cgfont
-pango_atsui_font_get_atsfont
-<SUBSECTION Standard>
-PANGO_ATSUI_FONT
-PANGO_ATSUI_FONT_CLASS
-PANGO_ATSUI_FONT_GET_CLASS
-PANGO_CAIRO_ATSUI_FONT
-PANGO_CAIRO_ATSUI_FONT_CLASS
-PANGO_CAIRO_ATSUI_FONT_GET_CLASS
-PANGO_IS_ATSUI_FONT
-PANGO_IS_ATSUI_FONT_CLASS
-PANGO_IS_CAIRO_ATSUI_FONT_CLASS
-PANGO_TYPE_ATSUI_FONT
-PANGO_TYPE_CAIRO_ATSUI_FONT
-PangoATSUIFont
-PangoATSUIFontClass
-PangoATSUIFontPrivate
-PangoCairoATSUIFont
-PangoCairoATSUIFontClass
-pango_atsui_font_get_type
-pango_cairo_atsui_font_get_type
-</SECTION>
-
-<SECTION>
 <TITLE>CoreText Fonts</TITLE>
 <FILE>coretext-fonts</FILE>
 PANGO_RENDER_TYPE_CORE_TEXT
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 306b9ec..1590855 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -35,7 +35,6 @@ pango_basic_win32_la_SOURCES = basic-win32.c
 libpango_basic_win32_la_SOURCES = basic-win32.c
 libpango_basic_win32_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_win32
 
-if HAVE_CAIRO_ATSUI
 if HAVE_CORE_TEXT
 INCLUDES += $(CAIRO_CFLAGS)
 if INCLUDE_BASIC_CORE_TEXT
@@ -45,16 +44,6 @@ if DYNAMIC_BASIC_CORE_TEXT
 module_LTLIBRARIES += pango-basic-coretext.la
 endif
 endif
-else
-INCLUDES += $(ATSUI_CFLAGS) $(CAIRO_CFLAGS)
-if INCLUDE_BASIC_ATSUI
-noinst_LTLIBRARIES += libpango-basic-atsui.la
-else
-if DYNAMIC_BASIC_ATSUI
-module_LTLIBRARIES += pango-basic-atsui.la
-endif
-endif
-endif
 endif
 
 pango_basic_coretext_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) -framework Carbon
@@ -63,12 +52,6 @@ pango_basic_coretext_la_SOURCES = basic-coretext.c
 libpango_basic_coretext_la_SOURCES = basic-coretext.c
 libpango_basic_coretext_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_coretext
 
-pango_basic_atsui_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) -framework Carbon
-pango_basic_atsui_la_LIBADD = $(pangoatsuilibs)
-pango_basic_atsui_la_SOURCES = basic-atsui.c
-libpango_basic_atsui_la_SOURCES = basic-atsui.c
-libpango_basic_atsui_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_atsui
-
 EXTRA_DIST =		\
 	tables-big.i	\
 	tables-small.i
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 4e9592a..ed1b48a 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -343,7 +343,6 @@ libpangocairo_1_0_la_SOURCES += \
 	pangocairo-fc.h
 endif
 
-if HAVE_CAIRO_ATSUI
 if HAVE_CORE_TEXT
 libpangocairo_1_0_la_SOURCES += \
 	modules.h		\
@@ -362,27 +361,6 @@ libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework Application
 libpangocairo_1_0_la_LIBADD += $(INCLUDED_CORE_TEXT_MODULES)
 # We don't have an CoreText GIR right now, so this is just hypothetical
 PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoCoreText-1.0
-
-else
-libpangocairo_1_0_la_SOURCES += \
-	modules.h		\
-	module-defs-atsui.c	\
-	pangoatsui.h		\
-	pangoatsui.c		\
-	pangoatsui-private.h	\
-	pangoatsui-fontmap.c	\
-	pangocairo-atsui.h	\
-	pangocairo-atsuifont.c	\
-	pangocairo-atsuifont.h	\
-	pangocairo-atsuifontmap.c
-pangoinclude_HEADERS += pangoatsui.h
-
-libpangocairo_1_0_la_CFLAGS = -xobjective-c
-libpangocairo_1_0_la_LDFLAGS += -framework CoreFoundation -framework Carbon -framework Cocoa
-libpangocairo_1_0_la_LIBADD += $(INCLUDED_ATSUI_MODULES)
-# We don't have an ATSUI GIR right now, so this is just hypothetical
-PANGOCAIRO_FONT_BACKEND_GI_MODULE = PangoATSUI-1.0
-endif
 endif
 
 pangocairo_introspection_files = \
@@ -563,7 +541,7 @@ if HAVE_INCLUDED_MODULES
 included-modules:
 	$(AM_V_GEN) cd $(top_builddir)/modules && $(MAKE) $(AM_MAKEFLAGS) included-modules
 
-$(INCLUDED_LANG_MODULES) $(INCLUDED_X_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCLUDED_ATSUI_MODULES): included-modules
+$(INCLUDED_LANG_MODULES) $(INCLUDED_X_MODULES) $(INCLUDED_FC_MODULES) $(INCLUDED_WIN32_MODULES) $(INCLUDED_CORE_TEXT_MODULES): included-modules
 	$(AM_V_GEN) true
 
 .PHONY: included-modules
@@ -575,7 +553,6 @@ MODULE_DEF_FILES = \
 	module-defs-x.c \
 	module-defs-fc.c \
 	module-defs-win32.c \
-	module-defs-atsui.c \
 	module-defs-coretext.c
 
 $(MODULE_DEF_FILES): $(top_builddir)/config.status
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]