Index: kdebase-workspace-4.1.96/ConfigureChecks.cmake =================================================================== --- kdebase-workspace-4.1.96/ConfigureChecks.cmake +++ kdebase-workspace-4.1.96/ConfigureChecks.cmake 2008-12-24 20:36:53.000000000 +0200 @@ -63,7 +63,6 @@ check_include_files("sys/types.h;sys/statfs.h" HAVE_SYS_STATFS_H) check_function_exists(statfs HAVE_STATFS) macro_bool_to_01(FONTCONFIG_FOUND HAVE_FONTCONFIG) # kcontrol/{fonts,kfontinst} -macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE) # kcontrol/fonts macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL) # kwin macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm Index: kdebase-workspace-4.1.96/config-workspace.h.cmake =================================================================== --- kdebase-workspace-4.1.96/config-workspace.h.cmake +++ kdebase-workspace-4.1.96/config-workspace.h.cmake 2008-12-24 20:39:36.000000000 +0200 @@ -12,9 +12,6 @@ /* Defines if your system has the libfontconfig library */ #cmakedefine HAVE_FONTCONFIG 1 -/* Defines if your system has the freetype library */ -#cmakedefine HAVE_FREETYPE 1 - /* Define if you have gethostname */ #cmakedefine HAVE_GETHOSTNAME 1 Index: kdebase-workspace-4.1.96/kcontrol/fonts/fonts.cpp =================================================================== --- kdebase-workspace-4.1.96/kcontrol/fonts/fonts.cpp +++ kdebase-workspace-4.1.96/kcontrol/fonts/fonts.cpp 2008-12-24 20:35:40.000000000 +0200 @@ -41,14 +41,6 @@ #include <kdebug.h> -#ifdef HAVE_FREETYPE -#include <ft2build.h> -#ifdef FT_LCD_FILTER_H -#include FT_FREETYPE_H -#include FT_LCD_FILTER_H -#endif -#endif - #include <X11/Xlib.h> #include <QX11Info> @@ -456,19 +448,6 @@ excludeTo->setEnabled(excludeRange->isChecked()); excludeToLabel->setEnabled(excludeRange->isChecked()); subPixelType->setEnabled(useSubPixel->isChecked()); -#ifdef FT_LCD_FILTER_H - static int ft_has_subpixel = -1; - if( ft_has_subpixel == -1 ) { - FT_Library ftLibrary; - if(FT_Init_FreeType(&ftLibrary) == 0) { - ft_has_subpixel = ( FT_Library_SetLcdFilter(ftLibrary, FT_LCD_FILTER_DEFAULT ) - == FT_Err_Unimplemented_Feature ) ? 0 : 1; - FT_Done_FreeType(ftLibrary); - } - } - useSubPixel->setEnabled(ft_has_subpixel); - subPixelType->setEnabled(ft_has_subpixel); -#endif } #endif