rpms/t1utils/devel t1utils-compile.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 t1utils.spec, 1.18, 1.19
José Abílio Oliveira Matos
jamatos at fedoraproject.org
Thu Jul 30 21:28:31 UTC 2009
- Previous message (by thread): rpms/olpc-powerd/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 olpc-powerd.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/util-linux-ng/devel util-linux-ng.spec, 1.52, 1.53 util-linux-ng-2.16-mount-conf.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jamatos
Update of /cvs/pkgs/rpms/t1utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4664
Modified Files:
.cvsignore sources t1utils.spec
Added Files:
t1utils-compile.patch
Log Message:
* Thu Jul 30 2009 José Matos <jamatos at fc.up.pt> - 1.34-1
- New upstream release and fix issue with stricter gcc.
t1utils-compile.patch:
t1asm.c | 96 ++++++++++++++++++++++++++++++++--------------------------------
1 file changed, 48 insertions(+), 48 deletions(-)
--- NEW FILE t1utils-compile.patch ---
--- t1asm.c.orig 2008-03-01 17:59:11.000000000 +0000
+++ t1asm.c 2009-07-30 22:23:47.038752459 +0100
@@ -23,11 +23,11 @@
* Revision 1.4 92/07/10 10:53:09 ilh
* Added support for additional PostScript after the closefile command
* (ie., some fonts have {restore}if after the cleartomark).
- *
+ *
* Revision 1.3 92/06/23 10:58:25 ilh
* MSDOS porting by Kai-Uwe Herbing (herbing at netmbx.netmbx.de)
* incoporated.
- *
+ *
* Revision 1.2 92/05/22 11:54:45 ilh
* Fixed bug where integers larger than 32000 could not be encoded in
* charstrings. Now integer range is correct for four-byte
@@ -183,7 +183,7 @@
static byte cencrypt(byte plain)
{
byte cipher;
-
+
/* Thanks to Tom Kacvinsky <tjk at ams.org> who reported that lenIV == -1 means
unencrypted charstrings. */
if (lenIV < 0) return plain;
@@ -201,7 +201,7 @@
{
static const char *hexchar = "0123456789abcdef";
static int hexcol = 0;
-
+
if (pfb) {
/* PFB */
PFB_OUTPUT_BYTE(&w, b);
@@ -252,7 +252,7 @@
pfb_writer_output_block(&w);
w.blocktyp = PFB_BINARY;
}
-
+
in_eexec = 1;
er = 55665;
eexec_byte(0);
@@ -280,16 +280,16 @@
the newline is put into line[]. When terminated by '{', the '{' is not put
into line[], and the flag start_charstring is set to 1. */
-static void getline()
+static void getline_()
{
int c;
char *p = line;
int comment = 0;
start_charstring = 0;
-
+
while (p < line + LINESIZE) {
c = getc(ifp);
-
+
if (c == EOF)
break;
else if (c == '%')
@@ -302,9 +302,9 @@
} else
active = 0;
}
-
+
*p++ = (char) c;
-
+
/* end of line processing: change CR or CRLF into LF, and exit */
if (c == '\r') {
c = getc(ifp);
@@ -315,7 +315,7 @@
} else if (c == '\n')
break;
}
-
+
*p = '\0';
}
@@ -326,16 +326,16 @@
static void eexec_end(void)
{
int i, j;
-
+
if (!pfb)
putc('\n', ofp);
else if (w.blocktyp != PFB_ASCII) {
pfb_writer_output_block(&w);
w.blocktyp = PFB_ASCII;
}
-
+
in_eexec = active = 0;
-
+
for (i = 0; i < 8; i++) {
for (j = 0; j < 64; j++)
eexec_byte('0');
@@ -438,16 +438,16 @@
int c = getc(ifp);
while (isspace(c))
c = getc(ifp);
-
+
if (c == '%') {
while (c != EOF && c != '\r' && c != '\n')
c = getc(ifp);
get_charstring_token();
-
+
} else if (c == '}') {
line[0] = '}';
line[1] = 0;
-
+
} else {
char *p = line;
while (p < line + LINESIZE) {
@@ -481,13 +481,13 @@
int one;
int two;
int ok = 0;
-
+
cp = (struct command *)
bsearch((void *) line, (void *) command_table,
sizeof(command_table) / sizeof(struct command),
sizeof(struct command),
command_compare);
-
+
if (cp) {
one = cp->one;
two = cp->two;
@@ -503,7 +503,7 @@
} else if (strncmp(line, "UNKNOWN_", 8) == 0) {
/* Allow unanticipated UNKNOWN commands. */
one = 12;
- if (sscanf(line + 8, "12_%d", &two) == 1)
+ if (sscanf(line + 8, "12_%d", &two) == 1)
ok = 1;
else if (sscanf(line + 8, "%d", &one) == 1) {
two = -1;
@@ -611,20 +611,20 @@
int main(int argc, char *argv[])
{
char *p, *q, *r;
-
+
Clp_Parser *clp =
Clp_NewParser(argc, (const char * const *)argv, sizeof(options) / sizeof(options[0]), options);
program_name = Clp_ProgramName(clp);
-
+
/* interpret command line arguments using CLP */
while (1) {
int opt = Clp_Next(clp);
switch (opt) {
-
+
case BLOCK_LEN_OPT:
blocklen = clp->val.i;
break;
-
+
output_file:
case OUTPUT_OPT:
if (ofp)
@@ -634,20 +634,20 @@
else if (!(ofp = fopen(clp->arg, "w")))
fatal_error("%s: %s", clp->arg, strerror(errno));
break;
-
+
case PFB_OPT:
pfb = 1;
break;
-
+
case PFA_OPT:
pfb = 0;
break;
-
+
case HELP_OPT:
usage();
exit(0);
break;
-
+
case VERSION_OPT:
printf("t1asm (LCDF t1utils) %s\n", VERSION);
printf("Copyright (C) 1992-2003 I. Lee Hetherington, Eddie Kohler et al.\n\
@@ -656,7 +656,7 @@
particular purpose.\n");
exit(0);
break;
-
+
case Clp_NotOption:
if (ifp && ofp)
fatal_error("too many arguments");
@@ -667,18 +667,18 @@
else if (!(ifp = fopen(clp->arg, "r")))
fatal_error("%s: %s", clp->arg, strerror(errno));
break;
-
+
case Clp_Done:
goto done;
-
+
case Clp_BadOption:
short_usage();
exit(1);
break;
-
+
}
}
-
+
done:
if (!pfb) {
if (blocklen == -1)
@@ -691,38 +691,38 @@
error("warning: line length lowered to %d", blocklen);
}
}
-
+
if (!ifp) ifp = stdin;
if (!ofp) ofp = stdout;
if (pfb)
init_pfb_writer(&w, blocklen, ofp);
-
+
#if defined(_MSDOS) || defined(_WIN32)
/* If we are processing a PFB (binary) output */
/* file, we must set its file mode to binary. */
if (pfb)
_setmode(_fileno(ofp), _O_BINARY);
#endif
-
+
/* Finally, we loop until no more input. Some special things to look for are
the `currentfile eexec' line, the beginning of the `/Subrs' or
`/CharStrings' definition, the definition of `/lenIV', and the definition
of the charstring start command which has `...string currentfile...' in
it.
-
+
Being careful: Check with `/Subrs' and `/CharStrings' to see that a
number follows the token -- otherwise, the token is probably nested in a
subroutine a la Adobe Jenson, and we shouldn't pay attention to it.
-
+
Bugs: Occurrence of `/Subrs 9' in a comment will fool t1asm.
-
+
Thanks to Tom Kacvinsky <tjk at ams.org> who reported that some fonts come
without /Subrs sections and provided a patch. */
-
+
while (!feof(ifp) && !ferror(ifp)) {
- getline();
-
+ getline_();
+
if (!ever_active) {
if (strncmp(line, "currentfile eexec", 17) == 0 && isspace(line[17])) {
/* Allow arbitrary whitespace after "currentfile eexec".
@@ -775,9 +775,9 @@
eexec_string(line);
break;
}
-
+
eexec_string(line);
-
+
/* output line data */
if (start_charstring) {
if (!cs_start[0])
@@ -785,17 +785,17 @@
parse_charstring();
}
}
-
+
/* Handle remaining PostScript after the eexec section */
if (in_eexec)
eexec_end();
-
+
/* There may be additional code. */
while (!feof(ifp) && !ferror(ifp)) {
- getline();
+ getline_();
eexec_string(line);
}
-
+
if (pfb)
pfb_writer_end(&w);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/t1utils/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 7 Sep 2008 15:19:58 -0000 1.3
+++ .cvsignore 30 Jul 2009 21:28:31 -0000 1.4
@@ -1 +1 @@
-t1utils-1.33.tar.gz
+t1utils-1.34.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/t1utils/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources 7 Sep 2008 15:19:58 -0000 1.3
+++ sources 30 Jul 2009 21:28:31 -0000 1.4
@@ -1 +1 @@
-a8d9dad4eab239357dd045275770eb8f t1utils-1.33.tar.gz
+2e83dbd36ade1a9e127ca64a8684771e t1utils-1.34.tar.gz
Index: t1utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/t1utils/devel/t1utils.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- t1utils.spec 27 Jul 2009 05:28:15 -0000 1.18
+++ t1utils.spec 30 Jul 2009 21:28:31 -0000 1.19
@@ -1,6 +1,6 @@
Name: t1utils
-Version: 1.33
-Release: 3%{?dist}
+Version: 1.34
+Release: 1%{?dist}
Summary: Collection of Type 1 and 2 font manipulation utilities
@@ -9,6 +9,7 @@ Group: Applications/Publishing
License: MIT
URL: http://www.lcdf.org/~eddietwo/type/
Source0: http://www.lcdf.org/~eddietwo/type/t1utils-%{version}.tar.gz
+Patch0: t1utils-compile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -20,6 +21,7 @@ format, and Macintosh resource forks.
%prep
%setup -q
+%patch0 -p0
iconv -f iso-8859-1 -t utf-8 -o NEWS{.utf8,}
mv NEWS{.utf8,}
@@ -45,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 30 2009 José Matos <jamatos at fc.up.pt> - 1.34-1
+- New upstream release and fix issue with stricter gcc.
+
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.33-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
- Previous message (by thread): rpms/olpc-powerd/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 olpc-powerd.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/util-linux-ng/devel util-linux-ng.spec, 1.52, 1.53 util-linux-ng-2.16-mount-conf.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list