Mercurial > mxe-octave

annotate src/fontconfig-1.patch @ 3725:2acaa9943159

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qscintilla: update 2.8.4 * src/qscintilla.mk: update to version and checksum for 2.8.4
author John Donoghue
date Mon, 20 Oct 2014 11:01:00 -0400
parents 5a35cc5310da
children 472c440a678b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3485
0a00857f8b9c Update fontconfig to 2.11.0
John Donoghue <john.donoghue@ieee.org>
parents: 3330
diff changeset
1 diff -u fontconfig-2.11.0.orig/Makefile.in fontconfig-2.11.0/Makefile.in
0a00857f8b9c Update fontconfig to 2.11.0
John Donoghue <john.donoghue@ieee.org>
parents: 3330
diff changeset
2 --- fontconfig-2.11.0.orig/Makefile.in 2014-02-01 14:30:40.000000000 -0500
0a00857f8b9c Update fontconfig to 2.11.0
John Donoghue <john.donoghue@ieee.org>
parents: 3330
diff changeset
3 +++ fontconfig-2.11.0/Makefile.in 2014-02-01 14:30:58.000000000 -0500
0a00857f8b9c Update fontconfig to 2.11.0
John Donoghue <john.donoghue@ieee.org>
parents: 3330
diff changeset
4 @@ -997,7 +997,7 @@
3329
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
5 mv $@.tmp $@
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
6
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
7 install-data-local: fonts.conf
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
8 - $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
9 + $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) #$(DESTDIR)$(fc_cachedir)
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
10 if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
11 echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
7bbaffce14a8 Don't create temporary fontconfig install dir which is never removed.
Rik <rik@octave.org>
parents:
diff changeset
12 mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
3505
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
13 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
14 --- fontconfig-2.11.0.orig/conf.d/Makefile.am 2014-02-06 16:51:06 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
15 +++ fontconfig-2.11.0/conf.d/Makefile.am 2014-02-06 16:53:20 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
16 @@ -88,9 +88,9 @@
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
17 @(echo cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
18 cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
19 for i in $(CONF_LINKS); do \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
20 - echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
21 + echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
22 $(RM) $$i; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
23 - ln -s $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
24 + $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
25 done)
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
26 uninstall-local:
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
27 @(echo cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
28 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
29 --- fontconfig-2.11.0.orig/conf.d/Makefile.in 2014-02-06 16:51:06 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
30 +++ fontconfig-2.11.0/conf.d/Makefile.in 2014-02-06 16:53:51 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
31 @@ -632,9 +632,9 @@
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
32 @(echo cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
33 cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
34 for i in $(CONF_LINKS); do \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
35 - echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
36 + echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
37 $(RM) $$i; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
38 - ln -s $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
39 + $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
40 done)
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
41 uninstall-local:
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
42 @(echo cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
43
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
44 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.am fontconfig-2.11.0/conf.d/Makefile.am
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
45 --- fontconfig-2.11.0.orig/conf.d/Makefile.am 2014-02-06 19:41:13 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
46 +++ fontconfig-2.11.0/conf.d/Makefile.am 2014-02-06 19:54:52 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
47 @@ -88,9 +88,9 @@
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
48 @(echo cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
49 cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
50 for i in $(CONF_LINKS); do \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
51 - echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
52 + echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
53 $(RM) $$i; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
54 - $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
55 + $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
56 done)
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
57 uninstall-local:
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
58 @(echo cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
59 diff -ur fontconfig-2.11.0.orig/conf.d/Makefile.in fontconfig-2.11.0/conf.d/Makefile.in
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
60 --- fontconfig-2.11.0.orig/conf.d/Makefile.in 2014-02-06 19:41:13 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
61 +++ fontconfig-2.11.0/conf.d/Makefile.in 2014-02-06 19:54:00 -0500
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
62 @@ -632,9 +632,9 @@
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
63 @(echo cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
64 cd $(DESTDIR)$(configdir); \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
65 for i in $(CONF_LINKS); do \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
66 - echo $(RM) $$i";" $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
67 + echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
68 $(RM) $$i; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
69 - $(LN_S) $(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
70 + $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
71 done)
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
72 uninstall-local:
5a35cc5310da fontconfig: use LN_S for ln -s commands
John Donoghue <john.donoghue@ieee.org>
parents: 3485
diff changeset
73 @(echo cd $(DESTDIR)$(configdir); \