diff --git a/0001-Use-native-fig2dev-pdf-output-instead-of-epstopdf.patch b/0001-Use-native-fig2dev-pdf-output-instead-of-epstopdf.patch index 8da547c..d9fb6b7 100644 --- a/0001-Use-native-fig2dev-pdf-output-instead-of-epstopdf.patch +++ b/0001-Use-native-fig2dev-pdf-output-instead-of-epstopdf.patch @@ -12,7 +12,7 @@ diff --git a/fig2dev/dev/genpstex.c b/fig2dev/dev/genpstex.c index bb081fd..5999e03 100644 --- a/fig2dev/dev/genpstex.c +++ b/fig2dev/dev/genpstex.c -@@ -279,10 +279,7 @@ int depth; +@@ -280,10 +280,7 @@ int depth; sprintf(szFileName + iLength, "%03d", iObjectsFileNumber++); fprintf(ptCreateFile, "if [ \"$iOptRemove\" == \"\" ]; then\n"); if (iPdfOutputs) diff --git a/fig2dev-3.2.6-fig2mpdf.patch b/fig2dev-3.2.6-fig2mpdf.patch index 2caf876..9ff1381 100644 --- a/fig2dev-3.2.6-fig2mpdf.patch +++ b/fig2dev-3.2.6-fig2mpdf.patch @@ -400,7 +400,7 @@ diff --git a/fig2dev/drivers.h b/fig2dev/drivers.h diff --git a/fig2dev/fig2dev.c b/fig2dev/fig2dev.c --- a/fig2dev/fig2dev.c +++ b/fig2dev/fig2dev.c -@@ -829,6 +829,23 @@ help_msg(void) +@@ -858,6 +858,23 @@ help_msg(void) ); } @@ -424,7 +424,7 @@ diff --git a/fig2dev/fig2dev.c b/fig2dev/fig2dev.c if (dev == NULL || !strcmp(lang, "shape")) { puts( "SHAPE (ShapePar driver) Options:\n" -@@ -974,6 +991,12 @@ static int compound_dump(F_compound *com +@@ -1003,6 +1020,12 @@ static int compound_dump(F_compound *com static int rec_comp(struct obj_rec *r1, struct obj_rec *r2) { @@ -1338,7 +1338,7 @@ diff --git a/fig2mpdf/fig2mpdf b/fig2mpdf/fig2mpdf diff --git a/man/fig2dev.1.in b/man/fig2dev.1.in --- a/man/fig2dev.1.in +++ b/man/fig2dev.1.in -@@ -75,8 +75,8 @@ Set the output graphics language. +@@ -80,8 +80,8 @@ Set the output graphics language. Valid languages are \fBbox, cgm, dxf, epic, eepic, eepicemu, emf, eps, gbx (Gerber beta driver), gif, ibmgl, jpeg, latex, map (HTML image map), mf (MetaFont), @@ -1349,7 +1349,7 @@ diff --git a/man/fig2dev.1.in b/man/fig2dev.1.in shape (LaTeX shaped paragraphs), sld (AutoCad slide format), svg, textyl, tiff, tikz, tk (tcl/tk), tpic, xbm and xpm\fR. -@@ -1145,6 +1145,61 @@ text flagged as "TeX Text". +@@ -1152,6 +1152,61 @@ text flagged as "TeX Text". The pstex and pdftex drivers accept the same options that the EPS driver accepts. @@ -1411,7 +1411,7 @@ diff --git a/man/fig2dev.1.in b/man/fig2dev.1.in .TP .B \-n name Set the Title part of the PostScript output to -@@ -1551,6 +1606,12 @@ The string \fIfont\fR can be one of +@@ -1558,6 +1613,12 @@ The string \fIfont\fR can be one of .SH BUGS and RESTRICTIONS @@ -1424,7 +1424,7 @@ diff --git a/man/fig2dev.1.in b/man/fig2dev.1.in Please send bug reports, fixes, new features etc. to: .br \&@PACKAGE_BUGREPORT@ -@@ -1640,3 +1701,7 @@ Michael Schrick (m_schrick@hotmail.com) +@@ -1647,3 +1708,7 @@ Michael Schrick (m_schrick@hotmail.com) The GBX (Gerber) driver was written by .br Edward Grace (ej.grace@imperial.ac.uk). diff --git a/fig2dev-3.2.9.tar.xz b/fig2dev-3.2.9.tar.xz deleted file mode 100644 index a35c9d8..0000000 --- a/fig2dev-3.2.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15e246c8d13cc72de25e08314038ad50ce7d2defa9cf1afc172fd7f5932090b1 -size 529892 diff --git a/fig2dev-3.2.9a.tar.xz b/fig2dev-3.2.9a.tar.xz new file mode 100644 index 0000000..d3c6727 --- /dev/null +++ b/fig2dev-3.2.9a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61e185393176852f03b901b3b05b19fbc5ad8258ff142f3da6e70b1b83513326 +size 536560 diff --git a/transfig-3.2.9.dif b/transfig-3.2.9.dif index f99ea3f..e7f3767 100644 --- a/transfig-3.2.9.dif +++ b/transfig-3.2.9.dif @@ -7,7 +7,7 @@ --- configure +++ configure 2023-09-15 07:11:23.442594968 +0000 -@@ -2340,7 +2340,7 @@ ac_c_conftest_c99_main=' +@@ -2359,7 +2359,7 @@ ac_c_conftest_c99_main=' int dynamic_array[ni.number]; dynamic_array[0] = argv[0][0]; dynamic_array[ni.number - 1] = 543; @@ -26,7 +26,7 @@ #include "fig2dev.h" /* includes bool.h and object.h */ //#include "object.h" /* NUMSHADES, NUMTINTS */ -@@ -1363,10 +1364,10 @@ append(const char *restrict infilename, +@@ -1366,10 +1367,10 @@ append(const char *restrict infilename, static bool append_find_composite(FILE *restrict out) { @@ -40,7 +40,7 @@ libdir = getenv("FIG2DEV_LIBDIR"); #ifdef I18N_DATADIR -@@ -1378,18 +1379,28 @@ append_find_composite(FILE *restrict out +@@ -1381,18 +1382,28 @@ append_find_composite(FILE *restrict out fputs(COMPOSITE_ERRMSG, stderr); return false; } @@ -76,7 +76,7 @@ return false; } -@@ -1443,8 +1454,7 @@ append_find_composite(FILE *restrict out +@@ -1446,8 +1457,7 @@ append_find_composite(FILE *restrict out put_msg("The output might be broken."); } diff --git a/transfig-gs10.03.patch b/transfig-gs10.03.patch index 482ae7e..e8be02a 100644 --- a/transfig-gs10.03.patch +++ b/transfig-gs10.03.patch @@ -4,11 +4,11 @@ --- fig2dev/dev/genpdf.c +++ fig2dev/dev/genpdf.c 2024-09-12 11:42:17.585579884 +0000 -@@ -48,6 +48,7 @@ +@@ -49,6 +49,7 @@ */ #ifdef GSEXE #define GSFMT GSEXE " -q -dSAFER -dAutoRotatePages=/None -sDEVICE=pdfwrite " \ + "-dWriteXRefStm=false -dWriteObjStms=false " \ - "-dCompatibilityLevel=1.4 -dPDFSETTINGS=/prepress -o '%s' -" + "-dCompatibilityLevel=1.%d -dPDFSETTINGS=/prepress -o '%s' -" #else #define GSFMT "" diff --git a/transfig.changes b/transfig.changes index 54a5c39..f2d76ec 100644 --- a/transfig.changes +++ b/transfig.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Tue Jan 14 08:47:58 UTC 2025 - Dr. Werner Fink + +- Update to fig2dev version 3.2.9a (Dec 2024) + o Specify pdf minor version with option -Y. + o Specify width (-Z w) or height (-Z h) of figure. + o Correctly read from a pipe, ticket #156. + o Fix behavior of option -F for e(e)pic and latex outputs, ticket #157. + o Compounds containing ascii-only text would disable utf-8 output, #158. + o Option --enable-versioning works in out-of-tree builds. + o Correct links to embedded image files in svg output. + o Correct font size in svg output, ticket #176. +- Port patches + * 0001-Use-native-fig2dev-pdf-output-instead-of-epstopdf.patch + * fig2dev-3.2.6-fig2mpdf.patch + * transfig-3.2.9.dif + * transfig-gs10.03.patch + ------------------------------------------------------------------- Thu Sep 12 12:00:53 UTC 2024 - Dr. Werner Fink diff --git a/transfig.spec b/transfig.spec index 609546e..9f69958 100644 --- a/transfig.spec +++ b/transfig.spec @@ -1,7 +1,7 @@ # # spec file for package transfig # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: transfig -Version: 3.2.9 +Version: 3.2.9a Release: 0 Summary: Graphic Converter # www.xfig.org is dead