Accepting request 26416 from graphics
Copy from graphics/xfig based on submit request 26416 from user WernerFink OBS-URL: https://build.opensuse.org/request/show/26416 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xfig?expand=0&rev=13
This commit is contained in:
OBS User autobuild
committed by
Git OBS Bridge
Git OBS Bridge
parent
31a4b947ef
commit
d5c59d51e2
195
xfig.3.2.5b.dif
Normal file
195
xfig.3.2.5b.dif
Normal file
@@ -0,0 +1,195 @@
|
||||
--- 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 2009-12-14 11:46:44.459929609 +0000
|
||||
@@ -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
|
||||
@@ -76,7 +76,7 @@ XCOMM Redefine the following if your PNG
|
||||
XCOMM are in different places
|
||||
|
||||
PNGLIBDIR = $(USRLIBDIR)
|
||||
-PNGINC = -I/usr/local/include
|
||||
+PNGINC = -I/usr/include
|
||||
ZLIBDIR = $(USRLIBDIR)
|
||||
|
||||
XCOMM If don't want JPEG support, comment out the #define USEJPEG line
|
||||
@@ -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/local/include/X11
|
||||
+XPMLIBDIR = $(USRLIBDIR)
|
||||
+XPMINC = -I$(USRLIBDIR)
|
||||
#endif
|
||||
|
||||
XCOMM Uncomment the following definiton if you want to use the small icons
|
||||
@@ -161,7 +161,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
|
||||
@@ -169,16 +169,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
|
||||
@@ -208,7 +211,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
|
||||
@@ -222,6 +225,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)
|
||||
@@ -251,7 +255,7 @@ DEPLIBJPEG = $(JPEGLIBDIR)/libjpeg.a
|
||||
#endif /* USEJPEG */
|
||||
|
||||
#ifdef I18N
|
||||
-I18N_DEFS = -DI18N -DSETLOCALE
|
||||
+I18N_DEFS = -DI18N
|
||||
I18N_SRC = w_i18n.c
|
||||
I18N_OBJ = w_i18n.o
|
||||
#endif
|
||||
--- fig.h
|
||||
+++ fig.h 2006-07-31 15:56:25.000000000 +0000
|
||||
@@ -29,6 +29,7 @@ extern char *my_strdup(char *str);
|
||||
#endif
|
||||
#include <sys/types.h> /* for stat structure */
|
||||
#endif
|
||||
+#include <sys/param.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
#if defined(__convex__) && defined(__STDC__)
|
||||
--- 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;
|
||||
Reference in New Issue
Block a user