[gentoo-commits] repo/gentoo:master commit in: media-fonts/opendesktop-fonts/files/, media-fonts/opendesktop-fonts/ - gentoo-commits

From:	"Robin H. Johnson" <robbat2@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: media-fonts/opendesktop-fonts/files/, media-fonts/opendesktop-fonts/
Date:	Sat, 23 Feb 2019 22:12:10
Message-Id:	`1550959914.d414ffb5df5048bdde43642e01564650bc79f3d9.robbat2@gentoo`

1

commit:     d414ffb5df5048bdde43642e01564650bc79f3d9

2

Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

3

AuthorDate: Sat Feb 23 22:10:12 2019 +0000

4

Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>

5

CommitDate: Sat Feb 23 22:11:54 2019 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d414ffb5

7

8

media-fonts/opendesktop-fonts: fix fontconfig warnings

9

10

Fixes: https://bugs.gentoo.org/671790

11

Thanks-To: <code <AT> edoceo.com>

12

See-Also: https://cromwell-intl.com/open-source/font-config-warnings.html

13

See-Also: https://cixtor.com/blog/fontconfig-warning

14

Package-Manager: Portage-2.3.59, Repoman-2.3.12

15

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

16

17

 .../files/opendesktop-fonts-1.4.2-multivalue.patch | 190 +++++++++++++++++++++

18

 .../opendesktop-fonts-1.4.2-r1.ebuild              |  27 +++

19

 2 files changed, 217 insertions(+)

20

21

diff --git a/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch b/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch

22

new file mode 100644

23

index 00000000000..8aa561cd107

24

--- /dev/null

25

+++ b/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch

26

@@ -0,0 +1,190 @@

27

+Fixup alias & test blocks in fontconfig definition.

28

+

29

+Fixes: https://bugs.gentoo.org/671790

30

+Partial-Credit: <code@××××××.com>

31

+Signed-off-by: Robin H. Johnson <robbat2@g.o>

32

+See-Also: https://cromwell-intl.com/open-source/font-config-warnings.html

33

+See-Also: https://cixtor.com/blog/fontconfig-warning

34

+

35

+--- opendesktop-fonts-1.4.2/69-odofonts.conf	2007-09-10 02:09:37.000000000 -0700

36

++++ opendesktop-fonts-1.4.2/69-odofonts.conf	2019-02-23 14:03:02.280680514 -0800

37

+@@ -1,38 +1,104 @@

38

+ <?xml version="1.0"?>

39

+ <!DOCTYPE fontconfig SYSTEM "fonts.dtd">

40

+ <fontconfig>

41

++<!-- serif group -->

42

+ <alias>

43

+ 	<family>文鼎ＰＬ新宋</family>

44

++	<default><family>serif</family></default>

45

++</alias>

46

++<alias>

47

+ 	<family>AR PL New Sung</family>

48

++	<default><family>serif</family></default>

49

++</alias>

50

++<alias>

51

+ 	<family>新細明體</family>

52

++	<default><family>serif</family></default>

53

++</alias>

54

++<alias>

55

+ 	<family>PMingLiU</family>

56

++	<default><family>serif</family></default>

57

++</alias>

58

++<alias>

59

+ 	<family>宋体</family>

60

++	<default><family>serif</family></default>

61

++</alias>

62

++<alias>

63

+ 	<family>SimSun</family>

64

++	<default><family>serif</family></default>

65

++</alias>

66

++<alias>

67

+ 	<family>文鼎ＰＬ新宋 ExtB</family>

68

++	<default><family>serif</family></default>

69

++</alias>

70

++<alias>

71

+ 	<family>AR PL New Sung ExtB</family>

72

+ 	<default><family>serif</family></default>

73

+ </alias>

74

+

75

++<!-- sans-serif group -->

76

+ <alias>

77

+ 	<family>文鼎ＰＬ新宋</family>

78

++	<default><family>sans-serif</family></default>

79

++</alias>

80

++<alias>

81

+ 	<family>AR PL New Sung</family>

