diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | pango/Makefile.am | 6 | ||||
| -rw-r--r-- | pango/pango.def | 2 |
4 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2004-12-17 Tor Lillqvist <tml@iki.fi> + + * pango/Makefile.am: Make the .la files depend on the + corresponding .def files. + + * pango/pango.def: Add a couple of missing functions. + Fri Dec 17 14:37:49 2004 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc): Use diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index f4e87f2a..ef9c9619 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +2004-12-17 Tor Lillqvist <tml@iki.fi> + + * pango/Makefile.am: Make the .la files depend on the + corresponding .def files. + + * pango/pango.def: Add a couple of missing functions. + Fri Dec 17 14:37:49 2004 Owen Taylor <otaylor@redhat.com> * pango/pangofc-fontmap.c (pango_fc_convert_weight_to_fc): Use diff --git a/pango/Makefile.am b/pango/Makefile.am index ceea5582..56af60f0 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -51,7 +51,7 @@ libpango_1_0_la_DEPENDENCIES = mini-fribidi/libmini-fribidi.la if OS_WIN32 libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def libpango_1_0_la_LIBADD += pango-win32res.lo -libpango_1_0_la_DEPENDENCIES += pango-win32res.lo +libpango_1_0_la_DEPENDENCIES += pango-win32res.lo pango.def endif pango-win32res.lo: pango.rc $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ @@ -189,7 +189,7 @@ libpangoft2_1_0_la_SOURCES = \ if OS_WIN32 libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def libpangoft2_1_0_la_LIBADD += pangoft2-win32res.lo -libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32res.lo +libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32res.lo pangoft2.def endif pangoft2-win32res.lo: pangoft2.rc $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ @@ -235,7 +235,7 @@ libpangowin32_1_0_la_SOURCES = \ if OS_WIN32 libpangowin32_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangowin32.def libpangowin32_1_0_la_LIBADD += pangowin32-win32res.lo -libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32res.lo +libpangowin32_1_0_la_DEPENDENCIES += pangowin32-win32res.lo pangowin32.def endif pangowin32-win32res.lo: pangowin32.rc $(top_srcdir)/../glib/build/win32/lt-compile-resource $< $@ diff --git a/pango/pango.def b/pango/pango.def index 0e6b00a6..4d4a24dc 100644 --- a/pango/pango.def +++ b/pango/pango.def @@ -93,6 +93,7 @@ EXPORTS pango_font_description_get_family pango_font_description_get_set_fields pango_font_description_get_size + pango_font_description_get_size_is_absolute pango_font_description_get_stretch pango_font_description_get_style pango_font_description_get_type @@ -102,6 +103,7 @@ EXPORTS pango_font_description_merge pango_font_description_merge_static pango_font_description_new + pango_font_description_set_absolute_size pango_font_description_set_family pango_font_description_set_family_static pango_font_description_set_size |