[gimp] build/win: Upgrade poppler to 0.34.0 and poppler-data to 0.4.7



commit 1a70fbfabffc40814a11c689d3d8179e9f74f4cf
Author: Michael Henning <drawoc darkrefraction com>
Date:   Sat Jul 18 10:55:59 2015 -0400

    build/win: Upgrade poppler to 0.34.0 and poppler-data to 0.4.7

 build/windows/jhbuild/misclibs.moduleset           |   14 ++++++++------
 .../jhbuild/patches/poppler-windows-h.patch        |   10 ++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/build/windows/jhbuild/misclibs.moduleset b/build/windows/jhbuild/misclibs.moduleset
index 9623026..a826061 100644
--- a/build/windows/jhbuild/misclibs.moduleset
+++ b/build/windows/jhbuild/misclibs.moduleset
@@ -111,16 +111,18 @@
 </autotools>
 
 <autotools id="poppler-data" autogen-sh=" || true" makeinstallargs="install prefix=$PREFIX">
-       <branch version="0.4.6" repo="poppler"
-                       module="poppler-data-0.4.6.tar.gz"
-                       hash="sha1:f030563eed9f93912b1a546e6d87936d07d7f27d">
+       <branch version="0.4.7" repo="poppler"
+                       module="poppler-data-0.4.7.tar.gz"
+                       hash="sha1:556a5bebd0eb743e0d91819ba11fd79947d8c674">
        </branch>
 </autotools>
 
 <autotools id="poppler" autogen-sh="configure">
-       <branch version="0.26.3" repo="poppler"
-                       module="poppler-0.26.3.tar.xz"
-                       hash="sha1:544f64ac2801c0625c519213a999e0c86a9a6bd6">
+       <branch version="0.34.0" repo="poppler"
+                       module="poppler-0.34.0.tar.xz"
+                       hash="sha1:f204cb6a57730971ef561732a269e7bafc8e8476">
+               <!-- https://bugs.freedesktop.org/show_bug.cgi?id=91384 -->
+               <patch file="poppler-windows-h.patch" strip="1"/>
        </branch>
        <dependencies>
                <dep package="freetype2"/>
diff --git a/build/windows/jhbuild/patches/poppler-windows-h.patch 
b/build/windows/jhbuild/patches/poppler-windows-h.patch
new file mode 100644
index 0000000..5c8aa54
--- /dev/null
+++ b/build/windows/jhbuild/patches/poppler-windows-h.patch
@@ -0,0 +1,10 @@
+--- a/poppler/GlobalParams.cc  2015-07-18 10:25:03.773578000 -0400
++++ b/poppler/GlobalParams.cc  2015-07-18 10:41:42.326920754 -0400
+@@ -56,6 +56,7 @@
+ #  endif
+ #endif
+ #ifdef _WIN32
++#  include <windows.h>
+ #  include <shlobj.h>
+ #  include <mbstring.h>
+ #endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]