82

++	<default><family>sans-serif</family></default>

83

++</alias>

84

++<alias>

85

+ 	<family>新細明體</family>

86

++	<default><family>sans-serif</family></default>

87

++</alias>

88

++<alias>

89

+ 	<family>PMingLiU</family>

90

++	<default><family>sans-serif</family></default>

91

++</alias>

92

++<alias>

93

+ 	<family>宋体</family>

94

++	<default><family>sans-serif</family></default>

95

++</alias>

96

++<alias>

97

+ 	<family>SimSun</family>

98

++	<default><family>sans-serif</family></default>

99

++</alias>

100

++<alias>

101

+ 	<family>文鼎ＰＬ新宋 ExtB</family>

102

++	<default><family>sans-serif</family></default>

103

++</alias>

104

++<alias>

105

+ 	<family>AR PL New Sung ExtB</family>

106

+ 	<default><family>sans-serif</family></default>

107

+ </alias>

108

+

109

++<!-- monospace group -->

110

+ <alias>

111

+ 	<family>文鼎ＰＬ新宋 Mono</family>

112

++	<default><family>monospace</family></default>

113

++</alias>

114

++<alias>

115

+ 	<family>AR PL New Sung Mono</family>

116

++	<default><family>monospace</family></default>

117

++</alias>

118

++<alias>

119

+ 	<family>細明體</family>

120

++	<default><family>monospace</family></default>

121

++</alias>

122

++<alias>

123

+ 	<family>MingLiU</family>

124

++	<default><family>monospace</family></default>

125

++</alias>

126

++<alias>

127

+ 	<family>新宋体</family>

128

++	<default><family>monospace</family></default>

129

++</alias>

130

++<alias>

131

+ 	<family>NSimSun</family>

132

++	<default><family>monospace</family></default>

133

++</alias>

134

++<alias>

135

+ 	<family>文鼎ＰＬ新宋 ExtB</family>

136

++	<default><family>monospace</family></default>

137

++</alias>

138

++<alias>

139

+ 	<family>AR PL New Sung ExtB</family>

140

+ 	<default><family>monospace</family></default>

141

+ </alias>

142

+@@ -82,12 +148,26 @@

143

+ <match target="font">

144

+ 	<test name="family" compare="eq">

145

+ 		<string>文鼎ＰＬ新宋</string>

146

++	</test>

147

++	<test name="family" compare="eq">

148

+ 		<string>AR PL New Sung</string>

149

++	</test>

150

++	<test name="family" compare="eq">

151

+ 		<string>新細明體</string>

152

++	</test>

153

++	<test name="family" compare="eq">

154

+ 		<string>PMingLiU</string>

155

++	</test>

156

++	<test name="family" compare="eq">

157

+ 		<string>宋体</string>

158

++	</test>

159

++	<test name="family" compare="eq">

160

+ 		<string>SimSun</string>

161

++	</test>

162

++	<test name="family" compare="eq">

163

+ 		<string>文鼎ＰＬ新宋 ExtB</string>

164

++	</test>

165

++	<test name="family" compare="eq">

166

+ 		<string>AR PL New Sung ExtB</string>

167

+ 	</test>

168

+ 	<edit name="embeddedbitmap">

169

+@@ -98,10 +178,20 @@

170

+ <match target="font">

171

+ 	<test name="family" compare="eq">

172

+ 		<string>文鼎ＰＬ新宋 Mono</string>

173

++	</test>

174

++	<test name="family" compare="eq">

175

+ 		<string>AR PL New Sung Mono</string>

176

++	</test>

177

++	<test name="family" compare="eq">

178

+ 		<string>細明體</string>

179

++	</test>

180

++	<test name="family" compare="eq">

181

+ 		<string>MingLiU</string>

182

++	</test>

183

++	<test name="family" compare="eq">

184

+ 		<string>新宋体</string>

185

++	</test>

186

++	<test name="family" compare="eq">

187

+ 		<string>NSimSun</string>

188

+ 	</test>

189

+ 	<edit name="globaladvance">

