Mercurial > mxe-octave

comparison 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
comparison
equal deleted inserted replaced
3297:42a34b8928a6 3298:ba6bf08118a8
1 diff -ur fontconfig-2.10.93-orig/Makefile.in fontconfig-2.10.93/Makefile.in
2 --- fontconfig-2.10.93-orig/Makefile.in 2013-05-20 04:44:34 -0400
3 +++ fontconfig-2.10.93/Makefile.in 2013-11-08 13:54:43 -0500
4 @@ -977,7 +977,7 @@
5 mv $@.tmp $@
6
7 install-data-local: fonts.conf
8 - $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
9 + $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) #$(DESTDIR)$(fc_cachedir)
10 if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
11 echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
12 mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
13 diff -ur fontconfig-2.10.93-orig/conf.d/Makefile.in fontconfig-2.10.93/conf.d/Makefile.in
14 --- fontconfig-2.10.93-orig/conf.d/Makefile.in 2013-05-20 04:44:34 -0400
15 +++ fontconfig-2.10.93/conf.d/Makefile.in 2013-11-08 13:54:25 -0500
16 @@ -604,9 +604,9 @@
17 @(echo cd $(DESTDIR)$(configdir); \
18 cd $(DESTDIR)$(configdir); \
19 for i in $(CONF_LINKS); do \
20 - echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
21 + echo $(RM) $$i";" ln -s $(DESTDIR)$(templatedir)/$$i .; \
22 $(RM) $$i; \
23 - ln -s $(templatedir)/$$i .; \
24 + ln -s $(DESTDIR)$(templatedir)/$$i .; \
25 done)
26 uninstall-local:
27 @(echo cd $(DESTDIR)$(configdir); \
1 diff -ur fontconfig-2.10.93-orig/fc-cache/fc-cache.c fontconfig-2.10.93/fc-cache/fc-cache.c 28 diff -ur fontconfig-2.10.93-orig/fc-cache/fc-cache.c fontconfig-2.10.93/fc-cache/fc-cache.c
2 --- fontconfig-2.10.93-orig/fc-cache/fc-cache.c 2013-04-03 23:09:46 -0400 29 --- fontconfig-2.10.93-orig/fc-cache/fc-cache.c 2013-04-03 23:09:46 -0400
3 +++ fontconfig-2.10.93/fc-cache/fc-cache.c 2013-07-22 23:39:46 -0400 30 +++ fontconfig-2.10.93/fc-cache/fc-cache.c 2013-11-08 13:53:48 -0500
4 @@ -81,6 +81,17 @@ 31 @@ -81,6 +81,17 @@
5 #endif 32 #endif
6 #endif 33 #endif
7 34
8 +#ifndef F_OK 35 +#ifndef F_OK
19 static void 46 static void
20 usage (char *program, int error) 47 usage (char *program, int error)
21 { 48 {
22 diff -ur fontconfig-2.10.93-orig/src/Makefile.in fontconfig-2.10.93/src/Makefile.in 49 diff -ur fontconfig-2.10.93-orig/src/Makefile.in fontconfig-2.10.93/src/Makefile.in
23 --- fontconfig-2.10.93-orig/src/Makefile.in 2013-05-20 04:44:35 -0400 50 --- fontconfig-2.10.93-orig/src/Makefile.in 2013-05-20 04:44:35 -0400
24 +++ fontconfig-2.10.93/src/Makefile.in 2013-07-22 23:39:46 -0400 51 +++ fontconfig-2.10.93/src/Makefile.in 2013-11-08 13:53:48 -0500
25 @@ -353,7 +353,7 @@ 52 @@ -353,7 +353,7 @@
26 @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def 53 @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def
27 54
28 # Microsoft import library install/uninstall 55 # Microsoft import library install/uninstall
29 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib 56 -@MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib
56 @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false) 83 @ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)
57 84
58 -include $(top_srcdir)/git.mk 85 -include $(top_srcdir)/git.mk
59 diff -ur fontconfig-2.10.93-orig/src/fccache.c fontconfig-2.10.93/src/fccache.c 86 diff -ur fontconfig-2.10.93-orig/src/fccache.c fontconfig-2.10.93/src/fccache.c
60 --- fontconfig-2.10.93-orig/src/fccache.c 2013-04-03 23:09:46 -0400 87 --- fontconfig-2.10.93-orig/src/fccache.c 2013-04-03 23:09:46 -0400
61 +++ fontconfig-2.10.93/src/fccache.c 2013-07-22 23:39:46 -0400 88 +++ fontconfig-2.10.93/src/fccache.c 2013-11-08 13:53:48 -0500
62 @@ -834,6 +834,12 @@ 89 @@ -834,6 +834,12 @@
63 #ifdef _WIN32 90 #ifdef _WIN32
64 #include <direct.h> 91 #include <direct.h>
65 #define mkdir(path,mode) _mkdir(path) 92 #define mkdir(path,mode) _mkdir(path)
66 +#ifndef F_OK 93 +#ifndef F_OK
72 #endif 99 #endif
73 100
74 static FcBool 101 static FcBool
75 diff -ur fontconfig-2.10.93-orig/src/fccompat.c fontconfig-2.10.93/src/fccompat.c 102 diff -ur fontconfig-2.10.93-orig/src/fccompat.c fontconfig-2.10.93/src/fccompat.c
76 --- fontconfig-2.10.93-orig/src/fccompat.c 2013-04-03 23:09:46 -0400 103 --- fontconfig-2.10.93-orig/src/fccompat.c 2013-04-03 23:09:46 -0400
77 +++ fontconfig-2.10.93/src/fccompat.c 2013-07-22 23:36:55 -0400 104 +++ fontconfig-2.10.93/src/fccompat.c 2013-11-08 13:53:48 -0500
78 @@ -72,6 +72,10 @@ 105 @@ -72,6 +72,10 @@
79 #define FC_O_NOINHERIT 0 106 #define FC_O_NOINHERIT 0
80 #endif 107 #endif
81 108
82 +#ifdef _MSC_VER 109 +#ifdef _MSC_VER
86 #if !defined (HAVE_MKOSTEMP) && !defined(HAVE_MKSTEMP) && !defined(HAVE__MKTEMP_S) 113 #if !defined (HAVE_MKOSTEMP) && !defined(HAVE_MKSTEMP) && !defined(HAVE__MKTEMP_S)
87 static int 114 static int
88 mkstemp (char *template) 115 mkstemp (char *template)
89 diff -ur fontconfig-2.10.93-orig/src/fcdir.c fontconfig-2.10.93/src/fcdir.c 116 diff -ur fontconfig-2.10.93-orig/src/fcdir.c fontconfig-2.10.93/src/fcdir.c
90 --- fontconfig-2.10.93-orig/src/fcdir.c 2013-01-03 20:47:59 -0500 117 --- fontconfig-2.10.93-orig/src/fcdir.c 2013-01-03 20:47:59 -0500
91 +++ fontconfig-2.10.93/src/fcdir.c 2013-07-22 23:39:46 -0400 118 +++ fontconfig-2.10.93/src/fcdir.c 2013-11-08 13:53:48 -0500
92 @@ -25,6 +25,10 @@ 119 @@ -25,6 +25,10 @@
93 #include "fcint.h" 120 #include "fcint.h"
94 #include <dirent.h> 121 #include <dirent.h>
95 122
96 +#ifndef S_ISDIR 123 +#ifndef S_ISDIR
100 FcBool 127 FcBool
101 FcFileIsDir (const FcChar8 *file) 128 FcFileIsDir (const FcChar8 *file)
102 { 129 {
103 diff -ur fontconfig-2.10.93-orig/src/fcformat.c fontconfig-2.10.93/src/fcformat.c 130 diff -ur fontconfig-2.10.93-orig/src/fcformat.c fontconfig-2.10.93/src/fcformat.c
104 --- fontconfig-2.10.93-orig/src/fcformat.c 2013-01-03 20:47:59 -0500 131 --- fontconfig-2.10.93-orig/src/fcformat.c 2013-01-03 20:47:59 -0500
105 +++ fontconfig-2.10.93/src/fcformat.c 2013-07-22 23:39:46 -0400 132 +++ fontconfig-2.10.93/src/fcformat.c 2013-11-08 13:53:48 -0500
106 @@ -27,6 +27,10 @@ 133 @@ -27,6 +27,10 @@
107 #include <string.h> 134 #include <string.h>
108 #include <stdarg.h> 135 #include <stdarg.h>
109 136
110 +#ifdef _MSC_VER 137 +#ifdef _MSC_VER