debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Purge unused Freetype dependency from CDE

Browse Source 
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:
Lev Kujawski
2021-02-06 12:53:58 -07:00
committed by Jon Trulson
parent 1f52f5ca81
commit 356ac2f327
12 changed files with 6 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cde/programs/dtfile/ChangeDirP.c
View File

@@ -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>

8
cde/programs/dtfile/Imakefile
View File

@@ -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