Author: ishikawa
Date: 2003-06-10 06:44:45 -0500 (Tue, 10 Jun 2003)
New Revision: 172
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
Log:
always disable FontLibSharedFreeType
Modified: branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
2003-06-09 21:54:42 UTC (rev 171)
+++ branches/4.3.0/sid/debian/patches/003_linux.cf_and_xfree86.cf.diff
2003-06-10 11:44:45 UTC (rev 172)
@@ -3,6 +3,10 @@
This patch originally by Branden Robinson, forward-ported with a few
updates by Daniel Stone.
+Disable FontLibSharedFreeType is added by ISHIKAWA Mutsumi, this
+change should drop when we can build the loader server liked
+against external FreeType2 library.
+
--- xc/config/cf/xfree86.cf.orig Fri Jan 3 11:55:00 2003
+++ xc/config/cf/xfree86.cf Fri Jan 3 11:55:09 2003
@@ -1952,27 +1952,33 @@
@@ -71,7 +75,7 @@
# define XF86SetupUsesStaticTcl NO
/* un-comment this when it is un-broken */
/* # define JoystickSupport YES */
-@@ -146,6 +152,23 @@
+@@ -146,10 +152,39 @@
# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n
xterm
# define BuildRman NO
# define BuildHtmlManPages NO
@@ -95,6 +99,22 @@
/* we build-depend on libfreetype6-dev (FreeType 2.x) */
# define BuildFreetype2Library NO
+ # define HasFreetype2 YES
++
++/*
++ We need to build both XFree86 server (loader server) and XFree86-dbg
++ server (static server for debug) with same FreeType2 code.
++ Currently Lodaer Server can not build with external Shared FreeType2
++ library. So we will not use external FreeType2 library to build
++ Xserver's Font Library. In the furture, Loader Server becomes to be able
++ to build with external FreeType2 Shared library, we will drop the
++ define bellow:
++*/
++# define FontLibSharedFreeType NO
++
+ /* m68k has no 2.4 kernel yet */
+ # ifndef Mc68020Architecture
+ # define HasLinuxInput YES
@@ -701,7 +714,7 @@
#if UseElfFormat
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-06-09 21:54:42 UTC (rev 171)
+++ branches/4.3.0/sid/debian/changelog 2003-06-10 11:44:45 UTC (rev 172)
@@ -7,7 +7,12 @@
keyboard away from me.
* #057_X11.tmpl_warning_fix.diff: Imake warning fix patch [ISHIKAWA Mutsumi]
-
+ * #003_linux.cf_and_xfree86.cf.diff:
+ - Always disable `FontLibSharedFreeType' for compatiblity between
+ normal XFree86 server and XFree86-dbg server.
+ We should drop this change, when we can build the Loader Server
+ liked against external FreeType2 [ISHIKAWA Mutsimi]
+
* debian/control:
- Change all references to libstdc++5-dev to be
libstdc++5-dev | libstdc++-dev, allowing libstdc++5-3.3-dev to satiffy
