File poppler-0.12.1-windows.patch of Package mingw32-poppler

Overview Repositories Revisions Requests Users Attributes Meta

File poppler-0.12.1-windows.patch of Package mingw32-poppler (Revision bcf4820219f1c4f3809fc17a6dd33aff)

Currently displaying revision bcf4820219f1c4f3809fc17a6dd33aff , Show latest

diff -ur poppler-0.12.1/configure.ac poppler-0.12.1/configure.ac
--- poppler-0.12.1/configure.ac	2009-10-18 01:25:15.000000000 +0200
+++ poppler-0.12.1/configure.ac	2009-11-11 16:54:29.000000000 +0100
@@ -38,6 +38,8 @@
 AC_DEFINE([MULTITHREADED], [1], [Enable multithreading support.])
 AC_DEFINE([TEXTOUT_WORD_LIST], [1], [Enable word list support.])
 
+AC_CANONICAL_HOST
+
 dnl Check for OS specific flags
 win32_libs=""
 create_shared_lib=""
@@ -50,12 +52,17 @@
     win32_libs="-lgdi32"
     create_shared_lib="-no-undefined"
     auto_import_flags="-Wl,--enable-auto-import"
-  ;;
+    os_win32=yes
+    ;;
+  *)
+    os_win32=no
+    ;;
 esac
 
 AC_SUBST(win32_libs)
 AC_SUBST(create_shared_lib)
 AC_SUBST(auto_import_flags)
+AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
 
 ACX_PTHREAD()
 
Only in poppler-0.12.1: configure.ac.orig
diff -ur poppler-0.12.1/poppler/GlobalParams.cc poppler-0.12.1/poppler/GlobalParams.cc
--- poppler-0.12.1/poppler/GlobalParams.cc	2009-10-06 00:46:28.000000000 +0200
+++ poppler-0.12.1/poppler/GlobalParams.cc	2009-11-11 16:54:29.000000000 +0100
@@ -44,6 +44,7 @@
 #endif
 #ifdef _WIN32
 #  include <shlobj.h>
+#  include <mbstring.h>
 #endif
 #include "goo/gmem.h"
 #include "goo/GooString.h"
@@ -142,6 +143,58 @@
 
 #ifdef _WIN32
 
+/* search for data relative to where we are installed */
+
+static HMODULE hmodule;
+
+extern "C" {
+BOOL WINAPI
+DllMain (HINSTANCE hinstDLL,
+	 DWORD     fdwReason,
+	 LPVOID    lpvReserved)
+{
+  switch (fdwReason)
+    {
+    case DLL_PROCESS_ATTACH:
+      hmodule = hinstDLL;
+      break;
+    }
+
+  return TRUE;
+}
+}
+
+static char *
+get_poppler_datadir (void)
+{
+  static char retval[1000];
+  static int beenhere = 0;
+
+  unsigned char *p;
+
+  if (beenhere)
+    return retval;
+
+  if (!GetModuleFileName (hmodule, (CHAR *) retval, sizeof(retval) - 10))
+    return POPPLER_DATADIR;
+
+  p = _mbsrchr ((const unsigned char *) retval, '\\');
+  *p = '\0';
+  p = _mbsrchr ((const unsigned char *) retval, '\\');
+  if (p) {
+    if (stricmp ((const char *) (p+1), "bin") == 0)
+      *p = '\0';
+  }
+  strcat (retval, "\\share\\poppler");
+
+  beenhere = 1;
+
+  return retval;
+}
+
+#undef POPPLER_DATADIR
+#define POPPLER_DATADIR get_poppler_datadir ()
+
 //------------------------------------------------------------------------
 // WinFontInfo
 //------------------------------------------------------------------------
@@ -557,7 +610,7 @@
   UnicodeMap *map;
   int i;
 
-#ifndef _MSC_VER  
+#ifndef _WIN32  
   FcInit();
   FCcfg = FcConfigGetCurrent();
 #endif
@@ -962,7 +1015,7 @@
   }
 }
 
-#ifndef _MSC_VER
+#ifndef _WIN32
 static FcPattern *buildFcPattern(GfxFont *font)
 {
   int weight = -1,
@@ -1110,7 +1163,7 @@
 /* if you can't or don't want to use Fontconfig, you need to implement
    this function for your platform. For Windows, it's in GlobalParamsWin.cc
 */
-#ifndef _MSC_VER
+#ifndef _WIN32
 DisplayFontParam *GlobalParams::getDisplayFont(GfxFont *font) {
   DisplayFontParam *dfp;
   FcPattern *p=0;
Only in poppler-0.12.1/poppler: GlobalParams.cc.orig
diff -ur poppler-0.12.1/poppler/GlobalParams.h poppler-0.12.1/poppler/GlobalParams.h
--- poppler-0.12.1/poppler/GlobalParams.h	2009-10-06 00:46:28.000000000 +0200
+++ poppler-0.12.1/poppler/GlobalParams.h	2009-11-11 16:54:29.000000000 +0100
@@ -37,7 +37,7 @@
 #include <assert.h>
 #include "poppler-config.h"
 #include <stdio.h>
-#ifndef _MSC_VER
+#ifndef _WIN32
 #include <fontconfig/fontconfig.h>
 #endif
 #include "goo/gtypes.h"
@@ -169,7 +169,7 @@
 
   void setBaseDir(char *dir);
 
-#ifdef _MSC_VER
+#ifdef _WIN32
   void setupBaseFonts(char *dir);
 #endif
 
@@ -352,7 +352,7 @@
   UnicodeMapCache *unicodeMapCache;
   CMapCache *cMapCache;
   
-#ifndef _MSC_VER
+#ifndef _WIN32
   FcConfig *FCcfg;
 #endif
 
Only in poppler-0.12.1/poppler: GlobalParams.h.orig
diff -ur poppler-0.12.1/poppler/Makefile.am poppler-0.12.1/poppler/Makefile.am
--- poppler-0.12.1/poppler/Makefile.am	2009-09-09 23:22:31.000000000 +0200
+++ poppler-0.12.1/poppler/Makefile.am	2009-11-11 16:54:29.000000000 +0100
@@ -117,6 +117,11 @@
 cms_libs = $(LCMS_LIBS)
 endif
 
+if OS_WIN32
+font_sources =				\
+	GlobalParamsWin.cc
+endif
+
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/goo			\
@@ -229,6 +234,7 @@
 	$(zlib_sources)		\
 	$(libjpeg2000_sources)	\
 	$(abiword_sources)	\
+	$(font_sources)	\
 	Annot.cc		\
 	Array.cc 		\
 	BuiltinFont.cc		\
Only in poppler-0.12.1/poppler: Makefile.am.orig

Places

File poppler-0.12.1-windows.patch of Package mingw32-poppler (Revision bcf4820219f1c4f3809fc17a6dd33aff)

Places