packages: ttmkfdir/ttmkfdir.spec, ttmkfdir/ttmkfdir-3.0.9-bug434301.patch (...
arekm
arekm at pld-linux.org
Tue Sep 6 17:39:19 CEST 2011
Author: arekm Date: Tue Sep 6 15:39:19 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- update to 3.0.9 (from debian) + patches (from fedora)
---- Files affected:
packages/ttmkfdir:
ttmkfdir.spec (1.26 -> 1.27) , ttmkfdir-3.0.9-bug434301.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-cpp.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-encoding-dir.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-fix-crash.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-fix-freetype217.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-font-scale.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-namespace.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-segfaults.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-warnings.patch (NONE -> 1.1) (NEW), ttmkfdir-3.0.9-zlib.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ttmkfdir/ttmkfdir.spec
diff -u packages/ttmkfdir/ttmkfdir.spec:1.26 packages/ttmkfdir/ttmkfdir.spec:1.27
--- packages/ttmkfdir/ttmkfdir.spec:1.26 Fri Apr 2 00:43:44 2010
+++ packages/ttmkfdir/ttmkfdir.spec Tue Sep 6 17:39:14 2011
@@ -2,25 +2,24 @@
Summary: Tool for creating fonts.dir for TrueType fonts
Summary(pl.UTF-8): Narzędzie do tworzenia plików fonts.dir dla fontów TrueType
Name: ttmkfdir
-Version: 2.20021109
+Version: 3.0.9
Release: 1
Epoch: 1
-License: unknown
+License: LGPL v2+
Group: Applications/File
-URL: http://people.redhat.com/yshao/
-Source0: http://people.redhat.com/yshao/%{name}%{version}.tar.bz2
-# Source0-md5: 79e0401393c9728865aa73bb2bd68dd4
+Source0: ftp://ftp.debian.org//debian/pool/main/t/ttmkfdir/%{name}_%{version}.orig.tar.gz
+# Source0-md5: c22b8b7f8401fd924200c8e0e04a78f9
Source1: %{name}2.1
-Patch0: %{name}2-libtool.patch
-Patch1: %{name}2-foundrynames.patch
-Patch2: %{name}2-gcc.patch
-Patch3: %{name}2-iso10646.patch
-Patch4: %{name}2-CJK-bugfix.patch
-Patch5: %{name}2-freetype2-port+cjk.patch
-Patch6: %{name}2-encodings.patch
-Patch7: %{name}2-nofileswithspaces.patch
-Patch8: %{name}2-build.patch
-Patch9: %{name}2-headers.patch
+Patch0: %{name}-3.0.9-cpp.patch
+Patch1: %{name}-3.0.9-zlib.patch
+Patch2: %{name}-3.0.9-fix-freetype217.patch
+Patch3: %{name}-3.0.9-namespace.patch
+Patch4: %{name}-3.0.9-fix-crash.patch
+Patch5: %{name}-3.0.9-warnings.patch
+Patch6: %{name}-3.0.9-segfaults.patch
+Patch7: %{name}-3.0.9-encoding-dir.patch
+Patch8: %{name}-3.0.9-font-scale.patch
+Patch9: %{name}-3.0.9-bug434301.patch
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.1
BuildRequires: libstdc++-devel
@@ -41,28 +40,32 @@
potrzebne, aby móc korzystać z fontów TrueType w X Window.
%prep
-%setup -q -n %{name}2
+%setup -q
%patch0 -p1
-%patch1 -p2
-%patch3 -p2
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
-%{__make} clean
%{__make} \
CXX="%{__cxx}" \
- DEBUG="%{rpmcflags}" \
+ DEBUG="%{rpmcflags} %{rpmcppflags}" \
FREETYPE_BASE="/usr/include/freetype2" \
FREETYPE_LIB="%{_libdir}/libfreetype.la"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+
+%{__make} install \
+ DESTDIR=$RPM_BUILD_ROOT
-install ttmkfdir $RPM_BUILD_ROOT%{_bindir}
install %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/ttmkfdir.1
%clean
@@ -79,6 +82,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.27 2011/09/06 15:39:14 arekm
+- update to 3.0.9 (from debian) + patches (from fedora)
+
Revision 1.26 2010/04/01 22:43:44 pawelz
- fix build on x86_64 (lib -> lib64)
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-bug434301.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-bug434301.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-bug434301.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,11 @@
+--- ttmkfdir-3.0.9/directory.cpp.bak 2008-02-27 10:18:52.000000000 +0800
++++ ttmkfdir-3.0.9/directory.cpp 2008-02-27 10:20:24.000000000 +0800
+@@ -3,6 +3,8 @@
+ #include <stdio.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
++#include <string.h>
++#include <stdlib.h>
+
+ #include "directory.h"
+
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-cpp.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-cpp.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-cpp.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,11 @@
+--- ttmkfdir-3.0.9/ttf.cpp.sopwith Thu Aug 7 12:49:08 2003
++++ ttmkfdir-3.0.9/ttf.cpp Thu Aug 7 12:50:01 2003
+@@ -239,7 +239,7 @@
+ for (i = 0; i < n; i++) {
+ if ((fterror = FT_Get_Sfnt_Name (face, i, &NamePtr)) != FT_Err_Ok) {
+ std::cout << "Warning: Can't SFNT name : " << FileName << "(" << fterror << ")" << std::endl;
+- return;
++ return NULL;
+ };
+ platform = NamePtr.platform_id;
+ encoding = NamePtr.encoding_id;
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-encoding-dir.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-encoding-dir.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-encoding-dir.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,20 @@
+--- ttmkfdir-3.0.9/ttmkfdir.cpp.Origin 2006-06-15 17:58:43.000000000 +0800
++++ ttmkfdir-3.0.9/ttmkfdir.cpp 2006-06-15 17:59:07.000000000 +0800
+@@ -16,7 +16,7 @@
+
+ cerr << "This Program is (C) Joerg Pommnitz, 2000" << endl;
+ cerr << "Usage: " << program << " [OPTION]" << endl;
+- cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/X11R6/lib/X11/fonts/encodings/encodings.dir\"" << endl;
++ cerr << "-e, --encoding\t\tname of the encoding directory file, default is \"/usr/share/X11/fonts/encodings/encodings.dir\"" << endl;
+ cerr << "-o, --output\t\tname of the destination file, default is \"fonts.scale\"" << endl;
+ cerr << "-d, --font-dir\t\tname of the TrueType font directory, default is \".\"" << endl;
+ cerr << "-f, --default-foundry\tname of the default font foundry, default is \"misc\"" << endl;
+@@ -32,7 +32,7 @@
+ void
+ ParseCommandline (int argc, char *argv[])
+ {
+- cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/X11R6/lib/X11/fonts/encodings/encodings.dir"));
++ cmdline::instance()->AddOption (new Commandline::Option ("encoding", 'e', "/usr/share/X11/fonts/encodings/encodings.dir"));
+ cmdline::instance()->AddOption (new Commandline::Option ("output", 'o', "fonts.scale"));
+ cmdline::instance()->AddOption (new Commandline::Option ("font-dir", 'd', "."));
+ cmdline::instance()->AddOption (new Commandline::Option ("default-foundry", 'f', "misc"));
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-fix-crash.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-fix-crash.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-fix-crash.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,79 @@
+--- ttmkfdir-3.0.9.orig/encoding.l 2003-01-08 14:25:25.000000000 +0900
++++ ttmkfdir-3.0.9/encoding.l 2005-08-03 19:24:22.000000000 +0900
+@@ -21,6 +21,19 @@
+
+ static Encoding *cur_enc;
+ static NumericMapping *cur_map;
++static int is_created_map = 0;
++
++static void
++create_mapping(void)
++{
++ cur_map = new NumericMapping (cur_enc->size,
++ TT_PLATFORM_MICROSOFT,
++ TT_MS_ID_UNICODE_CS);
++
++ cur_enc->enc_size = 0;
++ cur_enc->start_code = 0xffff;
++ is_created_map = 1;
++}
+
+ %}
+
+@@ -67,12 +80,6 @@
+ }
+
+ <INSIDE_ENC_BLOCK>STARTMAPPING{WHITESPACES}unicode {
+- cur_map = new NumericMapping (cur_enc->size,
+- TT_PLATFORM_MICROSOFT,
+- TT_MS_ID_UNICODE_CS);
+-
+- cur_enc->enc_size = 0;
+- cur_enc->start_code = 0xffff;
+ BEGIN(INSIDE_MAP_BLOCK);
+ }
+
+@@ -107,6 +114,12 @@
+ i2 = i1;
+ }
+
++ /* avoid a crash issue */
++ if (cur_enc->size < i2)
++ cur_enc->size = i2;
++ if (!is_created_map)
++ create_mapping();
++
+ /* now mark all the unassigned codes */
+ for (long i = i1; i <= i2; i++) {
+ (*cur_map)[i] = -1;
+@@ -114,10 +127,14 @@
+ }
+
+ <INSIDE_MAP_BLOCK>{NUMBER}({WHITESPACES}{NUMBER}){0,2} {
+- int numbers[3], i = 0, start_range, end_range, target, res;
++ unsigned int start_range;
++ int numbers[3], i = 0, end_range, target, res;
+ char *startptr;
+ char *endptr = yytext;
+
++ if (!is_created_map)
++ create_mapping();
++
+ for (i = 0;;i++) {
+ startptr = endptr;
+ res = std::strtol (startptr, &endptr, 0);
+@@ -150,9 +167,14 @@
+
+
+ <INSIDE_MAP_BLOCK>ENDMAPPING {
++ /* it may not happens but to be safe */
++ if (!is_created_map)
++ create_mapping();
++
+ cur_enc->AddMapping (cur_map);
+ dest.insert (std::make_pair(cur_map->cmapkey(), cur_enc));;
+ BEGIN(INSIDE_ENC_BLOCK);
++ is_created_map = 0;
+ }
+
+ <INSIDE_UNKNOWN_MAP>ENDMAPPING {
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-fix-freetype217.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-fix-freetype217.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-fix-freetype217.patch Tue Sep 6 17:39:14 2011
@@ -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"
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-font-scale.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-font-scale.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-font-scale.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,107 @@
+diff -ruN -x '*o' -x '*~' -x ttmkfdir -x parser.cpp ttmkfdir-3.0.9.orig/ttf.cpp ttmkfdir-3.0.9/ttf.cpp
+--- ttmkfdir-3.0.9.orig/ttf.cpp 2006-11-29 15:46:55.000000000 +0900
++++ ttmkfdir-3.0.9/ttf.cpp 2006-11-29 17:21:40.000000000 +0900
+@@ -70,7 +70,6 @@
+ Face::Face (const std::string &filename)
+ {
+ FT_Error fterror;
+- string header_enc("-");
+ int face_id, face_count;
+
+ string::size_type pos = filename.rfind("/");
+@@ -98,29 +97,13 @@
+ if ((post = (TT_Postscript *) FT_Get_Sfnt_Table(face, ft_sfnt_post)) == 0){
+ std::cout << "Warning: Can't get POST table : " << FileName << "(" << FT_Err_Post_Table_Missing << ")" << std::endl;
+ return;
+- }
++ }
+
+ if ((os2 = (TT_OS2 *) FT_Get_Sfnt_Table(face, ft_sfnt_os2)) == 0) {
+ std::cout << "Warning: Can't get OS2 table : " << FileName << "(" << FT_Err_Table_Missing << ")" << std::endl;
+ return;
+ }
+
+- for (int j = 0; j < 32; j++) {
+- switch (os2->ulCodePageRange1 & (1 << j)) {
+- case TT_CODEPAGE_RANGE_932: /* Japanese */
+- header_enc = "ji";
+- break;
+- case TT_CODEPAGE_RANGE_936: /* Simplified Chinese */
+- header_enc = "gb";
+- break;
+- case TT_CODEPAGE_RANGE_949: /* Korean Wansung */
+- header_enc = "ks";
+- break;
+- case TT_CODEPAGE_RANGE_950: /* Traditional Chinese */
+- header_enc = "big";
+- break;
+- }
+- }
+ /*
+ * Iterate over all cmap entries.
+ */
+@@ -148,25 +131,50 @@
+ */
+ typedef Encodings_t::const_iterator MI;
+ std::pair<MI, MI> bounds = Encodings::instance()->equal_range (key);
++ bool need_non_cjk_encoding = true;
+
+ /*
+ * then look whether each of these encodings is present in this cmap.
+ */
+- for (Encodings_t::const_iterator i = bounds.first; i != bounds.second; i++) {
+- if (MappingPresent (cmapidx,
+- i->second->mappings[key],
+- i->second->enc_size,
+- i->second->start_code,
+- (header_enc.compare("-")?((i->second->names[0].find(header_enc) != string::npos)?1:0):1)
+- )) {
+- /*
+- * if the mapping is present, add all xlfd names for this mapping to the
+- * list of available font names.
+- */
+- for (unsigned int k = 0; k < i->second->names.size (); k++) {
+- add_entries (i->second->names[k],face_id);
++ for (int j = 0; j < 32; j++) {
++ string header_enc("-");
++
++ switch (os2->ulCodePageRange1 & (1 << j)) {
++ case TT_CODEPAGE_RANGE_932: /* Japanese */
++ header_enc = "ji";
++ break;
++ case TT_CODEPAGE_RANGE_936: /* Simplified Chinese */
++ header_enc = "gb";
++ break;
++ case TT_CODEPAGE_RANGE_949: /* Korean Wansung */
++ header_enc = "ks";
++ break;
++ case TT_CODEPAGE_RANGE_950: /* Traditional Chinese */
++ header_enc = "big";
++ break;
++ default:
++ if (need_non_cjk_encoding)
++ need_non_cjk_encoding = false;
++ else
++ continue;
++ break;
++ }
++ for (Encodings_t::const_iterator i = bounds.first; i != bounds.second; i++) {
++ if (MappingPresent (cmapidx,
++ i->second->mappings[key],
++ i->second->enc_size,
++ i->second->start_code,
++ (header_enc.compare("-")?((i->second->names[0].find(header_enc) != string::npos)?1:0):1)
++ )) {
++ /*
++ * if the mapping is present, add all xlfd names for this mapping to the
++ * list of available font names.
++ */
++ for (unsigned int k = 0; k < i->second->names.size (); k++) {
++ add_entries (i->second->names[k],face_id);
++ }
+ }
+- }
++ }
+ }
+ }
+
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-namespace.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-namespace.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-namespace.patch Tue Sep 6 17:39:14 2011
@@ -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",}},
+
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-segfaults.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-segfaults.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-segfaults.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,20 @@
+--- ttmkfdir-3.0.9/directory.cpp.back 2005-10-08 14:25:37.839328408 +0800
++++ ttmkfdir-3.0.9/directory.cpp 2005-10-08 14:26:00.021956136 +0800
+@@ -1,5 +1,6 @@
+ #include <cctype>
+ #include <dirent.h>
++#include <stdio.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+@@ -13,6 +14,10 @@
+ directory::scan (const std::string &dir)
+ {
+ DIR *ttfdir = opendir(dir.c_str ());
++ if (!ttfdir) {
++ printf("%s is not exist!\n", dir.c_str ());
++ exit(-1);
++ }
+
+ this->clear ();
+ dirpath = dir;
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-warnings.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-warnings.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-warnings.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,75 @@
+--- ttmkfdir-3.0.9/encoding.l~ 2005-08-03 19:33:07.000000000 +0900
++++ ttmkfdir-3.0.9/encoding.l 2005-08-03 21:52:15.000000000 +0900
+@@ -115,7 +115,7 @@
+ }
+
+ /* avoid a crash issue */
+- if (cur_enc->size < i2)
++ if ((int) (cur_enc->size) < i2)
+ cur_enc->size = i2;
+ if (!is_created_map)
+ create_mapping();
+@@ -127,8 +127,8 @@
+ }
+
+ <INSIDE_MAP_BLOCK>{NUMBER}({WHITESPACES}{NUMBER}){0,2} {
+- unsigned int start_range;
+- int numbers[3], i = 0, end_range, target, res;
++ unsigned int start_range = 0, i = 0, end_range = 0;
++ int numbers[3], target = 0, res;
+ char *startptr;
+ char *endptr = yytext;
+
+--- ttmkfdir-3.0.9/commandline.cpp~ 2002-12-09 17:29:11.000000000 +0900
++++ ttmkfdir-3.0.9/commandline.cpp 2005-08-03 21:12:40.000000000 +0900
+@@ -1,6 +1,8 @@
+ #include <cstdlib>
+
++#ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
++#endif
+ #include <getopt.h>
+
+ #include "commandline.h"
+--- ttmkfdir-3.0.9/ttmkfdir.cpp~ 2003-01-20 08:33:11.000000000 +0900
++++ ttmkfdir-3.0.9/ttmkfdir.cpp 2005-08-03 21:08:43.000000000 +0900
+@@ -76,7 +76,7 @@
+ return 1;
+ }
+
+- fprintf (output, "%d\n", fontdir.size ());
++ fprintf (output, "%d\n", (int)(fontdir.size ()));
+
+ for (vector<string>::const_iterator i = fontdir.begin (); i != fontdir.end (); i++) {
+ fprintf (output, "%s\n", i->c_str ());
+--- ttmkfdir-3.0.9/ttf.cpp~ 2005-08-03 19:33:07.000000000 +0900
++++ ttmkfdir-3.0.9/ttf.cpp 2005-08-03 21:31:48.000000000 +0900
+@@ -533,7 +533,7 @@
+ const char *
+ Face::Weight (void) const
+ {
+- const char *result;
++ const char *result = NULL;
+
+ if (cmdline::instance()->option ("panose") && ((result = PanoseWeight ()) != 0)) {
+ return result;
+@@ -614,7 +614,7 @@
+ const char *
+ Face::Width (void) const
+ {
+- const char *result;
++ const char *result = NULL;
+
+ if (cmdline::instance()->option ("panose") && ((result = PanoseWidth ()) != 0)) {
+ return result;
+--- ttmkfdir-3.0.9/encoding.cpp~ 2005-08-03 19:33:07.000000000 +0900
++++ ttmkfdir-3.0.9/encoding.cpp 2005-08-03 21:31:44.000000000 +0900
+@@ -121,7 +121,7 @@
+
+ NumericMapping *m = new NumericMapping (size, b->mapdata.platform, b->mapdata.encoding);
+
+- for (int i = 0; i < size; i++)
++ for (unsigned int i = 0; i < size; i++)
+ (*m)[i] = b->mapdata.mappingtable[i];
+
+ AddMapping (m);
================================================================
Index: packages/ttmkfdir/ttmkfdir-3.0.9-zlib.patch
diff -u /dev/null packages/ttmkfdir/ttmkfdir-3.0.9-zlib.patch:1.1
--- /dev/null Tue Sep 6 17:39:20 2011
+++ packages/ttmkfdir/ttmkfdir-3.0.9-zlib.patch Tue Sep 6 17:39:14 2011
@@ -0,0 +1,80 @@
+--- ttmkfdir-3.0.9/encoding.cpp 2002-12-09 03:52:48.000000000 -0500
++++ ttmkfdir-3.0.9/encoding.cpp 2003-09-12 12:32:29.000000000 -0400
+@@ -2,6 +2,8 @@
+ #include <cstdio>
+ #include <cstdlib>
+ #include <cstring>
++#include <unistd.h>
++#include <zlib.h>
+ #include "freetype/freetype.h"
+
+ #include "ttmkfdir.h"
+@@ -32,9 +34,16 @@
+ NextFile (FILE *f, char *name)
+ {
+ char file_name [1024];
+- char command[1024];
++ char line_buf [1024];
++ char tmp_file_name[] = "/tmp/ttmkfdir_XXXXXX";
++ char inbuf[300000];
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ttmkfdir/ttmkfdir.spec?r1=1.26&r2=1.27&f=u
More information about the pld-cvs-commit
mailing list