rpm/transfig
SHA256
1
0
Fork 0
forked from pool/transfig
Code Pull Requests Activity

Accepting request 138798 from Publishing

Browse Source 
- Update to transfig version 3.2.5d
  * made PostScript output DSC 3.0 compliant to work with CUPS 
    patch from Ian Dall (see https://bugzilla.redhat.com/558380)
  * Changed STOCK_LAST from 17 to 19 in fig2dev/dev/genemf.c
  * Questionable copy of one data type to another in genemf.c
  * Changed definition of command for short slanted lines in genlatex.c
  * Added check for existance of arrows in SVG line generator
  * Removed %%Page: directive from included JPEG files in PostScript/EPS output
  * bound.c was passing pointers to int instead of double to arc_tangent
  * put_msg function uses proper varargs now
  * Option for debug comments in GBX output is "yes" or "no", not "on" or "off"
  * Added help (-h)  info for GBX output
  * In version 1.4 of the PNG library dither was removed so fig2dev now uses
    quantize when importing PNG images with palettes
  * put_msg was declared twice (fig2dev/dev/genemf.c)
  * Added xlink namespace for images in SVG export
  * SVG output for imported images didn't form href link properly
  * New PSTricks driver from Gene Ressler (see man fig2dev for info)
  * transfig command was hardwired for "tex" for "make all" directive and
    removing files with "make clean" directive in creating Makefile
  * -a option added to PostScript and PICTeX languages to NOT include user's
    login name in output
  * Gerber (RS-247-X for CAD drawings for printed circuits) export language from Edward Gr

OBS-URL: https://build.opensuse.org/request/show/138798
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/transfig?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2012-10-24 05:18:17 +00:00 committed by Git OBS Bridge
commit 3dae4d343c
7 changed files with 138 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
transfig.3.2.5a-cups.dif
View File

@ -1,40 +0,0 @@
--- fig2dev/dev/genps.c
+++ fig2dev/dev/genps.c 2008-10-08 13:27:05.000000000 +0000
@@ -661,6 +661,8 @@ F_compound *objects;
height = userury-userlly+1;
}
+ /* put in the magnification for information purposes */
+ fprintf(tfp, "%%Magnification: %.4f\n",metric? mag*76.2/80.0 : mag);
/* only include a pagesize command if PS */
if (!epsflag && !pdfflag) {
/* add comment for ghostview to recognize the page size */
@@ -669,6 +671,9 @@ F_compound *objects;
for (i=strlen(psize)-1; i>=0; i--)
psize[i] = tolower(psize[i]);
fprintf(tfp, "%%%%DocumentPaperSizes: %s\n",psize);
+ }
+ fprintf(tfp, "%%%%EndComments\n");
+ if (!epsflag && !pdfflag) {
fprintf(tfp, "%%%%BeginSetup\n");
fprintf(tfp, "[{\n");
fprintf(tfp, "%%%%BeginFeature: *PageRegion %s\n", papersize);
@@ -686,10 +691,6 @@ F_compound *objects;
}
- /* put in the magnification for information purposes */
- fprintf(tfp, "%%Magnification: %.4f\n",metric? mag*76.2/80.0 : mag);
- fprintf(tfp, "%%%%EndComments\n");
-
/* if the user wants an ASCII preview, route the rest of the eps to a temp file */
if (asciipreview) {
saveofile = tfp;
@@ -729,6 +730,7 @@ F_compound *objects;
fprintf(tfp,"%%%%BeginProlog\n");
if (pats_used)
fprintf(tfp,"/MyAppDict 100 dict dup begin def\n");
+ fprintf(tfp, "%%%%BeginProlog\n");
fprintf(tfp, "%s", BEGIN_PROLOG1);
/* define the standard colors */
genps_std_colors();

14
transfig.3.2.5a-libpng14.dif
View File

@ -1,14 +0,0 @@
--- fig2dev/dev/readpng.c
+++ fig2dev/dev/readpng.c 2010-04-20 15:22:10.142924814 +0000
@@ -127,7 +127,11 @@ read_png(file,filetype,pic,llx,lly)
if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) {
png_get_hIST(png_ptr, info_ptr, &histogram);
+#if (PNG_LIBPNG_VER_MAJOR > 1 || (PNG_LIBPNG_VER_MAJOR == 1 && (PNG_LIBPNG_VER_MINOR > 4))) || defined(png_set_quantize)
+ png_set_quantize(png_ptr, palette, num_palette, 256, histogram, 0);
+#else
png_set_dither(png_ptr, palette, num_palette, 256, histogram, 0);
+#endif
}
}
if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {

3
transfig.3.2.5a.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e11ba77a5c3f945e507578781f60b7a0f7bc41fb48ac30499675b364b002ac2a
size 326769

209
transfig.3.2.5a.dif → transfig.3.2.5d.dif
View File

@ -113,100 +113,6 @@
done) ;
install.all::
--- fig2dev/fig2dev.c
+++ fig2dev/fig2dev.c 2007-07-24 15:08:45.000000000 +0000
@@ -24,6 +24,7 @@
#include <sys/types.h>
#endif
#include <sys/file.h>
+#include <locale.h>
#include "fig2dev.h"
#include "alloc.h"
#include "object.h"
@@ -31,9 +32,14 @@
#include "bound.h"
#include "read.h"
+#ifndef __GLIBC__
extern int fig_getopt();
extern char *optarg;
extern int optind;
+#else
+# include <unistd.h>
+# define fig_getopt getopt
+#endif
char lang[40];
int parse_gridspec();
static void grid_usage();
@@ -378,6 +384,7 @@ char *argv[];
F_compound objects;
int status;
+ setlocale(LC_CTYPE, "");
#ifdef HAVE_SETMODE
setmode(1,O_BINARY); /* stdout is binary */
#endif
--- fig2dev/fig2dev.h
+++ fig2dev/fig2dev.h 2007-07-24 15:09:55.000000000 +0000
@@ -22,6 +22,7 @@
#include <sys/file.h>
#include <signal.h>
#include <string.h>
+#include <stdarg.h>
#include <pwd.h>
#include <errno.h>
#include <time.h>
@@ -56,7 +57,7 @@ typedef char Boolean;
#ifndef X_NOT_STDC_ENV
# include <string.h>
#else
-# ifdef SYSV
+# if defined(SYSV) || defined(__GLIBC__)
# include <string.h>
# else
# include <strings.h>
--- fig2dev/fig2ps2tex.script
+++ fig2dev/fig2ps2tex.script 2006-07-31 16:26:56.000000000 +0000
@@ -3,6 +3,7 @@
# Fig2ps2tex - generate a TeX file for including a PostScript file
# involves calculating the bounding box from fig2ps output
#
+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 2006-07-31 16:26:56.000000000 +0000
@@ -35,6 +35,7 @@ static char sccsfid[] = "@(#) getopt.c 5
#define EMSG ""
#define ENDARGS "--"
+#ifndef __GLIBC__
/* this is included because index is not on some UNIX systems */
static char *
index (s, c)
@@ -46,7 +47,9 @@ index (s, c)
else s++;
return (NULL);
}
+#endif
+#ifndef __GLIBC__
/*
* get option letter from argument vector
*/
@@ -95,4 +98,10 @@ fig_getopt(nargc,nargv,ostr)
}
return(optopt); /* dump back option letter */
}
-
+#else
+#include <unistd.h>
+fig_getopt(int nargc, char * const nargv[], const char *ostr)
+{
+ return getopt(nargc, nargv, ostr);
+}
+#endif
--- fig2dev/dev/genps.c
+++ fig2dev/dev/genps.c 2007-07-24 15:15:36.000000000 +0000
@@ -37,6 +37,8 @@
@ -218,7 +124,7 @@
#include "fig2dev.h"
#include "object.h"
#include "bound.h"
@@ -772,25 +774,46 @@ F_compound *objects;
@@ -786,25 +788,46 @@ F_compound *objects;
fprintf(tfp, "%s\n", SPLINE_PS);
#ifdef I18N
if (support_i18n && iso_text_exist(objects)) {
@ -289,8 +195,8 @@
static char pstex_file[1000] = "";
--- fig2dev/dev/gensvg.c
+++ fig2dev/dev/gensvg.c 2009-12-14 13:29:42.091429154 +0000
@@ -811,9 +811,11 @@ gensvg_text (t)
+++ fig2dev/dev/gensvg.c 2009-12-14 13:29:42.000000000 +0000
@@ -816,9 +816,11 @@ gensvg_text (t)
x, y, degrees (t->angle));
x = y = 0;
}
@ -305,6 +211,100 @@
( (t->font % 2 == 0 || t->font >31) ? "normal" : "italic"),
( (t->font % 4 < 2 || t->font >31) ? "normal" : "bold"), (int) (ceil (t->size * 12 * mag)),
anchor[t->type]);
--- fig2dev/fig2dev.c
+++ fig2dev/fig2dev.c 2007-07-24 15:08:45.000000000 +0000
@@ -24,6 +24,7 @@
#include <sys/types.h>
#endif
#include <sys/file.h>
+#include <locale.h>
#include "fig2dev.h"
#include "alloc.h"
#include "object.h"
@@ -31,9 +32,14 @@
#include "bound.h"
#include "read.h"
+#ifndef __GLIBC__
extern int fig_getopt();
extern char *optarg;
extern int optind;
+#else
+# include <unistd.h>
+# define fig_getopt getopt
+#endif
char lang[40];
int parse_gridspec();
static void grid_usage();
@@ -380,6 +386,7 @@ char *argv[];
F_compound objects;
int status;
+ setlocale(LC_CTYPE, "");
#ifdef HAVE_SETMODE
setmode(1,O_BINARY); /* stdout is binary */
#endif
--- fig2dev/fig2dev.h
+++ fig2dev/fig2dev.h 2007-07-24 15:09:55.000000000 +0000
@@ -23,6 +23,7 @@
#include <sys/file.h>
#include <signal.h>
#include <string.h>
+#include <stdarg.h>
#include <pwd.h>
#include <errno.h>
#include <time.h>
@@ -57,7 +58,7 @@ typedef char Boolean;
#ifndef X_NOT_STDC_ENV
# include <string.h>
#else
-# ifdef SYSV
+# if defined(SYSV) || defined(__GLIBC__)
# include <string.h>
# else
# include <strings.h>
--- fig2dev/fig2ps2tex.script
+++ fig2dev/fig2ps2tex.script 2006-07-31 16:26:56.000000000 +0000
@@ -3,6 +3,7 @@
# Fig2ps2tex - generate a TeX file for including a PostScript file
# involves calculating the bounding box from fig2ps output
#
+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 2006-07-31 16:26:56.000000000 +0000
@@ -35,6 +35,7 @@ static char sccsfid[] = "@(#) getopt.c 5
#define EMSG ""
#define ENDARGS "--"
+#ifndef __GLIBC__
/* this is included because index is not on some UNIX systems */
static char *
index (s, c)
@@ -46,7 +47,9 @@ index (s, c)
else s++;
return (NULL);
}
+#endif
+#ifndef __GLIBC__
/*
* get option letter from argument vector
*/
@@ -95,4 +98,10 @@ fig_getopt(nargc,nargv,ostr)
}
return(optopt); /* dump back option letter */
}
-
+#else
+#include <unistd.h>
+fig_getopt(int nargc, char * const nargv[], const char *ostr)
+{
+ return getopt(nargc, nargv, ostr);
+}
+#endif
--- transfig/Imakefile
+++ transfig/Imakefile 2006-07-31 16:26:56.000000000 +0000
@@ -32,7 +32,7 @@ XCOMM Uncomment the USELATEX2E flag to u
@ -317,22 +317,21 @@
XCOMM ******* DON'T CHANGE ANYTHING BELOW THIS POINT *******
--- transfig/sys.c
+++ transfig/sys.c 2006-07-31 16:26:56.000000000 +0000
@@ -15,6 +15,8 @@
*/
+++ transfig/sys.c 2012-09-28 14:24:03.339507328 +0000
@@ -17,6 +17,7 @@
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include "transfig.h"
#define MAXSYS 10000
--- transfig/transfig.c
+++ transfig/transfig.c 2006-07-31 16:26:56.000000000 +0000
@@ -25,6 +25,8 @@
*/
+++ transfig/transfig.c 2012-09-28 14:24:24.443392989 +0000
@@ -26,6 +26,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include "patchlevel.h"

