X Strike Force Xft SVN commit: rev 88 - in trunk: . debian
Author: branden
Date: 2003-11-17 01:56:44 -0500 (Mon, 17 Nov 2003)
New Revision: 88
Modified:
trunk/Xft.h
trunk/debian/changelog
Log:
Do not include <freetype/freetype.h> directly; use the macro FT_FREETYPE_H
to include it instead, as required by freetype 2.1.7 (fixes FTBFS when
FreeType 2.1.7 is on the system; thanks, Tore Anderson).
(Closes: #221129)
- Xft.h
Modified: trunk/Xft.h
===================================================================
--- trunk/Xft.h 2003-11-17 06:48:59 UTC (rev 87)
+++ trunk/Xft.h 2003-11-17 06:56:44 UTC (rev 88)
@@ -38,7 +38,8 @@
#define XftVersion XFT_VERSION
#include <stdarg.h>
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include <fontconfig/fontconfig.h>
#include <X11/extensions/Xrender.h>
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-11-17 06:48:59 UTC (rev 87)
+++ trunk/debian/changelog 2003-11-17 06:56:44 UTC (rev 88)
@@ -1,5 +1,7 @@
-xft (2.1.2-5) unstable; urgency=low
+xft (2.1.2-5) unstable; urgency=medium
+ * Urgency due to fix for FTBFS problem introduced by new FreeType library.
+
* Clean up package's build-dependencies and dependencies.
- debian/control:
+ Drop versioning of build-dependencies on libxrender-dev and xlibs-dev.
@@ -20,8 +22,14 @@
Uploaders field.
- debian/control
- -- Branden Robinson <branden@debian.org> Mon, 17 Nov 2003 01:47:53 -0500
+ * Do not include <freetype/freetype.h> directly; use the macro FT_FREETYPE_H
+ to include it instead, as required by freetype 2.1.7 (fixes FTBFS when
+ FreeType 2.1.7 is on the system; thanks, Tore Anderson).
+ (Closes: #221129)
+ - Xft.h
+ -- Branden Robinson <branden@debian.org> Mon, 17 Nov 2003 01:50:21 -0500
+
xft (2.1.2-4) unstable; urgency=low
* Set AM_MAINTAINER_MODE because we do not want users of the Debian source
Reply to: