Purge unused Freetype dependency from CDE
config/cf/{DragonFly,OpenBSD,darwin}.cf: Remove Freetype imake settings
config/cf/darwinLib.tmpl: Do not link against Freetype
debian/control: Remove Freetype and Xft dependencies
*/Imakefile: Purge Freetype includes
lib/DtWidget/ComboBoxP.h
lib/DtWidget/SpinBoxP.h
programs/dtfile/ChangeDirP.c
programs/dtlogin/vgcallback.c
Undefine USE_XFT so Motif 2.3 doesn't pull in Freetype
CDE included Freetype and Xft solely to satisfy builds of Motif with
Xft support enabled. However, as CDE only supports bitmap fonts, this
dependency was entirely superfluous and unnecessarily broke backwards
compatibility with older systems.
This commit is contained in:
committed by
Jon Trulson
parent
de23f29722
commit
3685f61cfa
@@ -62,6 +62,7 @@
|
||||
#include <Xm/Xm.h>
|
||||
#include <Xm/XmP.h>
|
||||
#include <Xm/DrawP.h>
|
||||
#undef USE_XFT
|
||||
#include <Xm/TextFP.h>
|
||||
#include <Xm/PushBG.h>
|
||||
#include <Xm/DragDrop.h>
|
||||
|
||||
@@ -37,13 +37,7 @@ EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
|
||||
EXTRA_CCOPTIONS = -xF
|
||||
#endif
|
||||
|
||||
#if defined(LinuxArchitecture)
|
||||
EXTRA_INCLUDES = -I/usr/include/freetype2
|
||||
EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
|
||||
#endif
|
||||
|
||||
#if defined(BSDArchitecture)
|
||||
EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
|
||||
#if defined(LinuxArchitecture) || defined(BSDArchitecture)
|
||||
EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
|
||||
#endif
|
||||
|
||||
|
||||
@@ -130,15 +130,6 @@ DEPXAUTHLIB =
|
||||
DEPXDMCPLIB =
|
||||
#endif
|
||||
|
||||
/* Add in freetype header locations, required for modern Motif libs */
|
||||
#ifdef LinuxArchitecture
|
||||
INCLUDES = -I/usr/include/freetype2
|
||||
#endif
|
||||
|
||||
#if defined(BSDArchitecture)
|
||||
INCLUDES = -I$(XPROJECTROOT)/include/freetype2
|
||||
#endif
|
||||
|
||||
/**************************************************************************
|
||||
*
|
||||
* Source and object modules
|
||||
|
||||
@@ -63,6 +63,7 @@
|
||||
#include <Xm/Xm.h>
|
||||
#include <Xm/MessageB.h>
|
||||
#include <Xm/TextF.h>
|
||||
#undef USE_XFT
|
||||
#include <Xm/TextFP.h>
|
||||
#include <Xm/PushBG.h>
|
||||
#include <Xm/ToggleBG.h>
|
||||
|
||||
Reference in New Issue
Block a user