OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 04-Apr-2006 10:04:57
Branch: HEAD Handle: 2006040409045600
Modified files:
openpkg-src/xfig xfig.patch xfig.spec
Log:
upgrade to Alpha version of xfig/transfig as it is a lot more modern
(although itself already years old)
Summary:
Revision Changes Path
1.3 +53 -29 openpkg-src/xfig/xfig.patch
1.28 +12 -8 openpkg-src/xfig/xfig.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/xfig/xfig.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 xfig.patch
--- openpkg-src/xfig/xfig.patch 28 Apr 2003 12:18:48 -0000 1.2
+++ openpkg-src/xfig/xfig.patch 4 Apr 2006 08:04:56 -0000 1.3
@@ -1,8 +1,20 @@
---- Fig.ad.orig Thu Dec 19 01:05:41 2002
-+++ Fig.ad Wed Mar 12 22:09:36 2003
+Index: Fig-color.ad
+--- Fig-color.ad.orig 2004-02-09 22:22:45 +0100
++++ Fig-color.ad 2006-04-04 09:59:22 +0200
+@@ -136,3 +136,7 @@
+
+ Fig*toggle*bottomShadowPixel: gray80
+ Fig*toggle*topShadowPixel: gray50
++
++! use a reasonable grid color (default is red)
++Fig.grid_color: gray60
++
+Index: Fig.ad
+--- Fig.ad.orig 2004-03-17 01:44:50 +0100
++++ Fig.ad 2006-04-04 09:59:22 +0200
@@ -3,6 +3,9 @@
- Fig.version: 3.2.4
+ Fig.version: 3.2.5-alpha5
+! disable splash screen
+Fig.splash: off
@@ -10,30 +22,42 @@
! some sample settings you may want to change
! The following fixes a problem that some window managers have
-@@ -515,11 +518,11 @@
-
- ! move scrollbar via wheel rotation
- !
--Fig*Scrollbar.translations: #override \
-- <Btn4Down>: StartScroll(Backward) StartScroll(Backward) \
-- StartScroll(Backward) StartScroll(Backward) StartScroll(Backward)
\n\
-- <Btn5Down>: StartScroll(Forward) StartScroll(Forward) \
-- StartScroll(Forward) StartScroll(Forward) StartScroll(Forward)
-+! Fig*Scrollbar.translations: #override \
-+! <Btn4Down>: StartScroll(Backward) StartScroll(Backward) \
-+! StartScroll(Backward) StartScroll(Backward) StartScroll(Backward)
\n\
-+! <Btn5Down>: StartScroll(Forward) StartScroll(Forward) \
-+! StartScroll(Forward) StartScroll(Forward) StartScroll(Forward)
-
- ! popup drawing/editing menu via wheel rotation.
- ! if Control is pressed, zoom in/zoom out via wheel rotation.
---- Fig-color.ad.orig 2000-07-25 21:18:44.000000000 +0200
-+++ Fig-color.ad 2003-04-28 14:16:43.000000000 +0200
-@@ -133,3 +133,7 @@
-
- Fig*toggle*bottomShadowPixel: gray80
- Fig*toggle*topShadowPixel: gray50
-+
-+! use a reasonable grid color (default is red)
-+Fig.grid_color: gray60
+Index: u_fonts.h
+--- u_fonts.h.orig 2004-01-06 20:47:45 +0100
++++ u_fonts.h 2006-04-04 10:00:25 +0200
+@@ -30,12 +30,6 @@
+ /* font number for the "nil" font (when user wants tiny text) */
+ #define NILL_FONT NUM_FONTS
+
+-extern int psfontnum();
+-extern int latexfontnum();
+-extern struct _xfstruct x_fontinfo[], x_backup_fontinfo[];
+-extern struct _fstruct ps_fontinfo[];
+-extern struct _fstruct latex_fontinfo[];
+-
+ /* element of linked list for each font
+ The head of list is for the different font NAMES,
+ and the elements of this list are for each different
+@@ -61,5 +55,11 @@
+ * sizes */
+ };
+
++extern int psfontnum();
++extern int latexfontnum();
++extern struct _xfstruct x_fontinfo[], x_backup_fontinfo[];
++extern struct _fstruct ps_fontinfo[];
++extern struct _fstruct latex_fontinfo[];
+
+ int x_fontnum();
+ #endif /* U_FONTS_H */
+Index: w_drawprim.c
+--- w_drawprim.c.orig 2004-02-09 19:32:56 +0100
++++ w_drawprim.c 2006-04-04 10:01:36 +0200
+@@ -35,6 +35,7 @@
+ #include "paintop.h"
+ #include "mode.h"
+ #include "object.h"
++#include "u_create.h"
+ #include "u_fonts.h"
+ #include "w_canvas.h"
+ #include "w_drawprim.h"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/xfig/xfig.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 xfig.spec
--- openpkg-src/xfig/xfig.spec 1 Jan 2006 13:24:22 -0000 1.27
+++ openpkg-src/xfig/xfig.spec 4 Apr 2006 08:04:56 -0000 1.28
@@ -22,21 +22,25 @@
## SUCH DAMAGE.
##
+# package version
+%define V_major 3.2.5
+%define V_minor 5
+
# package information
Name: xfig
Summary: Interactive Drawing Tool
-URL: http://www.xfig.org/
+URL: http://xfig.org/
Vendor: Brian V. Smith et al.
Packager: OpenPKG
Distribution: OpenPKG
Class: PLUS
Group: XWindow
License: MIT-style
-Version: 3.2.4
-Release: 20050224
+Version: %{V_major}a%{V_minor}
+Release: 20060404
# list of sources
-Source0: http://www.xfig.org/xfigdist/xfig.%{version}.code_only.tar.gz
+Source0:
http://xfig.org/software/xfig/%{V_major}-alpha/xfig.%{V_major}-alpha%{V_minor}.code_only.tar.gz
Source1: xfig.sh
Patch0: xfig.patch
@@ -59,13 +63,13 @@
%track
prog xfig = {
- version = %{version}
- url = http://www.xfig.org/xfigdist/
- regex = xfig\.(__VER__)\.code_only\.tar\.gz
+ version = %{V_major}_alpha%{V_minor}
+ url = http://www.xfig.org/art4.html
+ regex = xfig\.(__VER__[_-]alpha\d+)\.code_only\.tar\.gz
}
%prep
- %setup -q -n xfig.%{version}
+ %setup -q -n xfig.%{V_major}-alpha%{V_minor}
%patch -p0
%build
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]