[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-kimageshop
Subject:    [PATCH 2/4] Patch ext_poppler for mingw
From:       alvinhochun+krita () gmail ! com
Date:       2016-09-24 19:33:17
Message-ID: 1474745599-8572-3-git-send-email-alvinhochun+krita () gmail ! com
[Download RAW message or body]

From: Alvin Wong <alvinhochun@gmail.com>

ext_poppler is missing two defines in the cmake config which can cause
compilation error with some mingw versions, so we patch it.
---
 3rdparty/ext_poppler/CMakeLists.txt      |  1 +
 3rdparty/ext_poppler/poppler_mingw.patch | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 3rdparty/ext_poppler/poppler_mingw.patch

diff --git a/3rdparty/ext_poppler/CMakeLists.txt \
b/3rdparty/ext_poppler/CMakeLists.txt index 444319b..3a0074d 100755
--- a/3rdparty/ext_poppler/CMakeLists.txt
+++ b/3rdparty/ext_poppler/CMakeLists.txt
@@ -5,6 +5,7 @@ ExternalProject_Add( ext_poppler
 	URL_MD5 02a81a20e24849feb1a2af4db1aca865
 	
 	INSTALL_DIR ${PREFIX_ext_poppler}
+	PATCH_COMMAND ${PATCH_COMMAND} -p1 -i \
${CMAKE_CURRENT_SOURCE_DIR}/poppler_mingw.patch  CMAKE_ARGS \
-DCMAKE_INSTALL_PREFIX=${PREFIX_ext_poppler} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} \
${GLOBAL_PROFILE} -DBUILD_GTK_TESTS=OFF -DBUILD_QT5_TESTS=FALSE \
-BUILD_CPP_TESTS=FALSE  -DENABLE_UTILS=FALSE -DENABLE_GLIB=FALSE  \
-DENABLE_LIBOPENJPEG=FALSE  
     UPDATE_COMMAND ""
diff --git a/3rdparty/ext_poppler/poppler_mingw.patch \
b/3rdparty/ext_poppler/poppler_mingw.patch new file mode 100644
index 0000000..54dbbba
--- /dev/null
+++ b/3rdparty/ext_poppler/poppler_mingw.patch
@@ -0,0 +1,15 @@
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -115,6 +115,12 @@
+ /* Define to 1 if you have the <stdlib.h> header file. */
+ #cmakedefine HAVE_STDLIB_H 1
+ 
++/* Define to 1 if you have the `strcat_s' function. */
++#cmakedefine HAVE_STRCAT_S
++
++/* Define to 1 if you have the `strcpy_s' function. */
++#cmakedefine HAVE_STRCPY_S
++
+ /* Define to 1 if you have the <strings.h> header file. */
+ #cmakedefine HAVE_STRINGS_H 1
+ 
-- 
2.5.0.windows.1


[prev in list] [next in list] [prev in thread] [next in thread]