avatar
Rosa has added dadebda640
Automatic import for version 2.12.6-1
... ... --- /dev/null
... ... +++ b/.abf.yml
... ... @@ -0,0 +1,2 @@
1
sources:
2
  "fontconfig-2.12.6.tar.bz2": cae963814ba4bc41f3c96876604d33fc3abfc572
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/0001-fix-test-with-freetype2-2.7.1.patch
... ... @@ -0,0 +1,42 @@
1
From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001
2
From: Christian Hesse <mail@eworm.de>
3
Date: Tue, 10 Jan 2017 10:01:54 +0100
4
Subject: [PATCH 1/1] fix test with freetype2 2.7.1
5
6
Upstream freetype2 applied a patch from openSuSE [0]:
7
8
[pcf] Enrich family name with foundry name and glyph width info.
9
3576487add2f0e9691e8c43f8b0cd8e61aebf14f
10
11
This prepends the foundry name plus a space to the family name. We needs
12
change the font name in expexted test output.
13
14
[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f
15
16
Signed-off-by: Christian Hesse <mail@eworm.de>
17
---
18
 test/out.expected | 12 ++++++------
19
 1 file changed, 6 insertions(+), 6 deletions(-)
20
21
diff --git a/test/out.expected b/test/out.expected
22
index 39634c5..f3a8856 100644
23
--- a/test/out.expected
24
+++ b/test/out.expected
25
@@ -1,8 +1,8 @@
26
-Fixed:pixelsize=16
27
-Fixed:pixelsize=6
28
+Misc Fixed:pixelsize=6
29
+Sony Fixed:pixelsize=16
30
 =
31
-Fixed:pixelsize=16
32
-Fixed:pixelsize=6
33
+Misc Fixed:pixelsize=6
34
+Sony Fixed:pixelsize=16
35
 =
36
-Fixed:pixelsize=16
37
-Fixed:pixelsize=6
38
+Misc Fixed:pixelsize=6
39
+Sony Fixed:pixelsize=16
40
-- 
41
2.11.0
42
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/20-mdv-disable-antialias.conf
... ... @@ -0,0 +1,58 @@
1
<?xml version="1.0"?>
2
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3
<fontconfig>
4
5
	<!--
6
		Fonts for which antialiasing has to be disabled at small sizes
7
	-->
8
	<!-- disabled until QT4 bug is fixed, see Mdv bug #30877
9
	<match target="font">
10
		<test name="family">
11
			<string>Raghindi</string>
12
		</test>
13
		<test name="size" compare="less">
14
			<double>11</double>
15
		</test>
16
		<edit name="antialias">
17
			<bool>false</bool>
18
		</edit>
19
	</match>
20
21
	<match target="font">
22
		<test name="family" qual="any">
23
			<string>AR PL ShanHeiSun Uni</string>
24
			<string>AR PL New Sung</string>
25
			<string>SimSun</string>
26
			<string>NSimSun</string>
27
			<string>MingLiu</string>
28
			<string>PMingLiu</string>
29
		</test>
30
		<test name="pixelsize" compare="less_eq">
31
			<double>12</double>
32
		</test>
33
		<edit name="pixelsize" mode="assign">
34
			<double>12</double>
35
		</edit>
36
	</match>
37
	-->
38
39
	<!-- disabled until QT4 bug is fixed, see Mdv bug #30877
40
	<match target="font">
41
		<test name="family" qual="any">
42
			<string>AR PL ShanHeiSun Uni</string>
43
			<string>AR PL New Sung</string>
44
			<string>SimSun</string>
45
			<string>NSimSun</string>
46
			<string>MingLiu</string>
47
			<string>PMingLiu</string>
48
		</test>
49
		<test name="pixelsize" compare="less_eq">
50
			<double>16</double>
51
		</test>
52
		<edit name="antialias">
53
			<bool>false</bool>
54
		</edit>
55
	</match>
56
	-->
57
58
</fontconfig>
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/25-no-bitmap-fedora.conf
... ... @@ -0,0 +1,44 @@
1
<?xml version="1.0"?>
2
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3
<fontconfig>
4
	<match target="font">
5
		<test name="family" compare="eq">
6
			<string>Kochi Mincho</string>
7
		</test>
8
		<edit name="embeddedbitmap" mode="assign">
9
			<bool>false</bool>
10
		</edit>
11
	</match>
12
	<match target="font">
13
		<test name="family" compare="eq">
14
			<string>Kochi Gothic</string>
15
		</test>
16
		<edit name="embeddedbitmap" mode="assign">
17
			<bool>false</bool>
18
		</edit>
19
	</match>
20
	<match target="font">
21
		<test name="family" compare="eq">
22
			<string>Sazanami Mincho</string>
23
		</test>
24
		<edit name="embeddedbitmap" mode="assign">
25
			<bool>false</bool>
26
		</edit>
27
	</match>
28
	<match target="font">
29
		<test name="family" compare="eq">
30
			<string>Sazanami Gothic</string>
31
		</test>
32
		<edit name="embeddedbitmap" mode="assign">
33
			<bool>false</bool>
34
		</edit>
35
	</match>
36
        <match target="font">
37
                <test name="family" compare="eq">
38
                        <string>AR PL ShanHeiSun Uni</string>
39
                </test>
40
                <edit name="embeddedbitmap" mode="assign">
41
                        <bool>true</bool>
42
                </edit>
43
        </match>
44
</fontconfig>
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/26-mdv-no-embeddedbitmap.conf
... ... @@ -0,0 +1,31 @@
1
<?xml version="1.0"?>
2
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3
4
<!--  Disable embedded bitmaps unless for very small pixel sizes -->
5
6
<fontconfig>
7
        <match target="font">
8
                <test name="pixelsize" compare="more">
9
                        <double>16</double>
10
                </test>
11
                <edit name="embeddedbitmap" mode="assign">
12
                        <bool>false</bool>
13
                </edit>
14
        </match>
15
        <match target="font">
16
    	    <test name="family" compare="contains">
17
		<string>Calibri</string>
18
	</test>
19
	<edit name="embeddedbitmap" mode="assign">
20
		<bool>false</bool>
21
	</edit>
22
    </match>
23
    <match target="font">
24
	    <test name="family" compare="contains">
25
		<string>Cambria</string>
26
	    </test>
27
	<edit name="embeddedbitmap" mode="assign">
28
			<bool>false</bool>
29
		</edit>
30
	</match>
31
</fontconfig>
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/30-mdv-avoid-bitmap.conf
... ... @@ -0,0 +1,158 @@
1
<?xml version="1.0"?>
2
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3
<!-- /etc/fonts/local.conf file for local customizations -->
4
<fontconfig>
5
<!--
6
  Avoid KDE/QT uses some bitmapped fonts (Helvetica, Times, Courier, etc.)
7
-->
8
	<!-- Courier -->
9
	<match target="pattern">
10
		<test name="family">
11
			<string>Courier</string>
12
		</test>
13
		<test name="foundry">
14
			<string>Adobe</string>
15
		</test>
16
		<edit name="family" mode="prepend" binding="same">
17
			<string>Liberation Mono</string>
18
		</edit>
19
		<edit name="foundry" mode="prepend" binding="same">
20
			<string>unknown</string>
21
		</edit>
22
	</match>
23
24
	<!-- Helvetica -->
25
	<match target="pattern">
26
		<test name="family">
27
			<string>Helvetica</string>
28
		</test>
29
		<test name="foundry">
30
			<string>Adobe</string>
31
		</test>
32
		<edit name="family" mode="prepend" binding="same">
33
			<string>Liberation Sans</string>
34
		</edit>
35
		<edit name="foundry" mode="prepend" binding="same">
36
			<string>unknown</string>
37
		</edit>
38
	</match>
39
40
	<!-- New Century Schoolbook -->
41
	<match target="pattern">
42
		<test name="family">
43
			<string>New Century Schoolbook</string>
44
		</test>
45
		<test name="foundry">
46
			<string>Adobe</string>
47
		</test>
48
		<edit name="family" mode="prepend" binding="same">
49
			<string>Century Schoolbook L</string>
50
		</edit>
51
		<edit name="foundry" mode="prepend" binding="same">
52
			<string>URW</string>
53
		</edit>
54
	</match>
55
56
	<!-- Symbol --> 
57
	<match target="pattern">
58
		<test name="family">
59
			<string>Symbol</string>
60
		</test>
61
		<test name="foundry">
62
			<string>Adobe</string>
63
		</test>
64
		<edit name="family" mode="prepend" binding="same">
65
			<string>Symbols L</string>
66
		</edit>
67
		<edit name="foundry" mode="prepend" binding="same">
68
			<string>URW</string>
69
		</edit>
70
	</match>
71
72
	<!-- Times --> 
73
	<match target="pattern">
74
		<test name="family">
75
			<string>Times</string>
76
		</test>
77
		<test name="foundry">
78
			<string>Adobe</string>
79
		</test>
80
		<edit name="family" mode="prepend" binding="same">
81
			<string>Liberation Serif</string>
82
		</edit>
83
		<edit name="foundry" mode="prepend" binding="same">
84
			<string>unknown</string>
85
		</edit>
86
	</match>
87
88
	<!-- Charter --> 
89
	<match target="pattern">
90
		<test name="family">
91
			<string>Charter</string>
92
		</test>
93
		<test name="foundry">
94
			<string>Bitstream</string>
95
		</test>
96
		<edit name="family" mode="prepend" binding="same">
97
			<string>Bitstream Charter</string>
98
		</edit>
99
		<edit name="foundry" mode="prepend" binding="same">
100
			<string>Bitstream</string>
101
		</edit>
102
	</match>
103
104
	<!-- Lucida -->
105
	<match target="pattern">
106
		<test name="family">
107
			<string>Lucida</string>
108
		</test>
109
		<edit name="family" mode="prepend" binding="same">
110
			<string>Luxi Sans</string>
111
		</edit>
112
		<edit name="foundry" mode="prepend" binding="same">
113
			<string>B&amp;H</string>
114
		</edit>
115
	</match>
116
117
	<!-- LucidaBright -->
118
	<match target="pattern">
119
		<test name="family">
120
			<string>LucidaBright</string>
121
		</test>
122
		<edit name="family" mode="prepend" binding="same">
123
			<string>Luxi Serif</string>
124
		</edit>
125
		<edit name="foundry" mode="prepend" binding="same">
126
			<string>B&amp;H</string>
127
		</edit>
128
	</match>
129
130
	<!-- LucidaTypewriter -->
131
	<match target="pattern">
132
		<test name="family">
133
			<string>LucidaTypewriter</string>
134
		</test>
135
		<test name="pixelsize" compare="more_eq">
136
			<double>8.0</double>
137
		</test>
138
		<edit name="family" mode="prepend" binding="same">
139
			<string>Luxi Mono</string>
140
		</edit>
141
		<edit name="foundry" mode="prepend" binding="same">
142
			<string>B&amp;H</string>
143
		</edit>
144
	</match>
145
        <!-- Fixed -->
146
        <match target="pattern">
147
                <test name="family">
148
                        <string>Fixed</string>
149
                </test>
150
                <edit name="family" mode="prepend" binding="same">
151
                        <string>Liberation Mono</string>
152
                </edit>
153
                <edit name="foundry" mode="prepend" binding="same">
154
                        <string>unknown</string>
155
                </edit>
156
        </match>
157
158
</fontconfig>
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/30-mdv-urwfonts.conf
... ... @@ -0,0 +1,107 @@
1
<?xml version="1.0"?>
2
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3
<fontconfig>
4
5
	<!--
6
		Replacement using URW and Liberation fonts
7
	-->
8
	<match target="pattern">
9
		<test name="family">
10
			<string>Helvetica</string>
11
		</test>
12
		<edit name="family" mode="prepend" binding="same">
13
			<string>Liberation Sans</string>
14
		</edit>
15
	</match>
16
17
	<match target="pattern">
18
		<test name="family">
19
			<string>Palatino</string>
20
		</test>
21
		<edit name="family" mode="prepend" binding="same">
22
			<string>URW Palladio L</string>
23
		</edit>
24
	</match>
25
26
	<match target="pattern">
27
		<test name="family">
28
			<string>ITC Bookman</string>
29
		</test>
30
		<edit name="family" mode="prepend" binding="same">
31
			<string>URW Bookman L</string>
32
		</edit>
33
	</match>
34
35
	<match target="pattern">
36
		<test name="family">
37
			<string>Courier</string>
38
		</test>
39
		<edit name="family" mode="prepend" binding="same">
40
			<string>Liberation Mono</string>
41
		</edit>
42
	</match>
43
44
	<match target="pattern">
45
		<test name="family">
46
			<string>ITC Avant Garde Gothic</string>
47
		</test>
48
		<edit name="family" mode="prepend" binding="same">
49
			<string>URW Gothic L</string>
50
		</edit>
51
	</match>
52
53
	<match target="pattern">
54
		<test name="family">
55
			<string>New Century Schoolbook</string>
56
		</test>
57
		<edit name="family" mode="prepend" binding="same">
58
			<string>Century Schoolbook L</string>
59
		</edit>
60
	</match>
61
62
	<match target="pattern">
63
		<test name="family">
64
			<string>Times</string>
65
		</test>
66
		<edit name="family" mode="prepend" binding="same">
67
			<string>Liberation Serif</string>
68
		</edit>
69
	</match>
70
71
	<match target="pattern">
72
		<test name="family">
73
			<string>Symbol</string>
74
		</test>
75
		<edit name="family" mode="prepend" binding="same">
76
			<string>Standard Symbols L</string>
77
		</edit>
78
	</match>
79
80
	<match target="pattern">
81
		<test name="family">
82
			<string>ITC Zapf Chancery</string>
83
		</test>
84
		<edit name="family" mode="prepend" binding="same">
85
			<string>URW Chancery L</string>
86
		</edit>
87
	</match>
88
89
	<match target="pattern">
90
		<test name="family">
91
			<string>ITC Zapf Dingbats</string>
92
		</test>
93
		<edit name="family" mode="prepend" binding="same">
94
			<string>Dingbats</string>
95
		</edit>
96
	</match>
97
98
        <match target="pattern">
99
                <test name="family">
100
                        <string>fixed</string>
101
                </test>
102
                <edit name="family" mode="prepend" binding="same">
103
                        <string>Liberation Mono</string>
104
                </edit>
105
        </match>
106
107
</fontconfig>
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/65-lang-pl.conf
... ... @@ -0,0 +1,27 @@
1
<?xml version="1.0"?>
2
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
3
<fontconfig>
4
    <match target="pattern">
5
        <test name="lang" compare="contains">
6
            <string>pl</string>
7
        </test>
8
        <test qual="any" name="family">
9
            <string>sans-serif</string>
10
        </test>
11
        <edit name="family" mode="prepend" binding="strong">
12
            <string>Antykwa Poltawskiego</string>
13
        </edit>
14
    </match>
15
16
    <match target="pattern">
17
        <test name="lang" compare="contains">
18
            <string>pl</string>
19
        </test>
20
        <test qual="any" name="family">
21
            <string>serif</string>
22
        </test>
23
        <edit name="family" mode="prepend" binding="strong">
24
            <string>Antykwa Poltawskiego</string>
25
        </edit>
26
    </match>
27
</fontconfig>
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/fc-cache.filter
... ... @@ -0,0 +1 @@
1
^.(/usr/share/fonts/|/usr/lib/X11/fonts/|/usr/X11R6/lib/X11/fonts|/opt/ttfonts/)
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/fc-cache.script
... ... @@ -0,0 +1,3 @@
1
#!/bin/sh
2
3
fc-cache -s
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/fontconfig-2.11.95-wine-assert-nonfatal.patch
... ... @@ -0,0 +1,12 @@
1
--- fontconfig-2.11.95/src/fcweight.c.omv~	2016-06-03 23:22:39.335138695 +0200
2
+++ fontconfig-2.11.95/src/fcweight.c	2016-06-03 23:24:28.284082974 +0200
3
@@ -45,7 +45,8 @@ static int lerp(int x, int x1, int x2, i
4
 {
5
   int dx = x2 - x1;
6
   int dy = y2 - y1;
7
-  assert (dx > 0 && dy >= 0 && x1 <= x && x <= x2);
8
+  if (!(dx > 0 && dy >= 0 && x1 <= x && x <= x2))
9
+    fprintf(stderr, "lerp called with bad parameters %d,%d,%d,%d,%d,%d\n", x, x1, x2, y1, y2);
10
   return y1 + (dy*(x-x1) + dx/2) / dx;
11
 }
12
 
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/fontconfig-omdv-config.patch
... ... @@ -0,0 +1,155 @@
1
--- fontconfig-2.12.6/conf.d/45-latin.conf.0001~	2016-12-02 04:22:19.000000000 +0100
2
+++ fontconfig-2.12.6/conf.d/45-latin.conf	2017-10-18 17:40:56.294244729 +0200
3
@@ -58,6 +58,10 @@
4
 		<default><family>serif</family></default>
5
 	</alias>
6
 	<alias>
7
+		<family>Noto Serif</family>
8
+		<default><family>serif</family></default>
9
+	</alias>
10
+	<alias>
11
 		<family>Palatino Linotype</family>
12
 		<default><family>serif</family></default>
13
 	</alias>
14
@@ -70,6 +74,10 @@
15
 		<default><family>serif</family></default>
16
 	</alias>
17
 	<alias>
18
+		<family>Antykwa Poltawskiego</family>
19
+		<default><family>serif</family></default>
20
+	</alias>
21
+	<alias>
22
 		<family>Times New Roman</family>
23
 		<default><family>serif</family></default>
24
 	</alias>
25
@@ -149,6 +157,10 @@
26
 		<default><family>sans-serif</family></default>
27
 	</alias>
28
 	<alias>
29
+		<family>Noto Sans</family>
30
+		<default><family>sans-serif</family></default>
31
+	</alias>
32
+	<alias>
33
 		<family>Luxi Sans</family>
34
 		<default><family>sans-serif</family></default>
35
 	</alias>
36
@@ -232,6 +244,14 @@
37
 		<default><family>monospace</family></default>
38
 	</alias>
39
 	<alias>
40
+		<family>Noto Mono</family>
41
+		<default><family>monospace</family></default>
42
+	</alias>
43
+	<alias>
44
+		<family>Noto Sans Mono CJK SC</family>
45
+		<default><family>monospace</family></default>
46
+	</alias>
47
+	<alias>
48
 		<family>Terminal</family>
49
 		<default><family>monospace</family></default>
50
 	</alias>
51
--- fontconfig-2.12.6/conf.d/60-latin.conf.0001~	2016-12-02 04:22:19.000000000 +0100
52
+++ fontconfig-2.12.6/conf.d/60-latin.conf	2017-10-18 17:40:56.295244727 +0200
53
@@ -4,8 +4,9 @@
54
 	<alias>
55
 		<family>serif</family>
56
 		<prefer>
57
-			<family>Bitstream Vera Serif</family>
58
+			<family>Noto Serif</family>
59
 			<family>DejaVu Serif</family>
60
+			<family>Bitstream Vera Serif</family>
61
 			<family>Times New Roman</family>
62
 			<family>Thorndale AMT</family>
63
 			<family>Luxi Serif</family>
64
@@ -17,15 +18,16 @@
65
 	<alias>
66
 		<family>sans-serif</family>
67
 		<prefer>
68
-			<family>Bitstream Vera Sans</family>
69
+			<family>Noto Sans</family>
70
 			<family>DejaVu Sans</family>
71
-			<family>Verdana</family>
72
-			<family>Arial</family>
73
-			<family>Albany AMT</family>
74
+			<family>Bitstream Vera Sans</family>
75
 			<family>Luxi Sans</family>
76
 			<family>Nimbus Sans L</family>
77
 			<family>Nimbus Sans</family>
78
+			<family>Arial</family>
79
+			<family>Albany AMT</family>
80
 			<family>Helvetica</family>
81
+			<family>Verdana</family>
82
 			<family>Lucida Sans Unicode</family>
83
 			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
84
 			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
85
@@ -34,16 +36,18 @@
86
 	<alias>
87
 		<family>monospace</family>
88
 		<prefer>
89
-			<family>Bitstream Vera Sans Mono</family>
90
+			<family>Noto Mono</family>
91
+			<family>Noto Sans Mono CJK SC</family>
92
 			<family>DejaVu Sans Mono</family>
93
+			<family>Bitstream Vera Sans Mono</family>
94
 			<family>Inconsolata</family>
95
-			<family>Andale Mono</family>
96
-			<family>Courier New</family>
97
-			<family>Cumberland AMT</family>
98
 			<family>Luxi Mono</family>
99
 			<family>Nimbus Mono L</family>
100
 			<family>Nimbus Mono</family>
101
 			<family>Nimbus Mono PS</family>
102
+			<family>Andale Mono</family>
103
+			<family>Courier New</family>
104
+			<family>Cumberland AMT</family>
105
 			<family>Courier</family>
106
 		</prefer>
107
 	</alias>
108
--- fontconfig-2.12.6/conf.d/65-nonlatin.conf.0001~	2017-09-21 06:44:27.000000000 +0200
109
+++ fontconfig-2.12.6/conf.d/65-nonlatin.conf	2017-10-18 17:42:21.831088808 +0200
110
@@ -23,13 +23,25 @@
111
 			<family>Sampige</family> <!-- kannada -->
112
 			<family>padmaa</family> <!-- gujarati -->
113
 			<family>Hapax Berbère</family> <!-- tifinagh -->
114
+			<family>Noto Sans CJK SC</family>
115
+			<family>Noto Sans CJK TC</family>
116
 			<family>MS Mincho</family> <!-- han (ja) -->
117
+			<family>Microsoft YaHei UI</family> <!-- han (zh-cn,zh-tw) -->
118
+			<family>Microsoft JhengHei UI</family> <!-- han (zh-tw) -->
119
+			<family>Source Han Sans</family> <!-- han (ja, ko, zh) -->
120
+			<family>Open Hei</family> <!--han (zh-tw) -->
121
+			<family>WenQuanYi Micro Hei</family> <!-- han (zh-cn,zh-tw) -->
122
 			<family>SimSun</family> <!-- han (zh-cn,zh-tw) -->
123
 			<family>PMingLiu</family> <!-- han (zh-tw) -->
124
+			<family>Source Han Sans</family> <!-- han (ja, ko, zh) -->
125
+			<family>Open Hei</family> <!--han (zh-tw) -->
126
+			<family>WenQuanYi Micro Hei</family> <!-- han (zh-cn,zh-tw) -->
127
 			<family>WenQuanYi Zen Hei</family> <!-- han (zh-cn,zh-tw) -->
128
 			<family>WenQuanYi Bitmap Song</family> <!-- han (zh-cn,zh-tw) -->
129
 			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
130
 			<family>AR PL New Sung</family> <!-- han (zh-cn,zh-tw) -->
131
+			<family>AR PL UMing TW MBE</family> <!--han (zh-tw) -->
132
+			<family>AR PL UMing CN</family> <!--han (ja,zh-cn) -->
133
 			<family>ZYSong18030</family> <!-- han (zh-cn,zh-tw) -->
134
 			<family>HanyiSong</family> <!-- han (zh-cn,zh-tw) -->
135
 			<family>MgOpen Canonica</family>
136
@@ -150,12 +162,18 @@
137
 			<family>Sazanami Gothic</family>
138
 			<family>Kochi Gothic</family>
139
 			<family>AR PL KaitiM GB</family>
140
+			<family>Noto Sans Mono CJK SC</family>
141
+			<family>Noto Sans Mono CJK TC</family>
142
 			<family>MS Gothic</family> <!-- han (ja) -->
143
 			<family>UmePlus Gothic</family> <!-- han (ja) -->
144
 			<family>NSimSun</family> <!-- han (zh-cn,zh-tw) -->
145
 			<family>MingLiu</family> <!-- han (zh-tw) -->
146
-			<family>AR PL ShanHeiSun Uni</family> <!-- han (ja,zh-cn,zh-tw) -->
147
+			<family>Open Hei</family> <!--han (zh-tw) -->
148
+			<family>WenQuanYi Micro Hei Mono</family>  <!-- han (zh-cn,zh-tw) -->
149
+			<family>WenQuanYi Zen Hei Mono</family>  <!-- han (zh-cn,zh-tw) -->
150
 			<family>AR PL New Sung Mono</family> <!-- han (zh-cn,zh-tw) -->
151
+			<family>AR PL UMing TW MBE</family> <!-- han (zh-tw) -->
152
+			<family>AR PL UMing CN</family> <!-- han (ja,zh-cn) -->
153
 			<family>HanyiSong</family> <!-- han (zh-cn) -->
154
 			<family>AR PL SungtiL GB</family>
155
 			<family>AR PL Mingti2L Big5</family>
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/fontconfig-sleep-less.patch
... ... @@ -0,0 +1,12 @@
1
diff -pruN fontconfig-2.11.0.orig/fc-cache/fc-cache.c fontconfig-2.11.0/fc-cache/fc-cache.c
2
--- fontconfig-2.11.0.orig/fc-cache/fc-cache.c	2013-10-11 12:10:17.000000000 +0900
3
+++ fontconfig-2.11.0/fc-cache/fc-cache.c	2013-10-11 13:09:48.000000000 +0900
4
@@ -399,7 +399,7 @@ main (int argc, char **argv)
5
      */
6
     /* the resolution of mtime on FAT is 2 seconds */
7
     if (changed)
8
-	sleep (2);
9
+	sleep (1);
10
     if (verbose)
11
 	printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded");
12
     return ret;
view file @ dadebda640
... ... --- /dev/null
... ... +++ b/fontconfig.spec
... ... @@ -0,0 +1,160 @@
1
%define major	1
2
%define libname %mklibname %{name} %{major}
3
%define devname %mklibname %{name} -d
4
5
%define bootstrap 1
6
%{?_without_bootstrap: %global bootstrap 0}
7
%{?_with_bootstrap: %global bootstrap 1}
8
%define rebuild_doc	0
9
%if %{bootstrap}
10
%define rebuild_doc 0
11
%endif
12
13
Summary:	Font configuration library
14
Name:		fontconfig
15
Version:	2.12.6
16
Release:	1
17
License:	MIT
18
Group:		System/X11
19
Url:		http://fontconfig.org/
20
Source0:	http://www.freedesktop.org/software/fontconfig/release/%{name}-%{version}.tar.bz2
21
# (fc) 2.3.2-3mdk prefer urw fonts
22
Source1:	30-mdv-urwfonts.conf
23
# (fc) 2.3.2-3mdk disable antialiasing for some fonts
24
Source3:	20-mdv-disable-antialias.conf
25
# (tpg) use Antiqua Poltawski for polish language
26
Source4:	65-lang-pl.conf
27
# (fc) 2.3.2-3mdk  Avoid KDE/QT uses some bitmapped fonts (guisseppe)
28
Source5:	30-mdv-avoid-bitmap.conf
29
# (fc) 2.4.2-1mdv disable embedded bitmap for big size (Mdv bug #25924)
30
Source8:	26-mdv-no-embeddedbitmap.conf
31
# (fc) 2.4.92-1mdv enable embeddedbitmap on some CJK fonts (Fedora)
32
Source10:	25-no-bitmap-fedora.conf
33
# (fc) 2.1-4mdk change order of default fonts
34
Source11:	fc-cache.filter
35
Source12:	fc-cache.script
36
Patch0:		fontconfig-sleep-less.patch
37
Patch1:		fontconfig-omdv-config.patch
38
Patch2:		fontconfig-2.11.95-wine-assert-nonfatal.patch
39
# (archlinux) 2.12.1 freetype2 >= 2.7.1
40
Patch3:		0001-fix-test-with-freetype2-2.7.1.patch
41
BuildRequires:	ed
42
BuildRequires:	pkgconfig(expat)
43
BuildRequires:	lynx
44
BuildRequires:	gperf
45
BuildRequires:	bzip2-devel
46
BuildRequires:	pkgconfig(freetype2) >= 2.3.5
47
%if %rebuild_doc
48
# Actually, we don't really need whole set of texlive packages
49
# but it's hard to find what exactly we need. So we use texlive.
50
BuildRequires:	texlive
51
BuildRequires:	docbook-utils
52
BuildRequires:	docbook-utils-pdf
53
BuildRequires:	docbook-dtd31-sgml
54
BuildRequires:	docbook-dtd41-sgml
55
%endif
56
57
%description
58
Fontconfig is designed to locate fonts within the
59
system and select them according to requirements specified by 
60
applications.
61
62
%package -n %{libname}
63
Summary:	Font configuration and customization library
64
Group:		System/Libraries
65
66
%description -n	%{libname}
67
This package contains the shared library for %{name}.
68
69
%package -n %{devname}
70
Summary:	Font configuration and customization library
71
Group:		Development/C
72
Provides:	%{name}-devel = %{EVRD}
73
Requires:	%{libname} = %{EVRD}
74
75
%description -n	%{devname}
76
The fontconfig-devel package includes the header files,
77
and developer docs for the fontconfig package.
78
79
%track
80
prog %name = {
81
	url = http://www.freedesktop.org/software/fontconfig/release/
82
	version = %version
83
	regex = %name-(__VER__)\.tar\.bz2
84
}
85
86
%prep
87
%setup -q
88
%patch0 -p1
89
%patch1 -p1
90
%patch2 -p1
91
%patch3 -p1
92
93
# disable Werror for aarch64
94
# you can remove it in future
95
sed -i 's/-Werror//g' configure.ac
96
# (tpg) rebuild just to nuke rpath
97
libtoolize -f
98
autoreconf -fi
99
100
%build
101
%if !%rebuild_doc
102
export HASDOCBOOK=no
103
%endif
104
105
%configure2_5x \
106
	--disable-static \
107
	--localstatedir=/var \
108
	--disable-libxml2 \
109
	--with-add-fonts="/usr/lib/X11/fonts,/usr/X11R6/lib/X11/fonts,/opt/ttfonts"
110
111
%make LIBS="-lbz2"
112
113
%install
114
%makeinstall_std
115
116
mkdir -p %{buildroot}%{_sysconfdir}/fonts/conf.d
117
cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} %{buildroot}%{_sysconfdir}/fonts/conf.d
118
119
ln -s ../../..%{_datadir}/%{name}/conf.avail/25-unhint-nonlatin.conf %{buildroot}%{_sysconfdir}/fonts/conf.d
120
ln -s ../../..%{_datadir}/%{name}/conf.avail/10-sub-pixel-rgb.conf %{buildroot}%{_sysconfdir}/fonts/conf.d
121
122
# remove unpackaged files
123
rm -rf %{buildroot}%{_datadir}/doc/fontconfig 
124
125
# install filetriggers
126
install -d -m 0755 %{buildroot}%{_var}/lib/rpm/filetriggers
127
install -m 0644 %{SOURCE11} %{buildroot}%{_var}/lib/rpm/filetriggers
128
install -m 0755 %{SOURCE12} %{buildroot}%{_var}/lib/rpm/filetriggers
129
130
%post
131
%{_bindir}/fc-cache --force --system-only >/dev/null
132
133
%triggerprein -- fontconfig < 2.4.0
134
rm -f %{_var}/cache/fontconfig/*.cache-2
135
136
%files
137
%doc README AUTHORS COPYING doc/fontconfig-user.html doc/fontconfig-user.txt
138
%dir %{_var}/cache/fontconfig
139
%{_bindir}/*
140
%dir %{_sysconfdir}/fonts
141
%dir %{_sysconfdir}/fonts/conf.d
142
%{_datadir}/%{name}/conf.avail
143
%{_datadir}/xml/fontconfig/fonts.dtd
144
# those files must NOT have noreplace option
145
%config %{_sysconfdir}/fonts/fonts.conf
146
%config %{_sysconfdir}/fonts/conf.d/*.conf
147
%config %{_sysconfdir}/fonts/conf.d/README
148
%{_mandir}/man1/*
149
%{_mandir}/man5/*
150
%{_var}/lib/rpm/filetriggers/fc-cache.*
151
152
%files -n %{libname}
153
%{_libdir}/libfontconfig.so.%{major}*
154
155
%files -n %{devname}
156
%doc doc/fontconfig-devel doc/fontconfig-devel.txt 
157
%{_libdir}/*.so
158
%{_libdir}/pkgconfig/*
159
%{_includedir}/*
160
%{_mandir}/man3/*

Comments