Mercurial > mxe-octave

changeset 2439:f8ce0e75d4d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #21 from stloeffler/pkg-poppler New package: poppler
author mabrand <mabrand@mabrand.nl>
date Sat, 21 Apr 2012 12:10:40 -0700
parents 97fdc3814095 (current diff) 59d3f2a7aada (diff)
children 5982c58c53e7
files
diffstat 3 files changed, 313 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/poppler-1-win32.patch	Sat Apr 21 12:10:40 2012 -0700
@@ -0,0 +1,243 @@
+This file is part of MXE.
+See index.html for further information.
+
+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(-)
+
+diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
+index f989fb8..b15773f 100644
+--- a/poppler/GlobalParamsWin.cc
++++ b/poppler/GlobalParamsWin.cc
+@@ -73,13 +73,17 @@ static struct {
+     {"Helvetica-BoldOblique", "n019024l.pfb", "arialbi.ttf"},
+     {"Helvetica-Oblique",     "n019023l.pfb", "ariali.ttf"},
+     // TODO: not sure if "symbol.ttf" is right
++    // "symbol.ttf" can be used as a fallback, but some symbols are differently
++    // encoded (e.g., the glyphs for 'f', 'j', 'v'), while most other glyphs
++    // have a fairly different appearance
+     {"Symbol",                "s050000l.pfb", "symbol.ttf"},
+     {"Times-Bold",            "n021004l.pfb", "timesbd.ttf"},
+     {"Times-BoldItalic",      "n021024l.pfb", "timesbi.ttf"},
+     {"Times-Italic",          "n021023l.pfb", "timesi.ttf"},
+     {"Times-Roman",           "n021003l.pfb", "times.ttf"},
+     // TODO: not sure if "wingding.ttf" is right
+-    {"ZapfDingbats",          "d050000l.pfb", "wingding.ttf"},
++    // No, the symbol sets are totally different
++    {"ZapfDingbats",          "d050000l.pfb", NULL},
+ 
+     // those seem to be frequently accessed by PDF files and I kind of guess
+     // which font file do the refer to
+-- 
+1.7.5.4
+
+
+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(-)
+
+diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
+index b15773f..f68577f 100644
+--- a/poppler/GlobalParamsWin.cc
++++ b/poppler/GlobalParamsWin.cc
+@@ -243,7 +243,7 @@ void GlobalParams::setupBaseFonts(char * dir)
+         if (displayFonts->lookup(fontName))
+             continue;
+ 
+-        if (dir) {
++        if (dir && displayFontTab[i].t1FileName) {
+             GooString *fontPath = appendToPath(new GooString(dir), displayFontTab[i].t1FileName);
+             if (FileExists(fontPath->getCString())) {
+                 AddFont(displayFonts, fontName, fontPath, displayFontT1);
+-- 
+1.7.5.4
+
+
+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
+
+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 +-
+ 2 files changed, 32 insertions(+), 1 deletions(-)
+
+diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
+index 687fd25..eea60be 100644
+--- a/poppler/GlobalParams.cc
++++ b/poppler/GlobalParams.cc
+@@ -214,6 +214,37 @@ get_poppler_datadir (void)
+ 
+ #ifdef _WIN32
+ 
++static char *
++get_poppler_fontdir (void)
++{
++#if !ENABLE_RELOCATABLE
++  static HMODULE hmodule = 0;
++#endif
++  static char retval[MAX_PATH];
++  static int beenhere = 0;
++
++  unsigned char *p;
++
++  if (beenhere)
++    return retval;
++
++  if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 32))
++    return NULL;
++
++  p = _mbsrchr ((unsigned char *) retval, '\\');
++  *p = '\0';
++  p = _mbsrchr ((unsigned char *) retval, '\\');
++  if (p) {
++    if (stricmp ((const char *) (p+1), "bin") == 0)
++      *p = '\0';
++  }
++  strcat (retval, "\\share\\fonts\\type1\\gsfonts");
++
++  beenhere = 1;
++
++  return retval;
++}
++
+ //------------------------------------------------------------------------
+ // WinFontInfo
+ //------------------------------------------------------------------------
+diff --git a/poppler/GlobalParamsWin.cc b/poppler/GlobalParamsWin.cc
+index f68577f..3ee75e4 100644
+--- a/poppler/GlobalParamsWin.cc
++++ b/poppler/GlobalParamsWin.cc
+@@ -281,7 +281,7 @@ DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
+ 
+     if (!fontName) return NULL;
+     lockGlobalParams;
+-    setupBaseFonts(NULL);
++    setupBaseFonts(get_poppler_fontdir());
+     dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
+     if (!dfp) {
+         substFontName = findSubstituteName(fontName->getCString());
+-- 
+1.7.5.4
+
+
+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 ------------------
+ qt4/src/poppler-export.h |    5 -----
+ 3 files changed, 0 insertions(+), 28 deletions(-)
+
+diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
+index 5650182..6c3e01b 100644
+--- a/cpp/poppler-global.h
++++ b/cpp/poppler-global.h
+@@ -20,13 +20,8 @@
+ #ifndef POPPLER_GLOBAL_H
+ #define POPPLER_GLOBAL_H
+ 
+-#if defined(_WIN32)
+-#  define LIB_EXPORT __declspec(dllexport)
+-#  define LIB_IMPORT __declspec(dllimport)
+-#else
+ #  define LIB_EXPORT
+ #  define LIB_IMPORT
+-#endif
+ 
+ #if defined(poppler_cpp_EXPORTS)
+ #  define POPPLER_CPP_EXPORT LIB_EXPORT
+diff --git a/poppler/XpdfPluginAPI.h b/poppler/XpdfPluginAPI.h
+index 22540f7..290aa63 100644
+--- a/poppler/XpdfPluginAPI.h
++++ b/poppler/XpdfPluginAPI.h
+@@ -28,19 +28,11 @@ extern "C" {
+  */
+ #define xpdfPluginAPIVersion 1
+ 
+-#ifdef _WIN32
+-#  ifdef __cplusplus
+-#    define PLUGINFUNC(retType) extern "C" __declspec(dllexport) retType
+-#  else
+-#    define PLUGINFUNC(retType) extern __declspec(dllexport) retType
+-#  endif
+-#else
+ #  ifdef __cplusplus
+ #    define PLUGINFUNC(retType) extern "C" retType
+ #  else
+ #    define PLUGINFUNC(retType) extern retType
+ #  endif
+-#endif
+ 
+ /*------------------------------------------------------------------------
+  * Plugin setup/cleanup
+@@ -285,22 +277,12 @@ void (*_xpdfRegisterSecurityHandler)(XpdfSecurityHandler *handler);
+ 
+ } XpdfPluginVecTable;
+ 
+-#ifdef _WIN32
+-
+-extern __declspec(dllexport) XpdfPluginVecTable xpdfPluginVecTable;
+-
+-#define xpdfPluginSetup \
+-  extern __declspec(dllexport) \
+-  XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
+-
+-#else
+ 
+ extern XpdfPluginVecTable xpdfPluginVecTable;
+ 
+ #define xpdfPluginSetup \
+   XpdfPluginVecTable xpdfPluginVecTable = {xpdfPluginAPIVersion};
+ 
+-#endif
+ 
+ #define xpdfGetInfoDict (*xpdfPluginVecTable._xpdfGetInfoDict)
+ #define xpdfGetCatalog (*xpdfPluginVecTable._xpdfGetCatalog)
+diff --git a/qt4/src/poppler-export.h b/qt4/src/poppler-export.h
+index 7661fe9..ebb1e18 100644
+--- a/qt4/src/poppler-export.h
++++ b/qt4/src/poppler-export.h
+@@ -2,13 +2,8 @@
+ * This file is used to set the poppler_qt4_EXPORT macros right.
+ * This is needed for setting the visibility on windows, it will have no effect on other platforms.
+ */
+-#if defined(_WIN32)
+-# define LIB_EXPORT __declspec(dllexport)
+-# define LIB_IMPORT __declspec(dllimport)
+-#else
+ # define LIB_EXPORT
+ # define LIB_IMPORT
+-#endif
+ 
+ #ifdef poppler_qt4_EXPORTS
+ # define POPPLER_QT4_EXPORT LIB_EXPORT
+-- 
+1.7.5.4
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/poppler-test.cxx	Sat Apr 21 12:10:40 2012 -0700
@@ -0,0 +1,12 @@
+#include <iostream>
+#include <cpp/poppler-version.h>
+
+int main(int argc, char *argv[])
+{
+    (void)argc;
+    (void)argv;
+
+    std::cout << "Poppler version: " << poppler::version_string() << std::endl;
+    
+    return 0;
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/poppler.mk	Sat Apr 21 12:10:40 2012 -0700
@@ -0,0 +1,58 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := poppler
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 3753caecba71afaf29f097e0b9c52e0f83a10a59
+$(PKG)_SUBDIR   := poppler-$($(PKG)_VERSION)
+$(PKG)_FILE     := poppler-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://poppler.freedesktop.org/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib cairo libpng lcms jpeg tiff freetype zlib curl qt
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://poppler.freedesktop.org/' | \
+    $(SED) -n 's,.*"poppler-\([0-9.]\+\)\.tar\.gz".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    # Note: Specifying LIBS explicitly is necessary for configure to properly
+    #       pick up libtiff (otherwise linking a minimal test program fails not
+    #       because libtiff is not found, but because some references are
+    #       undefined)
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-silent-rules \
+        --disable-shared \
+        --enable-static \
+        --enable-xpdf-headers \
+        --enable-poppler-qt4 \
+        --enable-zlib \
+        --enable-libcurl \
+        --enable-libtiff \
+        --enable-libjpeg \
+        --enable-libpng \
+        --enable-poppler-glib \
+        --enable-poppler-cpp \
+        --enable-cairo-output \
+        --enable-splash-output \
+        --enable-compile-warnings=yes \
+        --enable-introspection=auto \
+        --disable-libopenjpeg \
+        --disable-gtk-test \
+        --disable-utils \
+        --disable-gtk-doc \
+        --disable-gtk-doc-html \
+        --disable-gtk-doc-pdf \
+        --with-font-configuration=win32 \
+        LIBS="`'$(TARGET)-pkg-config' zlib liblzma --libs` -ljpeg"
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+
+    # Test program
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -ansi -pedantic \
+        '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \
+        `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs`
+endef
+