From owner-svn-ports-all@freebsd.org Mon Aug 24 11:37:07 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1F2543BB0A4; Mon, 24 Aug 2020 11:37:07 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BZqpq04B1z4cCs; Mon, 24 Aug 2020 11:37:07 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC6D4178F7; Mon, 24 Aug 2020 11:37:06 +0000 (UTC) (envelope-from jrm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07OBb6YW090315; Mon, 24 Aug 2020 11:37:06 GMT (envelope-from jrm@FreeBSD.org) Received: (from jrm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07OBb6j9090313; Mon, 24 Aug 2020 11:37:06 GMT (envelope-from jrm@FreeBSD.org) Message-Id: <202008241137.07OBb6j9090313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jrm set sender to jrm@FreeBSD.org using -f From: Joseph Mingrone Date: Mon, 24 Aug 2020 11:37:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546067 - head/print/foomatic-filters/files X-SVN-Group: ports-head X-SVN-Commit-Author: jrm X-SVN-Commit-Paths: head/print/foomatic-filters/files X-SVN-Commit-Revision: 546067 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2020 11:37:07 -0000 Author: jrm Date: Mon Aug 24 11:37:05 2020 New Revision: 546067 URL: https://svnweb.freebsd.org/changeset/ports/546067 Log: 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 Added: head/print/foomatic-filters/files/patch-options.c (contents, props changed) Modified: head/print/foomatic-filters/files/patch-foomaticrip.c (contents, props changed) Modified: head/print/foomatic-filters/files/patch-foomaticrip.c ============================================================================== --- head/print/foomatic-filters/files/patch-foomaticrip.c Mon Aug 24 11:20:18 2020 (r546066) +++ head/print/foomatic-filters/files/patch-foomaticrip.c Mon Aug 24 11:37:05 2020 (r546067) @@ -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, Added: head/print/foomatic-filters/files/patch-options.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/foomatic-filters/files/patch-options.c Mon Aug 24 11:37:05 2020 (r546067) @@ -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;