Mailinglist Archive: opensuse-commit (926 mails)

< Previous Next >
commit transfig for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 16 Dec 2009 17:02:37 +0100
  • Message-id: <20091216160237.D0FF820298@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package transfig for openSUSE:Factory
checked in at Wed Dec 16 17:02:37 CET 2009.



--------
--- transfig/transfig.changes 2009-10-09 14:19:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/transfig/transfig.changes 2009-12-16
11:22:22.000000000 +0100
@@ -1,0 +2,34 @@
+Mon Dec 14 15:05:23 CET 2009 - werner@xxxxxxx
+
+- Update to transfig version 3.2.5a
+ * 22 new arrowhead types
+ * HTML map now produces reference to .png file instead of .gif
+ * CreationDate in pictex output was either wrong or caused segfault
+ * bugs fixed in SVG Driver:
+ - blue component of shaded colors was always zero
+ - line protruding beyond arrowhead on long arrows
+ - wrong position of back arrowhead on double-headed arrows
+ - fill patterns either missing or using incorrect linewidth
+ - lowercase greek phi did not match its X11 counterpart
+ from Martin Kroeker
+ * dubious printf(j++,j++) in MP driver
+ * missing #includes in MP driver
+ * added !defined(__FreeBSD) to fig2dev.h def for sys_nerr and errno
+ From Eric Scott
+ * added -quiet options to giftopnm and ppmtopcs in reading GIF files
+ From Eric Scott
+ * Typo in LaTeX driver when generating arc-box. "iut" should be "put"
+ * extraneous stroke:black in svg header removed along with stroke color
+ for text, since the text fill color does the whole job
+ * fig2dev produces more correctly structured PostScript. Files get printed
via
+ CUPS on PostScript printers. When viewing a .ps-file in gv you can go to
the
+ last page and back and to the last page again without getting PostScript
errors.
+ From Ronald Lembcke
+ * Renamed the macro \SetFigFont to \SetFigFontNFSS if NFSS is #defined to
alleviate
+ some problems. From Roland Rosenfeld.
+ * Grid in metric mode was incorrectly scaled
+ * Removes any %EOF or %%EOF from imported EPS pictures before exporting.
+ Also doesn't add %EOF when importing JPEG file now.
+ * Missing call to get local time before converting to string in genpictex.c
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
transfig.3.2.5-cups.dif
transfig.3.2.5.dif
transfig.3.2.5.tar.bz2

New:
----
transfig.3.2.5a-cups.dif
transfig.3.2.5a.dif
transfig.3.2.5a.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ transfig.spec ++++++
--- /var/tmp/diff_new_pack.hvPbHB/_old 2009-12-16 16:59:41.000000000 +0100
+++ /var/tmp/diff_new_pack.hvPbHB/_new 2009-12-16 16:59:41.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package transfig (Version 3.2.5)
+# spec file for package transfig (Version 3.2.5a)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,13 +25,13 @@
Provides: transfig.3.2.3d
Requires: netpbm ghostscript-library ghostscript-fonts-std
AutoReqProv: on
-Version: 3.2.5
-Release: 161
+Version: 3.2.5a
+Release: 1
Summary: Graphic Converter
Source: transfig.%{version}.tar.bz2
-Patch0: transfig.%{version}.dif
-Patch1: transfig.%{version}-cups.dif
-Patch2: transfig.%{version}-binderman.dif
+Patch0: transfig.3.2.5a.dif
+Patch1: transfig.3.2.5a-cups.dif
+Patch2: transfig.3.2.5-binderman.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"

++++++ transfig.3.2.5-cups.dif -> transfig.3.2.5a-cups.dif ++++++
--- transfig/transfig.3.2.5-cups.dif 2008-10-12 00:29:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/transfig/transfig.3.2.5a-cups.dif
2009-12-16 11:22:20.000000000 +0100
@@ -1,6 +1,6 @@
--- fig2dev/dev/genps.c
-+++ fig2dev/dev/genps.c 2008-10-08 15:27:05.095587461 +0200
-@@ -686,6 +686,8 @@ F_compound *objects;
++++ fig2dev/dev/genps.c 2008-10-08 13:27:05.000000000 +0000
+@@ -661,6 +661,8 @@ F_compound *objects;
height = userury-userlly+1;
}

@@ -9,7 +9,7 @@
/* only include a pagesize command if PS */
if (!epsflag && !pdfflag) {
/* add comment for ghostview to recognize the page size */
-@@ -694,6 +696,9 @@ F_compound *objects;
+@@ -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);
@@ -19,7 +19,7 @@
fprintf(tfp, "%%%%BeginSetup\n");
fprintf(tfp, "[{\n");
fprintf(tfp, "%%%%BeginFeature: *PageRegion %s\n", papersize);
-@@ -711,10 +716,6 @@ F_compound *objects;
+@@ -686,10 +691,6 @@ F_compound *objects;
}


