Hello community, here is the log from the commit of package transfig for openSUSE:Factory checked in at 2017-02-07 12:06:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/transfig (Old) and /work/SRC/openSUSE:Factory/.transfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transfig" Changes: -------- --- /work/SRC/openSUSE:Factory/transfig/transfig.changes 2015-04-22 01:15:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.transfig.new/transfig.changes 2017-02-07 12:06:30.903752405 +0100 @@ -1,0 +2,96 @@ +Mon Feb 6 11:23:24 UTC 2017 - wer...@suse.de + +- Fix now failing download source service, that is don't do this + +------------------------------------------------------------------- +Thu Feb 2 13:44:43 UTC 2017 - wer...@suse.de + +- Update to fig2dev version 3.2.6a (Patchlevel 6a (January 2017)) + NEW FEATURES: + o Distribute transfig.pdf. No need to build it from the TeX sources. + o Enable reproducible build for svg output. + o Set the creator to fig2dev, not to the path by which fig2dev is + invoked. + BUGS FIXED: + Ticket numbers refer to https://sourceforge.net/p/mcj/tickets/#. + o The svg output now produces correct patterns and pie-wege arcs. + Property names instead of style attributes are used. Hollow arrow + heads are really hollow, not filled with white. In the PostScript + output, this might also clip a bit of the filling underneath an arrow. + o tikz output: Re-use \dimen \XFigu if it is already defined. Ticket #3. + o tikz output: A pattern in an object with line width zero and the + stroke color equal to the fill color would produce a white fill. + The tikz output now does not try to be smart and puts a pattern, even + if the result is equal to a solid fill. Ticket #1. + o pict2e output: Standalone tex-files always include color.sty. #2. + o pict2e output: A pattern with stroke color equal to fill color is + rendered as a solid fill. + o Compiles when gnu iconv and standard iconv are present. + +------------------------------------------------------------------- +Fri Sep 23 12:04:22 UTC 2016 - wer...@suse.de + +- Update to fig2dev version 3.2.6 (the successor of transfig) + o Add compile switch --enable-versioning and script update-version_m4, + to create version string from source control system + o tikz output: Support -G (grid) option. Make \XFigwidth and \XFigheight + only scale coordinates, not line widths; Do not set unnecessarily + \color{black} on text. + From Roland Rosenfeld <rol...@spinnaker.de> + o Correct comment string in man page fig2ps2tex.1 + o Distribute autotest file lookup_X_color.at - only useful for hacko + From Brian V. Smith: + o Changed object defs from O_ to OBJ_ because O_TEXT conflicts + with system typedef (debian 37_OBJ_typedef.patch) + o Remove unused charset variables cs and ca from genibmgl.c + (debian 38_unusedcharset.patch) + o Build with make CFLAGS="-Werror -Wpedantic -Wformat -Wformat-security' + o On lines with Round or Projecting cap style and arrowheads, the line + endpoint stuck out beyond the arrowhead (this was fixed in + xfig 3.2.5c, but not here until now; debian 41_arrowhead.patch) + o Changed .ce (center lines) to .RS (right-justify) in fig2ps2tex man + page file because of issues when generating HTML (From Eric Raymond) + (debian 36_manpage_ce2RS.patch) + o Quotes added to output file name for several formats in case there + are blanks in the name (debian 39_gs_quote.patch) + o For PDF output, changed -dColorImageFilter from /FlateEncode to + /DCTEncode for lossy compression (smaller pdf files) + (debian 40_ColorImageFilter.patch) + o Update help for PDF options (debian 42_PDF_help.patch) + From Roland Rosenfeld. Bug numers refer to https://bugs.debian.org/#. + o Remove bashisms in fig2ps2tex script. Reported from + Chris Lamb <ch...@chris-lamb.co.uk>. Fixes debian bug 480615. + o Include sys/stat.h in genps.c. Reported from Steven Chamberlain + <ste...@pyro.eu.org>. Debian bug 654767. (28_fix_chmod...patch) + o Distribute the man page transig.1. (34_transfig.1.patch) + o Do not report user information in ps files. Debian bug 316382 + (04_displaywho.patch) + o Set locale to C. Debian bug 45378 (05_locale_patch). + o Support pdftex in transfig (20_transfig_pdftex.patch). Reported by + Jindrich Makovicka <makov...@gmail.com>. + o Fix some typos (22_typos.patch, 35_manpage_typos.patch). + o Honor environment variable SOURCE_DATE_EPOCH, for reproducible + builds. Debian bug 819911. From Alexis Bienvenüe <p...@passoire.fr>. + (33_honour_SOURCE_DATE_EPOCH.patch). + o Enable fonts >= 42 pt, needs \usepackage{type1cm}. Bug 343139, + (09_maxfontsize.patch). + o New pict2e and tikz output language, for use with TeX/LaTeX. + o Compile with ./configure; make; make install. + Optionally, use make check; make installcheck. + o By default, transfig is not built. + o Swap patterns in PostScript output, were upside down. + o Silence most compiler warnings. + o Update man-pages and help text. + o Accurately position arrowheads, flush with line, in PostScript output. +- Remove transfig.3.2.5d-patches.tar.bz2 but port and add the oldpatterns + and mpdf patches to 3.2.6: + fig2dev-3.2.6-fig2mpdf-doc.patch + fig2dev-3.2.6-fig2mpdf.patch + fig2dev-3.2.6-genps_oldpatterns.patch +- Patch transfig.3.2.5d.dif becomes transfig-3.2.6.dif +- Modify the patches + transfig-fix-afl.patch + transfig.3.2.5-binderman.dif + transfig.3.2.5d-mediaboxrealnb.dif + +------------------------------------------------------------------- Old: ---- transfig.3.2.5d-patches.tar.bz2 transfig.3.2.5d.dif transfig.3.2.5e.tar.gz New: ---- fig2dev-3.2.6-fig2mpdf-doc.patch fig2dev-3.2.6-fig2mpdf.patch fig2dev-3.2.6-genps_oldpatterns.patch fig2dev-3.2.6a.tar.xz transfig-3.2.6.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ transfig.spec ++++++ --- /var/tmp/diff_new_pack.WIz5ni/_old 2017-02-07 12:06:31.479670923 +0100 +++ /var/tmp/diff_new_pack.WIz5ni/_new 2017-02-07 12:06:31.479670923 +0100 @@ -1,7 +1,7 @@ # # spec file for package transfig # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ Name: transfig +BuildRequires: fdupes BuildRequires: libjpeg-devel BuildRequires: netpbm BuildRequires: texlive-latex @@ -25,9 +26,14 @@ BuildRequires: texlive-cm-super BuildRequires: texlive-courier BuildRequires: texlive-dvips +BuildRequires: texlive-epstopdf BuildRequires: texlive-pdftex BuildRequires: texlive-times +BuildRequires: tex(beamer.cls) +BuildRequires: tex(german.sty) +BuildRequires: tex(multimedia.sty) BuildRequires: tex(times.sty) +BuildRequires: tex(xmpmulti.sty) %endif %if 0%{?suse_version} > 1120 BuildRequires: libpng12-compat-devel @@ -37,22 +43,28 @@ %endif BuildRequires: xorg-x11 BuildRequires: xorg-x11-devel -Url: http://www.xfig.org/ +# www.xfig.org is dead +Url: http://mcj.sourceforge.net/ +Provides: fig2dev Provides: transfig.3.2.3d Requires: ghostscript-fonts-std Requires: ghostscript-library Requires: netpbm -Version: 3.2.5e +Requires: texlive-epstopdf +Version: 3.2.6a Release: 0 Summary: Graphic Converter License: MIT Group: Productivity/Graphics/Convertors -Source: http://sourceforge.net/projects/mcj/files/mcj-source/transfig.%{version}.tar.gz -Source1: transfig.3.2.5d-patches.tar.bz2 -Patch0: transfig.3.2.5d.dif +#Source: http://sourceforge.net/projects/mcj/files/fig2dev-%{version}.tar.xz/download#/fig2dev-%{version}.tar.xz +Source: fig2dev-%{version}.tar.xz +Patch0: transfig-3.2.6.dif Patch2: transfig.3.2.5-binderman.dif Patch3: transfig.3.2.5d-mediaboxrealnb.dif Patch4: transfig-fix-afl.patch +Patch42: fig2dev-3.2.6-genps_oldpatterns.patch +Patch43: fig2dev-3.2.6-fig2mpdf.patch +Patch44: fig2dev-3.2.6-fig2mpdf-doc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -87,49 +99,63 @@ Supoj Sutantavibul <b...@cs.utk.ecu> %prep -%setup -q -n transfig.%{version} +%setup -q -n fig2dev-%{version} find -type f | xargs -r chmod a-x,go-w -tar Oxfj %{S:1} | patch -p1 -s %patch0 -p0 -b .0 %patch2 -p0 -b .bm %patch3 -p0 -b .mbox -%patch4 -p1 -xmkmf -a -D_DATA='%{_data}' +%patch4 -p1 -b .afl +%patch42 -p2 -b .oldp +%patch43 -p2 -b .mpdf +%patch44 -p1 -b .mpdfdoc %build -make CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" -make -C doc/manual/ -rm -f doc/manual/*.{log,toc,div} +CC=gcc +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -w -D_GNU_SOURCE -std=gnu99" +CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" +export CC CFLAGS +chmod 755 configure +%configure \ + --docdir=%{_defaultdocdir}/%{name} \ + --enable-transfig \ + --enable-scale-pic2t2e +make %{?_smp_mflags} CCOPTIONS="$CFLAGS" %install -mkdir -p %{buildroot}%{_bindir} -mkdir -p %{buildroot}%{_x11data}/xfig/fig2dev -mkdir -p %{buildroot}%{_x11data}/xfig/bitmaps -make DESTDIR=%{buildroot} install CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" -make DESTDIR=%{buildroot} install.man CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w" -mkdir -p %{buildroot}%{_docdir}/transfig/manual -install -m 644 [CLNR]* %{buildroot}%{_docdir}/transfig/ -install -m 644 doc/manual/* %{buildroot}%{_docdir}/transfig/manual/ -rm -vf %{buildroot}%{_docdir}/transfig/manual/Makefile.orig -rm -vf %{buildroot}%{_docdir}/transfig/manual/*.aux -rm -vf %{buildroot}%{_docdir}/transfig/manual/*.toc -rm -vf %{buildroot}%{_docdir}/transfig/manual/*.log -rm -vf %{buildroot}%{_docdir}/transfig/manual/*.div +find -name '*.mpdfdoc' -o -name '*.mpdf' | xargs -r rm -vf +make DESTDIR=%{buildroot} install +install -m 0755 fig2mpdf/fig2mpdf %{buildroot}%{_bindir} +install -m 0644 fig2mpdf/fig2mpdf.1 %{buildroot}%{_mandir}/man1/ +gzip -9 %{buildroot}%{_mandir}/man1/fig2mpdf.1 + +mkdir -p %{buildroot}%{_defaultdocdir}/%{name} +install -m 0644 [CLNR]* %{buildroot}%{_defaultdocdir}/%{name} +pushd fig2mpdf/doc + make + mkdir %{buildroot}%{_defaultdocdir}/%{name}/fig2mpdf + rm -f overlay-sample-?.pdf + rm -f *.aux *.log *.nav *.out *.snm *.toc + install -m 0644 * %{buildroot}%{_defaultdocdir}/%{name}/fig2mpdf/ +popd +pushd transfig/doc + ../../fig2dev/fig2dev -L latex trans.fig > trans.tex + pdflatex manual.tex + pdflatex manual.tex + pdflatex manual.tex + install -m 0644 manual.pdf %{buildroot}%{_defaultdocdir}/%{name}/transfig.pdf +popd + +%fdupes %{buildroot} %files %defattr(-,root,root) %{_bindir}/fig2dev +%{_bindir}/fig2mpdf %{_bindir}/fig2ps2tex -%{_bindir}/fig2ps2tex.sh %{_bindir}/pic2tpic %{_bindir}/transfig -%dir %{_x11data}/xfig -%{_x11data}/xfig/fig2dev/ -%{_x11data}/xfig/bitmaps/ -%doc %{_mandir}/man1/fig2dev.1x.gz -%doc %{_mandir}/man1/fig2ps2tex.1x.gz -%doc %{_mandir}/man1/pic2tpic.1x.gz -%doc %{_mandir}/man1/transfig.1x.gz -%doc %{_docdir}/transfig/ +%{_datadir}/fig2dev/ +%doc %{_defaultdocdir}/%{name} +%doc %{_mandir}/man1/*.1*.gz %changelog ++++++ fig2dev-3.2.6-fig2mpdf-doc.patch ++++++ ++++ 4803 lines (skipped) ++++++ fig2dev-3.2.6-fig2mpdf.patch ++++++ ++++ 1424 lines (skipped) ++++++ fig2dev-3.2.6-genps_oldpatterns.patch ++++++ ++++ 1623 lines (skipped) ++++++ transfig-3.2.6.dif ++++++ --- fig2dev/dev/genps.c | 26 +++++++++++++++++++++++--- fig2dev/dev/genpstex.c | 8 ++++++-- fig2dev/fig2ps2tex.csh | 2 +- fig2dev/getopt.c | 10 ++++++++++ transfig/transfig.c | 2 ++ 5 files changed, 42 insertions(+), 6 deletions(-) --- fig2dev/dev/genps.c +++ fig2dev/dev/genps.c 2017-02-02 13:47:11.888588548 +0000 @@ -56,6 +56,7 @@ #include <pwd.h> #endif #include <locale.h> +#include <langinfo.h> #include "bool.h" #include "pi.h" @@ -801,8 +802,9 @@ genps_start(F_compound *objects) fprintf(tfp, "%s\n", SPLINE_PS); #ifdef I18N if (support_i18n && iso_text_exist(objects)) { - char *libdir, *locale; + char *libdir, *locale, *codeset; char localefile[512], str[512]; + size_t llen; FILE *fp; libdir = getenv("FIG2DEV_LIBDIR"); #ifdef I18N_DATADIR @@ -810,16 +812,34 @@ genps_start(F_compound *objects) libdir = I18N_DATADIR; #endif locale = setlocale(LC_CTYPE, NULL); + llen = strcspn(locale, ".@"); + codeset = nl_langinfo(CODESET); if (locale == NULL) { fprintf(stderr, "fig2dev: LANG not defined; assuming C locale\n"); locale = "C"; } - sprintf(localefile, "%s/%s.ps", libdir, locale); + snprintf(localefile, sizeof(localefile)-1, "%s/%s.ps", libdir, locale); /* get filename like ``/usr/local/lib/fig2dev/japanese.ps'' */ fp = fopen(localefile, "rb"); if (fp == NULL) { fprintf(stderr, "fig2dev: can't open file: %s\n", localefile); - } else { + } + if (fp == NULL && strlen(locale) != llen) { + locale[llen] = '\0'; + /* get filename like ``/usr/local/lib/fig2dev/de_DE.ps'' */ + snprintf(localefile, sizeof(localefile)-1, "%s/%s.ps", libdir, locale); + fp = fopen(localefile, "rb"); + if (fp == NULL) + fprintf(stderr, "fig2dev: B can't open file: %s\n", localefile); + } + if (fp == NULL && codeset) { + /* get filename like ``/usr/local/lib/fig2dev/ISO-8859-9.ps'' */ + snprintf(localefile, sizeof(localefile)-1, "%s/%s.ps", libdir, codeset); + fp = fopen(localefile, "rb"); + if (fp == NULL) + fprintf(stderr, "fig2dev: C can't open file: %s\n", localefile); + } + if (fp) { while (fgets(str, sizeof(str), fp)) { if (strstr(str, "CompositeRoman")) enable_composite_font = true; fputs(str, tfp); --- fig2dev/dev/genpstex.c +++ fig2dev/dev/genpstex.c 2017-02-02 13:47:38.580050694 +0000 @@ -44,6 +44,7 @@ #include <stdio.h> #include <string.h> #include <ctype.h> +#include <sys/stat.h> #include "bool.h" #include "fig2dev.h" @@ -61,10 +62,13 @@ extern void genps_spline(F_spline *s), genlatex_option(char opt, char *optarg), genlatex_text(F_text *t), - genps_text(F_text *t); + genps_text(F_text *t), + genpdf_option(char opt, char *optarg), + genpdf_start(F_compound *objects); extern int genlatex_end(void), - genps_end(void); + genps_end(void), + genpdf_end(void); extern void genpdf_option(char opt, char *optarg); /* genpdf.c */ extern void genpdf_start(F_compound *objects); /* genpdf.c */ --- fig2dev/fig2ps2tex.csh +++ fig2dev/fig2ps2tex.csh 2017-02-02 13:43:20.089154382 +0000 @@ -21,7 +21,7 @@ # # 2016-07-07 Thomas Loimer # * use here-document, instead of echo - +set echo_style=bsd set bbox = `grep "^%%BoundingBox:" $1` set xsp = `echo "3k $bbox[4] $bbox[2] - 72 / p" | dc` --- fig2dev/getopt.c +++ fig2dev/getopt.c 2017-02-02 13:43:20.089154382 +0000 @@ -45,6 +45,7 @@ static char sccsfid[] = "@(#) getopt.c 5 #define EMSG "" #define ENDARGS "--" +#ifndef __GLIBC__ /* * get option letter from argument vector */ @@ -89,3 +90,12 @@ fig_getopt(int nargc, char **nargv, char } return(optc); /* dump back option letter */ } +#else +#include <unistd.h> +int +fig_getopt(int nargc, char * const nargv[], const char *ostr) +{ + return getopt(nargc, nargv, ostr); +} +#endif + --- transfig/transfig.c +++ transfig/transfig.c 2017-02-02 13:43:20.089154382 +0000 @@ -26,6 +26,8 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> +#include <unistd.h> #include "transfig.h" extern void sysmv(char *file); /* sys.c */ ++++++ transfig-fix-afl.patch ++++++ --- /var/tmp/diff_new_pack.WIz5ni/_old 2017-02-07 12:06:31.539662435 +0100 +++ /var/tmp/diff_new_pack.WIz5ni/_new 2017-02-07 12:06:31.543661869 +0100 @@ -1,27 +1,12 @@ Index: transfig.3.2.5e/fig2dev/read1_3.c =================================================================== ---- transfig.3.2.5e.orig/fig2dev/read1_3.c -+++ transfig.3.2.5e/fig2dev/read1_3.c -@@ -336,6 +336,7 @@ FILE *fp; - l->back_arrow = NULL; - l->next = NULL; - l->points = Point_malloc(p); -+ l->points->next = NULL; - n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d", &t, - &l->style, &l->thickness, &l->style_val, - &f, &b, &h, &w, &p->x, &p->y); -@@ -395,6 +396,7 @@ FILE *fp; - s->controls = NULL; - s->next = NULL; - s->points = Point_malloc(p); -+ s->points->next = NULL; - n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d", - &t, &s->style, &s->thickness, &s->style_val, - &f, &b, -Index: transfig.3.2.5e/fig2dev/alloc.h -=================================================================== ---- transfig.3.2.5e.orig/fig2dev/alloc.h -+++ transfig.3.2.5e/fig2dev/alloc.h +--- + fig2dev-3.2.6a/fig2dev/alloc.h | 20 ++++++++++---------- + fig2dev-3.2.6a/fig2dev/read1_3.c | 2 ++ + 2 files changed, 12 insertions(+), 10 deletions(-) + +--- fig2dev-3.2.6a/fig2dev/alloc.h ++++ fig2dev-3.2.6a/fig2dev/alloc.h 2017-02-02 13:53:24.529089166 +0000 @@ -13,15 +13,15 @@ * notice remain intact. */ @@ -48,3 +33,21 @@ +#define Arrow_malloc(z) z = (F_arrow*)calloc(ARROW_SIZE,1) extern char Err_mem[]; +--- fig2dev-3.2.6a/fig2dev/read1_3.c ++++ fig2dev-3.2.6a/fig2dev/read1_3.c 2017-02-02 13:53:24.529089166 +0000 +@@ -343,6 +343,7 @@ read_lineobject(FILE *fp) + l->back_arrow = NULL; + l->next = NULL; + l->points = Point_malloc(p); ++ l->points->next = NULL; + n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d", &t, + &l->style, &l->thickness, &l->style_val, + &f, &b, &h, &w, &p->x, &p->y); +@@ -401,6 +402,7 @@ read_splineobject(FILE *fp) + s->controls = NULL; + s->next = NULL; + s->points = Point_malloc(p); ++ s->points->next = NULL; + n = fscanf(fp, " %d %d %d %lf %d %d %d %d %d %d", + &t, &s->style, &s->thickness, &s->style_val, + &f, &b, ++++++ transfig.3.2.5-binderman.dif ++++++ --- /var/tmp/diff_new_pack.WIz5ni/_old 2017-02-07 12:06:31.551660738 +0100 +++ /var/tmp/diff_new_pack.WIz5ni/_new 2017-02-07 12:06:31.551660738 +0100 @@ -1,6 +1,10 @@ +--- + transfig/sys.c | 1 + + 1 file changed, 1 insertion(+) + --- transfig/sys.c -+++ transfig/sys.c 2009-10-09 14:17:09.932073007 +0200 -@@ -37,6 +37,7 @@ char *sysls() ++++ transfig/sys.c 2016-09-22 13:02:49.040774112 +0000 +@@ -39,6 +39,7 @@ sysls(void) i += 1; c = fgetc(ls); } ++++++ transfig.3.2.5d-mediaboxrealnb.dif ++++++ --- /var/tmp/diff_new_pack.WIz5ni/_old 2017-02-07 12:06:31.559659606 +0100 +++ /var/tmp/diff_new_pack.WIz5ni/_new 2017-02-07 12:06:31.563659040 +0100 @@ -1,6 +1,10 @@ +--- + fig2dev/dev/readeps.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + --- fig2dev/dev/readeps.c -+++ fig2dev/dev/readeps.c 2013-02-08 11:21:58.593945615 +0000 -@@ -77,16 +77,22 @@ read_eps_pdf(file, filetype, pic, llx, l ++++ fig2dev/dev/readeps.c 2017-02-02 13:52:46.733848874 +0000 +@@ -75,16 +75,22 @@ read_eps_pdf(FILE *file, int filetype, F while (fgets(buf, 512, file) != NULL) { /* look for /MediaBox for pdf file */ if (pdf_flag) { @@ -14,7 +18,7 @@ *llx = *lly = 0; urx = paperdef[0].width*72; ury = paperdef[0].height*72; - put_msg("Bad MediaBox in imported PDF file %s, assuming %s size", + put_msg("Bad MediaBox in imported PDF file %s, assuming %s size", pic->file, metric? "A4" : "Letter" ); } + pic->bit_size.x = (urx-(*llx));