190

+@@ -115,12 +205,26 @@

191

+ <match target="font">

192

+ 	<test name="family" compare="eq">

193

+ 		<string>文鼎ＰＬ新中楷</string>

194

++	</test>

195

++	<test name="family" compare="eq">

196

+ 		<string>AR PL New Kai</string>

197

++	</test>

198

++	<test name="family" compare="eq">

199

+ 		<string>標楷體</string>

200

++	</test>

201

++	<test name="family" compare="eq">

202

+ 		<string>DFKai-SB</string>

203

++	</test>

204

++	<test name="family" compare="eq">

205

+ 		<string>楷体</string>

206

++	</test>

207

++	<test name="family" compare="eq">

208

+ 		<string>SimKai</string>

209

++	</test>

210

++	<test name="family" compare="eq">

211

+ 		<string>文鼎ＰＬ新中楷 ExtB</string>

212

++	</test>

213

++	<test name="family" compare="eq">

214

+ 		<string>AR PL New Kai ExtB</string>

215

+ 	</test>

216

+ 	<edit name="globaladvance">

217

218

diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild

219

new file mode 100644

220

index 00000000000..0c3aee0affb

221

--- /dev/null

222

+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild

223

@@ -0,0 +1,27 @@

224

+# Copyright 1999-2019 Gentoo Authors

225

+# Distributed under the terms of the GNU General Public License v2

226

+

227

+EAPI="6"

228

+

229

+inherit font

230

+

231

+DESCRIPTION="Chinese TrueType Fonts"

232

+#HOMEPAGE="http://www.opendesktop.org.tw/"

233

+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"

234

+SRC_URI="mirror://gentoo/${P}.tar.gz"

235

+

236

+LICENSE="Arphic"

237

+SLOT="0"

238

+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"

239

+IUSE=""

240

+

241

+FONT_SUFFIX="ttf ttc"

242

+FONT_S="${S}"

243

+FONT_CONF=(

244

+	"69-odofonts.conf"

245

+	"80-odofonts-original.conf"

246

+	"80-odofonts-simulate-MS-simplified-chinese.conf"

247

+	"80-odofonts-simulate-MS-triditional-chinese.conf"

248

+)

249

+DOCS="AUTHORS Changelog*"

250

+PATCHES=( "${FILESDIR}"/opendesktop-fonts-1.4.2-multivalue.patch )

