summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--ChangeLog.pre-1-1013
-rw-r--r--configure.in3
-rw-r--r--pangoxft-uninstalled.pc.in4
-rw-r--r--pangoxft.pc.in2
5 files changed, 29 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f4f61ec8..c08b86c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2005-06-14 Owen Taylor <otaylor@redhat.com>
+ Misc fixes from Stepan Kasal, #169928
+
+ * pangoxft.pc.in: Add requirement on pangoft2
+
+ * pangoxft-uninstalled.pc.in: Fix cut-and-paste
+ errors in Name/Description when copying from
+ pangox-uninstalled.
+
+ * configure.in: Don't call AC_SUBST() unnecessary
+ for XFT_CFLAGS/LIBS.
+
+2005-06-14 Owen Taylor <otaylor@redhat.com>
+
* pango/pango-utils.c (pango_parse_style): Fix some
missing case variants in the switch statement.
(#169852, Morten Welinder)
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index f4f61ec8..c08b86c0 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,5 +1,18 @@
2005-06-14 Owen Taylor <otaylor@redhat.com>
+ Misc fixes from Stepan Kasal, #169928
+
+ * pangoxft.pc.in: Add requirement on pangoft2
+
+ * pangoxft-uninstalled.pc.in: Fix cut-and-paste
+ errors in Name/Description when copying from
+ pangox-uninstalled.
+
+ * configure.in: Don't call AC_SUBST() unnecessary
+ for XFT_CFLAGS/LIBS.
+
+2005-06-14 Owen Taylor <otaylor@redhat.com>
+
* pango/pango-utils.c (pango_parse_style): Fix some
missing case variants in the switch statement.
(#169852, Morten Welinder)
diff --git a/configure.in b/configure.in
index dbba0b0c..32758cfb 100644
--- a/configure.in
+++ b/configure.in
@@ -237,9 +237,6 @@ if $have_fontconfig ; then
if $have_x && $have_freetype ; then
PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, :)
fi
-
- AC_SUBST(XFT_LIBS)
- AC_SUBST(XFT_CFLAGS)
else
AC_MSG_WARN([No fontconfig found, skipping tests for FreeType and Xft])
fi
diff --git a/pangoxft-uninstalled.pc.in b/pangoxft-uninstalled.pc.in
index 14c86f44..97a6bb55 100644
--- a/pangoxft-uninstalled.pc.in
+++ b/pangoxft-uninstalled.pc.in
@@ -1,5 +1,5 @@
-Name: Pango X Uninstalled
-Description: X Window System font support for Pango, Not Installed
+Name: Pango Xft Uninstalled
+Description: Xft font support for Pango, Not Installed
Version: @VERSION@
Requires: pango
Libs: ${pc_top_builddir}/${pcfiledir}/pango/libpangoxft-@PANGO_API_VERSION@.la @XFT_LIBS@
diff --git a/pangoxft.pc.in b/pangoxft.pc.in
index 8a1e54a1..46c2183d 100644
--- a/pangoxft.pc.in
+++ b/pangoxft.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: Pango Xft
Description: Xft font support for Pango
Version: @VERSION@
-Requires: pango
+Requires: pango pangoft2
Libs: -L${libdir} -lpangoxft-@PANGO_API_VERSION@ @PKGCONFIG_XFT_LIBS@
Cflags: -I${includedir}/pango-1.0 @XFT_CFLAGS@