From 663ba2eafd04f719fd2cc1a2fbe0d1b317a00b4c Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 23 Sep 2010 16:43:03 +0000 Subject: build fix from PaulVojta git-svn-id: svn://tug.org/texlive/trunk@19856 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog | 7 +++++++ .../texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-04-freetype | 12 ++++++++++++ Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-04-freetype (limited to 'Build/source/texk') diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog index 06a2b63855d..ceca1f0d96e 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog +++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/ChangeLog @@ -1,3 +1,10 @@ +2010-09-23 Peter Breitenlohner + + Added patch-04-freetype to allow to build with freetype-2.4.0 + + Problem detected and solution inspired by Paul Vojta + , mail from Tue, 17 Aug 2010 12:30:13. + 2010-07-05 Peter Breitenlohner Portability patches from Martin Gieseking. diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-04-freetype b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-04-freetype new file mode 100644 index 00000000000..364711a9bfd --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2-PATCHES/patch-04-freetype @@ -0,0 +1,12 @@ +diff -ur dvisvgm-1.0.2.orig/src/FontEngine.cpp dvisvgm-1.0.2/src/FontEngine.cpp +--- dvisvgm-1.0.2.orig/src/FontEngine.cpp 2010-06-16 19:08:12.000000000 +0200 ++++ dvisvgm-1.0.2/src/FontEngine.cpp 2010-09-23 17:52:38.000000000 +0200 +@@ -262,7 +262,7 @@ + + + // handle API change in freetype version 2.2.1 +-#if FREETYPE_MAJOR >= 2 && FREETYPE_MINOR >= 2 && FREETYPE_PATCH >= 1 ++#if ((FREETYPE_MAJOR >> 16)|(FREETYPE_MINOR >> 8)|FREETYPE_PATCH) >= ((2>>16)|(2>>8)|1) + typedef const FT_Vector *FTVectorPtr; + #else + typedef FT_Vector *FTVectorPtr; diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp index f8410535d5d..d3913bd7cc4 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-1.0.2/src/FontEngine.cpp @@ -262,7 +262,7 @@ bool FontEngine::setCharSize (int ptSize) { // handle API change in freetype version 2.2.1 -#if FREETYPE_MAJOR >= 2 && FREETYPE_MINOR >= 2 && FREETYPE_PATCH >= 1 +#if ((FREETYPE_MAJOR >> 16)|(FREETYPE_MINOR >> 8)|FREETYPE_PATCH) >= ((2>>16)|(2>>8)|1) typedef const FT_Vector *FTVectorPtr; #else typedef FT_Vector *FTVectorPtr; -- cgit v1.2.3