1	commit: d414ffb5df5048bdde43642e01564650bc79f3d9
2	Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
3	AuthorDate: Sat Feb 23 22:10:12 2019 +0000
4	Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
5	CommitDate: Sat Feb 23 22:11:54 2019 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d414ffb5
7
8	media-fonts/opendesktop-fonts: fix fontconfig warnings
9
10	Fixes: https://bugs.gentoo.org/671790
11	Thanks-To: <code <AT> edoceo.com>
12	See-Also: https://cromwell-intl.com/open-source/font-config-warnings.html
13	See-Also: https://cixtor.com/blog/fontconfig-warning
14	Package-Manager: Portage-2.3.59, Repoman-2.3.12
15	Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
16
17	.../files/opendesktop-fonts-1.4.2-multivalue.patch \| 190 +++++++++++++++++++++
18	.../opendesktop-fonts-1.4.2-r1.ebuild \| 27 +++
19	2 files changed, 217 insertions(+)
20
21	diff --git a/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch b/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch
22	new file mode 100644
23	index 00000000000..8aa561cd107
24	--- /dev/null
25	+++ b/media-fonts/opendesktop-fonts/files/opendesktop-fonts-1.4.2-multivalue.patch
26	@@ -0,0 +1,190 @@
27	+Fixup alias & test blocks in fontconfig definition.
28	+
29	+Fixes: https://bugs.gentoo.org/671790
30	+Partial-Credit: <code@××××××.com>
31	+Signed-off-by: Robin H. Johnson <robbat2@g.o>
32	+See-Also: https://cromwell-intl.com/open-source/font-config-warnings.html
33	+See-Also: https://cixtor.com/blog/fontconfig-warning
34	+
35	+--- opendesktop-fonts-1.4.2/69-odofonts.conf 2007-09-10 02:09:37.000000000 -0700
36	++++ opendesktop-fonts-1.4.2/69-odofonts.conf 2019-02-23 14:03:02.280680514 -0800
37	+@@ -1,38 +1,104 @@
38	+ <?xml version="1.0"?>
39	+ <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
40	+ <fontconfig>
41	++<!-- serif group -->
42	+ <alias>
43	+ <family>文鼎ＰＬ新宋</family>
44	++ <default><family>serif</family></default>
45	++</alias>
46	++<alias>
47	+ <family>AR PL New Sung</family>
48	++ <default><family>serif</family></default>
49	++</alias>
50	++<alias>
51	+ <family>新細明體</family>
52	++ <default><family>serif</family></default>
53	++</alias>
54	++<alias>
55	+ <family>PMingLiU</family>
56	++ <default><family>serif</family></default>
57	++</alias>
58	++<alias>
59	+ <family>宋体</family>
60	++ <default><family>serif</family></default>
61	++</alias>
62	++<alias>
63	+ <family>SimSun</family>
64	++ <default><family>serif</family></default>
65	++</alias>
66	++<alias>
67	+ <family>文鼎ＰＬ新宋 ExtB</family>
68	++ <default><family>serif</family></default>
69	++</alias>
70	++<alias>
71	+ <family>AR PL New Sung ExtB</family>
72	+ <default><family>serif</family></default>
73	+ </alias>
74	+
75	++<!-- sans-serif group -->
76	+ <alias>
77	+ <family>文鼎ＰＬ新宋</family>
78	++ <default><family>sans-serif</family></default>
79	++</alias>
80	++<alias>
81	+ <family>AR PL New Sung</family>
82	++ <default><family>sans-serif</family></default>
83	++</alias>
84	++<alias>
85	+ <family>新細明體</family>
86	++ <default><family>sans-serif</family></default>
87	++</alias>
88	++<alias>
89	+ <family>PMingLiU</family>
90	++ <default><family>sans-serif</family></default>
91	++</alias>
92	++<alias>
93	+ <family>宋体</family>
94	++ <default><family>sans-serif</family></default>
95	++</alias>
96	++<alias>
97	+ <family>SimSun</family>
98	++ <default><family>sans-serif</family></default>
99	++</alias>
100	++<alias>
101	+ <family>文鼎ＰＬ新宋 ExtB</family>
102	++ <default><family>sans-serif</family></default>
103	++</alias>
104	++<alias>
105	+ <family>AR PL New Sung ExtB</family>
106	+ <default><family>sans-serif</family></default>
107	+ </alias>
108	+
109	++<!-- monospace group -->
110	+ <alias>
111	+ <family>文鼎ＰＬ新宋 Mono</family>
112	++ <default><family>monospace</family></default>
113	++</alias>
114	++<alias>
115	+ <family>AR PL New Sung Mono</family>
116	++ <default><family>monospace</family></default>
117	++</alias>
118	++<alias>
119	+ <family>細明體</family>
120	++ <default><family>monospace</family></default>
121	++</alias>
122	++<alias>
123	+ <family>MingLiU</family>
124	++ <default><family>monospace</family></default>
125	++</alias>
126	++<alias>
127	+ <family>新宋体</family>
128	++ <default><family>monospace</family></default>
129	++</alias>
130	++<alias>
131	+ <family>NSimSun</family>
132	++ <default><family>monospace</family></default>
133	++</alias>
134	++<alias>
135	+ <family>文鼎ＰＬ新宋 ExtB</family>
136	++ <default><family>monospace</family></default>
137	++</alias>
138	++<alias>
139	+ <family>AR PL New Sung ExtB</family>
140	+ <default><family>monospace</family></default>
141	+ </alias>
142	+@@ -82,12 +148,26 @@
143	+ <match target="font">
144	+ <test name="family" compare="eq">
145	+ <string>文鼎ＰＬ新宋</string>
146	++ </test>
147	++ <test name="family" compare="eq">
148	+ <string>AR PL New Sung</string>
149	++ </test>
150	++ <test name="family" compare="eq">
151	+ <string>新細明體</string>
152	++ </test>
153	++ <test name="family" compare="eq">
154	+ <string>PMingLiU</string>
155	++ </test>
156	++ <test name="family" compare="eq">
157	+ <string>宋体</string>
158	++ </test>
159	++ <test name="family" compare="eq">
160	+ <string>SimSun</string>
161	++ </test>
162	++ <test name="family" compare="eq">
163	+ <string>文鼎ＰＬ新宋 ExtB</string>
164	++ </test>
165	++ <test name="family" compare="eq">
166	+ <string>AR PL New Sung ExtB</string>
167	+ </test>
168	+ <edit name="embeddedbitmap">
169	+@@ -98,10 +178,20 @@
170	+ <match target="font">
171	+ <test name="family" compare="eq">
172	+ <string>文鼎ＰＬ新宋 Mono</string>
173	++ </test>
174	++ <test name="family" compare="eq">
175	+ <string>AR PL New Sung Mono</string>
176	++ </test>
177	++ <test name="family" compare="eq">
178	+ <string>細明體</string>
179	++ </test>
180	++ <test name="family" compare="eq">
181	+ <string>MingLiU</string>
182	++ </test>
183	++ <test name="family" compare="eq">
184	+ <string>新宋体</string>
185	++ </test>
186	++ <test name="family" compare="eq">
187	+ <string>NSimSun</string>
188	+ </test>
189	+ <edit name="globaladvance">
190	+@@ -115,12 +205,26 @@
191	+ <match target="font">
192	+ <test name="family" compare="eq">
193	+ <string>文鼎ＰＬ新中楷</string>
194	++ </test>
195	++ <test name="family" compare="eq">
196	+ <string>AR PL New Kai</string>
197	++ </test>
198	++ <test name="family" compare="eq">
199	+ <string>標楷體</string>
200	++ </test>
201	++ <test name="family" compare="eq">
202	+ <string>DFKai-SB</string>
203	++ </test>
204	++ <test name="family" compare="eq">
205	+ <string>楷体</string>
206	++ </test>
207	++ <test name="family" compare="eq">
208	+ <string>SimKai</string>
209	++ </test>
210	++ <test name="family" compare="eq">
211	+ <string>文鼎ＰＬ新中楷 ExtB</string>
212	++ </test>
213	++ <test name="family" compare="eq">
214	+ <string>AR PL New Kai ExtB</string>
215	+ </test>
216	+ <edit name="globaladvance">
217
218	diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
219	new file mode 100644
220	index 00000000000..0c3aee0affb
221	--- /dev/null
222	+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
223	@@ -0,0 +1,27 @@
224	+# Copyright 1999-2019 Gentoo Authors
225	+# Distributed under the terms of the GNU General Public License v2
226	+
227	+EAPI="6"
228	+
229	+inherit font
230	+
231	+DESCRIPTION="Chinese TrueType Fonts"
232	+#HOMEPAGE="http://www.opendesktop.org.tw/"
233	+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
234	+SRC_URI="mirror://gentoo/${P}.tar.gz"
235	+
236	+LICENSE="Arphic"
237	+SLOT="0"
238	+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
239	+IUSE=""
240	+
241	+FONT_SUFFIX="ttf ttc"
242	+FONT_S="${S}"
243	+FONT_CONF=(
244	+ "69-odofonts.conf"
245	+ "80-odofonts-original.conf"
246	+ "80-odofonts-simulate-MS-simplified-chinese.conf"
247	+ "80-odofonts-simulate-MS-triditional-chinese.conf"
248	+)
249	+DOCS="AUTHORS Changelog*"
250	+PATCHES=( "${FILESDIR}"/opendesktop-fonts-1.4.2-multivalue.patch )

Gentoo Archives: gentoo-commits