Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 65831 | Differences between
and this patch

Collapse All | Expand All

(-)xpdf-3.00/configure.in (-2 / +5 lines)
Lines 306-315 Link Here
306
dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is
306
dnl ##### (Note: FT_Get_Name_Index was added in FT 2.0.5, and is
307
dnl ##### the reason that Xpdf requires 2.0.5+.)
307
dnl ##### the reason that Xpdf requires 2.0.5+.)
308
smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
308
smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
309
              FT_Get_Name_Index, freetype/freetype.h, -lm)
309
              FT_Get_Name_Index, freetype/ft2build.h, -lm)
310
if test x"$freetype2_LIBS" = x; then
310
if test x"$freetype2_LIBS" = x; then
311
  smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
311
  smr_CHECK_LIB(freetype2, freetype, [FreeType2 font rasterizer - version 2.0.5+],
312
                FT_Get_Name_Index, freetype.h, -lm)
312
                FT_Get_Name_Index, ft2build.h, -lm)
313
  if test "x$smr_have_freetype2_library" = xyes; then
314
    AC_DEFINE(HAVE_FREETYPE_H)
315
  fi
313
fi
316
fi
314
AC_SUBST(freetype2_LIBS)
317
AC_SUBST(freetype2_LIBS)
315
AC_SUBST(freetype2_CFLAGS)
318
AC_SUBST(freetype2_CFLAGS)
(-)xpdf-3.00/splash/SplashFTFont.cc (-2 / +4 lines)
Lines 12-19 Link Here
12
#pragma implementation
12
#pragma implementation
13
#endif
13
#endif
14
14
15
#include "freetype/ftoutln.h"
15
#include <ft2build.h>
16
#include "freetype/internal/ftobjs.h" // needed for FT_New_Size decl
16
#include FT_OUTLINE_H
17
#include FT_GLYPH_H
18
#include FT_SIZES_H // needed for FT_New_Size decl
17
#include "gmem.h"
19
#include "gmem.h"
18
#include "SplashMath.h"
20
#include "SplashMath.h"
19
#include "SplashGlyphBitmap.h"
21
#include "SplashGlyphBitmap.h"
(-)xpdf-3.00/splash/SplashFTFont.h (-1 / +2 lines)
Lines 15-21 Link Here
15
#pragma interface
15
#pragma interface
16
#endif
16
#endif
17
17
18
#include <freetype/freetype.h>
18
#include <ft2build.h>
19
#include FT_FREETYPE_H
19
#include "SplashFont.h"
20
#include "SplashFont.h"
20
21
21
class SplashFTFontFile;
22
class SplashFTFontFile;
(-)xpdf-3.00/splash/SplashFTFontEngine.h (-1 / +2 lines)
Lines 15-21 Link Here
15
#pragma interface
15
#pragma interface
16
#endif
16
#endif
17
17
18
#include <freetype/freetype.h>
18
#include <ft2build.h>
19
#include FT_FREETYPE_H
19
#include "gtypes.h"
20
#include "gtypes.h"
20
21
21
class SplashFontFile;
22
class SplashFontFile;
(-)xpdf-3.00/splash/SplashFTFontFile.h (-1 / +2 lines)
Lines 15-21 Link Here
15
#pragma interface
15
#pragma interface
16
#endif
16
#endif
17
17
18
#include <freetype/freetype.h>
18
#include <ft2build.h>
19
#include FT_FREETYPE_H
19
#include "SplashFontFile.h"
20
#include "SplashFontFile.h"
20
21
21
class SplashFontFileID;
22
class SplashFontFileID;

Return to bug 65831