Mercurial > gub
changeset 2472:6f36dc9287b8
Try gs x64 patch.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 24 Oct 2006 08:54:01 +0100 |
| parents | 54f9b5dcc7e5 |
| children | ca8362c16096 |
| files | patches/gs-r7029.patch specs/ghostscript.py |
| diffstat | 2 files changed, 37 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/gs-r7029.patch Tue Oct 24 08:54:01 2006 +0100 @@ -0,0 +1,36 @@ +Index: gs/src/sfxstdio.c +=================================================================== +--- gs/src/sfxstdio.c (revision 7001) ++++ gs/src/sfxstdio.c (working copy) +@@ -155,6 +155,7 @@ + return 0; + s_init_ids(s); + s->is_temp = 0; /* not a temp stream */ ++ s->foreign = 0; + /* + * Disable the stream now (in case we can't open the file, + * or a filter init procedure fails) so that `restore' won't +Index: gs/src/zcontrol.c +=================================================================== +--- gs/src/zcontrol.c (revision 7022) ++++ gs/src/zcontrol.c (working copy) +@@ -1009,12 +1009,13 @@ + es_ptr ep = rsenum.ptr + used - 1; + uint count = used; + +- for (; count; count--, ep--) +- if (r_is_estack_mark(ep) && +- estack_mark_index(ep) == es_stopped && +- (ep[2].value.intval & mask) != 0 +- ) +- return scanned + (used - count + 1); ++ for (; count; count--, ep--) { ++ if (r_is_estack_mark(ep)) { ++ if (estack_mark_index(ep) == es_stopped && ++ (ep[2].value.intval & mask) != 0) ++ return scanned + (used - count + 1); ++ } ++ } + scanned += used; + } while (ref_stack_enum_next(&rsenum)); + return 0;
--- a/specs/ghostscript.py Tue Oct 24 07:52:39 2006 +0100 +++ b/specs/ghostscript.py Tue Oct 24 08:54:01 2006 +0100 @@ -54,6 +54,7 @@ self.system ('cd %(srcdir)s/ && patch --force -p2 < %(patchdir)s/ghostscript-8.50-ttf.patch') if self.version == '8.54': self.system ('cd %(srcdir)s/ && patch --force -p1 < %(patchdir)s/05_gxfcopy_qsort_64bit_clean.dpatch') + self.system ('cd %(srcdir)s/ && patch --force -p1 < %(patchdir)s/gs-r7029.patch') substs = [(r'\$\(%s\)' % d, '$(DESTDIR)$(%s)' % d) for d in ['bindir', 'datadir', 'gsdir', 'gsdatadir', 'docdir',