auto-import changelog data from ttmkfdir-3.0.9-11.src.rpm
* Fri Mar 19 2004 Yu Shao <yshao@redhat.com> 3.0.9-11 - set default encoding size to DEFAULT_SIZE, bug #118713 * Fri Mar 12 2004 Yu Shao <yshao@redhat.com> 3.0.9-10 - patch suggested from law@redhat.com not to use semicolon in GCC3.4, 3.5 * Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com> - rebuilt * Thu Feb 12 2004 Yu Shao <yshao@redhat.com> 3.0.9-8 - patch for building package against freetype-2.1.7 - from kanagawa jigorou (jigorou3@mail.goo.ne.jp) #114682
This commit is contained in:
cvsdist
parent
15f8682feb
commit
0c4059e05b
44
ttmkfdir-3.0.9-fix-freetype217.patch
Normal file
44
ttmkfdir-3.0.9-fix-freetype217.patch
Normal file
@ -0,0 +1,44 @@
|
||||
--- ttmkfdir-3.0.9/encoding.cpp.orig 2002-12-09 17:52:48.000000000 +0900
|
||||
+++ ttmkfdir-3.0.9/encoding.cpp 2004-01-31 18:16:46.617118976 +0900
|
||||
@@ -4,7 +4,6 @@
|
||||
#include <cstring>
|
||||
#include <unistd.h>
|
||||
#include <zlib.h>
|
||||
-#include "freetype/freetype.h"
|
||||
|
||||
#include "ttmkfdir.h"
|
||||
#include "encoding.h"
|
||||
--- ttmkfdir-3.0.9/encoding.h.orig 2002-12-09 17:52:48.000000000 +0900
|
||||
+++ ttmkfdir-3.0.9/encoding.h 2004-01-31 18:19:18.600014064 +0900
|
||||
@@ -6,7 +6,8 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
-#include "freetype/freetype.h"
|
||||
+#include <ft2build.h>
|
||||
+#include FT_FREETYPE_H
|
||||
|
||||
#include "util.h"
|
||||
|
||||
--- ttmkfdir-3.0.9/ttf.h.orig 2003-01-08 14:25:25.000000000 +0900
|
||||
+++ ttmkfdir-3.0.9/ttf.h 2004-01-31 18:32:53.333155800 +0900
|
||||
@@ -3,12 +3,13 @@
|
||||
#define TTF_H__
|
||||
|
||||
#include <string>
|
||||
-#include "freetype/freetype.h"
|
||||
-#include "freetype/tttables.h"
|
||||
-#include "freetype/ftsnames.h"
|
||||
-#include "freetype/ttnameid.h"
|
||||
-#include "freetype/fterrors.h"
|
||||
-#include "freetype/ftmodule.h"
|
||||
+#include <ft2build.h>
|
||||
+#include FT_FREETYPE_H
|
||||
+#include FT_SFNT_NAMES_H
|
||||
+#include FT_TRUETYPE_TABLES_H
|
||||
+#include FT_TRUETYPE_IDS_H
|
||||
+#include FT_ERRORS_H
|
||||
+#include FT_MODULE_H
|
||||
|
||||
#include "util.h"
|
||||
#include "encoding.h"
|
||||
56
ttmkfdir-3.0.9-namespace.patch
Normal file
56
ttmkfdir-3.0.9-namespace.patch
Normal file
@ -0,0 +1,56 @@
|
||||
*** ttmkfdir-3.0.9/ttf.h.ORIG 2004-03-10 13:40:47.149814008 -0700
|
||||
--- ttmkfdir-3.0.9/ttf.h 2004-03-10 13:40:50.571293864 -0700
|
||||
*************** namespace ttf {
|
||||
*** 50,56 ****
|
||||
TT_Postscript *post;
|
||||
std::string FileName;
|
||||
};
|
||||
! };
|
||||
|
||||
#endif /* TTF_H__ */
|
||||
|
||||
--- 50,56 ----
|
||||
TT_Postscript *post;
|
||||
std::string FileName;
|
||||
};
|
||||
! }
|
||||
|
||||
#endif /* TTF_H__ */
|
||||
|
||||
*** ttmkfdir-3.0.9/util.h.ORIG 2004-03-10 13:40:19.872960720 -0700
|
||||
--- ttmkfdir-3.0.9/util.h 2004-03-10 13:40:34.059803992 -0700
|
||||
*************** namespace util {
|
||||
*** 17,22 ****
|
||||
Singleton (void) {};
|
||||
~Singleton (void) {};
|
||||
};
|
||||
! };
|
||||
|
||||
#endif // TTMKFDIRUTIL_H__
|
||||
--- 17,22 ----
|
||||
Singleton (void) {};
|
||||
~Singleton (void) {};
|
||||
};
|
||||
! }
|
||||
|
||||
#endif // TTMKFDIRUTIL_H__
|
||||
*** ttmkfdir-3.0.9/builtin.cpp.ORIG 2004-03-10 13:41:47.089701760 -0700
|
||||
--- ttmkfdir-3.0.9/builtin.cpp 2004-03-10 13:41:51.327057584 -0700
|
||||
*************** namespace {
|
||||
*** 600,606 ****
|
||||
0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
|
||||
};
|
||||
|
||||
! };
|
||||
|
||||
Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = {
|
||||
{256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}},
|
||||
--- 600,606 ----
|
||||
0x00f8, 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x00fe, 0x00ff
|
||||
};
|
||||
|
||||
! }
|
||||
|
||||
Encoding::BuiltinEncoding_t Encoding::builtin_encodings[] = {
|
||||
{256,191,32,{TT_PLATFORM_MICROSOFT,TT_MS_ID_UNICODE_CS,iso8859_1},{"iso8859-1",}},
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
Summary: Utility used to create fonts.scale files for truetype fonts
|
||||
Name: ttmkfdir
|
||||
Version: 3.0.9
|
||||
Release: 7
|
||||
Release: 11
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Patch: ttmkfdir-3.0.9-cpp.patch
|
||||
Patch1: ttmkfdir-3.0.9-zlib.patch
|
||||
Patch2: ttmkfdir-3.0.9-fix-freetype217.patch
|
||||
Patch3: ttmkfdir-3.0.9-namespace.patch
|
||||
Patch4: ttmkfdir-3.0.9-defautl_enc_size.patch
|
||||
License: GPL
|
||||
Group: Applications/System
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
@ -24,6 +27,9 @@ by the font server.
|
||||
%setup -q
|
||||
%patch -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
make OPTFLAGS="$RPM_OPT_FLAGS"
|
||||
@ -42,6 +48,19 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_bindir}/ttmkfdir
|
||||
|
||||
%changelog
|
||||
* Fri Mar 19 2004 Yu Shao <yshao@redhat.com> 3.0.9-11
|
||||
- set default encoding size to DEFAULT_SIZE, bug #118713
|
||||
|
||||
* Fri Mar 12 2004 Yu Shao <yshao@redhat.com> 3.0.9-10
|
||||
- patch suggested from law@redhat.com not to use semicolon in GCC3.4, 3.5
|
||||
|
||||
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Wed Feb 12 2004 Yu Shao <yshao@redhat.com> 3.0.9-8
|
||||
- patch for building package against freetype-2.1.7
|
||||
- from kanagawa jigorou (jigorou3@mail.goo.ne.jp) #114682
|
||||
|
||||
* Mon Sep 15 2003 Yu Shao <yshao@redhat.com> 3.0.9-6
|
||||
- updated zlib patch from Nalin Dahyabhai #104331
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user