@@ -30,22 +30,11 @@
/* if the user wants an ASCII preview, route the rest of the eps to a
temp file */
if (asciipreview) {
saveofile = tfp;
-@@ -753,6 +754,7 @@ F_compound *objects;
-
+@@ -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();
-@@ -870,8 +872,10 @@ F_compound *objects;
- if (multi_page) {
- /* reset the matrix for multipage mode */
- fprintf(tfp, "initmatrix\n");
-+ fprintf(tfp, "%%%%EndProlog\n");
- } else {
- fprintf(tfp, " %.5f %.5f sc\n", scalex, scaley );
-+ fprintf(tfp, "%%%%EndProlog\n");
- if (!epsflag) {
- fprintf(tfp,"%%%%Page: 1 1\n");
- fprintf(tfp, "%%%%BeginPageSetup\n");

++++++ transfig.3.2.5-cups.dif -> transfig.3.2.5a.dif ++++++
--- transfig/transfig.3.2.5-cups.dif 2008-10-12 00:29:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/transfig/transfig.3.2.5a.dif 2009-12-16
11:22:21.000000000 +0100
@@ -1,51 +1,340 @@
---- fig2dev/dev/genps.c
-+++ fig2dev/dev/genps.c 2008-10-08 15:27:05.095587461 +0200
-@@ -686,6 +686,8 @@ F_compound *objects;
- height = userury-userlly+1;
- }
+--- Imakefile
++++ Imakefile 2006-07-31 17:14:30.000000000 +0000
+@@ -1,7 +1,3 @@
+-#ifndef XCOMM
+-#define XCOMM #
+-#endif
+-
+ XCOMM Top level Makefile for TransFig

-+ /* 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 */
-@@ -694,6 +696,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);
-@@ -711,10 +716,6 @@ F_compound *objects;
- }
+ XCOMM TransFig: Facility for Translating Fig code
+@@ -24,6 +20,7 @@ XCOMM type "xmkmf", "make Makefiles", "m
+ #define IHaveSubdirs
+ #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
+
++MFLAGS = XFIGLIBDIR=_DATA/xfig
+ DEPLIBS =
+ SUBDIRS = fig2dev transfig
+ MakeSubdirs($(SUBDIRS))
+--- doc/manual/Makefile
++++ doc/manual/Makefile 2007-07-24 15:30:27.000000000 +0000
+@@ -2,7 +2,7 @@
+ # TransFig makefile
+ #
+
+-all: trans.tex
++all: trans.tex manual.pdf
+
+ # translation into latex
+
+@@ -12,3 +12,16 @@ clean::
+ rm -f trans.tex
+
+ cleandir::
++
++manual.ps: manual.dvi
++ dvips -o $@ $^
++
++manual.dvi: manual.tex trans.tex
++ latex manual.tex
++ latex manual.tex
++ latex manual.tex
++
++manual.pdf: manual.tex trans.tex
++ pdflatex manual.tex
++ pdflatex manual.tex
++ pdflatex manual.tex
+--- fig2dev/Imakefile
++++ fig2dev/Imakefile 2007-07-24 15:04:29.000000000 +0000
+@@ -34,7 +34,7 @@ XCOMM ******
+ XCOMM You should point XFIGLIBDIR to the same directory you did when you
compiled
+ XCOMM and installed xfig.
+
+-XFIGLIBDIR = /usr/local/lib/X11/xfig
++XFIGLIBDIR = $(LIBDIR)/xfig
+
+ XCOMM ******
+ XCOMM If your system doesn't have the strerror() function (has sys_errlist)
then
+@@ -53,7 +53,7 @@ XCOMM Uncomment the following line if yo
+ XCOMM inline functions. With the "INLINE" keyword, you should notice that
+ XCOMM the display will be a bit faster in complex figures
+
+-XCOMM USEINLINE = -DUSE_INLINE
++USEINLINE = -DUSE_INLINE
+
+ XCOMM ****************
+ XCOMM Change RGB if necessary, to point to your rgb.txt color database
+@@ -97,11 +97,11 @@ XPMINC = -I/usr/include/X11
+
+ XCOMM ****************
+ XCOMM Uncomment the following to set default paper size to A4
+-XCOMM DDA4 = -DA4
++DDA4 = -DA4
+
+ XCOMM ****************
+ XCOMM Uncomment the following to set IBM Graphics Enhancement Cartridge
+-XCOMM DDIBMGEC = -DIBMGEC
++DDIBMGEC = -DIBMGEC
+
+ XCOMM ****************
+ XCOMM Comment out the DDNFSS = ... line if you don't want NFSS2 font selection
+@@ -117,6 +117,7 @@ XCOMM probably want to include neither.
+
+ DDNFSS = -DNFSS
+ DDLATEX2E_GRAPHICS = -DLATEX2E_GRAPHICS
++XCOMM Use modern garphics style, not older epsfig style
+ XCOMM DDEPSFIG = -DEPSFIG
+
+ XCOMM ****************
+@@ -141,7 +142,7 @@ XCOMM Comment out the next line if you h
+
+ #ifdef I18N
+ I18N_DEFS = -DI18N
+-FIG2DEV_LIBDIR = /usr/local/lib/fig2dev
++FIG2DEV_LIBDIR = $(XFIGLIBDIR)/fig2dev
+ I18N_DEV_DEFS = $(I18N_DEFS) -DFIG2DEV_LIBDIR=$(FIG2DEV_LIBDIR)
-DFIG2DEV_LIBDIR_STR=\\\"$(FIG2DEV_LIBDIR)\\\"

