Mercurial > mxe-octave

annotate src/msvc-fontconfig-1.patch @ 3256:7fb479d0241c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update build tools for native mingw * src/build-m4.mk: do nothing for native mingw build * Makefile.in: - add bison, m4 as natve mingw, and python as jit build requirements. - remove build-bison as a mingw build dependancy * index.html: Add msys-bison to mingw required packages and mention ghostscript and python.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 26 Sep 2013 21:18:39 -0400
parents 33ba1ba99057
children ba6bf08118a8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
1 diff -ur fontconfig-2.10.93-orig/fc-cache/fc-cache.c fontconfig-2.10.93/fc-cache/fc-cache.c
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
2 --- fontconfig-2.10.93-orig/fc-cache/fc-cache.c 2013-04-03 23:09:46 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
3 +++ fontconfig-2.10.93/fc-cache/fc-cache.c 2013-07-22 23:39:46 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
4 @@ -81,6 +81,17 @@
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 #endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 #endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +#ifndef F_OK
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 +#define F_OK 0
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 +#define W_OK 2
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 +#define R_OK 4
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 +#define X_OK 0
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 +#ifndef S_ISDIR
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 +#define S_ISDIR(x) ((x)&S_IFDIR)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 static void
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 usage (char *program, int error)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 {
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
22 diff -ur fontconfig-2.10.93-orig/src/Makefile.in fontconfig-2.10.93/src/Makefile.in
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
23 --- fontconfig-2.10.93-orig/src/Makefile.in 2013-05-20 04:44:35 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
24 +++ fontconfig-2.10.93/src/Makefile.in 2013-07-22 23:39:46 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
25 @@ -353,7 +353,7 @@
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 # Microsoft import library install/uninstall
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 +@MS_LIB_AVAILABLE_TRUE@#noinst_DATA = fontconfig.lib
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
31 AM_CPPFLAGS = \
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
32 -I$(top_srcdir) \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 -I$(top_srcdir)/src \
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
34 @@ -847,9 +847,9 @@
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
35 $(AM_V_GEN) $(GPERF) -m 100 $< > $@.tmp && \
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
36 mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 -@ENABLE_SHARED_TRUE@install-data-local: install-ms-import-lib install-libtool-import-lib
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 +@ENABLE_SHARED_TRUE@#install-data-local: install-ms-import-lib install-libtool-import-lib
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 -@ENABLE_SHARED_TRUE@uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 +@ENABLE_SHARED_TRUE@#uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 fcaliastail.h: fcalias.h
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
46 @@ -870,10 +870,8 @@
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 echo Generating $@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 (echo EXPORTS; \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
49 (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
50 - $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/ /' | \
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
51 - sort; \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
52 - echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 - echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
54 + $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' | \
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 + sort) >$@
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
56 @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
58 -include $(top_srcdir)/git.mk
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
59 diff -ur fontconfig-2.10.93-orig/src/fccache.c fontconfig-2.10.93/src/fccache.c
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
60 --- fontconfig-2.10.93-orig/src/fccache.c 2013-04-03 23:09:46 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
61 +++ fontconfig-2.10.93/src/fccache.c 2013-07-22 23:39:46 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
62 @@ -834,6 +834,12 @@
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63 #ifdef _WIN32
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
64 #include <direct.h>
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 #define mkdir(path,mode) _mkdir(path)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
66 +#ifndef F_OK
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
67 +#define F_OK 0
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 +#define W_OK 2
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
69 +#define R_OK 4
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
70 +#define X_OK 0
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
72 #endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
73
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 static FcBool
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
75 diff -ur fontconfig-2.10.93-orig/src/fccompat.c fontconfig-2.10.93/src/fccompat.c
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
76 --- fontconfig-2.10.93-orig/src/fccompat.c 2013-04-03 23:09:46 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
77 +++ fontconfig-2.10.93/src/fccompat.c 2013-07-22 23:36:55 -0400
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
78 @@ -72,6 +72,10 @@
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
79 #define FC_O_NOINHERIT 0
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
80 #endif
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
81
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
82 +#ifdef _MSC_VER
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
83 +typedef int mode_t;
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
84 +#endif
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
85 +
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
86 #if !defined (HAVE_MKOSTEMP) && !defined(HAVE_MKSTEMP) && !defined(HAVE__MKTEMP_S)
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
87 static int
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
88 mkstemp (char *template)
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
89 diff -ur fontconfig-2.10.93-orig/src/fcdir.c fontconfig-2.10.93/src/fcdir.c
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
90 --- fontconfig-2.10.93-orig/src/fcdir.c 2013-01-03 20:47:59 -0500
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
91 +++ fontconfig-2.10.93/src/fcdir.c 2013-07-22 23:39:46 -0400
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 @@ -25,6 +25,10 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 #include "fcint.h"
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 #include <dirent.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 +#ifndef S_ISDIR
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 +#define S_ISDIR(x) ((x)&S_IFDIR)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
98 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
99 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
100 FcBool
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 FcFileIsDir (const FcChar8 *file)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 {
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
103 diff -ur fontconfig-2.10.93-orig/src/fcformat.c fontconfig-2.10.93/src/fcformat.c
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
104 --- fontconfig-2.10.93-orig/src/fcformat.c 2013-01-03 20:47:59 -0500
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
105 +++ fontconfig-2.10.93/src/fcformat.c 2013-07-22 23:39:46 -0400
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
106 @@ -27,6 +27,10 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
107 #include <string.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
108 #include <stdarg.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
109
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
110 +#ifdef _MSC_VER
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
111 +#define snprintf _snprintf
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
112 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
113 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
114
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
115 /* The language is documented in doc/fcformat.fncs
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
116 * These are the features implemented: