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

Accepting request 429839 from graphics

Browse Source 
- Update to xfig 3.2.6
  New features:
    o Add compile switch to enable xpm-icon and xpm-splash screen
      independently (--enable-xpm-icon, --enable-xpm-splash).
    o New compile switch --enable-versioning, calls update_version_m4
      to get version information from a source control system.
    o Should compile on Mac (Darwin) after installing dependencies using
      Macports, Fink or Homebrew.
    o Add two rudimentary tests. Run with make check.
    o New tikz and pict2e export drivers.
    o Build using autoconf (./configure; make; make install).
  UI changes:
    From Brian V. Smith. These changes were made because the original
    view was of the drawing on the page instead of the modern view
    of the observer moving left/right/up/down:
      o Left arrow moves observer left (used to scroll canvas left)
      o Right arrow moves observer right
      o Up arrow moves observer up
      o Down arrow moves observer down
      o Ctrl+Wheel up zooms in, Ctrl+Wheel down zooms out (was the other way around)
  Bugs fixed:
    o Update documentation to LaTeX and Xfig.
    o Change \r\n to \n in all files.
    From Roland Rosenfeld <roland@spinnaker.de>:
      o Update LaTeX documentation, use \documentclass instead of
        \documentstyle, \usepackage instead of \input.
      o Builds on hurd, had to #include <limits.h> in a few places.
      o Use application/x-xfig, not image/x-xfig in xfig.desktop file.
        See https://bugs.launchpad.net/ubuntu/+source/xfig/+bug/690067 and
        https://bugs.launchpad.net/ubuntu/+source/xfig/+bug/1045848 .

OBS-URL: https://build.opensuse.org/request/show/429839
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfig?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger 2016-10-18 08:39:05 +00:00 committed by Git OBS Bridge
commit bb55aeea6b
17 changed files with 300 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
browser
View File

@ -1,91 +0,0 @@
#!/bin/bash
#
# browser script
#
# Copyright (c) 2004 SuSE Linux AG, Nuernberg, Germany.
# Copyright (c) 2007 SuSE LINUX Products GmbH, Nuernberg, Germany
# Copyright (c) 2004, 2007 Werner Fink
#
# Author: Werner Fink
prog=""
for p in \
firefox \
Mozilla \
mozilla \
konqueror \
opera \
amaya \
Netscape \
netscape \
Mosaic \
mosaic
do
prog=$(type -p $p) && break
done
test -n "$prog" || { echo "${0##*/}: no web browser found" 1>&2; exit 1; }
cmd="openBrowser"
open="openURL"
for opt in $@ ; do
case "$opt" in
http://*|https://*|www.*)
url=$opt
;;
file:/*|*/*.htm|*/*.html)
url=$opt
open="openFile"
;;
ftp://*|*/*.htmls)
url=$opt
;;
*.htm|*.html|*.htmls)
url=$PWD/$opt
;;
-discussions|-news)
cmd=openNewsgroups
;;
-messenger|-mail)
cmd=openInbox
;;
-composer|-edit)
cmd=composeMessage
;;
-component-bar)
cmd=toggleTaskbar
;;
-remote|-help)
cmd=""; url="";
break
;;
esac
done
case "${prog##*/}" in
[nN]etscape|[Mm]ozilla)
ret=0
if test -n "$url" ; then
$prog -noraise -remote "xfeDoCommand(openBrowser)" &> /dev/null && \
$prog -remote "$open($url)"
ret=$?
elif test -n "$cmd" ; then
$p -noraise -remote "xfeDoCommand($cmd)" &> /dev/null
ret=$?
fi
test $ret -eq 0 && exit 0
;;
firefox)
ret=0
if test -n "$url" ; then
$prog -remote "$open($url,new-window)"
ret=$?
elif test -n "$cmd" ; then
echo "${prog##*/} does not support $cmd"
exit 1
fi
test $ret -eq 0 && exit 0
esac
# You are at your own
exec -a $prog $prog ${1+"$@"}

72
xfig-3.2.6.dif Normal file
View File

