From bcb85d7c073db03b124c5fb5bf5e48c6e2b88e9f Mon Sep 17 00:00:00 2001
From: Tigran Aivazian <tigran@bibles.org.uk>
Date: Mon, 27 Aug 2012 14:39:42 +0100
Subject: [PATCH] Fix the Makefile to use freetype-2.4.10 and
 kpvcrlib/CMakeLists.txt to do the same and also zlib 1.2.5->1.2.7 and libjpeg
 8d->9.

---
 Makefile                | 2 +-
 kpvcrlib/CMakeLists.txt | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 61d0f286d..8a5af214e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ DJVUDIR=djvulibre
 KPVCRLIBDIR=kpvcrlib
 CRENGINEDIR=$(KPVCRLIBDIR)/crengine
 
-FREETYPEDIR=$(MUPDFDIR)/thirdparty/freetype-2.4.9
+FREETYPEDIR=$(MUPDFDIR)/thirdparty/freetype-2.4.10
 LFSDIR=luafilesystem
 
 # must point to directory with *.ttf fonts for crengine
diff --git a/kpvcrlib/CMakeLists.txt b/kpvcrlib/CMakeLists.txt
index dae382518..d36200925 100644
--- a/kpvcrlib/CMakeLists.txt
+++ b/kpvcrlib/CMakeLists.txt
@@ -9,14 +9,14 @@ SET(CR_3RDPARTY_DIR crengine/thirdparty)
 SET(CR3_PNG 1)
 #SET(CR3_JPEG 1)
 
-SET(FREETYPE_INCLUDE_DIRS ${MUPDF_3RDPARTY_DIR}/freetype-2.4.9/include)
+SET(FREETYPE_INCLUDE_DIRS ${MUPDF_3RDPARTY_DIR}/freetype-2.4.10/include)
 #SET(FREETYPE_INCLUDE_DIRS ${CR_3RDPARTY_DIR}/freetype/include)
 SET(ANTIWORD_INCLUDE_DIR ${CR_3RDPARTY_DIR}/antiword)
 SET(CHM_INCLUDE_DIRS ${CR_3RDPARTY_DIR}/chmlib)
 SET(PNG_INCLUDE_DIR ${CR_3RDPARTY_DIR}/libpng)
-SET(ZLIB_INCLUDE_DIR ${MUPDF_3RDPARTY_DIR}/zlib-1.2.5)
+SET(ZLIB_INCLUDE_DIR ${MUPDF_3RDPARTY_DIR}/zlib-1.2.7)
 #SET(ZLIB_INCLUDE_DIR ${CR_3RDPARTY_DIR}/zlib)
-SET(JPEGLIB_INCLUDE_DIR ${MUPDF_3RDPARTY_DIR}/jpeg-8d)
+SET(JPEGLIB_INCLUDE_DIR ${MUPDF_3RDPARTY_DIR}/jpeg-9)
 #SET(JPEGLIB_INCLUDE_DIR ${CR_3RDPARTY_DIR}/libjpeg)
 SET(JCONFIG_INCLUDE_DIR ${MUPDF_DIR}/scripts)