3
transfig.3.2.5d.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc2ea61cbc9b6e181ba9b9005875d72eed393dac318f7f86e4299e63f35ae76f
size 387087

27
transfig.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Sep 28 14:15:17 UTC 2012 - werner@suse.de
- Update to transfig version 3.2.5d
* made PostScript output DSC 3.0 compliant to work with CUPS
patch from Ian Dall (see https://bugzilla.redhat.com/558380)
* Changed STOCK_LAST from 17 to 19 in fig2dev/dev/genemf.c
* Questionable copy of one data type to another in genemf.c
* Changed definition of command for short slanted lines in genlatex.c
* Added check for existance of arrows in SVG line generator
* Removed %%Page: directive from included JPEG files in PostScript/EPS output
* bound.c was passing pointers to int instead of double to arc_tangent
* put_msg function uses proper varargs now
* Option for debug comments in GBX output is "yes" or "no", not "on" or "off"
* Added help (-h) info for GBX output
* In version 1.4 of the PNG library dither was removed so fig2dev now uses
quantize when importing PNG images with palettes
* put_msg was declared twice (fig2dev/dev/genemf.c)
* Added xlink namespace for images in SVG export
* SVG output for imported images didn't form href link properly
* New PSTricks driver from Gene Ressler (see man fig2dev for info)
* transfig command was hardwired for "tex" for "make all" directive and
removing files with "make clean" directive in creating Makefile
* -a option added to PostScript and PICTeX languages to NOT include user's
login name in output
* Gerber (RS-247-X for CAD drawings for printed circuits) export language from Edward Gr
-------------------------------------------------------------------
Tue Jul 24 09:46:42 UTC 2012 - werner@suse.de

12
transfig.spec
View File

@ -42,16 +42,14 @@ Provides: transfig.3.2.3d
Requires: ghostscript-fonts-std
Requires: ghostscript-library
Requires: netpbm
Version: 3.2.5a
Version: 3.2.5d
Release: 0
Summary: Graphic Converter
License: MIT
Group: Productivity/Graphics/Convertors
Source: transfig.%{version}.tar.bz2
Patch0: transfig.3.2.5a.dif
Patch1: transfig.3.2.5a-cups.dif
Patch0: transfig.3.2.5d.dif
Patch2: transfig.3.2.5-binderman.dif
Patch3: transfig.3.2.5a-libpng14.dif
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,10 +85,8 @@ Authors:
%prep
%setup -q -n transfig.%{version}
%patch0
%patch1
%patch2
%patch3
%patch0 -b .0
%patch2 -b .bm
xmkmf -a -D_DATA='%{_data}'
%build