X Strike Force XFree86 SVN commit: rev 793 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-11-22 15:13:40 -0500 (Sat, 22 Nov 2003)
New Revision: 793
Added:
branches/4.3.0/sid/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
Modified:
branches/4.3.0/sid/debian/changelog
Log:
Patch XFree86's internal copies of the Xft library to enable building
against FreeType 2.1.7; fixes FTBFS.
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-11-22 19:51:36 UTC (rev 792)
+++ branches/4.3.0/sid/debian/changelog 2003-11-22 20:13:40 UTC (rev 793)
@@ -239,8 +239,12 @@
+ update x-window-system-dev to depend on the packages split from
xlibs-dev instead of xlibs-dev itself
- -- Branden Robinson <branden@debian.org> Sat, 22 Nov 2003 14:48:37 -0500
+ * debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff:
+ + Patch XFree86's internal copies of the Xft library to enable building
+ against FreeType 2.1.7; fixes FTBFS.
+ -- Branden Robinson <branden@debian.org> Sat, 22 Nov 2003 15:09:04 -0500
+
xfree86 (4.3.0-0pre1v4) experimental; urgency=low
* Add missing symbolic links for libXTrap. [ISHIKAWA Mutsumi]
Added: branches/4.3.0/sid/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff 2003-11-22 19:51:36 UTC (rev 792)
+++ branches/4.3.0/sid/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff 2003-11-22 20:13:40 UTC (rev 793)
@@ -0,0 +1,31 @@
+$Id$
+
+Do not include <freetype/freetype.h> directly; use the macro FT_FREETYPE_H
+to include it instead, as required by FreeType 2.1.7.
+
+This patch by Tore Anderson. Not submitted upstream yet.
+
+--- xc/lib/Xft/Xft.h~ 2003-11-22 14:56:19.000000000 -0500
++++ xc/lib/Xft/Xft.h 2003-11-22 14:57:07.000000000 -0500
+@@ -32,7 +32,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>
+
+--- xc/lib/Xft1/XftFreetype.h~ 2003-11-22 15:03:31.000000000 -0500
++++ xc/lib/Xft1/XftFreetype.h 2003-11-22 15:03:45.000000000 -0500
+@@ -26,7 +26,8 @@
+ #define _XFTFREETYPE_H_
+
+ #include "Xft.h"
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+
+ #include <X11/Xfuncproto.h>
+ #include <X11/Xosdefs.h>
Property changes on: branches/4.3.0/sid/debian/patches/099b_Xft_FreeType_2.1.7_build_fix.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: