avatar
abondrov has added 3e5100537b
Update freetype patch to fix build with freetype 2.5.x
view file @ 3e5100537b
... ... --- a/ttmkfdir-3.0.9-fix-freetype217.patch
... ... +++ b/ttmkfdir-3.0.9-fix-freetype217.patch
... ... @@ -42,3 +42,13 @@
42 42
43 43
 #include "util.h"
44 44
 #include "encoding.h"
45
--- ttmkfdir-3.0.9/ttf.cpp.orig	2014-05-21 16:17:08.592383307 -0400
46
+++ ttmkfdir-3.0.9/ttf.cpp	2014-05-21 16:20:26.553059071 -0400
47
@@ -3,7 +3,6 @@
48
 #include <cctype>
49
 #include <cstring>
50
 
51
-#include "freetype/tttables.h"
52
 #include "ttmkfdir.h"
53
 #include "ttf.h"
54
 #include "ttos2val.h"
... ... --- a/ttmkfdir.spec
... ... +++ b/ttmkfdir.spec
... ... @@ -1,7 +1,7 @@
1 1
Summary:	Utility to create fonts.scale files for truetype fonts
2 2
Name:		ttmkfdir
3 3
Version:	3.0.9
4
Release:	8
4
Release:	9
5 5
# Only licensing attribution is in README, no version.
6 6
License:	LGPLv2+
7 7
Group:		System/Fonts/True type
... ... @@ -21,15 +21,21 @@ Patch8: ttmkfdir-3.0.9-font-scale.patch
21 21
Patch9:		ttmkfdir-3.0.9-bug434301.patch
22 22
Patch10:	ttmkfdir-3.0.9-libtool.patch
23 23
BuildRequires:	flex
24
BuildRequires:	pkgconfig(freetype2)
25 24
BuildRequires:	libtool
26
BuildRequires:	zlib-devel
27
Provides:	freetype-tools = %{version}-%{release}
25
BuildRequires:	pkgconfig(freetype2)
26
BuildRequires:	pkgconfig(zlib)
27
Provides:	freetype-tools = %{EVRD}
28 28
29 29
%description
30 30
ttmkfdir is a utility used to create fonts.scale files in TrueType font
31 31
directories in order to prepare them for use by the font server.
32 32
33
%files
34
%doc README
35
%{_bindir}/ttmkfdir
36
37
#----------------------------------------------------------------------------
38
33 39
%prep
34 40
%setup -q
35 41
%patch0 -p1
... ... @@ -50,181 +56,4 @@ directories in order to prepare them for use by the font server.
56 56
%install
57 57
%makeinstall_std
58 58
59
%files
60
%doc README
61
%{_bindir}/ttmkfdir
62
63
%changelog
64
* Fri May 06 2011 Oden Eriksson <oeriksson@mandriva.com> 3.0.9-2mdv2011.0
65
+ Revision: 670732
66
- mass rebuild
67
68
* Fri Sep 24 2010 Oden Eriksson <oeriksson@mandriva.com> 3.0.9-1mdv2011.0
69
+ Revision: 580931
70
- fix group
71
- import ttmkfdir
72
73
74
* Fri Sep 24 2010 Oden Eriksson <oeriksson@mandriva.com> 3.0.9-1mdv2010.1
75
- initial Mandriva package (fedora import)
76
77
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.9-32
78
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
79
80
* Wed Jun 24 2009 Jens Petersen <petersen@redhat.com> - 3.0.9-31
81
- simplify ttmkfdir-3.0.9-encoding-dir.patch to drop X11R6/ check (#173705)
82
83
* Tue Mar 03 2009 Caolán McNamara <caolanm@redhat.com> - 3.0.9-30
84
- fix ttmkfdir-3.0.9-segfaults.patch to include stdio.h for added printf
85
86
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.9-29
87
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
88
89
* Mon Dec 15 2008 Pravin Satpute <psatpute@redhat.com> - 3.0.9-28
90
- modified spec file as per merge review suggestions bug 226506
91
92
* Mon Sep  8 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 3.0.9-27
93
- fix license tag
94
95
* Wed Feb 27 2008 Lingning Zhang <lizhang@redhat.com> - 3.0.9-26
96
- fix bug434301.
97
98
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.0.9-25
99
- Autorebuild for GCC 4.3
100
101
* Thu Nov 30 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-24.fc7
102
- add ttmkfdir-3.0.9-font-scale.patch to fix bug #209102.
103
- Patch from Akira TAGOH.
104
105
* Wed Oct 18 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-23
106
- rebuild
107
108
* Fri Sep 29 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-22
109
- delete "%%post" and "Requires(post)" in ttmkfdir.spec
110
111
* Thu Sep 28 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-21
112
- modify release
113
114
* Wed Sep 27 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-20.4
115
- modify "%%post" and add "Requires(post)" in ttmkfdir.spec for fixing bug173591, bug207279, bug208122
116
117
* Wed Sep 06 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-20.3
118
- add "%%post" in ttmkfdir.spec for fixing bug173591
119
120
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 3.0.9-20.2.1
121
- rebuild
122
123
* Tue Jun 20 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-20.2
124
- add "BuildRequires: libtool" in ttmkfdir.spec
125
126
* Mon Jun 19 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-20.1
127
- remove the modifying part of ttmkfdir-3.0.9/Makefile, recover the old Makefile
128
- modify ttmkfdir-3.0.9-encoding-dir.patch about Makefile
129
130
* Thu Jun 15 2006 Lingning Zhang <lizhang@redhat.com> - 3.0.9-20
131
- add ttmkfdir-3.0.9-encoding-dir.patch to fix bug #173705
132
- modify ttmkfdir-3.0.9/Makefile to delete the compiling flag of "ggdb"
133
134
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 3.0.9-19.2.1
135
- bump again for double-long bug on ppc(64)
136
137
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 3.0.9-19.2
138
- rebuilt for new gcc4.1 snapshot and glibc changes
139
140
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
141
- rebuilt
142
143
* Sat Oct 8 2005 LingNing Zhang <lizhang@redhat.com> -3.0.9-19
144
- add ttmkfdir-3.0.9-segfaults.patch to fix bug #164969
145
146
* Wed Aug  3 2005 Jens Petersen <petersen@redhat.com> - 3.0.9-17
147
- replace ttmkfdir-3.0.9-defautl_enc_size.patch and
148
  ttmkfdir-3.0.9-crashplus.patch with ttmkfdir-3.0.9-fix-crash.patch
149
  to fix missing native encodings of fonts
150
  (Akira Tagoh, #143941)
151
- buildrequire flex
152
- add ttmkfdir-3.0.9-warnings.patch to silence most of compiler warnings
153
154
* Sun Mar 20 2005 Yu Shao <yshao@redhat.com> 3.0.9-16
155
- rebuild with GCC 4
156
157
* Fri Sep 10 2004 Yu Shao <yshao@redhat.com> 3.0.9-14
158
- bug #100560, requires zlib-devel rather than zlib
159
160
* Tue Aug 17 2004 Elliot Lee <sopwith@redhat.com> 3.0.9-13
161
- Follow-on fix for the issue detailed in #118713
162
- Improve performance when checking if a font has a mapping present
163
- Base font file selection on the magic at the start of the file, rather than the filename
164
165
* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
166
- rebuilt
167
168
* Fri Mar 19 2004 Yu Shao <yshao@redhat.com> 3.0.9-11
169
- set default encoding size to DEFAULT_SIZE, bug #118713
170
171
* Fri Mar 12 2004 Yu Shao <yshao@redhat.com> 3.0.9-10
172
- patch suggested from law@redhat.com not to use semicolon in GCC3.4, 3.5
173
174
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
175
- rebuilt
176
177
* Wed Feb 12 2004 Yu Shao <yshao@redhat.com> 3.0.9-8
178
- patch for building package against freetype-2.1.7
179
- from kanagawa jigorou (jigorou3@mail.goo.ne.jp) #114682
180
181
* Mon Sep 15 2003 Yu Shao <yshao@redhat.com> 3.0.9-6
182
- updated zlib patch from Nalin Dahyabhai #104331
183
184
* Thu Aug 21 2003 Yu Shao <yshao@redhat.com> 3.0.9-4
185
- added zlib build requirement, partly releated to #100560
186
- other fixes
187
188
* Thu Aug  7 2003 Elliot Lee <sopwith@redhat.com>
189
- Fix compile error (cpp.patch)
190
191
* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
192
- rebuilt
193
194
* Thu Jan 23 2003 Yu Shao <yshao@redhat.com> 3.0.9-1
195
- added freetype-devel build requirement #82468
196
197
* Mon Jan 20 2003 Yu Shao <yshao@redhat.com> 3.0.8-1
198
- revert additional-entries to 0 #82125
199
200
* Wed Jan 15 2003 Yu Shao <yshao@redhat.com> 3.0.7-1
201
- set default value of additional-entries to 1
202
203
* Mon Jan 13 2003 Yu Shao <yshao@redhat.com> 3.0.6-1
204
- added iso8859-13 support from Nerijus Baliunas #77289
205
- added README 
206
207
* Wed Jan 8 2003 Yu Shao <yshao@redhat.com> 3.0.5-1
208
- encoding.l fix and ttc support patch 
209
- default read system encodings.dir instead of the one
210
- in current directory
211
212
* Wed Dec 18 2002 Yu Shao <yshao@redhat.com> 3.0.4-1
213
- make ttmkfdir keep silent with FIRSTINDEX. #61769
214
215
* Wed Dec 18 2002 Yu Shao <yshao@redhat.com> 3.0.3-1
216
- Applied new patches to make ttmkfdir provide more infomation when meets 
217
- bad fonts
218
219
* Mon Dec  9 2002 Mike A. Harris <mharris@devel.capslock.lan> 3.0.2-1
220
- Changed the nonstandard RPM Group from System/Utilities to Applications/System
221
- Added a new Makefile install target, and changed specfile to use makeinstall
222
223
* Mon Dec  9 2002 Mike A. Harris <mharris@devel.capslock.lan> 3.0.1-1
224
- Imported ttmkfdir into CVS on cvs.devel and applied all patches to CVS
225
- Removed patches from spec file
226
- Rewrote Makefile, now uses freetype-config to autodetect CFLAGS and libs,
227
  allowing a lot of spec file cleanups.  Added new targets for tagging CVS,
228
  making tarball, and making srpm.
229
230
* Mon Dec  2 2002 Mike A. Harris <mharris@devel.capslock.lan> 3.0.0-2
231
- Added Conflicts for prior packages which contained ttmkfdir
232 59
233
* Fri Nov 29 2002 Mike A. Harris <mharris@devel.capslock.lan> 3.0.0-1
234
- Initial build.  Basically just renamed our existing ttmkfdir to version
235
  3.0.0 to differentiate it.  It's the same old thing as before, but is
236
  likely going to move to CVS for easier development.

Comments