Mercurial > mxe-octave

annotate src/poppler-1-win32.patch @ 2988:aca8511e7751

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt.mk: link to correct files in bin directory
author John W. Eaton <jwe@octave.org>
date Thu, 16 May 2013 13:32:57 -0400
parents 9aa687683a32
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
1 This file is part of MXE.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
2 See index.html for further information.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
3
2660
9aa687683a32 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2609
diff changeset
4 From 0cdf3c0c6d2740fa3542d7030878eaffdd4cf7a4 Mon Sep 17 00:00:00 2001
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
5 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
6 Date: Sat, 21 Apr 2012 09:34:46 +0200
2660
9aa687683a32 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2609
diff changeset
7 Subject: [PATCH 1/2] Only check for Type1 fonts in custom directory if path
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
8 is non-NULL
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
9
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
10 Otherwise, programs using poppler may crash
2426
59d3f2a7aada Include upstream URLs in commit messages of poppler patch
Stefan Löffler <st.loeffler@gmail.com>
parents: 2425
diff changeset
11 Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
12
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
13 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
2660
9aa687683a32 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2609
diff changeset
14 index 527f08e..0739946 100644
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
15 --- a/poppler/GlobalParamsWin.cc
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
16 +++ b/poppler/GlobalParamsWin.cc
2660
9aa687683a32 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2609
diff changeset
17 @@ -424,7 +424,7 @@ void GlobalParams::setupBaseFonts(char * dir)
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
18 if (fontFiles->lookup(fontName))
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
19 continue;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
20
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
21 - if (dir) {
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
22 + if (dir && displayFontTab[i].t1FileName) {
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
23 GooString *fontPath = appendToPath(new GooString(dir), displayFontTab[i].t1FileName);
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
24 if (FileExists(fontPath->getCString()) ||
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
25 FileExists(replaceSuffix(fontPath, ".pfb", ".pfa")->getCString())) {
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
26 --
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
27 1.7.10.4
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
28
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
29
2660
9aa687683a32 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2609
diff changeset
30 From fe1720718e224b0138f3f95c5aa0c72ac85e06b8 Mon Sep 17 00:00:00 2001
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
31 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
32 Date: Sat, 21 Apr 2012 13:19:54 +0200
2660
9aa687683a32 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2609
diff changeset
33 Subject: [PATCH 2/2] Don't use dllimport/dllexport
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
34
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
35 Otherwise static linking fails
2426
59d3f2a7aada Include upstream URLs in commit messages of poppler patch
Stefan Löffler <st.loeffler@gmail.com>
parents: 2425
diff changeset
36 MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!)
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
37
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
38 diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
39 index 5650182..6c3e01b 100644
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
40 --- a/cpp/poppler-global.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
41 +++ b/cpp/poppler-global.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
42 @@ -20,13 +20,8 @@
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
43 #ifndef POPPLER_GLOBAL_H
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
44 #define POPPLER_GLOBAL_H
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
45
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
46 -#if defined(_WIN32)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
47 -# define LIB_EXPORT __declspec(dllexport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
48 -# define LIB_IMPORT __declspec(dllimport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
49 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
50 # define LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
51 # define LIB_IMPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
52 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
53
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
54 #if defined(poppler_cpp_EXPORTS)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
55 # define POPPLER_CPP_EXPORT LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
56 diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
57 index b0165c0..5a10595 100644
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
58 --- a/poppler/XpdfPluginAPI.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
59 +++ b/poppler/XpdfPluginAPI.h
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
60 @@ -42,19 +42,11 @@ extern "C" {
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
61 */
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
62 #define xpdfPluginAPIVersion 1
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
63
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
64 -#ifdef _WIN32
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
65 -# ifdef __cplusplus
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
66 -# define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
67 -# else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
68 -# define PLUGINFUNC(retType) extern __declspec(dllexport) retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
69 -# endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
70 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
71 # ifdef __cplusplus
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
72 # define PLUGINFUNC(retType) extern "C" retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
73 # else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
74 # define PLUGINFUNC(retType) extern retType
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
75 # endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
76 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
77
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
78 /*------------------------------------------------------------------------
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
79 * Plugin setup/cleanup
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
80 @@ -281,22 +273,12 @@ void (*_xpdfRegisterSecurityHandler)(XpdfSecurityHandler *handler);
2424
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
81
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
82 } XpdfPluginVecTable;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
83
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
84 -#ifdef _WIN32
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
85 -
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
86 -extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
87 -
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
88 -#define xpdfPluginSetup \
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
89 - extern __declspec(dllexport) \
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
90 - XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
91 -
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
92 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
93
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
94 extern XpdfPluginVecTable xpdfPluginVecTable;
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
95
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
96 #define xpdfPluginSetup \
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
97 XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
98
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
99 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
100
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
101 #define xpdfGetInfoDict (*xpdfPluginVecTable._xpdfGetInfoDict)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
102 #define xpdfGetCatalog (*xpdfPluginVecTable._xpdfGetCatalog)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
103 diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
104 index 7661fe9..ebb1e18 100644
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
105 --- a/qt4/src/poppler-export.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
106 +++ b/qt4/src/poppler-export.h
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
107 @@ -2,13 +2,8 @@
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
108 * This file is used to set the poppler_qt4_EXPORT macros right.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
109 * This is needed for setting the visibility on windows, it will have no effect on other platforms.
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
110 */
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
111 -#if defined(_WIN32)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
112 -# define LIB_EXPORT __declspec(dllexport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
113 -# define LIB_IMPORT __declspec(dllimport)
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
114 -#else
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
115 # define LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
116 # define LIB_IMPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
117 -#endif
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
118
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
119 #ifdef poppler_qt4_EXPORTS
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
120 # define POPPLER_QT4_EXPORT LIB_EXPORT
9fadee4a9a23 Combine patches into single file and improve them
Stefan Löffler <st.loeffler@gmail.com>
parents:
diff changeset
121 --
2609
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
122 1.7.10.4
dcc2a7e93901 update package poppler
Mark Brand <mabrand@mabrand.nl>
parents: 2426
diff changeset
123