Mercurial > mxe-octave

annotate src/msvc-fontconfig-1.patch @ 3091:5ba57870c491

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[MSVC] enable fontconfig compilation
author Michael Goffioul <michael.goffioul@gmail.com>
date Tue, 25 Jun 2013 10:55:35 -0400
parents
children 33ba1ba99057
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur fontconfig-2.10.1-orig/fc-cache/fc-cache.c fontconfig-2.10.1/fc-cache/fc-cache.c
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- fontconfig-2.10.1-orig/fc-cache/fc-cache.c 2012-07-23 22:01:32 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ fontconfig-2.10.1/fc-cache/fc-cache.c 2013-06-25 10:47:29 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -80,6 +80,17 @@
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 {
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 diff -ur fontconfig-2.10.1-orig/src/Makefile.in fontconfig-2.10.1/src/Makefile.in
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 --- fontconfig-2.10.1-orig/src/Makefile.in 2012-07-26 22:24:51 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 +++ fontconfig-2.10.1/src/Makefile.in 2013-06-25 10:47:47 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 @@ -308,7 +308,7 @@
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
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31 INCLUDES = \
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 \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 @@ -754,9 +754,9 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 ../fc-lang/fclang.h:
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 cd ../fc-lang && $(MAKE) $(AM_MAKEFLAGS) fclang.h
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
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 @@ -772,10 +772,8 @@
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 ()' ) | \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
50 - grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/ /' | \
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@) >$@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54 + grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' | \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 + sort) >$@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 @ ! grep -q FcERROR $@ || ($(RM) $@; false)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
58 # Tell versions [3.59,3.63) of GNU make to not export all variables.
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 diff -ur fontconfig-2.10.1-orig/src/fccache.c fontconfig-2.10.1/src/fccache.c
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 --- fontconfig-2.10.1-orig/src/fccache.c 2012-07-23 22:01:32 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
61 +++ fontconfig-2.10.1/src/fccache.c 2013-06-25 10:47:29 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
62 @@ -804,6 +804,12 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
63
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64 #ifdef _WIN32
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
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 diff -ur fontconfig-2.10.1-orig/src/fcdir.c fontconfig-2.10.1/src/fcdir.c
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 --- fontconfig-2.10.1-orig/src/fcdir.c 2012-07-23 22:01:32 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
77 +++ fontconfig-2.10.1/src/fcdir.c 2013-06-25 10:47:29 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 @@ -25,6 +25,10 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 #include "fcint.h"
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 #include <dirent.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
81
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 +#ifndef S_ISDIR
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
83 +#define S_ISDIR(x) ((x)&S_IFDIR)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
85 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
86 FcBool
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
87 FcFileIsDir (const FcChar8 *file)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
88 {
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
89 diff -ur fontconfig-2.10.1-orig/src/fcformat.c fontconfig-2.10.1/src/fcformat.c
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 --- fontconfig-2.10.1-orig/src/fcformat.c 2012-07-23 22:01:32 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
91 +++ fontconfig-2.10.1/src/fcformat.c 2013-06-25 10:47:29 -0400
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 @@ -27,6 +27,10 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 #include <string.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 #include <stdarg.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 +#ifdef _MSC_VER
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 +#define snprintf _snprintf
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
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
101 /* The language is documented in doc/fcformat.fncs
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
102 * These are the features implemented: