diff options
| author | Stefan Löffler <st.loeffler@gmail.com> | 2012-04-21 15:44:46 (GMT) |
|---|---|---|
| committer | Stefan Löffler <st.loeffler@gmail.com> | 2012-04-21 15:44:46 (GMT) |
| commit | 2ced39c54781eddbabdb13f3168de516f4cdbb4e (patch) | |
| tree | 3447c774fc00c549791e23e09fa86e154ecab6f3 /src/poppler-1-win32.patch | |
| parent | 614da6b6dfe0a49ed048e5d7cf9850b2ea772b40 (diff) | |
| download | mxe-2ced39c54781eddbabdb13f3168de516f4cdbb4e.zip mxe-2ced39c54781eddbabdb13f3168de516f4cdbb4e.tar.gz mxe-2ced39c54781eddbabdb13f3168de516f4cdbb4e.tar.bz2 | |
Include upstream URLs in commit messages of poppler patch
as per https://github.com/mxe/mxe/pull/21#issuecomment-5261238
Diffstat (limited to 'src/poppler-1-win32.patch')
| -rw-r--r-- | src/poppler-1-win32.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/poppler-1-win32.patch b/src/poppler-1-win32.patch index bfff37f..11add51 100644 --- a/src/poppler-1-win32.patch +++ b/src/poppler-1-win32.patch @@ -1,16 +1,14 @@ This file is part of MXE. See index.html for further information. -Patches 1-3 proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 -Patch 4 is an MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 - -From f084359f36e68aaaede8fed598933156e03ac442 Mon Sep 17 00:00:00 2001 +From 991d23243522e1ae2bd8efd279032792681f3789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Sat, 21 Apr 2012 09:29:25 +0200 Subject: [PATCH 1/4] Fix Standard-14 fallback fonts wingding.ttf is totally different from ZapfDingbats. symbol.ttf is only a lousy fallback for Symbol. Based on patch provided by Jonathan Kew. +Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 --- poppler/GlobalParamsWin.cc | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) @@ -42,13 +40,14 @@ index f989fb8..b15773f 100644 1.7.5.4 -From 81dd27ef8bd213d8edc3e7983986bc17b6ef1d97 Mon Sep 17 00:00:00 2001 +From 482782fa1951c8c75636918fb45c90f3f329bf86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Sat, 21 Apr 2012 09:34:46 +0200 Subject: [PATCH 2/4] Only check for Type1 fonts in custom directory if path is non-NULL Otherwise, programs using poppler may crash +Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 --- poppler/GlobalParamsWin.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) @@ -70,7 +69,7 @@ index b15773f..f68577f 100644 1.7.5.4 -From 3ee566eef0bc1e45807de257ea9b914ead61d205 Mon Sep 17 00:00:00 2001 +From 7f01e803b134d01a72f6912d088d7887eba0df08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Sat, 21 Apr 2012 11:57:02 +0200 Subject: [PATCH 3/4] Allow custom substitution fonts on Windows @@ -78,6 +77,7 @@ Subject: [PATCH 3/4] Allow custom substitution fonts on Windows Standard-compliant PDF viewers must be able to handle 14 standard fonts even if they are not embedded. For the Symbol and ZapfDingbats fonts, there is no suitable alternative available on Windows by default, so they must be provided separately (and poppler must find them). The search path is share/fonts/type1/gsfonts (relative to poppler) similar to *nix systems and the search path for poppler-data. +Proposed upstream at https://bugs.freedesktop.org/show_bug.cgi?id=49037 --- poppler/GlobalParams.cc | 31 +++++++++++++++++++++++++++++++ poppler/GlobalParamsWin.cc | 2 +- @@ -142,12 +142,13 @@ index f68577f..3ee75e4 100644 1.7.5.4 -From 51130351c64db0137795a4f253732a2aac8a4ec2 Mon Sep 17 00:00:00 2001 +From e000aafa7dec5441d072158814fa35631c5a9c52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20L=C3=B6ffler?= <st.loeffler@gmail.com> Date: Sat, 21 Apr 2012 13:19:54 +0200 Subject: [PATCH 4/4] Don't use dllimport/dllexport Otherwise static linking fails +MXE workaround for https://bugs.freedesktop.org/show_bug.cgi?id=49038 (presumably would break shared linking!) --- cpp/poppler-global.h | 5 ----- poppler/XpdfPluginAPI.h | 18 ------------------ |