summaryrefslogtreecommitdiff
path: root/external/poppler/poppler-snprintf.patch.1
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-11-03 20:21:01 +0200
committerDavid Tardon <dtardon@redhat.com>2013-11-04 02:31:25 -0600
commit40276b4ceb72f1d070bb1457ed5b403b35ca4deb (patch)
treed3853c906a5732c5d4de226f727cb4a38e58d80a /external/poppler/poppler-snprintf.patch.1
parentfde2065b0f3266fc7ee9e1b85733e3ddcf1c9e03 (diff)
fdo#70393: move poppler to a subdir of external
Change-Id: I399df92d2b6907c129e18f3a55afeadf02783c14 Reviewed-on: https://gerrit.libreoffice.org/6548 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/poppler/poppler-snprintf.patch.1')
-rw-r--r--external/poppler/poppler-snprintf.patch.150
1 files changed, 50 insertions, 0 deletions
diff --git a/external/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1
new file mode 100644
index 000000000000..389a5b0fc97e
--- /dev/null
+++ b/external/poppler/poppler-snprintf.patch.1
@@ -0,0 +1,50 @@
+--- poppler-0.22.5/poppler/Catalog.cc 2013-06-09 12:16:12.000000000 +0200
++++ poppler-0.22.5/poppler/Catalog.cc 2013-07-08 16:54:30.712095880 +0200
+@@ -40,6 +40,14 @@
+
+ #include <stddef.h>
+ #include <stdlib.h>
++#ifdef _WIN32
++# ifdef __MINGW32__
++# define _SNPRINTF_DLLIMPORT
++# endif
++# ifdef _MSC_VER
++# include <systools/win32/snprintf.h>
++# endif
++#endif
+ #include "goo/gmem.h"
+ #include "Object.h"
+ #include "PDFDoc.h"
+--- poppler-0.22.5/poppler/GlobalParams.cc 2013-03-25 22:48:34.000000000 +0100
++++ poppler-0.22.5/poppler/GlobalParams.cc 2013-07-08 16:55:04.753303654 +0200
+@@ -57,6 +57,12 @@
+ #ifdef _WIN32
+ # include <shlobj.h>
+ # include <mbstring.h>
++# ifdef __MINGW32__
++# define _SNPRINTF_DLLIMPORT
++# endif
++# ifdef _MSC_VER
++# include <systools/win32/snprintf.h>
++# endif
+ #endif
+ #include "goo/gmem.h"
+ #include "goo/GooString.h"
+--- poppler-0.22.5/poppler/PageLabelInfo.cc 2013-03-25 22:48:34.000000000 +0100
++++ poppler-0.22.5/poppler/PageLabelInfo.cc 2013-07-08 16:56:47.977901129 +0200
+@@ -17,6 +17,14 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <assert.h>
++#ifdef _WIN32
++# ifdef __MINGW32__
++# define _SNPRINTF_DLLIMPORT
++# endif
++# ifdef _MSC_VER
++# include <systools/win32/snprintf.h>
++# endif
++#endif
+
+ #include "PageLabelInfo.h"
+
+Only in poppler-0.22.5: poppler-snprintf.patch.1