Mercurial > mxe-octave
changeset 3298:ba6bf08118a8
* 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 | 42a34b8928a6 |
| children | 45018a221c4a |
| files | src/msvc-fontconfig-1.patch |
| diffstat | 1 files changed, 33 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/msvc-fontconfig-1.patch Sat Nov 09 23:28:04 2013 -0500 +++ b/src/msvc-fontconfig-1.patch Sat Nov 09 23:28:04 2013 -0500 @@ -1,6 +1,33 @@ +diff -ur fontconfig-2.10.93-orig/Makefile.in fontconfig-2.10.93/Makefile.in +--- fontconfig-2.10.93-orig/Makefile.in 2013-05-20 04:44:34 -0400 ++++ fontconfig-2.10.93/Makefile.in 2013-11-08 13:54:43 -0500 +@@ -977,7 +977,7 @@ + mv $@.tmp $@ + + install-data-local: fonts.conf +- $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir) ++ $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) #$(DESTDIR)$(fc_cachedir) + if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \ + echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \ + mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \ +diff -ur fontconfig-2.10.93-orig/conf.d/Makefile.in fontconfig-2.10.93/conf.d/Makefile.in +--- fontconfig-2.10.93-orig/conf.d/Makefile.in 2013-05-20 04:44:34 -0400 ++++ fontconfig-2.10.93/conf.d/Makefile.in 2013-11-08 13:54:25 -0500 +@@ -604,9 +604,9 @@ + @(echo cd $(DESTDIR)$(configdir); \ + cd $(DESTDIR)$(configdir); \ + for i in $(CONF_LINKS); do \ +- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ ++ echo $(RM) $$i";" ln -s $(DESTDIR)$(templatedir)/$$i .; \ + $(RM) $$i; \ +- ln -s $(templatedir)/$$i .; \ ++ ln -s $(DESTDIR)$(templatedir)/$$i .; \ + done) + uninstall-local: + @(echo cd $(DESTDIR)$(configdir); \ diff -ur fontconfig-2.10.93-orig/fc-cache/fc-cache.c fontconfig-2.10.93/fc-cache/fc-cache.c --- fontconfig-2.10.93-orig/fc-cache/fc-cache.c 2013-04-03 23:09:46 -0400 -+++ fontconfig-2.10.93/fc-cache/fc-cache.c 2013-07-22 23:39:46 -0400 ++++ fontconfig-2.10.93/fc-cache/fc-cache.c 2013-11-08 13:53:48 -0500 @@ -81,6 +81,17 @@ #endif #endif @@ -21,7 +48,7 @@ { diff -ur fontconfig-2.10.93-orig/src/Makefile.in fontconfig-2.10.93/src/Makefile.in --- fontconfig-2.10.93-orig/src/Makefile.in 2013-05-20 04:44:35 -0400 -+++ fontconfig-2.10.93/src/Makefile.in 2013-07-22 23:39:46 -0400 ++++ fontconfig-2.10.93/src/Makefile.in 2013-11-08 13:53:48 -0500 @@ -353,7 +353,7 @@ @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def @@ -58,7 +85,7 @@ -include $(top_srcdir)/git.mk diff -ur fontconfig-2.10.93-orig/src/fccache.c fontconfig-2.10.93/src/fccache.c --- fontconfig-2.10.93-orig/src/fccache.c 2013-04-03 23:09:46 -0400 -+++ fontconfig-2.10.93/src/fccache.c 2013-07-22 23:39:46 -0400 ++++ fontconfig-2.10.93/src/fccache.c 2013-11-08 13:53:48 -0500 @@ -834,6 +834,12 @@ #ifdef _WIN32 #include <direct.h> @@ -74,7 +101,7 @@ static FcBool diff -ur fontconfig-2.10.93-orig/src/fccompat.c fontconfig-2.10.93/src/fccompat.c --- fontconfig-2.10.93-orig/src/fccompat.c 2013-04-03 23:09:46 -0400 -+++ fontconfig-2.10.93/src/fccompat.c 2013-07-22 23:36:55 -0400 ++++ fontconfig-2.10.93/src/fccompat.c 2013-11-08 13:53:48 -0500 @@ -72,6 +72,10 @@ #define FC_O_NOINHERIT 0 #endif @@ -88,7 +115,7 @@ mkstemp (char *template) diff -ur fontconfig-2.10.93-orig/src/fcdir.c fontconfig-2.10.93/src/fcdir.c --- fontconfig-2.10.93-orig/src/fcdir.c 2013-01-03 20:47:59 -0500 -+++ fontconfig-2.10.93/src/fcdir.c 2013-07-22 23:39:46 -0400 ++++ fontconfig-2.10.93/src/fcdir.c 2013-11-08 13:53:48 -0500 @@ -25,6 +25,10 @@ #include "fcint.h" #include <dirent.h> @@ -102,7 +129,7 @@ { diff -ur fontconfig-2.10.93-orig/src/fcformat.c fontconfig-2.10.93/src/fcformat.c --- fontconfig-2.10.93-orig/src/fcformat.c 2013-01-03 20:47:59 -0500 -+++ fontconfig-2.10.93/src/fcformat.c 2013-07-22 23:39:46 -0400 ++++ fontconfig-2.10.93/src/fcformat.c 2013-11-08 13:53:48 -0500 @@ -27,6 +27,10 @@ #include <string.h> #include <stdarg.h>