Mercurial > mxe-octave

annotate src/msvc-fontconfig-1.patch @ 3298:ba6bf08118a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
author Michael Goffioul <michael.goffioul@gmail.com>
date Sat, 09 Nov 2013 23:28:04 -0500
parents 33ba1ba99057
children 7bbaffce14a8
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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/Makefile.in fontconfig-2.10.93/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/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/Makefile.in 2013-11-08 13:54:43 -0500
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
4 @@ -977,7 +977,7 @@
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
5 mv $@.tmp $@
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
6
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
7 install-data-local: fonts.conf
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
8 - $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
9 + $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) #$(DESTDIR)$(fc_cachedir)
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
10 if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
11 echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
12 mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
13 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
14 --- 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
15 +++ 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
16 @@ -604,9 +604,9 @@
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
17 @(echo cd $(DESTDIR)$(configdir); \
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
18 cd $(DESTDIR)$(configdir); \
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
19 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
20 - 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
21 + 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
22 $(RM) $$i; \
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
23 - ln -s $(templatedir)/$$i .; \
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
24 + 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
25 done)
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
26 uninstall-local:
ba6bf08118a8 * src/msvc-fontconfig-1.patch: fix installation in DESTDIR.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3173
diff changeset
27 @(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
28 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
29 --- 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
30 +++ 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
31 @@ -81,6 +81,17 @@
3091
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 #endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 +#ifndef F_OK
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 +#define F_OK 0
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37 +#define W_OK 2
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 +#define R_OK 4
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39 +#define X_OK 0
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 +#ifndef S_ISDIR
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 +#define S_ISDIR(x) ((x)&S_IFDIR)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 +#endif
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 static void
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
47 usage (char *program, int error)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
48 {
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
49 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
50 --- 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
51 +++ 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
52 @@ -353,7 +353,7 @@
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
53 @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
54
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
55 # Microsoft import library install/uninstall
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
56 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
57 +@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
58 AM_CPPFLAGS = \
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
59 -I$(top_srcdir) \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
60 -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
61 @@ -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
62 $(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
63 mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
64
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
65 -@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
66 +@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
67
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
68 -@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
69 +@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
70
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
71 fcaliastail.h: fcalias.h
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 @@ -870,10 +870,8 @@
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
74 echo Generating $@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
75 (echo EXPORTS; \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
76 (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
77 - $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' -e 's/^/ /' | \
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
78 - sort; \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
79 - echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
80 - 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
81 + $(GREP) '^Fc[^ ]* *(' | $(SED) -e 's/ *(.*$$//' | \
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
82 + sort) >$@
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
83 @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
84
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
85 -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
86 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
87 --- 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
88 +++ 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
89 @@ -834,6 +834,12 @@
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
90 #ifdef _WIN32
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
91 #include <direct.h>
3091
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
92 #define mkdir(path,mode) _mkdir(path)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
93 +#ifndef F_OK
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
94 +#define F_OK 0
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
95 +#define W_OK 2
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
96 +#define R_OK 4
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
97 +#define X_OK 0
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 #endif
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 static FcBool
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
102 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
103 --- 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
104 +++ 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
105 @@ -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
106 #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
107 #endif
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
108
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
109 +#ifdef _MSC_VER
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
110 +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
111 +#endif
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
112 +
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
113 #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
114 static int
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
115 mkstemp (char *template)
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
116 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
117 --- 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
118 +++ 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
119 @@ -25,6 +25,10 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
120 #include "fcint.h"
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
121 #include <dirent.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
122
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
123 +#ifndef S_ISDIR
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
124 +#define S_ISDIR(x) ((x)&S_IFDIR)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
125 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
126 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
127 FcBool
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
128 FcFileIsDir (const FcChar8 *file)
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
129 {
3173
33ba1ba99057 Update fontconfig to 2.10.93 (required by current Pango)
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3091
diff changeset
130 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
131 --- 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
132 +++ 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
133 @@ -27,6 +27,10 @@
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
134 #include <string.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
135 #include <stdarg.h>
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
136
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
137 +#ifdef _MSC_VER
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
138 +#define snprintf _snprintf
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
139 +#endif
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
140 +
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
141
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
142 /* The language is documented in doc/fcformat.fncs
5ba57870c491 [MSVC] enable fontconfig compilation
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
143 * These are the features implemented: