diff --git a/.gitignore b/.gitignore index 26e4cf7..b652b45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ xfig.3.2.5b.full.tar.gz -/xfig-icons.tar.gz -/xfig.3.2.5c.full.tar.gz -/xfig_3.2.5.c-8.debian.tar.xz -/xfig-full-3.2.6.tar.xz -/xfig-3.2.6.tar.xz -/xfig-3.2.6a.tar.xz -/xfig-3.2.7a.tar.xz -/xfig-3.2.7b.tar.xz -/xfig-3.2.8a.tar.xz -/xfig-3.2.8b.tar.xz -/xfig-3.2.9.tar.xz -/mcj-xfig-ce9782a404b6a527393839369aac13dcfb66ff16.zip diff --git a/30_figparserstack.patch b/30_figparserstack.patch new file mode 100644 index 0000000..70d3912 --- /dev/null +++ b/30_figparserstack.patch @@ -0,0 +1,56 @@ +From: Hans de Goede +Subject: Fix Stack-based buffer overflow by loading malformed .FIG files +Bug: https://bugzilla.redhat.com/show_bug.cgi?id=543905 +Bug-Debian: http://bugs.debian.org/559274 + +--- a/f_readold.c ++++ b/f_readold.c +@@ -471,7 +471,7 @@ + F_text *t; + int n; + int dum; +- char buf[128]; ++ char buf[512]; + PR_SIZE tx_dim; + + if ((t = create_text()) == NULL) +@@ -485,22 +485,34 @@ + t->pen_style = -1; + t->angle = 0.0; + t->next = NULL; ++ if (!fgets(buf, sizeof(buf), fp)) { ++ file_msg("Incomplete text data"); ++ free((char *) t); ++ return (NULL); ++ } ++ ++ /* Note using strlen(buf) here will waste a few bytes, as the ++ various text attributes are counted into this length too. */ ++ if ((t->cstring = new_string(strlen(buf))) == NULL) ++ return (NULL); ++ + /* ascent and length will be recalculated later */ +- n = fscanf(fp, " %d %d %d %d %d %d %d %[^\n]", ++ n = sscanf(buf, " %d %d %d %d %d %d %d %[^\n]", + &t->font, &dum, &dum, &t->ascent, &t->length, +- &t->base_x, &t->base_y, buf); ++ &t->base_x, &t->base_y, t->cstring); + if (n != 8) { + file_msg("Incomplete text data"); ++ free(t->cstring); + free((char *) t); + return (NULL); + } +- if ((t->cstring = new_string(strlen(buf))) == NULL) { ++ ++ if (!strlen(t->cstring)) { ++ free(t->cstring); + free((char *) t); + file_msg("Empty text string at line %d.", line_no); + return (NULL); + } +- /* put string in structure */ +- strcpy(t->cstring, buf); + + /* get the font struct */ + t->zoom = zoomscale; diff --git a/36_libpng15.dpatch b/36_libpng15.dpatch new file mode 100644 index 0000000..fbeba17 --- /dev/null +++ b/36_libpng15.dpatch @@ -0,0 +1,84 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 36_libpng15.dpatch by Nobuhiro Iwamatsu +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Some changes to cooperate with libpng 1.5. + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' xfig~/f_readpng.c xfig/f_readpng.c +--- xfig~/f_readpng.c ++++ xfig/f_readpng.c +@@ -43,7 +43,7 @@ + char *ptr; + int num_palette; + png_colorp palette; +- png_color_16 background; ++ png_color_16 background, *image_background; + + /* make scale factor smaller for metric */ + float scale = (appres.INCHES ? +@@ -73,7 +73,7 @@ + } + + /* set long jump recovery here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + /* if we get here there was a problem reading the file */ + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + close_picfile(file,filetype); +@@ -90,14 +90,18 @@ + png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, + &interlace_type, &compression_type, &filter_type); + +- if (info_ptr->valid & PNG_INFO_gAMA) +- png_set_gamma(png_ptr, 2.2, info_ptr->gamma); +- else ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_gAMA)) { ++ double gamma; ++ png_get_gAMA(png_ptr, info_ptr, &gamma); ++ png_set_gamma(png_ptr, 2.2, gamma); ++ } else { + png_set_gamma(png_ptr, 2.2, 0.45); ++ } + +- if (info_ptr->valid & PNG_INFO_bKGD) ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_bKGD) && ++ png_get_bKGD(png_ptr, info_ptr, &image_background)) + /* set the background to the one supplied */ +- png_set_background(png_ptr, &info_ptr->background, ++ png_set_background(png_ptr, image_background, + PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); + else { + /* blend the canvas background using the alpha channel */ +@@ -136,7 +140,11 @@ + + if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) { + png_get_hIST(png_ptr, info_ptr, &histogram); ++#ifdef PNG_READ_QUANTIZE_SUPPORTED ++ 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) { +diff -urNad '--exclude=CVS' '--exclude=.svn' xfig~/f_wrpng.c xfig/f_wrpng.c +--- xfig~/f_wrpng.c ++++ xfig/f_wrpng.c +@@ -20,6 +20,7 @@ + #include "w_msgpanel.h" + #include "w_setup.h" + #include ++#include + + /* + * Write PNG file from rgb data +@@ -59,7 +60,7 @@ + } + + /* set long jump recovery here */ +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf((png_ptr)))) { + /* if we get here there was a problem reading the file */ + png_destroy_write_struct(&png_ptr, &info_ptr); + return False; diff --git a/sources b/sources index 221c443..9b95348 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (mcj-xfig-ce9782a404b6a527393839369aac13dcfb66ff16.zip) = a0d483d77edb16d869596a53f89783efd232832b4447089227f34ff552836209f595e5cc9f179242386e85f6f8378607433913720aab29b9d69a2a4007404b47 -SHA512 (xfig-icons.tar.gz) = f7d9b314d57994d479712740dcac4a2c924ddacea028db1c6cdeef36fb7d846885c45d21499f7453c750c265eeb5877e4b032454911ce91667ccc550cb2112e5 +499b0ce103a6b353453bf7e327f9a3b9 xfig.3.2.5b.full.tar.gz diff --git a/xfig-3.2.5-debian.patch b/xfig-3.2.5-debian.patch new file mode 100644 index 0000000..13c1cf0 --- /dev/null +++ b/xfig-3.2.5-debian.patch @@ -0,0 +1,48 @@ +diff -urN xfig.3.2.5.orig/Doc/xfig.man xfig.3.2.5/Doc/xfig.man +--- xfig.3.2.5.orig/Doc/xfig.man 2004-04-14 19:26:07.000000000 +0200 ++++ xfig.3.2.5/Doc/xfig.man 2009-03-15 16:44:48.000000000 +0100 +@@ -1474,8 +1475,11 @@ + See the + .IR Imakefile . + .TP +-/usr/lib/X11/xfig +-This directory contains the html documentation, the above mentioned ++/usr/share/doc/xfig-3.2.5 ++This directory contains the documentation. ++.TP ++/usr/share/xfig ++This directory contains the above mentioned + CompKeyDB file, and a directory of libraries containing Fig objects + such as electrical symbols, logic symbols, etc. + .TP +diff -urN xfig.3.2.5.orig/Doc/xfig_man.html xfig.3.2.5/Doc/xfig_man.html +--- xfig.3.2.5.orig/Doc/xfig_man.html 2004-04-14 19:35:44.000000000 +0200 ++++ xfig.3.2.5/Doc/xfig_man.html 2009-03-15 16:44:48.000000000 +0100 +@@ -2504,8 +2504,11 @@ + See the + Imakefile. + +-
/usr/lib/X11/xfig
+-This directory contains the html documentation, the above mentioned ++
/usr/share/doc/xfig-3.2.5
++This directory contains the documentation. ++ ++
/usr/share/xfig
++This directory contains the above mentioned + CompKeyDB file, and a directory of libraries containing Fig objects + such as electrical symbols, logic symbols, etc. +
Fig.ad and Fig-color.ad +diff -urN xfig.3.2.5.orig/Fig.ad xfig.3.2.5/Fig.ad +--- xfig.3.2.5.orig/Fig.ad 2009-03-15 16:31:31.000000000 +0100 ++++ xfig.3.2.5/Fig.ad 2009-03-15 16:44:48.000000000 +0100 +@@ -5,6 +5,10 @@ + + ! some sample settings you may want to change + ++! If the following resource is set to false, xfig will use metric units ++! by default. ++Fig.inches: true ++ + ! The following fixes a problem that some window managers have + ! with xfig continually resizing itself + diff --git a/xfig-3.2.5-enable-Xaw3d.patch b/xfig-3.2.5-enable-Xaw3d.patch new file mode 100644 index 0000000..a1df816 --- /dev/null +++ b/xfig-3.2.5-enable-Xaw3d.patch @@ -0,0 +1,21 @@ +diff -up xfig.3.2.5a/Imakefile.no-Xaw3d xfig.3.2.5a/Imakefile +--- xfig.3.2.5a/Imakefile.no-Xaw3d 2009-03-27 16:33:46.000000000 +0100 ++++ xfig.3.2.5a/Imakefile 2009-03-27 16:35:06.000000000 +0100 +@@ -50,7 +50,7 @@ XAPPLOADDIR = /usr/share/X11/app-default + XCOMM Comment out the following definition for XAW3D if you don't to want to use + XCOMM the 3d Athena Widget Set + +-XCOMM #define XAW3D ++#define XAW3D + + #ifdef XAW3D + XAWLIB = -lXaw3d +@@ -60,7 +60,7 @@ XCOMM Uncomment the following if you hav + XCOMM some new features, including "Tips", which replace xfig's "help balloons" + XCOMM NOTE: This is the default for many X systems now. + +-XCOMM #define XAW3D1_5E ++#define XAW3D1_5E + + #ifdef XAW3D1_5E + DUSEXAW3D = -DXAW3D -DXAW3D1_5E diff --git a/xfig-3.2.5-fhs.patch b/xfig-3.2.5-fhs.patch new file mode 100644 index 0000000..a17d908 --- /dev/null +++ b/xfig-3.2.5-fhs.patch @@ -0,0 +1,12 @@ +--- xfig.3.2.5/Imakefile.fhs 2006-10-11 01:19:22.000000000 +0200 ++++ xfig.3.2.5/Imakefile 2007-04-16 14:04:45.000000000 +0200 +@@ -169,8 +169,7 @@ + XFIGLIBDIR = $(LIBDIR)/xfig + + XCOMM XFIGDOCDIR tells where the html and pdf documentation should go +-XCOMM XFIGDOCDIR = $(DOCDIR)/xfig +-XFIGDOCDIR = /usr/local/xfig/doc ++XFIGDOCDIR = $(DOCDIR)/xfig + + XCOMM MANDIR tells where the standard man pages should go (no need to change it + XCOMM if you want the man pages installed in the standard place on your system diff --git a/xfig-3.2.5-urwfonts.patch b/xfig-3.2.5-urwfonts.patch new file mode 100644 index 0000000..7bc766b --- /dev/null +++ b/xfig-3.2.5-urwfonts.patch @@ -0,0 +1,79 @@ +--- xfig.3.2.4/u_fonts.c 2002-09-09 13:36:58.000000000 -0400 ++++ new-xfig-3.2.4/u_fonts.c 2006-10-11 00:29:07.000000000 -0400 +@@ -22,41 +22,41 @@ + /* X11 font names */ + + struct _xfstruct x_fontinfo[NUM_FONTS] = { +- {"-*-times-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-times-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-times-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-times-bold-i-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL}, +- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL}, +- {"-*-bookman-light-r-normal--", (struct xfont*) NULL}, +- {"-*-bookman-light-i-normal--", (struct xfont*) NULL}, +- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL}, +- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL}, +- {"-*-courier-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-courier-medium-o-normal--", (struct xfont*) NULL}, +- {"-*-courier-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-courier-bold-o-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL}, +- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL}, +- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL}, +- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL}, +- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL}, +- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL}, +- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL}, +- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-medium-r-condensed--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-medium-i-condensed--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-bold-r-condensed--", (struct xfont*) NULL}, ++ {"-urw-nimbus sans l condensed-bold-i-condensed--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL}, ++ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL}, ++ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL}, ++ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL}, + }; + + /* Use the following font names for any font that doesn't exist in the table above. diff --git a/xfig-3.2.5a-default-apps.patch b/xfig-3.2.5a-default-apps.patch new file mode 100644 index 0000000..29f42d4 --- /dev/null +++ b/xfig-3.2.5a-default-apps.patch @@ -0,0 +1,25 @@ +diff -up xfig.3.2.5a/Fig.ad~ xfig.3.2.5a/Fig.ad +--- xfig.3.2.5a/Fig.ad~ 2007-04-14 04:17:24.000000000 +0200 ++++ xfig.3.2.5a/Fig.ad 2009-03-27 15:15:27.000000000 +0100 +@@ -23,18 +23,16 @@ Fig*AllowShellResize: false + + ! Browser - put your favorite browser here. + ! This is for viewing the xfig html reference. +-! For firefox, this command will open the help pages in a running firefox, +-! or start a new netscape if one isn't already running +-Fig.browser: firefox -remote 'openFile(%f)' || firefox %f ++Fig.browser: xdg-open %f + + ! pdfviewer - put your favorite pdf viewer here. + ! This is for viewing the xfig how-to guide and man pages +-Fig.pdfviewer: xpdf %f ++Fig.pdfviewer: xdg-open %f + + ! Spell check program - put your favorite spelling check program here. + ! It must write the misspelled words to standard output. + +-Fig.spellcheckcommand: spell %f ++Fig.spellcheckcommand: enchant -l %f + + ! delay before spinner automatically counts when pressed (milliseconds) + Fig.spinner_delay: 1000 diff --git a/xfig-3.2.5b-fix-eps-reading.patch b/xfig-3.2.5b-fix-eps-reading.patch new file mode 100644 index 0000000..7601d20 --- /dev/null +++ b/xfig-3.2.5b-fix-eps-reading.patch @@ -0,0 +1,46 @@ +diff -ur xfig.3.2.5b/f_readeps.c xfig.3.2.5b.new/f_readeps.c +--- xfig.3.2.5b/f_readeps.c 2009-03-30 17:52:18.000000000 +0200 ++++ xfig.3.2.5b.new/f_readeps.c 2010-11-25 16:53:54.328247928 +0100 +@@ -252,12 +252,13 @@ + { + char buf[300]; + FILE *tmpfp, *pixfile, *gsfile; +- char *psnam, *driver; ++ char *driver; + int status, wid, ht, nbitmap, fd; + char tmpfile[PATH_MAX], + pixnam[PATH_MAX], + errnam[PATH_MAX], +- gscom[2 * PATH_MAX]; ++ gscom[2 * PATH_MAX], ++ psnam[PATH_MAX]; + + wid = urx - llx; + ht = ury - lly; +@@ -307,19 +308,14 @@ + /* for color, use pcx */ + driver = "pcx256"; + } +- /* avoid absolute paths (for Cygwin with gswin32) by changing directory */ +- if (tmpfile[0] == '/') { +- psnam = strrchr(tmpfile, '/'); +- *psnam = 0; +- sprintf(gscom, "cd \"%s/\";", tmpfile); +- *psnam++ = '/'; /* Restore name for unlink() below */ +- } else { +- psnam = tmpfile; +- gscom[0] = '\0'; ++ /* Canonicalize the eps file filename, needed to "defeat" -dSAFER */ ++ if (!realpath(tmpfile, psnam)) { ++ file_msg("Cannot canonicalize %s: %s\n", tmpfile, strerror(errno)); ++ return False; + } +- sprintf(&gscom[strlen(gscom)], +- "%s -r72x72 -dSAFER -sDEVICE=%s -g%dx%d -sOutputFile=%s -q - > %s 2>&1", +- appres.ghostscript, driver, wid, ht, pixnam, errnam); ++ sprintf(gscom, ++ "%s -r72x72 -sDEVICE=%s -g%dx%d -sOutputFile=%s -dDELAYSAFER -c '<< /PermitFileReading [ (%s)] >> setuserparams .locksafe' -dSAFER -q - > %s 2>&1", ++ appres.ghostscript, driver, wid, ht, pixnam, psnam, errnam); + if (appres.DEBUG) + fprintf(stderr,"calling: %s\n",gscom); + if ((gsfile = popen(gscom, "w")) == 0) { diff --git a/xfig-3.2.5b-fix-fig-buffer-overflow.patch b/xfig-3.2.5b-fix-fig-buffer-overflow.patch new file mode 100644 index 0000000..77b7224 --- /dev/null +++ b/xfig-3.2.5b-fix-fig-buffer-overflow.patch @@ -0,0 +1,22 @@ +--- w_msgpanel.c ++++ w_msgpanel.c 2010-12-03 14:21:07.931926127 +0000 +@@ -60,7 +60,7 @@ DeclareStaticArgs(12); + /* for the popup message (file_msg) window */ + + static int file_msg_length=0; +-static char tmpstr[300]; ++static char tmpstr[512]; + static Widget file_msg_panel, + file_msg_win, file_msg_dismiss; + +@@ -582,8 +582,8 @@ file_msg(char *format,...) + } + + va_start(ap, format); +- /* format the string */ +- vsprintf(tmpstr, format, ap); ++ /* format the string (but leave room for \n and \0) */ ++ vsnprintf(tmpstr, sizeof(tmpstr)-2, format, ap); + va_end(ap); + + strcat(tmpstr,"\n"); diff --git a/xfig.3.2.5-Xaw3d.patch b/xfig.3.2.5-Xaw3d.patch new file mode 100644 index 0000000..c5d54c3 --- /dev/null +++ b/xfig.3.2.5-Xaw3d.patch @@ -0,0 +1,12 @@ +diff -up xfig.3.2.5a/Imakefile.Xaw3d xfig.3.2.5a/Imakefile +--- xfig.3.2.5a/Imakefile.Xaw3d 2009-03-27 16:32:20.000000000 +0100 ++++ xfig.3.2.5a/Imakefile 2009-03-27 16:33:20.000000000 +0100 +@@ -50,7 +50,7 @@ XAPPLOADDIR = /usr/share/X11/app-default + XCOMM Comment out the following definition for XAW3D if you don't to want to use + XCOMM the 3d Athena Widget Set + +-#define XAW3D ++XCOMM #define XAW3D + + #ifdef XAW3D + XAWLIB = -lXaw3d diff --git a/xfig.3.2.5-modularX.patch b/xfig.3.2.5-modularX.patch new file mode 100644 index 0000000..f5fb91f --- /dev/null +++ b/xfig.3.2.5-modularX.patch @@ -0,0 +1,29 @@ +diff -up xfig.3.2.5a/Imakefile~ xfig.3.2.5a/Imakefile +--- xfig.3.2.5a/Imakefile~ 2009-03-27 15:31:02.000000000 +0100 ++++ xfig.3.2.5a/Imakefile 2009-03-27 15:35:44.000000000 +0100 +@@ -45,7 +45,7 @@ XCOMM Don't set the DESTDIR variable unl + XCOMM different tree than the "correct" tree that your X system expects. The usual + XCOMM purpose of DESTDIR is to test an install process by installing in a benign area. + +-XCOMM XAPPLOADDIR = /home/user/xfig ++XAPPLOADDIR = /usr/share/X11/app-defaults + + XCOMM Comment out the following definition for XAW3D if you don't to want to use + XCOMM the 3d Athena Widget Set +@@ -169,14 +169,14 @@ XCOMM be sure to comment out the second + XCOMM XFIGLIBDIR = $(LIBDIR) + + XCOMM use this if you want the multi-key data base file in the standard X11 tree +-XFIGLIBDIR = $(LIBDIR)/xfig ++XFIGLIBDIR = /usr/share/xfig + + XCOMM XFIGDOCDIR tells where the html and pdf documentation should go + XFIGDOCDIR = $(DOCDIR)/xfig + + XCOMM MANDIR tells where the standard man pages should go (no need to change it + XCOMM if you want the man pages installed in the standard place on your system +-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX) ++MANDIR = /usr/share/man/man1 + XCOMM MANDIR = /usr/local/xfig/man + + XCOMM If your system doesn't have strstr undefine the following definition diff --git a/xfig.desktop b/xfig.desktop new file mode 100644 index 0000000..3fd49e7 --- /dev/null +++ b/xfig.desktop @@ -0,0 +1,47 @@ +[Desktop Entry] +Encoding=UTF-8 +Categories=Graphics; +MimeType=image/fig;image/x-xfig; +Exec=xfig +Icon=xfig +Type=Application +Name=Xfig +Name[eo]=XDesegno +Name[et]=Ffig +Name[ja]=xfig +Name[no]=X-figur +Comment=Xfig drawing application +Comment[bg]=Xfig ïðîãðàìà çà ðèñóâàíå +Comment[ca]=Aplicació de dibuix Xfig +Comment[cs]=Aplikace pro kreslení vektorových obrázků +Comment[da]=Xfig tegneprogram +Comment[de]=Xfig-Zeichenprogramm +Comment[el]=Xfig +Comment[eo]=Desegnilo "Xfig" +Comment[es]=Aplicación de diseño vectorial (objetos) +Comment[et]=XFig joonistusprogramm +Comment[fi]=Xfig vektoripiirto-ohjelma +Comment[fr]=Programme de dessin objet Xfig +Comment[gl]=Aplicación de debuxo (obxectos) +Comment[he]=Xfig רויצה םושיי +Comment[hr]=Program za crtanje +Comment[hu]=Rajzolóprogram +Comment[is]=Hlutbundið teikniforrit +Comment[it]=Applicazione di disegno Xfig +Comment[lt]=Xfig braižymo programa +Comment[mk]=Едноставна апликација за векторско цртање +Comment[nl]=Xfig-tekenprogramma +Comment[no]=Xfig-tegneprogram +Comment[no_NY]=Teikneprogrammet Xfig +Comment[pl]=Aplikacja do kreślenia +Comment[pt]=Aplicação de desenho +Comment[ro]=Program de desenare vectorială +Comment[ru]=Приложения для рисования векторной графики +Comment[sk]=Xfig aplikácia pre kreslenie vektorových obrázkov +Comment[sl]=Program za risanje Xfig +Comment[sr]=Xfig prgram za vektorsko crtanje +Comment[sv]=Xfig ritprogram +Comment[ta]=Xfig Ũþø ÀÂýÀ¡Î +Comment[tr]=Xfig çizim uygulaması +Comment[uk]=Xfig +Comment[zh_CN.GB2312]=Xfig 绘图应用程序 diff --git a/xfig.png b/xfig.png new file mode 100644 index 0000000..c0d68e9 Binary files /dev/null and b/xfig.png differ diff --git a/xfig.rpmlintrc b/xfig.rpmlintrc deleted file mode 100644 index e87b437..0000000 --- a/xfig.rpmlintrc +++ /dev/null @@ -1,5 +0,0 @@ -addFilter("W: invalid-url Source1") -addFilter("W: no-%check-section") -addFilter("W: files-duplicate /usr/share/") -addFilter("E: non-executable-script /usr/share/xfig/Libraries/Maps/") -addFilter("E: spelling-error") diff --git a/xfig.sh b/xfig.sh new file mode 100644 index 0000000..cc85396 --- /dev/null +++ b/xfig.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +if [ -x /usr/bin/xfig-Xaw3d ]; then + exec xfig-Xaw3d "$@" +else + exec xfig-plain "$@" +fi diff --git a/xfig.spec b/xfig.spec index 2443f40..691792c 100644 --- a/xfig.spec +++ b/xfig.spec @@ -1,27 +1,35 @@ -%global commit ce9782a404b6a527393839369aac13dcfb66ff16 -%global commitdate 20250317 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%define app_defaults_dir %{_datadir}/X11/app-defaults Summary: An X Window System tool for drawing basic vector graphics Name: xfig -Version: 3.2.9a -Release: 3.%{commitdate}git%{shortcommit}%{?dist} +Version: 3.2.5 +Release: 32.b%{?dist} License: MIT -URL: https://en.wikipedia.org/wiki/Xfig -#Source0: http://downloads.sourceforge.net/mcj/xfig-%%{version}.tar.xz -Source0: https://sourceforge.net/code-snapshots/git/m/mc/mcj/xfig.git/mcj-xfig-%{commit}.zip -Source1: xfig-icons.tar.gz +Group: Applications/Multimedia +URL: http://www.xfig.org/ +Source0: http://downloads.sourceforge.net/mcj/xfig.%{version}b.full.tar.gz +Source1: xfig.png +Source2: xfig.desktop +Source3: xfig.sh + +Patch0: xfig-3.2.5a-default-apps.patch +Patch1: xfig-3.2.5-fhs.patch +Patch7: xfig.3.2.5-modularX.patch +Patch9: xfig.3.2.5-Xaw3d.patch +Patch10: xfig-3.2.5-enable-Xaw3d.patch +Patch13: xfig-3.2.5-urwfonts.patch +Patch19: xfig-3.2.5-debian.patch +Patch20: xfig-3.2.5b-fix-eps-reading.patch +Patch21: xfig-3.2.5b-fix-fig-buffer-overflow.patch +Patch22: 36_libpng15.dpatch +Patch23: 30_figparserstack.patch -BuildRequires: make -BuildRequires: gcc libtool -BuildRequires: transfig BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: libtiff-devel +BuildRequires: imake BuildRequires: libICE-devel BuildRequires: libSM-devel BuildRequires: libX11-devel -BuildRequires: libXft-devel BuildRequires: libXaw-devel BuildRequires: libXext-devel BuildRequires: libXi-devel @@ -29,22 +37,13 @@ BuildRequires: libXmu-devel BuildRequires: libXpm-devel BuildRequires: libXt-devel BuildRequires: Xaw3d-devel -BuildRequires: man2html-core ImageMagick -# For eps preview generation -Requires: ghostscript -Requires: transfig -# Used in the UI -Requires: xorg-x11-fonts-misc -# For scalable fonts, inc. Bookman, New Century Schoolbook and Palatino -Requires: urw-base35-fonts-legacy +BuildRequires: desktop-file-utils -# We used to have seperate Xaw3d and non Xaw3d pkgs, now we only have Xaw3d -Obsoletes: %{name}-common < %{version}-%{release} -Provides: %{name}-common = %{version}-%{release} -Obsoletes: %{name}-plain < %{version}-%{release} -Provides: %{name}-plain = %{version}-%{release} -Obsoletes: %{name}-Xaw3d < %{version}-%{release} -Provides: %{name}-Xaw3d = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} +Provides: %{name}-executable = %{version}-%{release} +# Xaw3d used to be the one in a subpackage, now the plain Xaw version is +Obsoletes: %{name}-Xaw3d <= 3.2.5-7.fc8 +Provides: %{name}-Xaw3d = %{version}-%{release} %description Xfig is an X Window System tool for creating basic vector graphics, @@ -57,201 +56,475 @@ You should install xfig if you need a simple program to create vector graphics. +%package plain +Summary: Plain Xaw version of xfig +Group: Applications/Multimedia +Requires: %{name}-common = %{version}-%{release} +Provides: %{name}-executable = %{version}-%{release} + +%description plain +Plain Xaw version of xfig, an X Window System tool for creating basic vector +graphics, including bezier curves, lines, rulers and more. The normal xfig +package uses the more modern / prettier looking Xaw3d toolkit, whereas this +version uses the very basic Xaw toolkit. Unless you really know you want this +version you probably don't want this version. + + +%package common +Summary: Common xfig files +Group: Applications/Multimedia +Requires: transfig >= 1:3.2.5, xdg-utils, enchant, urw-fonts +Requires: hicolor-icon-theme +Requires: xorg-x11-fonts-base +# So that this will get uninstalled together with xfig / xfig-Xaw3d +Requires: %{name}-executable = %{version}-%{release} +Requires(post): desktop-file-utils +Requires(postun): desktop-file-utils + +%description common +Files common to both the plain Xaw and the Xaw3d version of xfig. + + %prep -%autosetup -p1 -a 1 -n mcj-xfig-%{commit} -for i in doc/html/japanese/button_frame.fig doc/html/japanese/japanese.ps \ - doc/html/animate.js; do - sed -i.orig 's/\r//' $i; touch -r $i.orig $i; rm $i.orig -done -autoreconf -i +%setup -q -n xfig.%{version}b +%patch0 -p1 -b .redhat +%patch1 -p1 -b .fhs +%patch7 -p1 -b .modularX +%patch9 -p1 -b .Xaw3d +%patch10 -p1 -b .no-Xaw3d +%patch13 -p1 -b .urw +%patch19 -p1 +%patch20 -p1 +%patch21 +%patch22 -p1 -b .libpng +%patch23 -p1 +iconv -f ISO-8859-1 -t UTF8 CHANGES > tmp; touch -r CHANGES tmp; mv tmp CHANGES +rm Doc/html/images/sav1a0.tmp +chmod -x `find -type f` %build -# Fedora's Xaw3d is built with -DXAW_ARROW_SCROLLBARS -export CFLAGS="-DXAW_ARROW_SCROLLBARS $RPM_OPT_FLAGS -fno-strength-reduce -fno-strict-aliasing" -%configure -%make_build +# First build the Xaw3d version +xmkmf +# make sure cmdline option parsing still works despite us renaming the binary +sed -i 's/"xfig"/"xfig-Xaw3d"/' main.c +make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \ + CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing" +mv xfig xfig-Xaw3d +make distclean + +# And then build the normal Xaw version +mv Imakefile.no-Xaw3d Imakefile +xmkmf +# make sure cmdline option parsing still works despite us renaming the binary +sed -i 's/"xfig-Xaw3d"/"xfig-plain"/' main.c +make XFIGDOCDIR=%{_docdir}/%{name}-%{version} \ + CDEBUGFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fno-strength-reduce -fno-strict-aliasing" %install -%make_install INSTALL="install -p" -cp -p README CHANGES FIGAPPS $RPM_BUILD_ROOT%{_docdir}/%{name} +make DESTDIR=%{buildroot} XFIGDOCDIR=%{_docdir}/%{name}-%{version} \ + INSTALL="install -p" install.all +install -p -m 644 CHANGES README LATEX.AND.XFIG* FIGAPPS \ + %{buildroot}%{_docdir}/%{name}-%{version} -rm -r $RPM_BUILD_ROOT%{_datadir}/pixmaps -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,64x64}/apps -convert %{name}16x16.xpm \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/%{name}.png -convert %{name}32x32.xpm \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.png -convert %{name}64x64.xpm \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +# install the Xaw3d version and the wrapper for the .desktop file +mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_bindir}/%{name}-plain +install -p -m 755 %{SOURCE3} %{buildroot}%{_bindir}/%{name} +install -m 755 %{name}-Xaw3d %{buildroot}%{_bindir} + +# remove the map generation scripts, these are for xfig developers only +rm %{buildroot}%{_datadir}/%{name}/Libraries/Maps/{USA,Canada}/assemble + +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps \ + %{buildroot}%{_datadir}/applications + +install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps + +desktop-file-install --vendor fedora \ + --dir %{buildroot}%{_datadir}/applications \ + %{SOURCE2} + +# remove app-defaults symlink which gets installed +rm %{buildroot}%{_prefix}/lib*/X11/app-defaults + + +%post common +update-desktop-database &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi + +%postun common +update-desktop-database &> /dev/null || : +touch --no-create %{_datadir}/icons/hicolor || : +if [ -x %{_bindir}/gtk-update-icon-cache ]; then + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +fi %files -%doc %{_docdir}/%{name} +%{_bindir}/%{name}-Xaw3d + +%files plain +%{_bindir}/%{name}-plain + +%files common +%doc %{_docdir}/%{name}-%{version} %{_bindir}/%{name} %{_datadir}/%{name} -%{_mandir}/man1/%{name}.1* -%{_datadir}/X11/app-defaults/Fig -%{_datadir}/metainfo/org.xfig.xfig.metainfo.xml -%{_datadir}/applications/org.xfig.xfig.desktop -%{_datadir}/icons/hicolor/??x??/apps/%{name}.png +%{_mandir}/*/* +%{app_defaults_dir}/* +%{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/32x32/apps/%{name}.png %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 3.2.9a-3.20250317gitce9782a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild +* Sun Aug 12 2012 Hans de Goede - 3.2.5-32.b +- Fix a stack overflow when importing 1.3 files (CVE-2009-4227) (rhbz#543905) -* Sat Jan 17 2026 Fedora Release Engineering - 3.2.9a-2.20250317gitce9782a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild +* Sun Jul 22 2012 Fedora Release Engineering - 3.2.5-31.b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Wed Aug 6 2025 Hans de Goede - 3.2.9a-1.20250317gitce9782a -- Update to 3.2.9a + latest git changes to fix build with -std=c11 -- Switch to upstream appdata/metainfo and desktop file -- Drop all patches (all upstreamed) -- Resolves: rhbz#2341567 -- Resolves: rhbz#2385740 +* Sun Feb 26 2012 Orion Poplawski - 3.2.5-30.b +- Rebuild with Xaw3d 1.6.1 -* Fri Jul 25 2025 Fedora Release Engineering - 3.2.9-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Tue Feb 14 2012 Peter Robinson - 3.2.5-29.b +- Add patch from Debian for libpng 1.5 -* Sun Jan 19 2025 Fedora Release Engineering - 3.2.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +* Sat Jan 14 2012 Fedora Release Engineering - 3.2.5-28.b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Sat Jul 20 2024 Fedora Release Engineering - 3.2.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* Tue Dec 06 2011 Adam Jackson - 3.2.5-27.b +- Rebuild for new libpng -* Mon Feb 26 2024 Hans de Goede - 3.2.9-4 -- Fix missing Dingbats and Symbol glyphs -- Resolves: rhbz#2260359 +* Mon Feb 07 2011 Fedora Release Engineering - 3.2.5-26.b +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Sat Jan 27 2024 Fedora Release Engineering - 3.2.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Mon Dec 6 2010 Stanislav Ochotnicky - 3.2.5-25.b +- Fix buffer overflow when opening malicious fig files -* Thu Jan 18 2024 Mamoru TASAKA - 3.2.9-2 -- Backport upstream patches for upstream 2 issues - - Fix exporting only active layers - - Sanitize a call to realloc (redhat #2252679) +* Thu Nov 25 2010 Hans de Goede 3.2.5-24.b +- Fix importing of eps files (#657290) -* Sat Aug 26 2023 Ranjan Maitra - 3.2.9-1 -- New upstream release 3.2.9 +* Wed Sep 30 2009 Hans de Goede 3.2.5-23.b +- New upstream 3.2.5b release +- Drop many merged patches -* Sat Jan 21 2023 Fedora Release Engineering - 3.2.8b-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Mon Jul 27 2009 Fedora Release Engineering - 3.2.5-22.a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Sat Jul 23 2022 Fedora Release Engineering - 3.2.8b-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Sun Jun 28 2009 Caolán McNamara 3.2.5-21.a +- Resolves: rhbz#506791 make xfig spellchecking work -* Sat Jan 22 2022 Fedora Release Engineering - 3.2.8b-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Wed Jun 3 2009 Hans de Goede 3.2.5-20.a +- Fix eps preview (#503911) -* Mon Oct 11 2021 Hans de Goede - 3.2.8b-1 -- New upstream release 3.2.8b +* Wed Apr 8 2009 Hans de Goede 3.2.5-19.a +- Fix crash when printing (#494193), thanks to Ian Dall for the patch -* Fri Jul 23 2021 Fedora Release Engineering - 3.2.8a-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Fri Mar 27 2009 Hans de Goede 3.2.5-18.a +- Rebase to new upstream 3.2.5a release, this was made available to me by + the Debian maintainer who is in contact with upstream, which appearantly + is still somewhat alive (but not alive enough to put the tarbal on the + homepage ??) -* Sat May 29 2021 Hans de Goede - 3.2.8a-1 -- New upstream release 3.2.8a +* Sun Mar 15 2009 Hans de Goede 3.2.5-17 +- Add various patches from Debian (doc updates, new figures in the lib, + better fix for modepanel resizing) +- Do not crash when inserting a character from the charmap into a text string -* Thu Jan 28 2021 Fedora Release Engineering - 3.2.7b-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Sun Mar 15 2009 Hans de Goede 3.2.5-16 +- Fix Text size field inserts characters on left instead of right (#490257) +- Fix xfig-Xaw3d does not display messages in message panel (#490259) -* Sat Aug 01 2020 Fedora Release Engineering - 3.2.7b-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Thu Feb 26 2009 Fedora Release Engineering - 3.2.5-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Wed Jul 29 2020 Fedora Release Engineering - 3.2.7b-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Sun Feb 22 2009 Hans de Goede 3.2.5-14 +- Add missing Requires: xorg-x11-fonts-base (#486701) -* Fri Jan 31 2020 Fedora Release Engineering - 3.2.7b-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Mon Nov 10 2008 Stepan Kasal - 3.2.5-13 +- fix the Obsoletes tag to <= 3.2.5-7.fc8, which is the last + release with Xaw3d subpackage -* Thu Jan 16 2020 Hans de Goede - 3.2.7b-1 -- New upstream release 3.2.7b +* Tue Nov 4 2008 Hans de Goede 3.2.5-12 +- Various small specfile cleanups from merge review -* Sat Jul 27 2019 Fedora Release Engineering - 3.2.7a-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Mon Jul 14 2008 Ian Hutchinson 3.2.5-11 +- Fix incorrect height of modepanel. -* Sun Feb 03 2019 Fedora Release Engineering - 3.2.7a-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Thu Apr 3 2008 Hans de Goede 3.2.5-10 +- Fix missing prototype compiler warnings -* Fri Jan 11 2019 Hans de Goede - 3.2.7a-2 -- Fix spline drawing (rhbz#1665237) +* Thu Feb 28 2008 Hans de Goede 3.2.5-9 +- Fix cmdline parsing (broken by renaming the binary) (bz 435097) -* Mon Oct 29 2018 Hans de Goede - 3.2.7a-1 -- New upstream release 3.2.7a -- Add Requires: transfig to make sure esp export works (rhbz#1642033) -- Switch back to URW fonts so that Bookman, New Century Schoolbook and - Palatino work again. This uses the old version of the URW fonts which are - now packaged as urw-base35-fonts-legacy (rhbz#1523624, rhbz#1551219) -- Trim the changelog +* Tue Feb 19 2008 Fedora Release Engineering - 3.2.5-8 +- Autorebuild for GCC 4.3 -* Sat Jul 14 2018 Fedora Release Engineering - 3.2.6a-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Wed Dec 12 2007 Hans de Goede 3.2.5-7 +- Fix xfig crashing when zooming in a lot (bz 420411) -* Sat Mar 03 2018 Hans de Goede - 3.2.6a-7 -- Fix font issues take 2 (rhbz#1523624) : - - It turns out the new urw fonts are completely unusuable as X11 core fonts, - stop using them for now (see bug rhbz#1551219) - - Add a patch to use the fallback fonts for non-scalable fonts too, so that - we at least show something somewhat reasonable for Bookman, New Century - Schoolbook and Palatino - - This means that display of Zapf Chancery and Zapf Dingbats currently - falls back to the "fixed" font, which is completely wrong for Dingbats +* Sat Nov 17 2007 Hans de Goede 3.2.5-6 +- Put the Xaw3d version in the main xfig package, put the plain Xaw version + in a -plain subpackage -* Thu Mar 01 2018 Hans de Goede - 3.2.6a-6 -- Fix font issues (rhbz#1523624) : - - Adjust xfig-3.2.5-urwfonts.patch for new font names in urw-base35-fonts - - Except for the symbols font, use the old un-scalable Adobe PCF Symbol font - for now as StandardSymbolsPS.otf from urw-base35-fonts is currently broken - - Add a patch to deal with some fonts being scalable, while Symbol is not - - Note the dingbats font is also broken in urw-base35-fonts, but there is no - replacement for it, so that font is still broken, see rhbz#1534206 -- ghostscript-core no longer exists, instead require ghostscript (rhbz#1536581) -- Remove obsolete icon-cache and desktop-database scriptlets -- Add a patch from Debian fixing some issues with arrows +* Fri Nov 16 2007 Hans de Goede 3.2.5-5 +- Also compile a version against Xaw3d instead of plain Xaw, available in the + new xfig-Xaw3d package +- Various specfile cleanups for packaging guidelines compliance +- Remove spurious executable permissions on various files (bz 247424) +- Apply patch fixing problems with xfig not finding fonts (bz 210278) -* Fri Feb 09 2018 Fedora Release Engineering - 3.2.6a-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Thu Nov 15 2007 Than Ngo 3.2.5-4 +- fix #201992, xfig crashes in the edit function -* Tue Nov 07 2017 Adam Jackson - 3.2.6a-4 -- Drop unneeded BuildRequires: imake +* Thu Nov 15 2007 Than Ngo 3.2.5-3 +- fix #201992, xfig crashes in the edit function -* Thu Aug 03 2017 Fedora Release Engineering - 3.2.6a-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild +* Fri Oct 05 2007 Than Ngo - 3.2.5-2 +- rh#313321, use xdg-open -* Thu Jul 27 2017 Fedora Release Engineering - 3.2.6a-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Mon Apr 16 2007 Than Ngo - 3.2.5-1.fc7 +- 3.2.5 -* Mon Feb 13 2017 Hans de Goede - 3.2.6a-1 -- New upstream release 3.2.6a +* Wed Jul 12 2006 Jesse Keating - 3.2.4-21.1 +- rebuild -* Sun Feb 12 2017 Hans de Goede - 3.2.6-5 -- Build with -DGSBIT to fix eps file preview generation (rhbz#1418560) -- Fix broken screenshot links in appdata +* Tue May 16 2006 Than Ngo 3.2.4-21 +- fix #191816, Xaw3d build problem -* Sat Feb 11 2017 Fedora Release Engineering - 3.2.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Fri May 05 2006 Than Ngo 3.2.4-20 +- fix #169330, wrong docdir +- fix #187902, no parameter negotiation for xfig +- fix #182451, switch xfig's pdf viewer to evince -* Fri Aug 12 2016 Hans de Goede - 3.2.6-3 -- Switch to non -full (smaller) version of upstream sources, - we package transfig seperately so we do not need the -full version +* Tue Apr 25 2006 Adam Jackson 3.2.4-19 +- Rebuild for updated imake build rules -* Thu Aug 11 2016 Hans de Goede - 3.2.6-2 -- Make using metric units the default again +* Tue Apr 04 2006 Than Ngo 3.2.4-18 +- no parameter negotiation for xfig, fix #187902 -* Thu Aug 11 2016 Hans de Goede - 3.2.6-1 -- New upstream release 3.2.6 -- Drop all patches, all fixes are upstream now -- Drop -plain subpackage, only build Xaw3d version -- Update appdata screenshots for xfig.org being gone - (point to http://epb.lbl.gov/xfig/ for now) +* Fri Feb 10 2006 Jesse Keating - 3.2.4-17.2 +- bump again for double-long bug on ppc(64) -* Sun Feb 28 2016 Hans de Goede - 3.2.5-48.c -- Bring in various bugfixes from Debian -- Convert icons to png -- Add appdata +* Tue Feb 07 2006 Jesse Keating - 3.2.4-17.1 +- rebuilt for new gcc4.1 snapshot and glibc changes -* Fri Feb 05 2016 Fedora Release Engineering - 3.2.5-47.c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Wed Dec 21 2005 Than Ngo 3.2.4-17 +- workaround for utf8 + +* Sun Dec 18 2005 Than Ngo 3.2.4-16 +- add correct app-defaults directory + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Tue Nov 15 2005 Than Ngo 3.2.4-15 +- fix for modular X + +* Mon Oct 24 2005 Than Ngo 3.2.4-14 +- enable xpm support #158422 + +* Tue Jul 19 2005 Than Ngo 3.2.4-13 +- buildrequires on xorg-x11-devel + +* Mon Jul 18 2005 Than Ngo 3.2.4-12 +- fix another buffer overflow #163413 + +* Thu May 19 2005 Than Ngo 3.2.4-11 +- apply patch to fix buffer overflow #158088 + +* Mon Mar 21 2005 Than Ngo 3.2.4-10 +- fix font warning #116542 + +* Mon Mar 07 2005 Than Ngo 3.2.4-9 +- cleanup + +* Sat Mar 05 2005 Than Ngo 3.2.4-8 +- rebuilt + +* Wed Feb 09 2005 Than Ngo 3.2.4-7 +- rebuilt + +* Sat Sep 25 2004 Than Ngo 3.2.4-6 +- add mimetype spec #131629 + +* Mon Sep 13 2004 Than Ngo 3.2.4-5 +- fix desktop file #131983 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Tue May 6 2003 Than Ngo 3.2.4-1 +- 3.2.4 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Nov 7 2002 Than Ngo 3.2.3d-11 +- rebuild in new enviroment + +* Thu Aug 22 2002 Than Ngo 3.2.3d-10 +- close should get fd, not filename + +* Wed Jul 31 2002 Than Ngo 3.2.3d-9 +- Fixed typo bug (bug #70347) + +* Wed Jul 24 2002 Than Ngo 3.2.3d-8 +- desktop file issue (bug #69543) + +* Tue Jun 25 2002 Than Ngo 3.2.3d-7 +- add patch file using mkstemp (bug #67351) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Fri Jul 13 2001 Than Ngo 3.2.3d-3 +- fix build dependencies (bug #48910) + +* Tue Jul 03 2001 Than Ngo +- fix export to eps when i18n set (bug #45114) +- requires transfig-3.2.3d + +* Fri Jun 15 2001 Than Ngo +- update to 3.2.3d release + +* Tue Jun 12 2001 Than Ngo +- fix to build against XFree86-4.1.0 + +* Tue May 29 2001 Than Ngo +- update to 3.2.3d beta2 fixes (Bug #42597, #42556) +- fix bug when LANG is set, launching help gives a spurious error (Bug #42596) +- fix bug in resource setting (Bug #42595) +- remove some patches, which are included in 3.2.3d beta2 +- fix wrong version number +- use make install.all +- fix fhs problem + +* Wed May 9 2001 Bernhard Rosenkraenzer +- Don't require Netscape at all - use htmlview (which automatically launches + Netscape, Mozilla or Konqueror depending on what is installed/running). + No need to depend on proprietary stuff... + +* Thu Apr 26 2001 Florian La Roche +- do the same for s390x + +* Sat Jan 06 2001 Florian La Roche +- only require /usr/bin/netscape if not on S390 + +* Tue Dec 20 2000 Yukihiro Nakai +- Delete enable_japanese macro and set i18n default. +- Fix Japanese translation in .desktop file + +* Mon Nov 20 2000 Than Ngo +- rebuilt to fix bad dir perms + +* Thu Nov 9 2000 Than Ngo +- fixed f_read, which made xfig stop reading the file after + removing such bad objects. + +* Fri Oct 13 2000 Preston Brown +- improved .desktop entry + +* Thu Aug 24 2000 Yukihiro Nakai +- Add Japanese patch + +* Tue Aug 08 2000 Than Ngo +- fixed dependency problem +- fixed starting xpdf + +* Mon Aug 07 2000 Than Ngo +- fixed for using xpdf instead acroreader (Bug #15621) +- add requires: netscape, display + +* Sat Aug 05 2000 Than Ngo +- update to 3.2.3c (bugs fixed released) +- fix parse_printcap broken (Bug #11147) + +* Thu Jul 13 2000 Prospector +- automatic rebuild + +* Fri Jun 23 2000 Than Ngo +- xfig crash, if a menu item was clicked (Bug #12855) + +* Sun Jun 18 2000 Than Ngo +- rebuilt in the new build environment +- enable optimization + +* Sat Jun 03 2000 Than Ngo +- fix requires, xfig-3.2.3a requires transfig-2.2.3 or newer +- disable optimization -O2 (gcc-2.96 Bug) on i386 + +* Thu May 18 2000 Preston Brown +- fix buildroot issue in Imakefile + +* Mon May 8 2000 Bernhard Rosenkraenzer +- rebuild with current libXaw3d +- update to 3.2.3a + +* Mon Feb 07 2000 Preston Brown +- rebuild to gzip man pages + +* Fri Jan 14 2000 Preston Brown +- upgrade to beta1 of 2.2.3. Hopefully this fixes outstanding issues. +- no need for vararg fix, commented out + +* Thu Sep 23 1999 Preston Brown +- add icon +- don't compile with optimization on alpha + +* Mon Aug 30 1999 Preston Brown +- converted to use a .desktop file + +* Fri Mar 26 1999 Michael Maher +- added files that were missing. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 4) +- varargs fix + +* Thu Feb 18 1999 Jeff Johnson +- correct DESTDIRR typo (#962) + +* Wed Dec 30 1998 Cristian Gafton +- build for glibc 2.1 + +* Tue Jul 7 1998 Jeff Johnson +- updated to 3.2.2. + +* Wed Jun 10 1998 Prospector System +- translations modified for de + +* Fri May 08 1998 Prospector System +- translations modified for de, fr, tr + +* Sat Apr 11 1998 Cristian Gafton +- updated for manhattan +- buildroot + +* Thu Oct 23 1997 Marc Ewing +- new version +- messed with config for 5.0 +- updated Requires and Copyright +- added wmconfig + +* Mon Jul 21 1997 Erik Troan +- built against glibc