From bd796f5db951870db868f2aaa53fe0553d962b20 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Wed, 14 May 2014 23:59:08 +0200
Subject: win64: add poppler to build

(bzr r13341.4.1)
---
 build-x64.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/build-x64.xml b/build-x64.xml
index 6bb8c52e9..74d7c2e28 100644
--- a/build-x64.xml
+++ b/build-x64.xml
@@ -183,9 +183,11 @@
         #undef HAVE_SSL
 
         /* use poppler for pdf import? */
-        //#define HAVE_POPPLER                  1
-        //#define HAVE_POPPLER_GLIB             1
-        //#define HAVE_POPPLER_CAIRO            1
+        #define HAVE_POPPLER                  1
+        #define HAVE_POPPLER_GLIB             1
+        #define HAVE_POPPLER_CAIRO            1
+        #define POPPLER_NEW_ERRORAPI          1
+        #define POPPLER_NEW_GFXPATCH          1
 
         /* do we want bitmap manipulation? */
         #define WITH_IMAGE_MAGICK             1
@@ -723,19 +725,16 @@
     <copy todir="${dist}" file="${devlibs}/bin/bz2-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libiconv-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libpopt-0.dll"/>
-<!--    <copy todir="${dist}" file="${devlibs}/bin/liblcms-1.dll"/> -->
     <copy todir="${dist}" file="${devlibs}/bin/liblcms2-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagick++-6.Q16-3.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagickCore-6.Q16-2.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libMagickWand-6.Q16-2.dll"/>
-<!--    <copy todir="${dist}" file="${devlibs}/bin/intl.dll"/> -->
     <copy todir="${dist}" file="${devlibs}/bin/libintl-8.dll"/>
     <!-- MINGW support DLLs -->
     <copy todir="${dist}" file="${mingw_bin}/libstdc++-6.dll"/>
     <copy todir="${dist}" file="${mingw_bin}/libwinpthread-1.dll"/>
     <copy todir="${dist}" file="${mingw_bin}/libgcc_s_sjlj-1.dll"/>
     <!-- MINGW support DLLs needed for openmp support  -->
-<!--    <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/> -->
     <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/>
 
     <!-- MSGFMT files -->
-- 
cgit v1.2.3