Mercurial > mxe-octave
changeset 3329:7bbaffce14a8
Don't create temporary fontconfig install dir which is never removed.
* src/mingw-fontconfig-1.patch: Don't create fc_cachedir, it only needs to
exist on cross-compiled host.
* src/msvc-fontconfig-1.patch: Rely on mingw-fontconfig-1.patch to stop
creation of fc_cachedir.
author | Rik <rik@octave.org> |
---|---|
date | Sun, 17 Nov 2013 14:32:02 -0800 |
parents | ef8e004ebb93 |
children | 5439a2879141 |
files | src/mingw-fontconfig-1.patch src/msvc-fontconfig-1.patch |
diffstat | 2 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mingw-fontconfig-1.patch Sun Nov 17 14:32:02 2013 -0800 @@ -0,0 +1,12 @@ +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; \
--- a/src/msvc-fontconfig-1.patch Sun Nov 17 14:24:25 2013 -0800 +++ b/src/msvc-fontconfig-1.patch Sun Nov 17 14:32:02 2013 -0800 @@ -1,15 +1,3 @@ -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