+ #endif /* I18N */
+@@ -150,7 +151,7 @@ XCOMM **********************************
+ XCOMM *** You shouldn't have to change anything below this point ***
+ XCOMM **************************************************************

-- /* put in the magnification for information purposes */
-- fprintf(tfp, "%%Magnification: %.4f\n",metric? mag*76.2/80.0 : mag);
-- fprintf(tfp, "%%%%EndComments\n");
+-DIR_DEFS= -DBITMAPDIR=\\\"$(DESTDIR)$(XFIGLIBDIR)/bitmaps\\\"
++DIR_DEFS= -DBITMAPDIR=\\\"$(XFIGLIBDIR)/bitmaps\\\"
+
+ #ifdef USEPNG
+ DUSEPNG = -DUSE_PNG
+@@ -229,7 +230,7 @@ install::
+ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XFIGLIBDIR)/bitmaps ); fi ; \
+ echo Copying bitmap files for tk to $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
+ for f in * ; do \
+- $(INSTALL) -c $$f $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
++ $(INSTALL) -m644 $$f $(DESTDIR)$(XFIGLIBDIR)/bitmaps ; \
+ 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 */
+ }
-
- /* if the user wants an ASCII preview, route the rest of the eps to a
temp file */
- if (asciipreview) {
- saveofile = tfp;
-@@ -753,6 +754,7 @@ F_compound *objects;
-
- 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();
-@@ -870,8 +872,10 @@ F_compound *objects;
- if (multi_page) {
- /* reset the matrix for multipage mode */
- fprintf(tfp, "initmatrix\n");
-+ fprintf(tfp, "%%%%EndProlog\n");
- } else {
- fprintf(tfp, " %.5f %.5f sc\n", scalex, scaley );
-+ fprintf(tfp, "%%%%EndProlog\n");
- if (!epsflag) {
- fprintf(tfp,"%%%%Page: 1 1\n");
- fprintf(tfp, "%%%%BeginPageSetup\n");
++#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 @@
+ */
+
+ #include <sys/stat.h>
++#include <locale.h>
++#include <langinfo.h>
+ #include "fig2dev.h"
+ #include "object.h"
+ #include "bound.h"
+@@ -772,25 +774,46 @@ 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 FIG2DEV_LIBDIR_STR
+ if (libdir == NULL)
+ libdir = FIG2DEV_LIBDIR_STR;
+ #endif
+- locale = getenv("LANG");
++ 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) {
++ 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 2008-04-25 14:01:42.000000000 +0000
+@@ -64,10 +64,13 @@ extern void
+ genps_spline (),
+ genlatex_option (),
+ genlatex_text (),
+- genps_text ();
++ genps_text (),
++ genpdf_option(),
++ genpdf_start();
+ extern int
+ genlatex_end (),
+- genps_end ();
++ genps_end (),
++ genpdf_end();
+
+ 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)
+ x, y, degrees (t->angle));
+ x = y = 0;
+ }
+- fprintf (tfp, "<text xml:space=\"preserve\" x=\"%d\" y=\"%d\"
fill=\"#%6.6x\" font-family=\"%s\" "\
+- "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\">",
+- x, y, rgbColorVal (t->color), family[t->font / 4],
++ fprintf (tfp,
++ "<text xml:space=\"preserve\" x=\"%d\" y=\"%d\" fill=\"#%6.6x\"
font-family=\"%s\" ",
++ x, y, rgbColorVal (t->color), family[t->font / 4]);
++ fprintf (tfp,
++ "font-style=\"%s\" font-weight=\"%s\" font-size=\"%d\"
text-anchor=\"%s\">",
+ ( (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]);
+--- transfig/Imakefile
++++ transfig/Imakefile 2006-07-31 16:26:56.000000000 +0000
+@@ -32,7 +32,7 @@ XCOMM Uncomment the USELATEX2E flag to u
+ XCOMM \\usepackage{} command for LaTeX2e.
+ XCOMM The default is to use \\documentstyle{} for LaTeX209.
+
+-XCOMM USELATEX2E = -DLATEX2E
++USELATEX2E = -DLATEX2E
+
+ 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 @@
+ */
+
+ #include <stdio.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 @@
+ */
+
+ #include <stdio.h>
++#include <string.h>
++#include <unistd.h>
+ #include "patchlevel.h"
+ #include "transfig.h"
+


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread