diff --git a/xfig-3.2.6a.tar.xz b/xfig-3.2.6a.tar.xz deleted file mode 100644 index 52f75dc..0000000 --- a/xfig-3.2.6a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:867ced1506537f1ef15f62f89d109bc3ecdcab466bd087f8d9205248a4ba2720 -size 5040284 diff --git a/xfig-3.2.7a.tar.xz b/xfig-3.2.7a.tar.xz new file mode 100644 index 0000000..8aef1b4 --- /dev/null +++ b/xfig-3.2.7a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32831801fdfe54b32f1e222db12676312ee98acac76c79be91bd424ec9512507 +size 5067004 diff --git a/xfig.3.2.5-urw-fonts.dif b/xfig.3.2.5-urw-fonts.dif index a655522..d064bbb 100644 --- a/xfig.3.2.5-urw-fonts.dif +++ b/xfig.3.2.5-urw-fonts.dif @@ -5,7 +5,7 @@ 3 files changed, 59 insertions(+), 1 deletion(-) --- src/u_fonts.c -+++ src/u_fonts.c 2017-02-02 13:38:18.519009382 +0000 ++++ src/u_fonts.c 2018-05-07 07:26:22.753355835 +0000 @@ -21,7 +21,9 @@ /* X11 font names */ @@ -63,7 +63,7 @@ * These come with the Open Group X distribution so they should be a common set. * --- src/u_fonts.h -+++ src/u_fonts.h 2017-02-02 13:38:18.519009382 +0000 ++++ src/u_fonts.h 2018-05-07 07:26:22.757355761 +0000 @@ -60,6 +60,8 @@ extern int psfontnum(char *font); extern int latexfontnum(char *font); @@ -74,8 +74,8 @@ extern struct _fstruct latex_fontinfo[]; --- src/w_drawprim.c -+++ src/w_drawprim.c 2017-02-02 13:38:18.519009382 +0000 -@@ -118,6 +118,22 @@ void init_font(void) ++++ src/w_drawprim.c 2018-05-07 07:26:22.757355761 +0000 +@@ -120,6 +120,22 @@ void init_font(void) appres.buttonFont, appres.normalFont); button_font = XLoadQueryFont(tool_d, appres.normalFont); } diff --git a/xfig.3.2.5b-locale.dif b/xfig.3.2.5b-locale.dif index 3990e06..315e166 100644 --- a/xfig.3.2.5b-locale.dif +++ b/xfig.3.2.5b-locale.dif @@ -4,7 +4,7 @@ 2 files changed, 13 insertions(+), 6 deletions(-) --- src/main.c -+++ src/main.c 2017-02-02 13:38:50.542387406 +0000 ++++ src/main.c 2018-05-07 07:27:07.684524349 +0000 @@ -59,11 +59,13 @@ /* input extensions for an input tablet */ @@ -56,8 +56,8 @@ tool_d = XtDisplay(tool); tool_s = XtScreen(tool); --- src/u_print.c -+++ src/u_print.c 2017-02-02 13:38:50.542387406 +0000 -@@ -15,6 +15,7 @@ ++++ src/u_print.c 2018-05-07 07:27:07.684524349 +0000 +@@ -16,6 +16,7 @@ * */ diff --git a/xfig.3.2.5b-pspdftex.dif b/xfig.3.2.5b-pspdftex.dif index ee0e4ce..aec5ea4 100644 --- a/xfig.3.2.5b-pspdftex.dif +++ b/xfig.3.2.5b-pspdftex.dif @@ -1,36 +1,24 @@ --- - src/u_print.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) + src/u_print.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) --- src/u_print.c -+++ src/u_print.c 2016-09-22 08:48:41.606479729 +0000 -@@ -363,8 +363,10 @@ print_to_file(char *file, char *lang, fl - strcat(prcmd, tmpcmd); - } else if (!strcmp(lang,"pspdftex")) { - /* first generate pstex postscript then pdftex PDF. */ -- sprintf(tmpcmd, "-n %s", outfile); -+ sprintf(tmpcmd, "-b %d -n %s", border, outfile); - strcat(prcmd, tmpcmd); -+ if (appres.correct_font_size) -+ strcat(prcmd," -F "); ++++ src/u_print.c 2018-05-07 07:42:00.783930631 +0000 +@@ -375,7 +375,7 @@ print_to_file(char *file, int xoff, int + /* make it suitable for pstex. */ + strcpy(tmpcmd, prcmd); + strcat(tmpcmd, ".eps"); +- (void) exec_prcmd(tmpcmd, "EXPORT of PostScript part"); ++ (void) exec_prcmd(tmpcmd, "EXPORT of EPS part"); - if (backgrnd[0]) { - strcat(prcmd," -g \\"); /* must escape the #rrggbb color spec */ -@@ -385,7 +387,7 @@ print_to_file(char *file, char *lang, fl - /* make it suitable for pstex. */ - strsub(prcmd,"pspdftex","pstex",tmpcmd,0); - strcat(tmpcmd,".eps"); -- (void) exec_prcmd(tmpcmd, "EXPORT of PostScript part"); -+ (void) exec_prcmd(tmpcmd, "EXPORT of EPS part"); - - /* make it suitable for pdftex. */ - strsub(prcmd,"ps","pdf",tmpcmd,0); -@@ -755,7 +757,7 @@ void build_layer_list(char *layers) + /* make it suitable for pdftex. */ + strsub(prcmd, "ps", "pdf", tmpcmd, 0); +@@ -694,7 +694,7 @@ build_layer_list(char *layers) { - char list[PATH_MAX], notlist[PATH_MAX], num[10]; - int layer, len, notlen; -- int firstyes, lastyes, firstno, lastno; -+ int firstyes, lastyes = 0, firstno, lastno = 0; + char list[PATH_MAX], notlist[PATH_MAX], num[10]; + int layer, len, notlen; +- int firstyes, lastyes, firstno, lastno; ++ int firstyes, lastyes = 0, firstno, lastno = 0; - layers[0] = '\0'; + layers[0] = '\0'; diff --git a/xfig.changes b/xfig.changes index 9181bdd..ffb6437 100644 --- a/xfig.changes +++ b/xfig.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon May 7 07:47:46 UTC 2018 - werner@suse.de + +- Update to xfig 3.2.7 Patchlevel 7a (May 2017) + o Export to pdf now allows to choose between output to a full-page pdf, + or cropping to the bounding box (the default behavior). + o Enable horizontal scrolling with mouse buttons 6 and 7 (sideway push + of mouse wheel, or horizontal movement on touchpad). + o Rename the text flag "Special Flag" to "TeX Flag". + o Interpolated splines are now created with the recommended value of the + shape factor of -0.5, not with -1.0. A description of the shape factor + o Really fix ticket #9, debian bug #270113. When entering the "Open.." + dialog, moving to a new directory, pressing Cancel, a subsequent + "Save" placed the figure file into the new directory. + o Center canvas around cursor when zooming by pressing CTRL and using a + wheel-mouse. + o Apply xfig-3.2.6a-fallback-for-nonscalable-fonts.patch and + xfig-3.2.6a-scalable-fonts.patch from Hans de Goede. + o Apply debian patches 08_every_time.patch, 10_RELEASE_DATE.patch, + 11_declare_swap_colors.patch, from Roland Rosenfeld. + o Apply debian patch 07_colorsliderarrows.patch. Debian bug #870365. + o Change map of India to disputed boundaries, from + https://en.wikipedia.org/wiki/File:India_disputed_areas_map.svg, + retrieved 2018-02-25. Debian bug #270799, 09_india_disputed.patch + o Prevent integer overflow in {floor,ceil}_coords_{x,y}(). Fixes debian + bug #300436. Also prevent integer overflow in round_coords(). + o Completely remove alloca.h and alloca() from the code. + o When entering the "Save as..." dialog, moving to a new directory and + pressing "Cancel", a subsequent "Save" wrote to the new directory. + This happened analogously for the "Export" dialog. Fixed, ticket #9. + ------------------------------------------------------------------- Thu Mar 1 21:03:21 UTC 2018 - crrodriguez@opensuse.org diff --git a/xfig.spec b/xfig.spec index 2c6874a..9eee862 100644 --- a/xfig.spec +++ b/xfig.spec @@ -42,7 +42,7 @@ Requires: netpbm Requires: transfig Requires: xorg-x11-fonts Requires: xorg-x11-fonts-core -Version: 3.2.6a +Version: 3.2.7a Release: 0 Summary: Facility for Interactive Generation of Figures under the X Window System # www.xfig.org is dead @@ -51,10 +51,11 @@ Group: Productivity/Graphics/Vector Editors Url: http://mcj.sourceforge.net/ # # Remove forbidden files: aircraft.fig -# xfig.3.2.5c.tar -# tar -f xfig.3.2.5c.tar --delete xfig.3.2.5c/Libraries/Examples/aircraft.fig -# xfig.3.2.5c.tar +# xfig-3.2.5c.tar +# tar -f xfig-3.2.5c.tar --delete xfig-3.2.5c/Libraries/Examples/aircraft.fig +# xfig-3.2.5c.tar # +#Source: http://sourceforge.net/projects/mcj/files/xfig-%{version}.tar.xz/download#/xfig-%{version}.tar.xz Source: xfig-%{version}.tar.xz Source1: font-test.fig Source3: xfig.sh