@ -0,0 +1,72 @@
---
app-defaults/Fig | 32 ++++++++++++++++++++++++++++++--
src/w_menuentry.c | 2 +-
2 files changed, 31 insertions(+), 3 deletions(-)
--- app-defaults/Fig.in
+++ app-defaults/Fig.in 2016-09-22 08:33:16.879768102 +0000
@@ -14,6 +14,7 @@ Fig.version: 3.2.6
! with xfig continually resizing itself
Fig*AllowShellResize: false
+Fig.inches: false
! Image editor - can edit imported image
Fig.image_editor: xdg-open
@@ -167,8 +168,13 @@ Fig.internalborderwidth: 1
!if on monochrome server, or no Fig-color app-defaults file
! This background resource shows between the buttons like a border
- Fig*mode_panel.background: black
+ Fig*mode_panel.background: gray67
Fig*mode_panel.foreground: black
+ Fig*mode_panel*topShadow: white
+ Fig*mode_panel*bottomShadow: gray17
+ Fig*mode_panel*topShadowPixel: white
+ Fig*mode_panel*bottomShadowPixel: gray17
+
! Specify a private Compose key database file. If this resource contains a "/"
! then the wired-in name of the xfig global directory won't be prefixed to it.
@@ -661,7 +667,29 @@ Fig*sideruler.background: gray95
Fig*FigList*background: gray95
Fig*List*background: gray95
-Fig*Scrollbar.background: gray80
+Fig*Scrollbar.background: gray77
+
+Fig*Scrollbar.foreground: gray37
+Fig*ScrollbarBackground: gray67
+Fig*ScrollbarForeground: gray37
+
+Fig*horizontal.shadowWidth: 2
+Fig*horizontal.topShadowPixel: gray95
+Fig*horizontal.bottomShadowPixel: gray37
+Fig*horizontal.topShadow: gray95
+Fig*horizontal.bottomShadow: gray37
+
+Fig*Scrollbar.shadowWidth: 2
+Fig*Scrollbar.topShadow: gray95
+Fig*Scrollbar.bottomShadow: gray37
+Fig*Scrollbar.topShadowPixel: gray95
+Fig*Scrollbar.bottomShadowPixel: gray37
+
+Fig*stdColor.shadowWidth: 2
+Fig*stdColor.topShadow: gray95
+Fig*stdColor.bottomShadow: gray37
+Fig*stdColor.topShadowPixel: gray95
+Fig*stdColor.bottomShadowPixel: gray37
Fig*Label.background: gray80
Fig*ind_box.background: gray80
--- src/w_menuentry.c
+++ src/w_menuentry.c 2016-09-22 08:34:54.249950001 +0000
@@ -172,7 +172,7 @@ Redisplay(Widget w, XEvent *event, Regio
gc = entry->sme_bsb.norm_gray_gc;
}
- if (entry->sme_bsb.label != NULL) {
+ if (entry->sme_bsb.label != /* NULL */ XtName((Widget)(entry))) {
int x_loc = entry->sme_bsb.left_margin;
int len = strlen(entry->sme_bsb.label);
char * label = entry->sme_bsb.label;

3
xfig-3.2.6.tar.xz Normal file
View File

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

4
xfig.3.2.3d-international-std-fonts.dif
View File

@ -1,5 +1,5 @@
--- main.c
+++ main.c 2013-12-10 13:40:27.062735528 +0000
--- src/main.c
+++ src/main.c 2013-12-10 13:40:27.062735528 +0000
@@ -328,8 +328,36 @@ static XtResource application_resources[
XtOffset(appresPtr, always_use_fontset), XtRBoolean, (caddr_t) & false},
{"fixedFontSet", "FontSet", XtRFontSet, sizeof(XFontSet),

12
xfig.3.2.5-urw-fonts.dif
View File

@ -1,5 +1,5 @@
--- u_fonts.c
+++ u_fonts.c 2005-10-06 18:55:22.000000000 +0200
--- src/u_fonts.c
+++ src/u_fonts.c 2005-10-06 18:55:22.000000000 +0200
@@ -21,7 +21,9 @@
/* X11 font names */
@ -56,8 +56,8 @@
/* Use the following font names for any font that doesn't exist in the table above.
* These come with the Open Group X distribution so they should be a common set.
*
--- u_fonts.h
+++ u_fonts.h 2013-12-10 13:33:06.818235791 +0000
--- src/u_fonts.h
+++ src/u_fonts.h 2013-12-10 13:33:06.818235791 +0000
@@ -60,6 +60,8 @@ extern int psfontnum(char *font);
extern int latexfontnum(char *font);
@ -67,8 +67,8 @@
extern struct _fstruct ps_fontinfo[];
extern struct _fstruct latex_fontinfo[];
--- w_drawprim.c
+++ w_drawprim.c 2005-10-06 19:12:02.000000000 +0200
--- src/w_drawprim.c
+++ src/w_drawprim.c 2005-10-06 19:12:02.000000000 +0200
@@ -117,6 +117,22 @@ void init_font(void)
appres.buttonFont, appres.normalFont);
button_font = XLoadQueryFont(tool_d, appres.normalFont);

10
xfig.3.2.5-xim.dif
View File

@ -1,6 +1,10 @@
--- d_text.c
+++ d_text.c 2007-05-07 00:00:00.000000000 +0200
@@ -1973,7 +1973,10 @@ xim_initialize(w)
---
src/d_text.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
--- src/d_text.c
+++ src/d_text.c 2016-09-22 08:46:29.848945840 +0000
@@ -1968,7 +1968,10 @@ xim_initialize(Widget w)
if (xim_style == 0) xim_style = style_root;
}
}

30
xfig.3.2.5b-fixes.dif
View File

@ -1,5 +1,9 @@
--- w_layers.c
+++ w_layers.c 2009-12-14 12:37:11.335429185 +0000
---
src/w_layers.c | 37 +++++++++++++++++++++++++++++++------
1 file changed, 31 insertions(+), 6 deletions(-)
--- src/w_layers.c
+++ src/w_layers.c 2016-09-22 08:45:38.381908911 +0000
@@ -118,9 +118,27 @@ init_depth_panel(Widget parent)
{
Widget label, below;
@ -7,30 +11,30 @@
+ Dimension ind_ht = 0, snap_ht = 0, mouse_ht;
- /* MOUSEFUN_HT and ind_panel height aren't known yet */
- LAYER_HT = TOPRULER_HT + CANVAS_HT;
- LAYER_HT = TOPRULER_HT + CANVAS_HT;
+ if (XtIsManaged(ind_panel)) {
+ /* get height of indicator panel */
+ FirstArg(XtNheight, &ind_ht);
+ GetValues(ind_panel);
+ ind_ht += INTERNAL_BW*2;
+ /* get height of indicator panel */
+ FirstArg(XtNheight, &ind_ht);
+ GetValues(ind_panel);
+ ind_ht += INTERNAL_BW*2;
+ }
+
+ if (XtIsManaged(snap_indicator_panel)) {
+ /* get height of snap panel */
+ FirstArg(XtNheight, &snap_ht);
+ GetValues(snap_indicator_panel);
+ snap_ht += INTERNAL_BW*4;
+ /* get height of snap panel */
+ FirstArg(XtNheight, &snap_ht);
+ GetValues(snap_indicator_panel);
+ snap_ht += INTERNAL_BW*4;
+ }
+
+ /* MOUSEFUN_HT height aren't known yet */
+ mouse_ht = MSGPANEL_HT + CMDFORM_HT + INTERNAL_BW;
+
+ /* now that the bitmaps have been created, put the checkmark in the proper toggle */
+ LAYER_HT = mouse_ht + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*2 - snap_ht;
+ LAYER_HT = mouse_ht + TOPRULER_HT + CANVAS_HT + ind_ht + INTERNAL_BW*2 - snap_ht;
/* main form to hold all the layer stuff */
@@ -367,11 +385,18 @@ void
@@ -366,11 +384,18 @@ void
setup_depth_panel(void)
{
Dimension ind_ht, snap_ht=0;

15
xfig.3.2.5b-locale.dif
View File

@ -1,6 +1,11 @@
--- main.c
+++ main.c 2013-12-10 13:47:11.675533754 +0000
@@ -61,11 +61,13 @@
---
src/main.c | 18 ++++++++++++------
src/u_print.c | 1 +
2 files changed, 13 insertions(+), 6 deletions(-)
--- src/main.c
+++ src/main.c 2016-09-22 08:48:13.826999752 +0000
@@ -59,11 +59,13 @@
/* input extensions for an input tablet */
#ifdef USE_TAB
@ -50,8 +55,8 @@
/* save important info */
tool_d = XtDisplay(tool);
tool_s = XtScreen(tool);
--- u_print.c
+++ u_print.c 2006-11-16 12:45:46.000000000 +0000
--- src/u_print.c
+++ src/u_print.c 2016-09-22 08:48:13.826999752 +0000
@@ -15,6 +15,7 @@
*
*/

29
xfig.3.2.5b-mediaboxrealnb.dif
View File

@ -1,29 +0,0 @@
--- f_readeps.c
+++ f_readeps.c 2013-02-08 11:11:22.717952436 +0000
@@ -77,11 +77,13 @@ read_epsf_pdf(FILE *file, int filetype,
/* look for /MediaBox for pdf file */
if (pdf_flag) {
- if (!strncmp(buf, "/MediaBox", 8)) { /* look for the MediaBox spec */
+ char *s;
+ for(s=buf; (s=strchr(s,'/')); s++) {
+ if (!strncmp(s, "/MediaBox", 8)) { /* look for the MediaBox spec */
char *c;
- c = strchr(buf, '[') + 1;
- if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
+ c = strchr(s, '[');
+ if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
llx = lly = 0;
urx = paper_sizes[0].width * 72 / PIX_PER_INCH;
ury = paper_sizes[0].height * 72 / PIX_PER_INCH;
@@ -89,7 +91,9 @@ read_epsf_pdf(FILE *file, int filetype,
appres.INCHES ? "Letter" : "A4");
app_flush();
}
+ break;
}
+ }
/* look for bounding box */
} else if (!nested && !strncmp(buf, "%%BoundingBox:", 14)) {
if (!strstr(buf, "(atend)")) { /* make sure doesn't say (atend) */

24
xfig.3.2.5b-null.dif
View File

@ -1,6 +1,12 @@
--- w_dir.c
+++ w_dir.c 2004-03-22 12:17:21.000000000 +0000
@@ -126,6 +126,8 @@
---
src/w_dir.c | 4 ++++
src/w_library.c | 2 ++
src/w_srchrepl.c | 3 +++
3 files changed, 9 insertions(+)
--- src/w_dir.c
+++ src/w_dir.c 2016-09-22 08:47:20.164004194 +0000
@@ -127,6 +127,8 @@ FileSelected(Widget w, XtPointer client_
{
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
@ -9,7 +15,7 @@
strcpy(CurrentSelectionName, ret_struct->string);
FirstArg(XtNstring, CurrentSelectionName);
if (browse_up) {
@@ -160,6 +162,8 @@
@@ -158,6 +160,8 @@ DirSelected(Widget w, XtPointer client_d
{
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
@ -18,9 +24,9 @@
strcpy(CurrentSelectionName, ret_struct->string);
DoChangeDir(CurrentSelectionName);
}
--- w_library.c
+++ w_library.c 2004-03-22 12:19:10.000000000 +0000
@@ -461,6 +461,8 @@
--- src/w_library.c
+++ src/w_library.c 2016-09-22 08:47:20.164004194 +0000
@@ -476,6 +476,8 @@ NewObjectSel(Widget w, XtPointer closure
int new_obj;
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;
@ -29,8 +35,8 @@
new_obj = ret_struct->list_index;
if (icons_made) {
/* unhighlight the current view icon */
--- w_srchrepl.c
+++ w_srchrepl.c 2004-03-22 12:20:38.000000000 +0000
--- src/w_srchrepl.c
+++ src/w_srchrepl.c 2016-09-22 08:47:20.164004194 +0000
@@ -883,6 +883,9 @@ spell_select_word(Widget widget, XtPoint
{
XawListReturnStruct *ret_struct = (XawListReturnStruct *) call_data;

4
xfig.3.2.5b-preview.dif
View File

@ -1,5 +1,5 @@
--- f_readeps.c
+++ f_readeps.c 2013-12-10 13:57:36.222235930 +0000
--- src/f_readeps.c
+++ src/f_readeps.c 2013-12-10 13:57:36.222235930 +0000
@@ -257,7 +257,7 @@ bitmap_from_gs(file, filetype, pic, urx,
char buf[300];
FILE *tmpfp, *pixfile, *gsfile;

29
xfig.3.2.5b-pspdftex.dif
View File

@ -1,6 +1,10 @@
--- u_print.c
+++ u_print.c 2013-12-10 13:52:12.414235932 +0000
@@ -354,8 +354,10 @@ int print_to_file(char *file, char *lang
---
src/u_print.c | 8 +++++---
1 file changed, 5 insertions(+), 3 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. */
@ -12,7 +16,7 @@
if (backgrnd[0]) {
strcat(prcmd," -g \\"); /* must escape the #rrggbb color spec */
@@ -370,7 +373,7 @@ int print_to_file(char *file, char *lang
@@ -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");
@ -21,22 +25,7 @@
/* make it suitable for pdftex. */
strsub(prcmd,"ps","pdf",tmpcmd,0);
@@ -382,10 +385,11 @@ int print_to_file(char *file, char *lang
#ifdef I18N
/* set the numeric locale to C so we get decimal points for numbers */
setlocale(LC_NUMERIC, "C");
- sprintf(prcmd, "fig2dev %s -L %s -p %s -m %f %s %s %s",
- appres.international ? appres.fig2dev_localize_option : "",
+ sprintf(prcmd, "%s %s -L %s -p %s -m %f %s %s %s",
+ fig2dev_cmd, appres.international ? appres.fig2dev_localize_option : "",
#else
- sprintf(prcmd, "fig2dev -L %s -p %s -m %f %s %s %s",
+ sprintf(prcmd, "%s -L %s -p %s -m %f %s %s %s",
+ fig2dev_cmd,
#endif /* I18N */
"pstex_t", tmp_name, mag/100.0, layers, tmp_fig_file, outfile);
#ifdef I18N
@@ -742,7 +746,7 @@ void build_layer_list(char *layers)
@@ -755,7 +757,7 @@ void build_layer_list(char *layers)
{
char list[PATH_MAX], notlist[PATH_MAX], num[10];
int layer, len, notlen;

194
xfig.3.2.5b.dif
View File

@ -1,194 +0,0 @@
--- ./Doc/xfig.man
+++ ./Doc/xfig.man 2013-12-09 15:40:37.278735670 +0000
@@ -1489,8 +1489,11 @@ or X toolkit resource keyFile.
See the
.IR Imakefile .
.TP
-/usr/lib/X11/xfig
-This directory contains the html documentation, the above mentioned
+/usr/share/doc/packages/xfig
+This directory contains the documentation.
+.TP
+/usr/share/X11/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
--- Fig.ad
+++ Fig.ad 2009-12-14 11:42:24.307429001 +0000
@@ -15,6 +15,8 @@ Fig.version: 3.2.5b
Fig*AllowShellResize: false
+Fig.inches: false
+
! Image editor - can edit imported image
Fig.image_editor: xv
@@ -25,7 +27,7 @@ Fig.ghostscript: gs
! 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: /usr/X11R6/lib/X11/xfig/browser %f
! pdfviewer - put your favorite pdf viewer here.
! This is for viewing the xfig how-to guide and man pages
@@ -643,6 +645,12 @@ Fig*MenuButton*background: gray83
! in the color editor popup
Fig*mixedEdit.background: gray83
+Fig*mode_panel.background: gray67
+Fig*mode_panel*topShadow:: white
+Fig*mode_panel*bottomShadow: gray17
+Fig*mode_panel*topShadowPixel: white
+Fig*mode_panel*bottomShadowPixel: gray17
+
Fig*cancel.background: gray88
Fig*dismiss.background: gray88
Fig*commands*background: gray88
@@ -650,14 +658,36 @@ Fig*horizontal.background: gray88
! ruler colors
-Fig*topruler.background: gray95
-Fig*sideruler.background: gray95
+Fig*topruler.background: gray95
+Fig*sideruler.background: gray95
! file panel and scrollbar
Fig*FigList*background: gray95
Fig*List*background: gray95
-Fig*Scrollbar.background: gray80
+Fig*Scrollbar.background: gray77
+
+Fig*Scrollbar.foreground: gray37
+Fig*ScrollbarBackground: gray67
+Fig*ScrollbarForeground: gray37
+
+Fig*horizontal.shadowWidth: 2
+Fig*horizontal.topShadowPixel: gray95
+Fig*horizontal.bottomShadowPixel: gray37
+Fig*horizontal.topShadow: gray95
+Fig*horizontal.bottomShadow: gray37
+
+Fig*Scrollbar.shadowWidth: 2
+Fig*Scrollbar.topShadow: gray95
+Fig*Scrollbar.bottomShadow: gray37
+Fig*Scrollbar.topShadowPixel: gray95
+Fig*Scrollbar.bottomShadowPixel: gray37
+
+Fig*stdColor.shadowWidth: 2
+Fig*stdColor.topShadow: gray95
+Fig*stdColor.bottomShadow: gray37
+Fig*stdColor.topShadowPixel: gray95
+Fig*stdColor.bottomShadowPixel: gray37
Fig*Label.background: gray80
Fig*ind_box.background: gray80
--- Imakefile
+++ Imakefile 2013-12-09 15:55:48.894736219 +0000
@@ -53,7 +53,7 @@ XCOMM the 3d Athena Widget Set
#define XAW3D
#ifdef XAW3D
-XAWLIB = -lXaw3d
+XAWLIB = $(shell pkg-config xaw3d --libs)
#endif
XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
@@ -96,8 +96,8 @@ XCOMM You must have version 5b or newer
#ifdef USEJPEG
# ifdef USEINSTALLEDJPEG
- JPEGLIBDIR = /usr/local/lib
- JPEGINC = -I/usr/include/X11
+ JPEGLIBDIR = /usr/lib
+ JPEGINC = -I/usr/include
# else
JPEGLIBDIR = ../jpeg
JPEGINC = -I$(JPEGLIBDIR)
@@ -119,8 +119,8 @@ XCOMM Change XPMINC if necessary to poin
#define USEXPM_ICON
#ifdef USEXPM
-XPMLIBDIR = /usr/local/lib
-XPMINC = -I/usr/include/X11
+XPMLIBDIR = $(USRLIBDIR)
+XPMINC = -I/usr/include
#endif
XCOMM Uncomment the following definiton if you want to use the small icons
@@ -150,8 +150,8 @@ XCOMM Comment out the next two lines if
XCOMM If your setlocale() doesn't support the locale, you should
XCOMM add -DSETLOCALE to I18N_DEFS.
-XCOMM #define I18N
-XCOMM XAW_INTERN = -DXAW_INTERNATIONALIZATION
+#define I18N
+XAW_INTERN = $(shell pkg-config xaw3d --cflags)
XCOMM If using an input tablet uncomment the following
@@ -162,7 +162,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 use (and change) the following if you want the multi-key data base file
XCOMM somewhere other than the standard X11 library directory
@@ -170,16 +170,19 @@ 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
+XCOMM XFIGLIBDIR = $(LIBDIR)/xfig
+XFIGLIBDIR = _DATA/xfig
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
XCOMM XFIGDOCDIR = $(DOCDIR)/xfig
-XFIGDOCDIR = /usr/local/xfig/doc
+XCOMM XFIGDOCDIR = /usr/local/xfig/doc
+XFIGDOCDIR = /usr/share/doc/packages/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)
+XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
XCOMM MANDIR = /usr/local/xfig/man
+MANDIR = /usr/share/man/man1
XCOMM If your system doesn't have strstr undefine the following definition
XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
@@ -209,7 +212,7 @@ XCOMM instead.
XCOMM Add `-DCACHE_SIZE_LIMIT=xxxx' where xxxx is the cache size in kilobytes.
XCOMM A cache size of zero turns caching off.
-CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=300
+CACHE = -DCACHE_BITMAPS -DCACHE_SIZE_LIMIT=512 -DMAXNUMPTS=50000 -DBSDLPR
XCOMM For SYSV systems with BSD-style printer command which use lpr instead of
XCOMM lp (SGI is one such machine), add -DBSDLPR to the DEFINES variable
@@ -223,6 +226,7 @@ XCOMM number of vertices.
XCOMM If you want a compiler other than "cc", define it here
XCOMM CC = /opt/SUNWspro/bin/cc
+CC = gcc
XCOMM Shorten unnecessary dependencies:
XCOMM #define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
--- w_menuentry.c
+++ w_menuentry.c 2006-07-31 15:56:25.000000000 +0000
@@ -169,7 +169,8 @@ Redisplay(Widget w, XEvent *event, Regio
gc = entry->sme_bsb.norm_gray_gc;
}
- if (entry->sme_bsb.label != NULL) {
+/* if (entry->sme_bsb.label != NULL) { */
+ if (entry->sme_bsb.label == XtName((Widget)(entry))) {
int x_loc = entry->sme_bsb.left_margin;
int len = strlen(entry->sme_bsb.label);
char * label = entry->sme_bsb.label;

3
xfig.3.2.5c-patches.tar.bz2
View File

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

3
xfig.3.2.5c.tar.gz
View File

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

124
xfig.changes
View File

@ -1,3 +1,125 @@
-------------------------------------------------------------------
Thu Sep 22 10:40:28 UTC 2016 - werner@suse.de
- Update to xfig 3.2.6
New features:
o Add compile switch to enable xpm-icon and xpm-splash screen
independently (--enable-xpm-icon, --enable-xpm-splash).
o New compile switch --enable-versioning, calls update_version_m4
to get version information from a source control system.
o Should compile on Mac (Darwin) after installing dependencies using
Macports, Fink or Homebrew.
o Add two rudimentary tests. Run with make check.
o New tikz and pict2e export drivers.
o Build using autoconf (./configure; make; make install).
UI changes:
From Brian V. Smith. These changes were made because the original
view was of the drawing on the page instead of the modern view
of the observer moving left/right/up/down:
o Left arrow moves observer left (used to scroll canvas left)
o Right arrow moves observer right
o Up arrow moves observer up
o Down arrow moves observer down
o Ctrl+Wheel up zooms in, Ctrl+Wheel down zooms out (was the other way around)
Bugs fixed:
o Update documentation to LaTeX and Xfig.
o Change \r\n to \n in all files.
From Roland Rosenfeld <roland@spinnaker.de>:
o Update LaTeX documentation, use \documentclass instead of
\documentstyle, \usepackage instead of \input.
o Builds on hurd, had to #include <limits.h> in a few places.
o Use application/x-xfig, not image/x-xfig in xfig.desktop file.
See https://bugs.launchpad.net/ubuntu/+source/xfig/+bug/690067 and
https://bugs.launchpad.net/ubuntu/+source/xfig/+bug/1045848 .
o To compile on ancient systems, try make -DANCIENT.
o Report correct paths to installed files in the man page.
From Vladislav Zavjalov; Commit numbers refer to
http://git.altlinux.org/people/slazav/packages/?p=xfig.git;a=commit;h=#
o Preserve comments when deleting objects; Commit #6c42e5c
o Restore colors and main comment after Delete All + Undo; #34f6105
o Draw horizontal scrollbar if property buttons are too wide to fit
on the screen. Commit #e9c1394
o Add save8bit app-resource to allow saving 8-bit files. #5bd9fbb
o Move Xfuncs.h and Xosdefs.h out from fig.h. Commit #b433478
o Move -l flags from LDFLAGS to LDADD. Commit #2d57c85
From Roland Rosenfeld. Bug numers refer to https://bugs.debian.org/#.
o Do not link with -lXmu, if linking with Xaw3d > 1.5e.
o Make japanese documentation available for LANG=ja_JP.ujis.
o Set the Creation date in xfig_man.html to the date when
creating the source tarball.
o Really fix reading png files,
https://bugzilla.redhat.com/show_bug.cgi?id=1150330
o Delete some superfluos files, fix typos (Caribbean),
add semicolon in xfig.desktop (bug # 812477).
From Brian V. Smith:
o old link for "Xfig On Microsoft Windows" (Getting and Installing Xfig html page)
o dash_list wrong dimension causes segfault on some line styles
o Should handle systems where REG_NOERROR (regular expression) is undefined now
o Missing xfig_man.html
o Modify a few places where to set locale to "C".
o Didn't allocate enough space for fonts (would segfault when popping up File panels)
o Moving arc point would segfault
From Roland Rosenfeld. Bug numbers refer to https://bugs.debian.org/#.
In fact, most of the bugs below, also those from other sources, were
fixed by applying the debian-patches.
o Position independent executables work, fixes bug # 756791.
o Revert previous change of X-spline parameter.
o Use C locale for fig2dev, to correctly interpret decimal point.
Fixes bug # 782737.
o Correct grid mode distances in man page. Bug # 314820.
o Extend xfig.desktop.
o Fix unsecure use of temporary file. From Thomas Hoger, gentoo.
Debian Bug # 565341.
o Escape - in man-page.
o Securely print string.
o Restore old shadow behaviour.
o Fix reading "/MediaBox" when importing pdf. Closes Bug # 530898.
o With -papersize b1, use B1, not B10. Bug 535181.
From Vladislav Zavjalov. Information on bugs is found
at https://bugzilla.altlinux.org/show_bug.cgi?id=#
o Do not use fontsets for symbol and dingbat fonts, bug # 26579.
o Fix compiler warnigs in w_indpanel.c. Commit feabe27.
o Restore correct depths when loading a figure, then undo.
Commit b5c79b3.
o Restore filename after delete region, undo. Commit 219d690.
o Restore user color when opening new fig-file. Commit fccd915.
o Restore correct depths when joining lines with different depths.
Commit a77bcaf.
o Fix xfontlist->fset initialization. Commit a592399.
o Fix default origin (100000,100000) -> (0,0) for filled objects.
Commit 4d87e60.
o Fix 100% cpu-load by save panel. Commit 81a4596.
o Do not use local SimpleMenu.c with XAW3D1_5E. Would segfault on
some 64-bit systems when opening main menu.
o Missing argument may cause crash or undefined behaviour.
Debian bug # 795642. From Michael Tautschnig.
From Hans de Goede. Bug information
at https://bugzilla.redhat.com/show_bug.cgi?id=#.
o Patch for importing png-files, Red Hat bug # 1150330. From David Kaufmann.
o Fix crash when changing arrow size. Bug # 1046102.
o Fix crash when creating dash-dotted lines. Bug # 1023744.
From Michael Srb, thanks to Maurizio Pollini and David Kaufmann.
o Fix crash on exit. From Peter Volkov at gentoo
- Remove browser script as for now xdg-open is used
- Patch xfig.3.2.5b.dif becomes xfig-3.2.6.dif
- Remove patch xfig.3.2.5b-mediaboxrealnb.dif and collection
xfig.3.2.5c-patches.tar.bz2 as now upstream
- Port the patches
xfig.3.2.3d-international-std-fonts.dif
xfig.3.2.5-urw-fonts.dif
xfig.3.2.5-xim.dif
xfig.3.2.5b-fixes.dif
xfig.3.2.5b-locale.dif
xfig.3.2.5b-null.dif
xfig.3.2.5b-preview.dif
xfig.3.2.5b-pspdftex.dif
to 3.2.6
-------------------------------------------------------------------
Fri Mar 11 09:34:01 UTC 2016 - werner@suse.de
- Add BuildRequires on libXmu-devel
-------------------------------------------------------------------
Thu Jun 18 19:53:44 UTC 2015 - crrodriguez@opensuse.org
@ -330,7 +452,7 @@ Mon May 7 16:44:45 CEST 2007 - werner@suse.de
End: end-of-line
Del: delete-character-right
* Added *.jpeg* to picture browse options
* New libraries for electronics from Fabio González in
* New libraries for electronics from Fabio González in
Libraries/Electronics/Schematic/More
* typo in latex_and_xfig.html and LATEX_AND_XFIG files. Text should be:
\convertMPtoPDF{foo.0}{1}{1}

86
xfig.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package xfig
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,9 +18,9 @@
Name: xfig
BuildRequires: dos2unix
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: freetype2-devel
BuildRequires: imake
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xt)
@ -38,6 +38,7 @@ BuildRequires: libpng12-devel
%else
BuildRequires: libpng-devel
%endif
BuildRequires: libXmu-devel
Provides: xfig.3.2.3d
Requires: efont-unicode
Requires: ghostscript-fonts-std
@ -46,30 +47,28 @@ Requires: netpbm
Requires: transfig
Requires: xorg-x11-fonts
Requires: xorg-x11-fonts-core
Version: 3.2.5c
Version: 3.2.6
Release: 0
Summary: Facility for Interactive Generation of Figures under the X Window System
License: MIT
Group: Productivity/Graphics/Vector Editors
Url: http://www.xfig.org/
# www.xfig.org is dead
Url: http://mcj.sourceforge.net/
#
# Remove forbidden files: aircraft.fig
# gunzip xfig.3.2.5c.tar
# <uncompess> xfig.3.2.5c.tar
# tar -f xfig.3.2.5c.tar --delete xfig.3.2.5c/Libraries/Examples/aircraft.fig
# gzip xfig.3.2.5c.tar
# <compress> xfig.3.2.5c.tar
#
Source: xfig.%{version}.tar.gz
Source: xfig-%{version}.tar.xz
Source1: font-test.fig
Source2: browser
Source3: xfig.sh
Source4: xfig.desktop
Source5: xfig.3.2.5c-patches.tar.bz2
Patch0: xfig.3.2.5b.dif
Patch0: xfig-%{version}.dif
Patch1: xfig.3.2.5-urw-fonts.dif
Patch2: xfig.3.2.5-xim.dif
Patch3: xfig.3.2.3d-international-std-fonts.dif
# PATCH-FIX-UPSTREAM xfig.3.2.5b-mediaboxrealnb.dif [debian#530898]
Patch4: xfig.3.2.5b-mediaboxrealnb.dif
Patch5: xfig.3.2.5b-null.dif
Patch6: xfig.3.2.5b-locale.dif
Patch7: xfig.3.2.5b-fixes.dif
@ -110,7 +109,7 @@ Authors:
Uwe Bonnes <bon@lte.e-technik.uni-erlangen.de>
%prep
%setup -q -n xfig.%{version}
%setup -q -n xfig-%{version}
set +x
find -type f | xargs -r chmod a-x,go-w
find -type f | while read file; do
@ -119,12 +118,10 @@ find -type f | while read file; do
fi
done
set -x
tar Oxfj %{S:5} | patch -p1 -s
%patch0 -p0
%patch1 -p0 -b .urw-fonts
%patch2 -p0 -b .xim
%patch3 -p0 -b .international-std-fonts
%patch4 -p0 -b .mbox
%patch5 -p0 -b .null
%patch6 -p0 -b .locale
%patch7 -p0 -b .fixes
@ -151,53 +148,38 @@ EOF
PKG_CONFIG_PATH=/usr/share/pkgconfig:/usr/lib/pkgconfig:${PWD}
export PKG_CONFIG_PATH
%endif
xmkmf -a -D_DATA='%{_data}' -DStandardDefines=''
CCOPTIONS="$RPM_OPT_FLAGS -fno-strict-aliasing -w -D_GNU_SOURCE -std=gnu99"
CCOPTIONS="$CCOPTIONS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
make CCOPTIONS="$CCOPTIONS"
CC=gcc
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -w -D_GNU_SOURCE -std=gnu99"
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
CFLAGS="$CFLAGS -DMAXNUMPTS=50000"
CFLAGS="$CFLAGS -DBSDLPR"
export CC CFLAGS
chmod 755 configure
%configure \
--docdir=%{_defaultdocdir}/%{name} \
--enable-cache-size=512 \
--enable-xpm-splash \
--with-x \
--with-xaw3d1_5e \
--with-xaw3d
make %{?_smp_mflags} CCOPTIONS="$CFLAGS"
%install
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_x11data}/xfig
mkdir -p %{buildroot}%{_appdefdir}
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/Libraries/Examples
rm -rf %{buildroot}%{_defaultdocdir}/%{name}/Examples
ln -sf Libraries/Examples \
%{buildroot}%{_defaultdocdir}/%{name}/TheExamples
ln -sf %{_defaultdocdir}/%{name}/Libraries \
%{buildroot}%{_x11data}/xfig/Libraries
ln -sf %{_defaultdocdir}/%{name}/html \
%{buildroot}%{_x11data}/xfig/
ln -sf %{_defaultdocdir}/%{name}/xfig-howto.pdf \
%{buildroot}%{_x11data}/xfig/
install -m 0755 %{SOURCE2} %{buildroot}%{_x11data}/xfig/
make DESTDIR=%{buildroot} install
make DESTDIR=%{buildroot} install.man
mkdir -p %{buildroot}/%{_docdir}/%{name}
cp -pr README FIGAPPS Libraries font-test.fig %{buildroot}/%{_docdir}/%{name}
cp -pr Doc/FORMAT* Doc/TODO Doc/html Doc/*.pdf %{buildroot}/%{_docdir}/%{name}
find %{buildroot}%{_defaultdocdir}/%{name}/ -name '*.bak' | xargs -r rm
find %{buildroot}%{_defaultdocdir}/%{name}/ -type f -print0 | xargs -0 chmod 644
mkdir -p %{buildroot}%{_datadir}/pixmaps
cp -p %{name}.png %{buildroot}%{_datadir}/pixmaps/
mv %{buildroot}%{_bindir}/xfig %{buildroot}%{_bindir}/xfig.bin
sed 's|@@BINDIR@@|%{_bindir}|' < %{SOURCE3} > %{buildroot}%{_bindir}/xfig
chmod 0755 %{SOURCE3} %{buildroot}%{_bindir}/xfig
install -d %{buildroot}/usr/share/applications
sed 's|@@BINDIR@@|%{_bindir}|' < %{SOURCE4} > %{buildroot}/usr/share/applications/xfig.desktop
chmod 0644 %{buildroot}/usr/share/applications/xfig.desktop
find %{buildroot}/%{_docdir}/%{name} -name '*.orig' | xargs -r rm -f
mv %{buildroot}%{_mandir}/man1/xfig.1 %{buildroot}%{_mandir}/man1/xfig.1x
gzip -9 %{buildroot}%{_mandir}/man1/xfig.1x
%fdupes %{buildroot}
%suse_update_desktop_file xfig VectorGraphics &> /dev/null
%files
%defattr(-,root,root,755)
%doc %{_docdir}/%{name}
%dir %{_appdefdir}
%{_appdefdir}/Fig
%{_bindir}/xfig*
%{_datadir}/applications/xfig.desktop
%{_datadir}/pixmaps/xfig.png
%{_x11data}/xfig
%{_bindir}/xfig*
%dir %{_appdefdir}
%config %{_appdefdir}/Fig
%doc %{_mandir}/man1/xfig.1x.gz
%{_datadir}/xfig
%doc %{_mandir}/man1/xfig.1*.gz
%changelog