Mercurial > mxe-octave

comparison src/poppler-1-win32.patch @ 2660:9aa687683a32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package poppler
author Mark Brand <mabrand@mabrand.nl>
date Wed, 11 Jul 2012 21:25:16 +0200
parents dcc2a7e93901
children
comparison
equal deleted inserted replaced
2659:49ecbfac69b1 2660:9aa687683a32
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 From 5aede813b0cfdf672241f925bc34b766cf567a0f Mon Sep 17 00:00:00 2001 4 From 0cdf3c0c6d2740fa3542d7030878eaffdd4cf7a4 Mon Sep 17 00:00:00 2001
5 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> 5 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
6 Date: Sat, 21 Apr 2012 09:34:46 +0200 6 Date: Sat, 21 Apr 2012 09:34:46 +0200
7 Subject: [PATCH 1/3] Only check for Type1 fonts in custom directory if path 7 Subject: [PATCH 1/2] Only check for Type1 fonts in custom directory if path
8 is non-NULL 8 is non-NULL
9 9
10 Otherwise, programs using poppler may crash 10 Otherwise, programs using poppler may crash
11 Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 11 Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037
12 ---
13 poppler/GlobalParamsWin.cc | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15 12
16 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc 13 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
17 index b77ac4f..f660224 100644 14 index 527f08e..0739946 100644
18 --- a/poppler/GlobalParamsWin.cc 15 --- a/poppler/GlobalParamsWin.cc
19 +++ b/poppler/GlobalParamsWin.cc 16 +++ b/poppler/GlobalParamsWin.cc
20 @@ -423,7 +423,7 @@ void GlobalParams::setupBaseFonts(char * dir) 17 @@ -424,7 +424,7 @@ void GlobalParams::setupBaseFonts(char * dir)
21 if (fontFiles->lookup(fontName)) 18 if (fontFiles->lookup(fontName))
22 continue; 19 continue;
23 20
24 - if (dir) { 21 - if (dir) {
25 + if (dir && displayFontTab[i].t1FileName) { 22 + if (dir && displayFontTab[i].t1FileName) {
28 FileExists(replaceSuffix(fontPath, ".pfb", ".pfa")->getCString())) { 25 FileExists(replaceSuffix(fontPath, ".pfb", ".pfa")->getCString())) {
29 -- 26 --
30 1.7.10.4 27 1.7.10.4
31 28
32 29
33 From 944b910b4ede55c0b1dca5169960068fb9d1d0a4 Mon Sep 17 00:00:00 2001 30 From fe1720718e224b0138f3f95c5aa0c72ac85e06b8 Mon Sep 17 00:00:00 2001
34 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> 31 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com>
35 Date: Sat, 21 Apr 2012 13:19:54 +0200 32 Date: Sat, 21 Apr 2012 13:19:54 +0200
36 Subject: [PATCH 2/3] Don't use dllimport/dllexport 33 Subject: [PATCH 2/2] Don't use dllimport/dllexport
37 34
38 Otherwise static linking fails 35 Otherwise static linking fails
39 MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!) 36 MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!)
40 ---
41 cpp/poppler-global.h | 5 -----
42 poppler/XpdfPluginAPI.h | 18 ------------------
43 qt4/src/poppler-export.h | 5 -----
44 3 files changed, 28 deletions(-)
45 37
46 diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h 38 diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
47 index 5650182..6c3e01b 100644 39 index 5650182..6c3e01b 100644
48 --- a/cpp/poppler-global.h 40 --- a/cpp/poppler-global.h
49 +++ b/cpp/poppler-global.h 41 +++ b/cpp/poppler-global.h
127 #ifdef poppler_qt4_EXPORTS 119 #ifdef poppler_qt4_EXPORTS
128 # define POPPLER_QT4_EXPORT LIB_EXPORT 120 # define POPPLER_QT4_EXPORT LIB_EXPORT
129 -- 121 --
130 1.7.10.4 122 1.7.10.4
131 123
132
133 From 66acb0dedae6564d1975d652abca10b18ab4eb46 Mon Sep 17 00:00:00 2001
134 From: Mark Brand <mabrand@mabrand.nl>
135 Date: Thu, 14 Jun 2012 17:08:58 +0200
136 Subject: [PATCH 3/3] fix typo
137
138 taken from
139 https://bugs.freedesktop.org/show_bug.cgi?id=51079
140 ---
141 poppler/GlobalParamsWin.cc | 2 +-
142 1 file changed, 1 insertion(+), 1 deletion(-)
143
144 diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
145 index f660224..0e691eb 100644
146 --- a/poppler/GlobalParamsWin.cc
147 +++ b/poppler/GlobalParamsWin.cc
148 @@ -573,7 +573,7 @@ GooString *GlobalParams::findSystemFontFile(GfxFont *font,
149 *type = fi->type;
150 *fontNum = fi->fontNum;
151 if (substituteFontName)
152 - substituteFontName.Set(fi->substituteName->getCString());
153 + substituteFontName->Set(fi->substituteName->getCString());
154 } else {
155 GooString *substFontName = new GooString(findSubstituteName(font, fontFiles,
156 substFiles,
157 --
158 1.7.10.4
159