Mercurial > mxe-octave
annotate src/msvc-fontconfig-1.patch @ 3705:d30ced3f489e
libpng: update to 1.6.13
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 02 Sep 2014 11:45:16 -0400 |
parents | 7bbaffce14a8 |
children |
rev | line source |
---|---|
3298
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
1 diff -ur fontconfig-2.10.93-orig/conf.d/Makefile.in fontconfig-2.10.93/conf.d/Makefile.in |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
2 --- fontconfig-2.10.93-orig/conf.d/Makefile.in 2013-05-20 04:44:34 -0400 |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
3 +++ fontconfig-2.10.93/conf.d/Makefile.in 2013-11-08 13:54:25 -0500 |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
4 @@ -604,9 +604,9 @@ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
5 @(echo cd $(DESTDIR)$(configdir); \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
6 cd $(DESTDIR)$(configdir); \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
7 for i in $(CONF_LINKS); do \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
8 - echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
9 + echo $(RM) $$i";" ln -s $(DESTDIR)$(templatedir)/$$i .; \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
10 $(RM) $$i; \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
11 - ln -s $(templatedir)/$$i .; \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
12 + ln -s $(DESTDIR)$(templatedir)/$$i .; \ |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
13 done) |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
14 uninstall-local: |
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
15 @(echo cd $(DESTDIR)$(configdir); \ |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
16 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
|
17 --- fontconfig-2.10.93-orig/fc-cache/fc-cache.c 2013-04-03 23:09:46 -0400 |
3298
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
18 +++ fontconfig-2.10.93/fc-cache/fc-cache.c 2013-11-08 13:53:48 -0500 |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
19 @@ -81,6 +81,17 @@ |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
20 #endif |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
21 #endif |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
22 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
23 +#ifndef F_OK |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
24 +#define F_OK 0 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
25 +#define W_OK 2 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
26 +#define R_OK 4 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
27 +#define X_OK 0 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
28 +#endif |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
29 + |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
30 +#ifndef S_ISDIR |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
31 +#define S_ISDIR(x) ((x)&S_IFDIR) |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
32 +#endif |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
33 + |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
34 static void |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
35 usage (char *program, int error) |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
36 { |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
37 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
|
38 --- fontconfig-2.10.93-orig/src/Makefile.in 2013-05-20 04:44:35 -0400 |
3298
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
39 +++ fontconfig-2.10.93/src/Makefile.in 2013-11-08 13:53:48 -0500 |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
40 @@ -353,7 +353,7 @@ |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
41 @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
42 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
43 # Microsoft import library install/uninstall |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
44 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
45 +@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
|
46 AM_CPPFLAGS = \ |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
47 -I$(top_srcdir) \ |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
48 -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
|
49 @@ -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
|
50 $(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
|
51 mv -f $@.tmp $@ || ( $(RM) $@.tmp && false ) |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
52 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
53 -@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
|
54 +@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
|
55 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
56 -@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
|
57 +@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
|
58 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
59 fcaliastail.h: fcalias.h |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
60 |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
61 @@ -870,10 +870,8 @@ |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
62 echo Generating $@ |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
63 (echo EXPORTS; \ |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
64 (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
|
65 - $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/ /' | \ |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
66 - sort; \ |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
67 - echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \ |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
68 - 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
|
69 + $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' | \ |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
70 + sort) >$@ |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
71 @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false) |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
72 |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
73 -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
|
74 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
|
75 --- fontconfig-2.10.93-orig/src/fccache.c 2013-04-03 23:09:46 -0400 |
3298
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
76 +++ fontconfig-2.10.93/src/fccache.c 2013-11-08 13:53:48 -0500 |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
77 @@ -834,6 +834,12 @@ |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
78 #ifdef _WIN32 |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
79 #include <direct.h> |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
80 #define mkdir(path,mode) _mkdir(path) |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
81 +#ifndef F_OK |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
82 +#define F_OK 0 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
83 +#define W_OK 2 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
84 +#define R_OK 4 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
85 +#define X_OK 0 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
86 +#endif |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
87 #endif |
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 static FcBool |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
90 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
|
91 --- fontconfig-2.10.93-orig/src/fccompat.c 2013-04-03 23:09:46 -0400 |
3298
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
92 +++ fontconfig-2.10.93/src/fccompat.c 2013-11-08 13:53:48 -0500 |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
93 @@ -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
|
94 #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
|
95 #endif |
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
96 |
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
97 +#ifdef _MSC_VER |
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
98 +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
|
99 +#endif |
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
100 + |
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
101 #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
|
102 static int |
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
103 mkstemp (char *template) |
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
104 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
|
105 --- fontconfig-2.10.93-orig/src/fcdir.c 2013-01-03 20:47:59 -0500 |
3298
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
106 +++ fontconfig-2.10.93/src/fcdir.c 2013-11-08 13:53:48 -0500 |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
107 @@ -25,6 +25,10 @@ |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
108 #include "fcint.h" |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
109 #include <dirent.h> |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
110 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
111 +#ifndef S_ISDIR |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
112 +#define S_ISDIR(x) ((x)&S_IFDIR) |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
113 +#endif |
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 FcBool |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
116 FcFileIsDir (const FcChar8 *file) |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
117 { |
3173
33ba1ba99057
Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3091
diff
changeset
|
118 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
|
119 --- fontconfig-2.10.93-orig/src/fcformat.c 2013-01-03 20:47:59 -0500 |
3298
ba6bf08118a8
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
3173
diff
changeset
|
120 +++ fontconfig-2.10.93/src/fcformat.c 2013-11-08 13:53:48 -0500 |
3091
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
121 @@ -27,6 +27,10 @@ |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
122 #include <string.h> |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
123 #include <stdarg.h> |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
124 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
125 +#ifdef _MSC_VER |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
126 +#define snprintf _snprintf |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
127 +#endif |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
128 + |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
129 |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
130 /* The language is documented in doc/fcformat.fncs |
5ba57870c491
[MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff
changeset
|
131 * These are the features implemented: |