diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-08-24 11:37:05 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-08-24 11:37:05 +0000 |
| commit | 3f226e3afbf0cbfd2663dbbdb21efc241281f117 (patch) | |
| tree | fef89b388b5d6474a4ff61e94a57dc10a44789f6 /print | |
| parent | cb006f26ecaca1503319278aef5a7e306f8b11f8 (diff) | |
| download | ports-3f226e3afbf0cbfd2663dbbdb21efc241281f117.tar.gz ports-3f226e3afbf0cbfd2663dbbdb21efc241281f117.zip | |
print/foomatic-filters: Fix build with -fno-common
Submitted by: zeising
Reviewed by: rene, zeising
MFH: 2020Q3 (implicit, -fno-common fixes)
Differential Revision: https://reviews.freebsd.org/D26164
Notes
Notes:
svn path=/head/; revision=546067
Diffstat (limited to 'print')
| -rw-r--r-- | print/foomatic-filters/files/patch-foomaticrip.c | 13 | ||||
| -rw-r--r-- | print/foomatic-filters/files/patch-options.c | 21 |
2 files changed, 32 insertions, 2 deletions
diff --git a/print/foomatic-filters/files/patch-foomaticrip.c b/print/foomatic-filters/files/patch-foomaticrip.c index 44a29a4ef773..08cab68f8d43 100644 --- a/print/foomatic-filters/files/patch-foomaticrip.c +++ b/print/foomatic-filters/files/patch-foomaticrip.c @@ -1,6 +1,15 @@ --- foomaticrip.c.orig 2012-07-02 14:50:46 UTC +++ foomaticrip.c -@@ -180,7 +180,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/lo +@@ -109,7 +109,7 @@ jobparams_t * get_current_job() + } + + +-dstr_t *postpipe; /* command into which the output of this filter should be piped */ ++dstr_t *postpipe = NULL; /* command into which the output of this filter should be piped */ + FILE *postpipe_fh = NULL; + + FILE * open_postpipe() +@@ -180,7 +180,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/f "/opt/cups/filter:" "/usr/lib/cups/filter"; @@ -9,7 +18,7 @@ void config_set_option(const char *key, const char *value) { -@@ -1061,7 +1061,7 @@ int print_file(const char *filename, int +@@ -1061,7 +1061,7 @@ int print_file(const char *filename, int convert) Ghostscript is not available. */ if (spooler == SPOOLER_CUPS) snprintf(pdf2ps_cmd, PATH_MAX, diff --git a/print/foomatic-filters/files/patch-options.c b/print/foomatic-filters/files/patch-options.c new file mode 100644 index 000000000000..c6bcb276f468 --- /dev/null +++ b/print/foomatic-filters/files/patch-options.c @@ -0,0 +1,21 @@ +--- options.c.orig 2012-07-02 14:50:46 UTC ++++ options.c +@@ -38,15 +38,15 @@ typedef struct icc_mapping_entry_s { + } icc_mapping_entry_t; + + /* Values from foomatic keywords in the ppd file */ +-char printer_model [256]; ++extern char printer_model [256]; + char printer_id [256]; + char driver [128]; + char cmd [4096]; + char cmd_pdf [4096]; +-dstr_t *postpipe = NULL; /* command into which the output of this ++extern dstr_t *postpipe; /* command into which the output of this + filter should be piped */ + int ps_accounting = 1; +-char cupsfilter [256]; ++extern char cupsfilter [256]; + int jobentitymaxlen = 0; + int userentitymaxlen = 0; + int hostentitymaxlen = 0; |