Ship the gstoraster MIME conversion rule now we provide that filter (bug #1019261).
Resolves: rhbz#1019261
This commit is contained in:
Tim Waugh
parent
7327a9a3a3
commit
a267035fb9
@ -1,71 +0,0 @@
|
||||
diff -up cups-filters-1.0.40/filter/pdfutils.c.format-mismatch cups-filters-1.0.40/filter/pdfutils.c
|
||||
--- cups-filters-1.0.40/filter/pdfutils.c.format-mismatch 2013-10-07 16:30:48.000000000 +0100
|
||||
+++ cups-filters-1.0.40/filter/pdfutils.c 2013-10-15 12:53:39.759827578 +0100
|
||||
@@ -242,7 +242,7 @@ void pdfOut_finish_pdf(pdfOut *pdf) // {
|
||||
"%010d 65535 f \n",
|
||||
0,pdf->xrefsize+1,0);
|
||||
for (iA=0;iA<pdf->xrefsize;iA++) {
|
||||
- pdfOut_printf(pdf,"%010ld 00000 n \n",
|
||||
+ pdfOut_printf(pdf,"%010d 00000 n \n",
|
||||
pdf->xref[iA]);
|
||||
}
|
||||
pdfOut_printf(pdf,"trailer\n"
|
||||
@@ -347,7 +347,7 @@ int pdfOut_write_font(pdfOut *pdf,EMB_PA
|
||||
const int l0_obj=pdfOut_add_xref(pdf);
|
||||
assert(l0_obj==ff_obj+1);
|
||||
pdfOut_printf(pdf,"%d 0 obj\n"
|
||||
- "%ld\n"
|
||||
+ "%d\n"
|
||||
"endobj\n"
|
||||
,l0_obj,streamsize);
|
||||
|
||||
diff -up cups-filters-1.0.40/filter/pdfutils.h.format-mismatch cups-filters-1.0.40/filter/pdfutils.h
|
||||
--- cups-filters-1.0.40/filter/pdfutils.h.format-mismatch 2013-10-07 16:30:48.000000000 +0100
|
||||
+++ cups-filters-1.0.40/filter/pdfutils.h 2013-10-15 12:53:39.759827578 +0100
|
||||
@@ -42,8 +42,7 @@ void pdfOut_finish_pdf(pdfOut *pdf);
|
||||
/* General output routine for our pdf.
|
||||
* Keeps track of characters actually written out
|
||||
*/
|
||||
-void pdfOut_printf(pdfOut *pdf,const char *fmt,...)
|
||||
- __attribute__((format(printf, 2, 3)));
|
||||
+void pdfOut_printf(pdfOut *pdf,const char *fmt,...);
|
||||
|
||||
/* write out an escaped pdf string: e.g. (Text \(Test\)\n)
|
||||
* >len==-1: use strlen(str)
|
||||
diff -up cups-filters-1.0.40/filter/texttopdf.c.format-mismatch cups-filters-1.0.40/filter/texttopdf.c
|
||||
--- cups-filters-1.0.40/filter/texttopdf.c.format-mismatch 2013-10-07 16:30:48.000000000 +0100
|
||||
+++ cups-filters-1.0.40/filter/texttopdf.c 2013-10-15 12:53:39.760827583 +0100
|
||||
@@ -250,7 +250,7 @@ WritePage(void)
|
||||
int len_obj=pdfOut_add_xref(pdf);
|
||||
assert(len_obj==content+1);
|
||||
pdfOut_printf(pdf,"%d 0 obj\n"
|
||||
- "%ld\n"
|
||||
+ "%d\n"
|
||||
"endobj\n",
|
||||
len_obj,size);
|
||||
|
||||
diff -up cups-filters-1.0.40/fontembed/dynstring.h.format-mismatch cups-filters-1.0.40/fontembed/dynstring.h
|
||||
--- cups-filters-1.0.40/fontembed/dynstring.h.format-mismatch 2013-10-07 16:30:48.000000000 +0100
|
||||
+++ cups-filters-1.0.40/fontembed/dynstring.h 2013-10-15 12:53:39.760827583 +0100
|
||||
@@ -9,8 +9,7 @@ typedef struct {
|
||||
int dyn_init(DYN_STRING *ds,int reserve_size); // -1 on error
|
||||
void dyn_free(DYN_STRING *ds);
|
||||
int dyn_ensure(DYN_STRING *ds,int free_space);
|
||||
-int dyn_printf(DYN_STRING *ds,const char *fmt,...) // appends
|
||||
- __attribute__((format(printf, 2, 3)));
|
||||
+int dyn_printf(DYN_STRING *ds,const char *fmt,...); // appends
|
||||
|
||||
#endif
|
||||
|
||||
diff -up cups-filters-1.0.40/fontembed/embed_sfnt.c.format-mismatch cups-filters-1.0.40/fontembed/embed_sfnt.c
|
||||
--- cups-filters-1.0.40/fontembed/embed_sfnt.c.format-mismatch 2013-10-07 16:30:48.000000000 +0100
|
||||
+++ cups-filters-1.0.40/fontembed/embed_sfnt.c 2013-10-15 12:53:39.761827588 +0100
|
||||
@@ -519,7 +519,7 @@ int emb_otf_ps(OTF_FILE *otf,unsigned sh
|
||||
free(ds.buf);
|
||||
return -1;
|
||||
}
|
||||
- dyn_printf(&ds,"%%!PS-TrueTypeFont-%d-%d\n",
|
||||
+ dyn_printf(&ds,"%!PS-TrueTypeFont-%d-%d\n",
|
||||
otf->version,get_ULONG(head+4));
|
||||
const int bbxmin=get_SHORT(head+36)*1000/otf->unitsPerEm,
|
||||
bbymin=get_SHORT(head+38)*1000/otf->unitsPerEm,
|
||||
@ -4,7 +4,7 @@
|
||||
Summary: OpenPrinting CUPS filters and backends
|
||||
Name: cups-filters
|
||||
Version: 1.0.40
|
||||
Release: 2.0.0.1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
|
||||
# For a breakdown of the licensing, see COPYING file
|
||||
# GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*,
|
||||
@ -22,7 +22,6 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups
|
||||
Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
|
||||
|
||||
Patch1: cups-filters-pdf-landscape.patch
|
||||
Patch2: cups-filters-format-mismatch.patch
|
||||
|
||||
Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
@ -108,9 +107,6 @@ This is the development package for OpenPrinting CUPS filters and backends.
|
||||
# Fix PDF landscape printing (bug #768811).
|
||||
%patch1 -p1 -b .pdf-landscape
|
||||
|
||||
# Revert bug for bug #1014093.
|
||||
%patch2 -p1 -b .format-mismatch
|
||||
|
||||
%build
|
||||
# work-around Rpath
|
||||
./autogen.sh
|
||||
@ -129,11 +125,6 @@ make %{?_smp_mflags}
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
# Avoid conflicts with ghostscript < 9.08
|
||||
rm -f %{buildroot}%{_datadir}/ppd/cupsfilters/pxl{color,mono}.ppd
|
||||
rm -f %{buildroot}%{_cups_serverbin}/filter/gsto*
|
||||
sed -i -e '/gstoraster/d' %{buildroot}%{_datadir}/cups/mime/cupsfilters.convs
|
||||
|
||||
# https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc
|
||||
mkdir __doc
|
||||
mv %{buildroot}%{_datadir}/doc/cups-filters/* __doc
|
||||
@ -229,8 +220,9 @@ fi
|
||||
%{_libdir}/libfontembed.so
|
||||
|
||||
%changelog
|
||||
* Tue Oct 15 2013 Tim Waugh <twaugh@redhat.com> - 1.0.40-2.0.0.1
|
||||
- Revert bug for bug #1014093.
|
||||
* Wed Oct 16 2013 Tim Waugh <twaugh@redhat.com> - 1.0.40-3
|
||||
- Ship the gstoraster MIME conversion rule now we provide that filter
|
||||
(bug #1019261).
|
||||
|
||||
* Fri Oct 11 2013 Tim Waugh <twaugh@redhat.com> - 1.0.40-2
|
||||
- Fix PDF landscape printing (bug #768811).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user