Date: Mon, 24 Aug 2020 11:57:47 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r546070 - branches/2020Q3/print/foomatic-filters/files Message-ID: <202008241157.07OBvl2O003237@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Mon Aug 24 11:57:47 2020 New Revision: 546070 URL: https://svnweb.freebsd.org/changeset/ports/546070 Log: MFH: r546067 print/foomatic-filters: Fix build with -fno-common Submitted by: zeising Reviewed by: rene, zeising Differential Revision: https://reviews.freebsd.org/D26164 Approved by: ports-secteam (blanket: -fno-common build fix) Added: branches/2020Q3/print/foomatic-filters/files/patch-options.c - copied unchanged from r546067, head/print/foomatic-filters/files/patch-options.c Modified: branches/2020Q3/print/foomatic-filters/files/patch-foomaticrip.c Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/print/foomatic-filters/files/patch-foomaticrip.c ============================================================================== --- branches/2020Q3/print/foomatic-filters/files/patch-foomaticrip.c Mon Aug 24 11:44:39 2020 (r546069) +++ branches/2020Q3/print/foomatic-filters/files/patch-foomaticrip.c Mon Aug 24 11:57:47 2020 (r546070) @@ -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, Copied: branches/2020Q3/print/foomatic-filters/files/patch-options.c (from r546067, head/print/foomatic-filters/files/patch-options.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/print/foomatic-filters/files/patch-options.c Mon Aug 24 11:57:47 2020 (r546070, copy of r546067, head/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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008241157.07OBvl2O003237>