Bug 582851 -- Little fix for compiling with Cygwin

Use .def and .rc files on Cygwin, too. Use them for the pangox and
pangoxft libraries, too on Cygwin.

diff --git a/configure.in b/configure.in
index 5548026..5c1b283 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -153,7 +153,7 @@ esac
 AC_MSG_RESULT([$pango_platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test "$pango_platform_win32" = "yes")
 
-if test "$pango_os_win32" = "yes"; then
+if test "$pango_platform_win32" = "yes"; then
   AC_CHECK_TOOL(WINDRES, windres, no)
   if test "$WINDRES" = no; then
     AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
@@ -675,7 +675,7 @@ dnl ********************************************************
 #
 LIBRARY_LIBTOOL_OPTIONS="-version-info $VERSION_INFO"
 MODULE_LIBTOOL_OPTIONS="-export-dynamic -avoid-version"
-if test "$pango_os_win32" = yes; then
+if test "$pango_platform_win32" = yes; then
     # We currently use .def files on Windows
     true
     LIBRARY_LIBTOOL_OPTIONS="$LIBRARY_LIBTOOL_OPTIONS -no-undefined"
@@ -968,6 +968,8 @@ pango/opentype/Makefile
 pango/pango.rc
 pango/pangoft2.rc
 pango/pangowin32.rc
+pango/pangox.rc
+pango/pangoxft.rc
 pango-view/Makefile
 modules/Makefile
 modules/arabic/Makefile

diff --git a/pango/Makefile.am b/pango/Makefile.am
index 615fcc6..82ca29b 100644 (file)
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -56,7 +56,7 @@ libpango_1_0_la_DEPENDENCIES =                \
 libpango_1_0_la_LIBADD += mini-fribidi/libmini-fribidi.la
 libpango_1_0_la_DEPENDENCIES += mini-fribidi/libmini-fribidi.la
 
-if OS_WIN32
+if PLATFORM_WIN32
 libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o
 libpango_1_0_la_DEPENDENCIES += pango-win32-res.o pango.def
 endif
@@ -203,6 +203,15 @@ libpangox_1_0_la_LIBADD =                  \
 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                               \
@@ -279,7 +288,7 @@ libpangoft2_1_0_la_SOURCES =        \
        pango-ot-tag.c
 
 
-if OS_WIN32
+if PLATFORM_WIN32
 libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o
 libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o pangoft2.def
 endif
@@ -328,6 +337,14 @@ libpangoxft_1_0_la_LIBADD =                        \
 libpangoxft_1_0_la_DEPENDENCIES =              \
        libpangoft2-$(PANGO_API_VERSION).la     \
        libpango-$(PANGO_API_VERSION).la
+
+if PLATFORM_WIN32
+libpangoxft_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoxft.def -Wl,pangoxft-win32-res.o
+libpangoxft_1_0_la_DEPENDENCIES += pangoxft-win32-res.o pangoxft.def
+endif
+pangoxft-win32-res.o: pangoxft.rc
+       $(WINDRES) $< $@
+
 libpangoxft_1_0_la_SOURCES =           \
        pangoxft-font.c         \
        pangoxft-fontmap.c      \
@@ -381,7 +398,7 @@ libpangocairo_1_0_la_SOURCES =  \
        pangocairo-private.h
 
 if HAVE_CAIRO_WIN32
-if OS_WIN32
+if PLATFORM_WIN32
 libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
 libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
 endif
@@ -464,7 +481,7 @@ libpangowin32_1_0_la_SOURCES =      \
        pangowin32-fontcache.c  \
        pangowin32-fontmap.c
 
-if OS_WIN32
+if PLATFORM_WIN32
 libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def -Wl,pangowin32-win32-res.o
 libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32-res.o pangowin32.def
 endif
@@ -483,6 +500,10 @@ 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
+       $(INSTALL) $(srcdir)/pangoxft.def $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
+endif
 uninstall-def-files:
        -rm $(DESTDIR)$(libdir)/pango$(PANGO_API_VERSION).def
 if HAVE_FREETYPE
@@ -490,6 +511,10 @@ 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
+       -rm $(DESTDIR)$(libdir)/pangoxft-$(PANGO_API_VERSION).def
+endif
 else
 install-def-files:
 uninstall-def-files:
@@ -595,6 +620,10 @@ EXTRA_DIST +=                                      \
        pangoft2.rc.in                          \
        pangowin32.rc                           \
        pangowin32.rc.in                        \
+       pangox.rc                               \
+       pangox.rc.in                            \
+       pangoxft.rc                             \
+       pangoxft.rc.in                          \
        check.defs
 
 

diff --git a/pango/pangox.def b/pango/pangox.def
new file mode 100644 (file)
index 0000000..75fc349
--- /dev/null
+++ b/pango/pangox.def
@@ -0,0 +1,35 @@
+EXPORTS
+pango_x_apply_ligatures
+pango_x_context_set_funcs
+pango_x_face_get_coverage
+pango_x_face_get_type
+pango_x_face_remove
+pango_x_fallback_shape
+pango_x_family_get_type
+pango_x_find_first_subfont
+pango_x_font_cache_free
+pango_x_font_cache_load
+pango_x_font_cache_new
+pango_x_font_cache_unload
+pango_x_font_get_unknown_glyph
+pango_x_font_map_for_display
+pango_x_font_map_get_font_cache
+pango_x_font_map_get_type
+pango_x_font_new
+pango_x_font_subfont_xlfd
+pango_x_fontmap_atom_from_name
+pango_x_fontmap_cache_add
+pango_x_fontmap_cache_remove
+pango_x_fontmap_get_display
+pango_x_fontmap_name_from_atom
+pango_x_get_context
+pango_x_get_shaper_map
+pango_x_get_unknown_glyph
+pango_x_has_glyph
+pango_x_list_subfonts\r
+pango_x_load_font
+pango_x_make_matching_xlfd
+pango_x_render
+pango_x_render_layout
+pango_x_render_layout_line
+pango_x_shutdown_display

diff --git a/pango/pangox.rc.in b/pango/pangox.rc.in
new file mode 100644 (file)
index 0000000..c259393
--- /dev/null
+++ b/pango/pangox.rc.in
@@ -0,0 +1,30 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
+  PRODUCTVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+       VALUE "CompanyName", "Red Hat Software"
+       VALUE "FileDescription", "Pangox"
+       VALUE "FileVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@.0"
+       VALUE "InternalName", "pangox-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@"
+       VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software."
+       VALUE "OriginalFilename", "pangox-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll"
+       VALUE "ProductName", "Pangox"
+       VALUE "ProductVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END

diff --git a/pango/pangoxft.def b/pango/pangoxft.def
new file mode 100644 (file)
index 0000000..484d83e
--- /dev/null
+++ b/pango/pangoxft.def
@@ -0,0 +1,24 @@
+EXPORTS
+pango_xft_font_get_display
+pango_xft_font_get_font
+pango_xft_font_get_glyph
+pango_xft_font_get_type
+pango_xft_font_get_unknown_glyph
+pango_xft_font_has_char
+pango_xft_font_lock_face
+pango_xft_font_map_get_type
+pango_xft_font_unlock_face
+pango_xft_get_context
+pango_xft_get_font_map
+pango_xft_picture_render
+pango_xft_render
+pango_xft_render_layout
+pango_xft_render_layout_line
+pango_xft_render_transformed
+pango_xft_renderer_get_type
+pango_xft_renderer_new
+pango_xft_renderer_set_default_color
+pango_xft_renderer_set_draw
+pango_xft_set_default_substitute
+pango_xft_shutdown_display
+pango_xft_substitute_changed

diff --git a/pango/pangoxft.rc.in b/pango/pangoxft.rc.in
new file mode 100644 (file)
index 0000000..1f39685
--- /dev/null
+++ b/pango/pangoxft.rc.in
@@ -0,0 +1,30 @@
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+  FILEVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
+  PRODUCTVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
+  FILEFLAGSMASK 0
+  FILEFLAGS 0
+  FILEOS VOS__WINDOWS32
+  FILETYPE VFT_DLL
+  FILESUBTYPE VFT2_UNKNOWN
+  BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+      BLOCK "040904B0"
+      BEGIN
+       VALUE "CompanyName", "Red Hat Software"
+       VALUE "FileDescription", "Pangoxft"
+       VALUE "FileVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@.0"
+       VALUE "InternalName", "pangoxft-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@"
+       VALUE "LegalCopyright", "Copyright © 1999 Red Hat Software."
+       VALUE "OriginalFilename", "pangoxft-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll"
+       VALUE "ProductName", "Pangoxft"
+       VALUE "ProductVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@"
+      END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+      VALUE "Translation", 0x409, 1200
+    END
+  END