Date: Tue, 25 Aug 2020 12:27:34 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546159 - head/print/transfig/files Message-ID: <202008251227.07PCRYmw015794@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Tue Aug 25 12:27:34 2020 New Revision: 546159 URL: https://svnweb.freebsd.org/changeset/ports/546159 Log: print/transfig: Fix build with -fno-common Fix the build of print/transfig when built with -fno-common, which is the default with llvm 11. MFH: 2020Q3 (implicit, -fno-common fixes, ok by joenum) Added: head/print/transfig/files/patch-fig2dev_dev_gengbx.c (contents, props changed) head/print/transfig/files/patch-fig2dev_dev_genps.c (contents, props changed) Modified: head/print/transfig/files/patch-fig2dev_fig2dev.h Added: head/print/transfig/files/patch-fig2dev_dev_gengbx.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/transfig/files/patch-fig2dev_dev_gengbx.c Tue Aug 25 12:27:34 2020 (r546159) @@ -0,0 +1,15 @@ +--- fig2dev/dev/gengbx.c.orig 2020-08-25 12:18:01 UTC ++++ fig2dev/dev/gengbx.c +@@ -594,12 +594,6 @@ int define_aperture_for_arc(F_arc *a) { + + char *cctype[] = { "none", "black", "white" }; + +-/* arrowhead arrays */ +-Point points[50]; +-int npoints; +-int arrowx1, arrowy1; /* first point of object */ +-int arrowx2, arrowy2; /* second point of object */ +- + static F_point *p; + + /** Used to generate sequence numbers. */ Added: head/print/transfig/files/patch-fig2dev_dev_genps.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/transfig/files/patch-fig2dev_dev_genps.c Tue Aug 25 12:27:34 2020 (r546159) @@ -0,0 +1,15 @@ +--- fig2dev/dev/genps.c.orig 2020-08-25 12:22:17 UTC ++++ fig2dev/dev/genps.c +@@ -96,8 +96,10 @@ static float fllx, flly, furx, fury; + /* arrowhead arrays */ + Point bpoints[50], fpoints[50]; + int nbpoints, nfpoints; +-Point bfillpoints[50], ffillpoints[50], clippoints[50]; +-int nbfillpoints, nffillpoints, nclippoints; ++Point bfillpoints[50], ffillpoints[50]; ++int nbfillpoints, nffillpoints; ++extern int nclippoints; ++extern Point clippoints[50]; + int fpntx1, fpnty1; /* first point of object */ + int fpntx2, fpnty2; /* second point of object */ + int lpntx1, lpnty1; /* last point of object */ Modified: head/print/transfig/files/patch-fig2dev_fig2dev.h ============================================================================== --- head/print/transfig/files/patch-fig2dev_fig2dev.h Tue Aug 25 12:19:46 2020 (r546158) +++ head/print/transfig/files/patch-fig2dev_fig2dev.h Tue Aug 25 12:27:34 2020 (r546159) @@ -1,6 +1,15 @@ ---- fig2dev/fig2dev.h.orig 2010-03-16 11:53:20.000000000 -0700 -+++ fig2dev/fig2dev.h 2011-06-16 22:23:27.000000000 -0700 -@@ -214,7 +214,7 @@ +--- fig2dev/fig2dev.h.orig 2010-03-16 18:53:20 UTC ++++ fig2dev/fig2dev.h +@@ -126,7 +126,7 @@ extern int PSisomap[]; + extern char *prog, *from, *to; + extern char *name; + extern double font_size; +-Boolean correct_font_size; /* use correct font size */ ++extern Boolean correct_font_size; /* use correct font size */ + extern double mag, fontmag; + extern FILE *tfp; + +@@ -214,7 +214,7 @@ struct Cmap { #endif /* MAXPATHLEN */ #endif /* PATH_MAX */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008251227.07PCRYmw015794>